@pax2pay/model-banking 0.1.261 → 0.1.263

package/Counterbalance2.ts

@@ -1,30 +1,21 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
-import { Supplier } from "./Supplier"
 
 export type Counterbalance2 = {
 	minted: Partial<Record<Counterbalance2.Source, number>>
 	burned: Partial<Record<Counterbalance2.Sink, number>>
 }
 export namespace Counterbalance2 {
-	export const sources = [...Supplier.names, "internal"] as const
-	export type Source = `${typeof sources[number]}-${string}` // string: fiat account identifier
-	export const Source = isly.fromIs<Source>("Source", (value: any | Source) => {
-		const result = !value ? false : typeof value == "string" && value.split("-")
-		return result && result.length == 2 && sources.includes(result[0] as any) && typeof result[1] == "string"
-	})
-	export const sinks = [...Supplier.names, "internal"] as const
-	export type Sink = `${typeof sinks[number]}-${string}` // string: fiat account identifier
-	export const Sink = isly.fromIs<Sink>("Sink", (value: any | Sink) => {
-		const result = !value ? false : typeof value == "string" && value.split("-")
-		return result && result.length == 2 && sinks.includes(result[0] as any) && typeof result[1] == "string"
-	})
+	export type Source = string
+	export const Source = isly.string()
+	export type Sink = string
+	export const Sink = isly.string()
 	export const type = isly.object<Counterbalance2>({
 		minted: isly.record<Counterbalance2["minted"]>(Source, isly.number()),
 		burned: isly.record<Counterbalance2["burned"]>(Sink, isly.number()),
 	})
 	export type Link = Source | Sink
-	export const Link = isly.union<Link, Source, Sink>(Source, Sink)
+	export const Link = isly.string()
 	export function add(currency: isoly.Currency, addendee: Counterbalance2, addend: Counterbalance2): Counterbalance2 {
 		const result: Counterbalance2 = { minted: { ...addend.minted }, burned: { ...addend.burned } }
 		for (const [source, value] of Object.entries(addendee["minted"]) as [Source, number][]) {

package/Settlement/Amount.ts

@@ -0,0 +1,21 @@
+import { isoly } from "isoly"
+import { isly } from "isly"
+
+export type Amount = {
+	net: number
+	fee: {
+		other: number
+	}
+}
+export namespace Amount {
+	export const type = isly.object<Amount>({
+		net: isly.number(),
+		fee: isly.object<Amount["fee"]>({ other: isly.number() }),
+	})
+	export function add(currency: isoly.Currency, addendee: Amount, addend: Partial<Amount>): Amount {
+		const result = { ...addendee }
+		result.net = isoly.Currency.add(currency, result.net, addend.net ?? 0)
+		result.fee.other = isoly.Currency.add(currency, result.fee.other, addend.fee?.other ?? 0)
+		return result
+	}
+}

package/Settlement/Creatable.ts

@@ -1,10 +1,10 @@
 import { isly } from "isly"
 import { Card } from "../Card"
 import { Batch } from "./Batch"
-import { Total } from "./Total"
+import { Totals } from "./Totals"
 
 export interface Creatable {
-	expected?: Total
+	totals: Totals
 	processor: Card.Stack
 	references?: string[] //File name
 	batch: Batch
@@ -12,7 +12,7 @@ export interface Creatable {
 
 export namespace Creatable {
 	export const type = isly.object<Creatable>({
-		expected: Total.type.optional(),
+		totals: Totals.type,
 		processor: Card.Stack.type,
 		references: isly.string().array().optional(),
 		batch: Batch.type,

package/Settlement/Entry/Capture.ts

@@ -19,7 +19,7 @@ export namespace Capture {
 	export interface Creatable {
 		type: "capture"
 		authorization: Authorization
-		reference: string
+		reference: string // card transaction
 		batch: Batch
 		fee: Fee
 		amount: Amount

package/Settlement/Entry/index.ts

@@ -1,8 +1,6 @@
 import { gracely } from "gracely"
 import { isly } from "isly"
-import { Amount } from "../../Amount"
 import { Transaction } from "../../Transaction"
-import { Total } from "../Total"
 import { Cancel as EntryCancel } from "./Cancel"
 import { Capture as EntryCapture } from "./Capture"
 import { Creatable as EntryCreatable } from "./Creatable"
@@ -38,11 +36,6 @@ export namespace Entry {
 	export const Summary = EntrySummary
 	export type Creatable = EntryCreatable
 	export const Creatable = EntryCreatable
-	export function compile(entry: Entry): Total {
-		return entry.type == "unknown"
-			? Total.initiate()
-			: Total.initiate({ amount: Amount.toAmounts(entry.amount), fee: entry.fee })
-	}
 	export function from(creatable: Entry.Creatable, transaction: Transaction | gracely.Error | string): Entry {
 		let result: Entry
 		if (!Transaction.is(transaction) || transaction.status != "finalized")

package/Settlement/Total.ts

@@ -1,34 +1,82 @@
+import { isoly } from "isoly"
 import { isly } from "isly"
-import { Amounts } from "../Amounts"
-import { Transaction } from "../Transaction"
-import { Fee } from "./Fee"
+import { Amount } from "./Amount"
 
-export type Total = {
-	amount: Amounts
-	fee: Fee
+export interface Total {
+	expected: Amount
+	outcome?: Amount
+	collected?: Amount & { transactions: { net: string; fee: string } }
+	settled?: Total.Settled
 }
 export namespace Total {
-	export function initiate(partial?: Partial<Total>): Total {
-		return { amount: partial?.amount ?? {}, fee: partial?.fee ?? { other: {} } }
+	export type Settled = {
+		net: number
+		transactions: string[]
 	}
-	export function add(addendee: Total, addend: Total): Total {
-		return { amount: Amounts.add(addendee.amount, addend.amount), fee: Fee.add(addendee.fee, addend.fee) }
+	export const Settled = isly.object<Settled>({ net: isly.number(), transactions: isly.string().array() })
+	export const type = isly.object<Total>({
+		expected: Amount.type,
+		outcome: Amount.type.optional(),
+		collected: Amount.type
+			.extend<Required<Total>["collected"]>({
+				transactions: isly.object<Required<Total>["collected"]["transactions"]>({
+					net: isly.string(),
+					fee: isly.string(),
+				}),
+			})
+			.optional(),
+		settled: Settled.optional(),
+	})
+	export function create(): Total {
+		return { expected: { net: 0, fee: { other: 0 } } }
 	}
-	export function compare(expected: Total, outcome: Total): boolean {
-		return Amounts.compare(expected.amount, outcome.amount) && Amounts.compare(expected.fee.other, outcome.fee.other)
-	}
-	export function from(collect: Transaction.Collect, collected: Total = initiate()): Total {
-		let result: Total = collected
-		for (const [currency, counterbalance] of Object.entries(collect.counterbalances)) {
-			for (const [entry, amount] of Object.entries(counterbalance))
-				if (entry.startsWith("fee"))
-					result = add(result, initiate({ fee: { other: { [currency]: amount } } }))
-				else if (entry.startsWith("settle"))
-					result = add(result, initiate({ amount: { [currency]: amount } }))
+	export function verify(total: Total, type: "outcome" | "collected" | "settled"): boolean {
+		let result: boolean
+		switch (type) {
+			case "outcome":
+				result = total.outcome?.net == total.expected.net && total.outcome.fee.other == total.expected.fee.other
+				break
+			case "collected":
+				result = total.collected?.net == total.outcome?.net && total.collected?.fee.other == total.outcome?.fee.other
+				break
+			case "settled":
+				result = total.settled?.net == total.collected?.net
+				break
 		}
 		return result
 	}
-	export const type = isly.object<Total>({ amount: Amounts.type, fee: Fee.type })
-	export const is = type.is
-	export const flaw = type.flaw
+	export function add(currency: isoly.Currency, addendee: Total, addend: Partial<Total>): Total {
+		const result: Total = { ...addendee }
+		addend.expected && (result.expected = Amount.add(currency, result.expected, addend.expected))
+		if (result.outcome || addend.outcome)
+			result.outcome = Amount.add(currency, result.outcome ?? { net: 0, fee: { other: 0 } }, addend.outcome ?? {})
+		if (result.collected || addend.collected)
+			result.collected = {
+				...Amount.add(currency, result.collected ?? { net: 0, fee: { other: 0 } }, addend.collected ?? {}),
+				transactions: {
+					net: addend.collected?.transactions.net ?? result.collected?.transactions.net ?? "",
+					fee: addend.collected?.transactions.fee ?? result.collected?.transactions.fee ?? "",
+				},
+			}
+		if (result.settled || addend.settled)
+			result.settled = {
+				net: isoly.Currency.add(currency, result.settled?.net ?? 0, addend.settled?.net ?? 0),
+				transactions: (result.settled?.transactions ?? []).concat(addend.settled?.transactions ?? []),
+			}
+		return result
+	}
+	export function collect(
+		currency: isoly.Currency,
+		total: Total,
+		collected: Amount,
+		transactions: { net: string; fee: string }
+	): Total {
+		const result = { ...total }
+		if (result.collected) {
+			result.collected.net = isoly.Currency.add(currency, result.collected.net, collected.net)
+			result.collected.fee.other = isoly.Currency.add(currency, result.collected.fee.other, collected.fee.other)
+		} else
+			result.collected = { ...collected, transactions }
+		return result
+	}
 }

package/Settlement/Totals.ts

@@ -0,0 +1,54 @@
+import { isoly } from "isoly"
+import { isly } from "isly"
+import type { Collect } from "../Transaction/Collect"
+import { Amount } from "./Amount"
+import { Entry } from "./Entry"
+import { Total } from "./Total"
+
+export type Totals = Partial<Record<isoly.Currency, Total>>
+export namespace Totals {
+	export const type = isly.record<isoly.Currency, Total>(isly.string(isoly.Currency.types), Total.type)
+	export function addEntry(totals: Totals, entry: Entry): Totals {
+		const result = { ...totals }
+		if (entry.status == "succeeded" && (entry.type == "capture" || entry.type == "refund")) {
+			result[entry.amount[0]] = Total.add(entry.amount[0], result[entry.amount[0]] ?? Total.create(), {
+				outcome: {
+					net: entry.amount[1],
+					// TODO: other currencies in fees
+					fee: { other: entry.fee.other[entry.amount[0]] ?? 0 },
+				},
+			})
+		}
+		return result
+	}
+	export function verify(totals: Totals, type: "outcome" | "collected" | "settled"): boolean {
+		return Object.values(totals).every(t => Total.verify(t, type))
+	}
+	export function add(addendee: Totals, addends: Partial<Record<isoly.Currency, Partial<Total>>>): Totals {
+		const result = { ...addendee }
+		for (const [currency, addend] of Object.entries(addends) as [isoly.Currency, Partial<Total>][]) {
+			result[currency] = Total.add(currency, result[currency] ?? Total.create(), addend)
+		}
+		return result
+	}
+	// TODO: update this for new collection method
+	export function collect(totals: Totals, collect: Collect): Totals {
+		const result: Totals = { ...totals }
+		for (const [currency, counterbalance] of Object.entries(collect.counterbalances)) {
+			const collected: Amount = { net: 0, fee: { other: 0 } }
+			for (const [entry, amount] of Object.entries(counterbalance)) {
+				if (entry.startsWith("fee"))
+					collected.fee.other = isoly.Currency.add(currency as isoly.Currency, collected.fee.other, amount ?? 0)
+				else if (entry.startsWith("settle"))
+					collected.net = isoly.Currency.add(currency as isoly.Currency, collected.net, amount ?? 0)
+			}
+			result[currency as isoly.Currency] = Total.collect(
+				currency as isoly.Currency,
+				result[currency as isoly.Currency] ?? Total.create(),
+				collected,
+				{ net: "", fee: "" }
+			)
+		}
+		return result
+	}
+}

package/Settlement/index.ts

@@ -1,30 +1,30 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
-import { Card } from "../Card"
+import { Amounts } from "../Amounts"
 import { Identifier } from "../Identifier"
+import { Amount as SettlementAmount } from "./Amount"
 import { Batch as SettlementBatch } from "./Batch"
 import { Creatable as SettlementCreatable } from "./Creatable"
 import { Entry as SettlementEntry } from "./Entry"
 import { Fee as SettlementFee } from "./Fee"
-import { Settled as SettlementSettled } from "./Settled"
 import { Status } from "./Status"
 import { Total as SettlementTotal } from "./Total"
+import { Totals as SettlementTotals } from "./Totals"
 
 export interface Settlement extends Settlement.Creatable {
 	id: string
 	by?: string
 	created: isoly.DateTime
 	status: Status
-	collected?: Settlement.Total
-	outcome: Settlement.Total
-	settled?: Settlement.Settled
 	entries: Settlement.Entry.Summary
 }
 export namespace Settlement {
-	export type Settled = SettlementSettled
-	export const Settled = SettlementSettled
 	export const Total = SettlementTotal
 	export type Total = SettlementTotal
+	export const Totals = SettlementTotals
+	export type Totals = SettlementTotals
+	export const Amount = SettlementAmount
+	export type Amount = SettlementAmount
 	export const Fee = SettlementFee
 	export type Fee = SettlementFee
 	export type Creatable = SettlementCreatable
@@ -53,25 +53,11 @@ export namespace Settlement {
 			export type Creatable = SettlementEntry.Unknown.Creatable
 		}
 	}
-	export function initiate(id: string, by: string, batch: Batch, processor: Card.Stack): Settlement {
+	export function from(creatable: Settlement.Creatable, by: string): Settlement {
 		return {
-			id: id ?? Identifier.generate(),
-			by,
-			created: isoly.DateTime.now(),
-			batch,
-			processor,
-			status: { collected: "pending", settled: "pending" },
-			expected: Total.initiate(),
-			outcome: Total.initiate(),
-			entries: { count: 0 },
-		}
-	}
-	export function from(id: string, creatable: Settlement.Creatable, by: string): Settlement {
-		return {
-			id,
+			id: Identifier.generate(),
 			status: { collected: "pending", settled: "pending" },
 			by,
-			outcome: Total.initiate(),
 			...creatable,
 			created: isoly.DateTime.now(),
 			entries: { count: 0 },
@@ -82,7 +68,7 @@ export namespace Settlement {
 		for (const entry of entries) {
 			switch (entry.status) {
 				case "succeeded":
-					result.outcome = Total.add(result.outcome, Entry.compile(entry))
+					result.totals = Totals.addEntry(result.totals, entry)
 					result.entries.count++
 					break
 				case "failed":
@@ -92,28 +78,52 @@ export namespace Settlement {
 		}
 		return result
 	}
-	export function toFailed(id: string, creatable: Settlement.Creatable, by: string, reason: string): Settlement {
-		return {
-			id,
-			created: isoly.DateTime.now(),
-			status: { collected: "failed", settled: "failed" }, // ["failed", reason],
-			by,
-			processor: creatable.processor,
-			references: creatable.references,
-			batch: creatable.batch,
-			expected: Total.initiate(),
-			outcome: Total.initiate(),
-			entries: { count: 0 },
+	type OldTotal = { amount: Amounts; fee: Fee }
+	export type OldSettlement = Omit<Settlement, "totals"> & {
+		expected?: OldTotal
+		collected?: OldTotal
+		outcome: OldTotal
+		settled?: { paid: Amounts; transactions: string[] }
+	}
+	export type MaybeOld = Settlement | OldSettlement
+	export function fromLegacy(settlement: MaybeOld): Settlement {
+		let result: Settlement
+		if (!is(settlement)) {
+			const totalToAmount: (currency: isoly.Currency, total?: OldTotal) => Amount = (currency, oldTotal) => ({
+				net: oldTotal?.amount[currency] ?? 0,
+				fee: { other: oldTotal?.fee.other[currency] ?? 0 },
+			})
+			const { expected, collected, outcome, settled, ...partialSettlement } = settlement
+			const currencies = Array.from(
+				new Set<isoly.Currency>([
+					...Object.keys(expected?.amount ?? {}),
+					...Object.keys(collected?.amount ?? {}),
+					...Object.keys(settled?.paid ?? {}),
+					...Object.keys(outcome.amount),
+				] as isoly.Currency[])
+			)
+			const totals = currencies.reduce((total, currency) => {
+				total[currency] = {
+					expected: totalToAmount(currency, expected),
+					...(outcome ? { outcome: totalToAmount(currency, outcome) } : {}),
+					...(collected
+						? { collected: { ...totalToAmount(currency, collected), transactions: { net: "", fee: "" } } } //TODO: Find transactions?
+						: {}),
+					...(settled ? { settled: { net: settled.paid[currency] ?? 0, transactions: settled.transactions } } : {}), //Find transactions?
+				}
+				return total
+			}, {} as Totals)
+			result = { ...partialSettlement, totals }
+		} else {
+			result = settlement
 		}
+		return result
 	}
 	export const type = SettlementCreatable.type.extend<Settlement>({
 		id: isly.string(),
 		by: isly.string().optional(),
 		created: isly.fromIs("isoly.DateTime", isoly.DateTime.is),
 		status: Status.type,
-		collected: Settlement.Total.type.optional(),
-		outcome: Settlement.Total.type,
-		settled: Settled.type.optional(),
 		entries: Settlement.Entry.Summary.type,
 	})
 	export const is = type.is

package/Treasury/Account/Storable.ts

@@ -11,6 +11,7 @@ export interface Storable {
 	created: isoly.DateTime
 	realm: Realm
 	supplier: Supplier
+	link: string
 	type: Category
 	reference: string
 	conditions?: Conditions
@@ -22,6 +23,7 @@ export namespace Storable {
 		created: isly.fromIs("Treasury.Account.Storable", isoly.DateTime.is),
 		realm: isly.fromIs("realm", Realm.is),
 		supplier: isly.fromIs("supplier", Supplier.is),
+		link: isly.string(),
 		type: Category.type,
 		reference: isly.string(),
 		conditions: Conditions.type.optional(),

package/Treasury/Snapshot/Fragment.ts

@@ -1,12 +1,13 @@
 import { isly } from "isly"
 import { Balances } from "../../Balances"
-import { Counterbalance2 } from "../../Counterbalance2"
 import { Account } from "../Account"
 import { Warning } from "./Warning"
 
 export interface Fragment {
 	warnings: Warning[]
-	emoney: Balances.Balance & Counterbalance2
+	emoney: Balances.Balance
+	minted: Fragment.Coinage.Minted
+	burned: Fragment.Coinage.Burned
 	fiat: {
 		safe: number
 		unsafe: number
@@ -17,13 +18,29 @@ export interface Fragment {
 	}
 }
 export namespace Fragment {
+	export namespace Coinage {
+		export type LedgerAccount = string
+		export type Change = { account: Record<LedgerAccount, number>; amount: number }
+		export const change = isly.object<Change>({
+			account: isly.record(isly.string(), isly.number()),
+			amount: isly.number(),
+		})
+		type Source = string
+		export type Minted = Record<Source, Change>
+		export namespace Minted {
+			export const type = isly.record<Minted>(isly.string(), Fragment.Coinage.change)
+		}
+		type Sink = string
+		export type Burned = Record<Sink, Change>
+		export namespace Burned {
+			export const type = isly.record<Burned>(isly.string(), Fragment.Coinage.change)
+		}
+	}
 	export const type = isly.object<Fragment>({
 		warnings: Warning.type.array(),
-		// there is a problem with isly.intersection, but isly.union works for this case
-		emoney: isly.union<Fragment["emoney"], Balances.Balance, Counterbalance2>(
-			Balances.Balance.type,
-			Counterbalance2.type
-		),
+		emoney: Balances.Balance.type,
+		minted: Fragment.Coinage.Minted.type,
+		burned: Fragment.Coinage.Burned.type,
 		fiat: isly.object({
 			safe: isly.number(),
 			unsafe: isly.number(),

package/Treasury/Snapshot/index.ts

@@ -7,8 +7,7 @@ import { Warning as SnapshotWarning } from "./Warning"
 export type Snapshot = Partial<Record<isoly.Currency, Snapshot.Fragment>>
 
 export namespace Snapshot {
-	export type Fragment = SnapshotFragment
-	export const Fragment = SnapshotFragment
+	export import Fragment = SnapshotFragment
 	export type Warning = SnapshotWarning
 	export const Warning = SnapshotWarning
 	export type Emoney = SnapshotEmoney

package/Treasury/index.ts

@@ -17,13 +17,7 @@ export namespace Treasury {
 	export type Transaction = TreasuryTransaction
 	export type Balance = TreasuryBalance
 	export const Balance = TreasuryBalance
-	export type Snapshot = TreasurySnapshot
-	export const Snapshot = TreasurySnapshot
-	export namespace Snapshot {
-		export type Fragment = TreasurySnapshot.Fragment
-		export type Warning = TreasurySnapshot.Warning
-		export type Emoney = TreasurySnapshot.Emoney
-	}
+	export import Snapshot = TreasurySnapshot
 	export namespace Account {
 		export type Creatable = TreasuryAccount.Creatable
 		export const Creatable = TreasuryAccount.Creatable

package/dist/Counterbalance2.d.ts

@@ -5,14 +5,12 @@ export type Counterbalance2 = {
     burned: Partial<Record<Counterbalance2.Sink, number>>;
 };
 export declare namespace Counterbalance2 {
-    const sources: readonly ["paxgiro", "clearbank", "internal"];
-    type Source = `${typeof sources[number]}-${string}`;
-    const Source: isly.Type<`paxgiro-${string}` | `clearbank-${string}` | `internal-${string}`>;
-    const sinks: readonly ["paxgiro", "clearbank", "internal"];
-    type Sink = `${typeof sinks[number]}-${string}`;
-    const Sink: isly.Type<`paxgiro-${string}` | `clearbank-${string}` | `internal-${string}`>;
+    type Source = string;
+    const Source: isly.Type<string>;
+    type Sink = string;
+    const Sink: isly.Type<string>;
     const type: isly.object.ExtendableType<Counterbalance2>;
     type Link = Source | Sink;
-    const Link: isly.Type<Link>;
+    const Link: isly.Type<string>;
     function add(currency: isoly.Currency, addendee: Counterbalance2, addend: Counterbalance2): Counterbalance2;
 }

package/dist/Counterbalance2.js

@@ -1,23 +1,14 @@
 import { isoly } from "isoly";
 import { isly } from "isly";
-import { Supplier } from "./Supplier";
 export var Counterbalance2;
 (function (Counterbalance2) {
-    Counterbalance2.sources = [...Supplier.names, "internal"];
-    Counterbalance2.Source = isly.fromIs("Source", (value) => {
-        const result = !value ? false : typeof value == "string" && value.split("-");
-        return result && result.length == 2 && Counterbalance2.sources.includes(result[0]) && typeof result[1] == "string";
-    });
-    Counterbalance2.sinks = [...Supplier.names, "internal"];
-    Counterbalance2.Sink = isly.fromIs("Sink", (value) => {
-        const result = !value ? false : typeof value == "string" && value.split("-");
-        return result && result.length == 2 && Counterbalance2.sinks.includes(result[0]) && typeof result[1] == "string";
-    });
+    Counterbalance2.Source = isly.string();
+    Counterbalance2.Sink = isly.string();
     Counterbalance2.type = isly.object({
         minted: isly.record(Counterbalance2.Source, isly.number()),
         burned: isly.record(Counterbalance2.Sink, isly.number()),
     });
-    Counterbalance2.Link = isly.union(Counterbalance2.Source, Counterbalance2.Sink);
+    Counterbalance2.Link = isly.string();
     function add(currency, addendee, addend) {
         const result = { minted: { ...addend.minted }, burned: { ...addend.burned } };
         for (const [source, value] of Object.entries(addendee["minted"])) {

package/dist/Counterbalance2.js.map

@@ -1 +1 @@
-{"version":3,"file":"Counterbalance2.js","sourceRoot":"../","sources":["Counterbalance2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Counterbalance2.js","sourceRoot":"../","sources":["Counterbalance2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAM3B,MAAM,KAAW,eAAe,CAqB/B;AArBD,WAAiB,eAAe;IAElB,sBAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;IAEtB,oBAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;IACpB,oBAAI,GAAG,IAAI,CAAC,MAAM,CAAkB;QAChD,MAAM,EAAE,IAAI,CAAC,MAAM,CAA4B,gBAAA,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QACrE,MAAM,EAAE,IAAI,CAAC,MAAM,CAA4B,gBAAA,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;KACnE,CAAC,CAAA;IAEW,oBAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;IACjC,SAAgB,GAAG,CAAC,QAAwB,EAAE,QAAyB,EAAE,MAAuB;QAC/F,MAAM,MAAM,GAAoB,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,CAAA;QAC9F,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAuB,EAAE,CAAC;YACxF,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QACnG,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAqB,EAAE,CAAC;YACpF,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC/F,CAAC;QACD,OAAO,MAAM,CAAA;IACd,CAAC;IATe,mBAAG,MASlB,CAAA;AACF,CAAC,EArBgB,eAAe,KAAf,eAAe,QAqB/B"}

package/dist/Operation/Changes.d.ts

@@ -8,7 +8,7 @@ export type Changes = Partial<Record<Balances.Balance.Entry, Change>> & Record<C
 export declare namespace Changes {
     namespace Entry {
         type Counterbalance = `${Counterbalance2.Link}-${isoly.DateTime}`;
-        const Counterbalance: isly.Type<`paxgiro-${string}-${string}` | `clearbank-${string}-${string}` | `internal-${string}-${string}`>;
+        const Counterbalance: isly.Type<`${string}-${string}`>;
         function split(counterbalance: Counterbalance): [Counterbalance2.Link, isoly.DateTime];
     }
     type Entry = Balances.Balance.Entry | Entry.Counterbalance | Counterbalances.Counterbalance.Entry.Settlement;

package/dist/Settlement/Amount.d.ts

@@ -0,0 +1,12 @@
+import { isoly } from "isoly";
+import { isly } from "isly";
+export type Amount = {
+    net: number;
+    fee: {
+        other: number;
+    };
+};
+export declare namespace Amount {
+    const type: isly.object.ExtendableType<Amount>;
+    function add(currency: isoly.Currency, addendee: Amount, addend: Partial<Amount>): Amount;
+}

package/dist/Settlement/Amount.js

@@ -0,0 +1,17 @@
+import { isoly } from "isoly";
+import { isly } from "isly";
+export var Amount;
+(function (Amount) {
+    Amount.type = isly.object({
+        net: isly.number(),
+        fee: isly.object({ other: isly.number() }),
+    });
+    function add(currency, addendee, addend) {
+        const result = { ...addendee };
+        result.net = isoly.Currency.add(currency, result.net, addend.net ?? 0);
+        result.fee.other = isoly.Currency.add(currency, result.fee.other, addend.fee?.other ?? 0);
+        return result;
+    }
+    Amount.add = add;
+})(Amount || (Amount = {}));
+//# sourceMappingURL=Amount.js.map

package/dist/Settlement/Amount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Amount.js","sourceRoot":"../","sources":["Settlement/Amount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAQ3B,MAAM,KAAW,MAAM,CAWtB;AAXD,WAAiB,MAAM;IACT,WAAI,GAAG,IAAI,CAAC,MAAM,CAAS;QACvC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;QAClB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAgB,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;KACzD,CAAC,CAAA;IACF,SAAgB,GAAG,CAAC,QAAwB,EAAE,QAAgB,EAAE,MAAuB;QACtF,MAAM,MAAM,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAA;QAC9B,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QACtE,MAAM,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC,CAAA;QACzF,OAAO,MAAM,CAAA;IACd,CAAC;IALe,UAAG,MAKlB,CAAA;AACF,CAAC,EAXgB,MAAM,KAAN,MAAM,QAWtB"}

package/dist/Settlement/Creatable.d.ts

@@ -1,9 +1,9 @@
 import { isly } from "isly";
 import { Card } from "../Card";
 import { Batch } from "./Batch";
-import { Total } from "./Total";
+import { Totals } from "./Totals";
 export interface Creatable {
-    expected?: Total;
+    totals: Totals;
     processor: Card.Stack;
     references?: string[];
     batch: Batch;

package/dist/Settlement/Creatable.js

@@ -1,11 +1,11 @@
 import { isly } from "isly";
 import { Card } from "../Card";
 import { Batch } from "./Batch";
-import { Total } from "./Total";
+import { Totals } from "./Totals";
 export var Creatable;
 (function (Creatable) {
     Creatable.type = isly.object({
-        expected: Total.type.optional(),
+        totals: Totals.type,
         processor: Card.Stack.type,
         references: isly.string().array().optional(),
         batch: Batch.type,