@ledgerhq/coin-canton 0.5.0-nightly.4 → 0.5.0-nightly.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +12 -0
- package/lib/api/getBalance.integ.test.js +1 -1
- package/lib/api/getBalance.integ.test.js.map +1 -1
- package/lib/api/index.d.ts.map +1 -1
- package/lib/api/index.js +20 -28
- package/lib/api/index.js.map +1 -1
- package/lib/api/lastBlock.integ.test.js +1 -1
- package/lib/api/lastBlock.integ.test.js.map +1 -1
- package/lib/api/listOperations.integ.test.js +1 -1
- package/lib/api/listOperations.integ.test.js.map +1 -1
- package/lib/bridge/broadcast.d.ts.map +1 -1
- package/lib/bridge/broadcast.js +2 -2
- package/lib/bridge/broadcast.js.map +1 -1
- package/lib/bridge/broadcast.test.js +9 -0
- package/lib/bridge/broadcast.test.js.map +1 -1
- package/lib/bridge/createTransaction.js +1 -1
- package/lib/bridge/createTransaction.js.map +1 -1
- package/lib/bridge/getTransactionStatus.js +1 -1
- package/lib/bridge/getTransactionStatus.js.map +1 -1
- package/lib/bridge/onboard.d.ts +4 -3
- package/lib/bridge/onboard.d.ts.map +1 -1
- package/lib/bridge/onboard.integ.test.js +11 -8
- package/lib/bridge/onboard.integ.test.js.map +1 -1
- package/lib/bridge/onboard.js +24 -16
- package/lib/bridge/onboard.js.map +1 -1
- package/lib/bridge/prepareTransaction.js +1 -1
- package/lib/bridge/prepareTransaction.js.map +1 -1
- package/lib/bridge/signOperation.d.ts.map +1 -1
- package/lib/bridge/signOperation.js +10 -5
- package/lib/bridge/signOperation.js.map +1 -1
- package/lib/bridge/sync.d.ts.map +1 -1
- package/lib/bridge/sync.js +17 -12
- package/lib/bridge/sync.js.map +1 -1
- package/lib/common-logic/account/getBalance.d.ts +2 -1
- package/lib/common-logic/account/getBalance.d.ts.map +1 -1
- package/lib/common-logic/account/getBalance.js +7 -7
- package/lib/common-logic/account/getBalance.js.map +1 -1
- package/lib/common-logic/account/getBalance.unit.test.js +6 -3
- package/lib/common-logic/account/getBalance.unit.test.js.map +1 -1
- package/lib/common-logic/history/lastBlock.d.ts +2 -1
- package/lib/common-logic/history/lastBlock.d.ts.map +1 -1
- package/lib/common-logic/history/lastBlock.js +3 -3
- package/lib/common-logic/history/lastBlock.js.map +1 -1
- package/lib/common-logic/history/lastBlock.test.js +5 -2
- package/lib/common-logic/history/lastBlock.test.js.map +1 -1
- package/lib/common-logic/history/listOperations.d.ts +2 -1
- package/lib/common-logic/history/listOperations.d.ts.map +1 -1
- package/lib/common-logic/history/listOperations.js +2 -2
- package/lib/common-logic/history/listOperations.js.map +1 -1
- package/lib/common-logic/transaction/broadcast.d.ts +2 -1
- package/lib/common-logic/transaction/broadcast.d.ts.map +1 -1
- package/lib/common-logic/transaction/broadcast.js +4 -4
- package/lib/common-logic/transaction/broadcast.js.map +1 -1
- package/lib/common-logic/transaction/broadcast.test.js +6 -3
- package/lib/common-logic/transaction/broadcast.test.js.map +1 -1
- package/lib/common-logic/transaction/craftTransaction.d.ts +3 -1
- package/lib/common-logic/transaction/craftTransaction.d.ts.map +1 -1
- package/lib/common-logic/transaction/craftTransaction.js +8 -4
- package/lib/common-logic/transaction/craftTransaction.js.map +1 -1
- package/lib/common-logic/transaction/estimateFees.d.ts +2 -1
- package/lib/common-logic/transaction/estimateFees.d.ts.map +1 -1
- package/lib/common-logic/transaction/estimateFees.js +3 -4
- package/lib/common-logic/transaction/estimateFees.js.map +1 -1
- package/lib/network/gateway.d.ts +24 -14
- package/lib/network/gateway.d.ts.map +1 -1
- package/lib/network/gateway.integ.test.js +17 -14
- package/lib/network/gateway.integ.test.js.map +1 -1
- package/lib/network/gateway.js +33 -33
- package/lib/network/gateway.js.map +1 -1
- package/lib/types/bridge.d.ts +5 -2
- package/lib/types/bridge.d.ts.map +1 -1
- package/lib-es/api/getBalance.integ.test.js +1 -1
- package/lib-es/api/getBalance.integ.test.js.map +1 -1
- package/lib-es/api/index.d.ts.map +1 -1
- package/lib-es/api/index.js +19 -27
- package/lib-es/api/index.js.map +1 -1
- package/lib-es/api/lastBlock.integ.test.js +1 -1
- package/lib-es/api/lastBlock.integ.test.js.map +1 -1
- package/lib-es/api/listOperations.integ.test.js +1 -1
- package/lib-es/api/listOperations.integ.test.js.map +1 -1
- package/lib-es/bridge/broadcast.d.ts.map +1 -1
- package/lib-es/bridge/broadcast.js +2 -2
- package/lib-es/bridge/broadcast.js.map +1 -1
- package/lib-es/bridge/broadcast.test.js +9 -0
- package/lib-es/bridge/broadcast.test.js.map +1 -1
- package/lib-es/bridge/createTransaction.js +1 -1
- package/lib-es/bridge/createTransaction.js.map +1 -1
- package/lib-es/bridge/getTransactionStatus.js +1 -1
- package/lib-es/bridge/getTransactionStatus.js.map +1 -1
- package/lib-es/bridge/onboard.d.ts +4 -3
- package/lib-es/bridge/onboard.d.ts.map +1 -1
- package/lib-es/bridge/onboard.integ.test.js +11 -8
- package/lib-es/bridge/onboard.integ.test.js.map +1 -1
- package/lib-es/bridge/onboard.js +24 -16
- package/lib-es/bridge/onboard.js.map +1 -1
- package/lib-es/bridge/prepareTransaction.js +1 -1
- package/lib-es/bridge/prepareTransaction.js.map +1 -1
- package/lib-es/bridge/signOperation.d.ts.map +1 -1
- package/lib-es/bridge/signOperation.js +10 -5
- package/lib-es/bridge/signOperation.js.map +1 -1
- package/lib-es/bridge/sync.d.ts.map +1 -1
- package/lib-es/bridge/sync.js +17 -12
- package/lib-es/bridge/sync.js.map +1 -1
- package/lib-es/common-logic/account/getBalance.d.ts +2 -1
- package/lib-es/common-logic/account/getBalance.d.ts.map +1 -1
- package/lib-es/common-logic/account/getBalance.js +7 -7
- package/lib-es/common-logic/account/getBalance.js.map +1 -1
- package/lib-es/common-logic/account/getBalance.unit.test.js +6 -3
- package/lib-es/common-logic/account/getBalance.unit.test.js.map +1 -1
- package/lib-es/common-logic/history/lastBlock.d.ts +2 -1
- package/lib-es/common-logic/history/lastBlock.d.ts.map +1 -1
- package/lib-es/common-logic/history/lastBlock.js +3 -3
- package/lib-es/common-logic/history/lastBlock.js.map +1 -1
- package/lib-es/common-logic/history/lastBlock.test.js +5 -2
- package/lib-es/common-logic/history/lastBlock.test.js.map +1 -1
- package/lib-es/common-logic/history/listOperations.d.ts +2 -1
- package/lib-es/common-logic/history/listOperations.d.ts.map +1 -1
- package/lib-es/common-logic/history/listOperations.js +2 -2
- package/lib-es/common-logic/history/listOperations.js.map +1 -1
- package/lib-es/common-logic/transaction/broadcast.d.ts +2 -1
- package/lib-es/common-logic/transaction/broadcast.d.ts.map +1 -1
- package/lib-es/common-logic/transaction/broadcast.js +4 -4
- package/lib-es/common-logic/transaction/broadcast.js.map +1 -1
- package/lib-es/common-logic/transaction/broadcast.test.js +6 -3
- package/lib-es/common-logic/transaction/broadcast.test.js.map +1 -1
- package/lib-es/common-logic/transaction/craftTransaction.d.ts +3 -1
- package/lib-es/common-logic/transaction/craftTransaction.d.ts.map +1 -1
- package/lib-es/common-logic/transaction/craftTransaction.js +9 -5
- package/lib-es/common-logic/transaction/craftTransaction.js.map +1 -1
- package/lib-es/common-logic/transaction/estimateFees.d.ts +2 -1
- package/lib-es/common-logic/transaction/estimateFees.d.ts.map +1 -1
- package/lib-es/common-logic/transaction/estimateFees.js +3 -4
- package/lib-es/common-logic/transaction/estimateFees.js.map +1 -1
- package/lib-es/network/gateway.d.ts +24 -14
- package/lib-es/network/gateway.d.ts.map +1 -1
- package/lib-es/network/gateway.integ.test.js +17 -14
- package/lib-es/network/gateway.integ.test.js.map +1 -1
- package/lib-es/network/gateway.js +33 -33
- package/lib-es/network/gateway.js.map +1 -1
- package/lib-es/types/bridge.d.ts +5 -2
- package/lib-es/types/bridge.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/api/getBalance.integ.test.ts +1 -1
- package/src/api/index.ts +22 -51
- package/src/api/lastBlock.integ.test.ts +1 -1
- package/src/api/listOperations.integ.test.ts +1 -1
- package/src/bridge/broadcast.test.ts +11 -0
- package/src/bridge/broadcast.ts +5 -2
- package/src/bridge/createTransaction.ts +1 -1
- package/src/bridge/getTransactionStatus.ts +1 -1
- package/src/bridge/onboard.integ.test.ts +22 -10
- package/src/bridge/onboard.ts +32 -13
- package/src/bridge/prepareTransaction.ts +1 -1
- package/src/bridge/signOperation.ts +20 -7
- package/src/bridge/sync.ts +17 -14
- package/src/common-logic/account/getBalance.ts +12 -7
- package/src/common-logic/account/getBalance.unit.test.ts +8 -3
- package/src/common-logic/history/lastBlock.test.ts +7 -2
- package/src/common-logic/history/lastBlock.ts +5 -3
- package/src/common-logic/history/listOperations.ts +3 -2
- package/src/common-logic/transaction/broadcast.test.ts +8 -3
- package/src/common-logic/transaction/broadcast.ts +6 -3
- package/src/common-logic/transaction/craftTransaction.ts +22 -5
- package/src/common-logic/transaction/estimateFees.ts +4 -4
- package/src/network/gateway.integ.test.ts +29 -11
- package/src/network/gateway.ts +66 -35
- package/src/types/bridge.ts +5 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTransaction.js","sourceRoot":"","sources":["../../src/bridge/createTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,2DAA2D;AAC3D,MAAM,CAAC,MAAM,iBAAiB,GAAoD,GAAG,EAAE,CAAC,CAAC;IACvF,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;IACxB,SAAS,EAAE,EAAE;IACb,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"createTransaction.js","sourceRoot":"","sources":["../../src/bridge/createTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,2DAA2D;AAC3D,MAAM,CAAC,MAAM,iBAAiB,GAAoD,GAAG,EAAE,CAAC,CAAC;IACvF,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;IACxB,SAAS,EAAE,EAAE;IACb,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,EAAE;IACR,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,IAAI;CACpB,CAAC,CAAC"}
|
|
@@ -7,7 +7,7 @@ export const getTransactionStatus = async (account, transaction) => {
|
|
|
7
7
|
const errors = {};
|
|
8
8
|
const warnings = {};
|
|
9
9
|
// reserveAmount is the minimum amount of currency that an account must hold in order to stay activated
|
|
10
|
-
const reserveAmount = new BigNumber(coinConfig.getCoinConfig().minReserve || 0);
|
|
10
|
+
const reserveAmount = new BigNumber(coinConfig.getCoinConfig(account.currency).minReserve || 0);
|
|
11
11
|
const estimatedFees = new BigNumber(transaction.fee || 0);
|
|
12
12
|
const totalSpent = new BigNumber(transaction.amount).plus(estimatedFees);
|
|
13
13
|
const amount = new BigNumber(transaction.amount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,UAAU,EACV,cAAc,EACd,4CAA4C,EAC5C,4CAA4C,EAC5C,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,UAAU,MAAM,WAAW,CAAC;AAEnC,MAAM,CAAC,MAAM,oBAAoB,GAIL,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IACzD,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,MAAM,QAAQ,GAA0B,EAAE,CAAC;IAE3C,uGAAuG;IACvG,MAAM,aAAa,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,11 @@ import { Observable } from "rxjs";
|
|
|
2
2
|
import { SignerContext } from "@ledgerhq/coin-framework/signer";
|
|
3
3
|
import { CantonSigner } from "../types";
|
|
4
4
|
import { CantonOnboardProgress, CantonOnboardResult, CantonPreApprovalProgress, CantonPreApprovalResult } from "../types/onboard";
|
|
5
|
-
|
|
5
|
+
import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
|
|
6
|
+
export declare const isAccountOnboarded: (currency: CryptoCurrency, publicKey: string) => Promise<{
|
|
6
7
|
isOnboarded: boolean;
|
|
7
8
|
party_id?: string;
|
|
8
9
|
}>;
|
|
9
|
-
export declare const buildOnboardAccount: (signerContext: SignerContext<CantonSigner>) => (deviceId: string, derivationPath: string) => Observable<CantonOnboardProgress | CantonOnboardResult>;
|
|
10
|
-
export declare const buildAuthorizePreapproval: (signerContext: SignerContext<CantonSigner>) => (deviceId: string, derivationPath: string, partyId: string) => Observable<CantonPreApprovalProgress | CantonPreApprovalResult>;
|
|
10
|
+
export declare const buildOnboardAccount: (signerContext: SignerContext<CantonSigner>) => (currency: CryptoCurrency, deviceId: string, derivationPath: string) => Observable<CantonOnboardProgress | CantonOnboardResult>;
|
|
11
|
+
export declare const buildAuthorizePreapproval: (signerContext: SignerContext<CantonSigner>) => (currency: CryptoCurrency, deviceId: string, derivationPath: string, partyId: string) => Observable<CantonPreApprovalProgress | CantonPreApprovalResult>;
|
|
11
12
|
//# sourceMappingURL=onboard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.d.ts","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"onboard.d.ts","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAiB,YAAY,EAAE,MAAM,UAAU,CAAC;AAWvD,OAAO,EAGL,qBAAqB,EACrB,mBAAmB,EACnB,yBAAyB,EACzB,uBAAuB,EAExB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAa9D,eAAO,MAAM,kBAAkB,GAC7B,UAAU,cAAc,EACxB,WAAW,MAAM,KAChB,OAAO,CAAC;IAAE,WAAW,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAarD,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC7B,eAAe,aAAa,CAAC,YAAY,CAAC,MAEzC,UAAU,cAAc,EACxB,UAAU,MAAM,EAChB,gBAAgB,MAAM,KACrB,UAAU,CAAC,qBAAqB,GAAG,mBAAmB,CAmGrD,CAAC;AAEP,eAAO,MAAM,yBAAyB,GACnC,eAAe,aAAa,CAAC,YAAY,CAAC,MAEzC,UAAU,cAAc,EACxB,UAAU,MAAM,EAChB,gBAAgB,MAAM,EACtB,SAAS,MAAM,KACd,UAAU,CAAC,yBAAyB,GAAG,uBAAuB,CAoF7D,CAAC"}
|
|
@@ -6,6 +6,9 @@ import coinConfig from "../config";
|
|
|
6
6
|
describe("onboard (devnet)", () => {
|
|
7
7
|
const mockDeviceId = "test-device-id";
|
|
8
8
|
const mockDerivationPath = "44'/6767'/0'/0'/0'";
|
|
9
|
+
const mockCurrency = {
|
|
10
|
+
id: "canton_network",
|
|
11
|
+
};
|
|
9
12
|
let onboardedAccount = null;
|
|
10
13
|
beforeAll(() => {
|
|
11
14
|
coinConfig.setCoinConfig(() => ({
|
|
@@ -32,7 +35,7 @@ describe("onboard (devnet)", () => {
|
|
|
32
35
|
return callback(mockSigner);
|
|
33
36
|
});
|
|
34
37
|
const onboardObservable = buildOnboardAccount(mockSignerContext);
|
|
35
|
-
const onboardValues = await firstValueFrom(onboardObservable(mockDeviceId, mockDerivationPath).pipe(toArray()));
|
|
38
|
+
const onboardValues = await firstValueFrom(onboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe(toArray()));
|
|
36
39
|
const onboardResult = onboardValues.find((value) => "partyId" in value);
|
|
37
40
|
if (!onboardResult) {
|
|
38
41
|
throw new Error("Failed to onboard account for shared test data");
|
|
@@ -45,7 +48,7 @@ describe("onboard (devnet)", () => {
|
|
|
45
48
|
onboardResult,
|
|
46
49
|
};
|
|
47
50
|
// WHEN
|
|
48
|
-
const result = await isAccountOnboarded(keyPair.publicKeyHex);
|
|
51
|
+
const result = await isAccountOnboarded(mockCurrency, keyPair.publicKeyHex);
|
|
49
52
|
// THEN
|
|
50
53
|
expect(result).not.toBe(false);
|
|
51
54
|
if (typeof result === "object") {
|
|
@@ -57,7 +60,7 @@ describe("onboard (devnet)", () => {
|
|
|
57
60
|
// GIVEN
|
|
58
61
|
const keyPair = generateMockKeyPair();
|
|
59
62
|
// WHEN
|
|
60
|
-
const result = await isAccountOnboarded(keyPair.publicKeyHex);
|
|
63
|
+
const result = await isAccountOnboarded(mockCurrency, keyPair.publicKeyHex);
|
|
61
64
|
// THEN
|
|
62
65
|
expect(result).toEqual({ isOnboarded: false });
|
|
63
66
|
}, 15000);
|
|
@@ -65,7 +68,7 @@ describe("onboard (devnet)", () => {
|
|
|
65
68
|
// GIVEN
|
|
66
69
|
const keyPair = generateMockKeyPair();
|
|
67
70
|
// WHEN
|
|
68
|
-
const result = await isAccountOnboarded(keyPair.publicKeyHex);
|
|
71
|
+
const result = await isAccountOnboarded(mockCurrency, keyPair.publicKeyHex);
|
|
69
72
|
// THEN
|
|
70
73
|
expect(result).toEqual({ isOnboarded: false });
|
|
71
74
|
}, 15000);
|
|
@@ -80,7 +83,7 @@ describe("onboard (devnet)", () => {
|
|
|
80
83
|
});
|
|
81
84
|
const onboardObservable = buildOnboardAccount(mockSignerContext);
|
|
82
85
|
// WHEN
|
|
83
|
-
const allValues = await firstValueFrom(onboardObservable(mockDeviceId, mockDerivationPath).pipe(toArray()));
|
|
86
|
+
const allValues = await firstValueFrom(onboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe(toArray()));
|
|
84
87
|
const progressValues = allValues.filter((value) => "status" in value && !("partyId" in value));
|
|
85
88
|
const resultValues = allValues.filter((value) => "partyId" in value);
|
|
86
89
|
// THEN
|
|
@@ -101,7 +104,7 @@ describe("onboard (devnet)", () => {
|
|
|
101
104
|
const { keyPair, mockSignerContext, onboardResult: firstResult } = getOnboardedAccount();
|
|
102
105
|
const secondOnboardObservable = buildOnboardAccount(mockSignerContext);
|
|
103
106
|
// WHEN
|
|
104
|
-
const secondOnboardValues = await firstValueFrom(secondOnboardObservable(mockDeviceId, mockDerivationPath).pipe(toArray()));
|
|
107
|
+
const secondOnboardValues = await firstValueFrom(secondOnboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe(toArray()));
|
|
105
108
|
const secondResult = secondOnboardValues.find((value) => "partyId" in value);
|
|
106
109
|
// THEN
|
|
107
110
|
expect(secondResult).toBeDefined();
|
|
@@ -115,7 +118,7 @@ describe("onboard (devnet)", () => {
|
|
|
115
118
|
const { mockSignerContext, onboardResult } = getOnboardedAccount();
|
|
116
119
|
const preapprovalObservable = buildAuthorizePreapproval(mockSignerContext);
|
|
117
120
|
// WHEN
|
|
118
|
-
const preapprovalValues = await firstValueFrom(preapprovalObservable(mockDeviceId, mockDerivationPath, onboardResult.partyId).pipe(toArray()));
|
|
121
|
+
const preapprovalValues = await firstValueFrom(preapprovalObservable(mockCurrency, mockDeviceId, mockDerivationPath, onboardResult.partyId).pipe(toArray()));
|
|
119
122
|
const progressValues = preapprovalValues.filter((value) => "status" in value && !("isApproved" in value));
|
|
120
123
|
const resultValues = preapprovalValues.filter((value) => "isApproved" in value);
|
|
121
124
|
// THEN
|
|
@@ -139,7 +142,7 @@ describe("onboard (devnet)", () => {
|
|
|
139
142
|
const preapprovalObservable = buildAuthorizePreapproval(mockSignerContext);
|
|
140
143
|
// WHEN & THEN
|
|
141
144
|
try {
|
|
142
|
-
await firstValueFrom(preapprovalObservable(mockDeviceId, mockDerivationPath, "invalid-party-id-123"));
|
|
145
|
+
await firstValueFrom(preapprovalObservable(mockCurrency, mockDeviceId, mockDerivationPath, "invalid-party-id-123"));
|
|
143
146
|
expect(true).toBe(true);
|
|
144
147
|
}
|
|
145
148
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.integ.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.integ.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAC/F,OAAO,EACL,aAAa,EACb,iBAAiB,GAKlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,UAAU,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"onboard.integ.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.integ.test.ts"],"names":[],"mappings":"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"}
|
package/lib-es/bridge/onboard.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Observable } from "rxjs";
|
|
2
2
|
import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
|
|
3
3
|
import { getDerivationModesForCurrency } from "@ledgerhq/coin-framework/derivation";
|
|
4
|
-
import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
|
|
5
4
|
import { getAccountShape } from "./sync";
|
|
6
5
|
import { prepareOnboarding, submitOnboarding, getPartyByPubKey, preparePreApprovalTransaction, submitPreApprovalTransaction, prepareTapRequest, submitTapRequest, } from "../network/gateway";
|
|
7
6
|
import { OnboardStatus, PreApprovalStatus, } from "../types/onboard";
|
|
@@ -12,11 +11,9 @@ async function _getKeypair(signerContext, deviceId, derivationPath) {
|
|
|
12
11
|
return { signer, publicKey: publicKey.replace("0x", ""), address };
|
|
13
12
|
});
|
|
14
13
|
}
|
|
15
|
-
const
|
|
16
|
-
const derivationMode = getDerivationModesForCurrency(currency)[0];
|
|
17
|
-
export const isAccountOnboarded = async (publicKey) => {
|
|
14
|
+
export const isAccountOnboarded = async (currency, publicKey) => {
|
|
18
15
|
try {
|
|
19
|
-
const { party_id } = await getPartyByPubKey(publicKey);
|
|
16
|
+
const { party_id } = await getPartyByPubKey(currency, publicKey);
|
|
20
17
|
if (party_id) {
|
|
21
18
|
return { isOnboarded: true, party_id };
|
|
22
19
|
}
|
|
@@ -29,11 +26,12 @@ export const isAccountOnboarded = async (publicKey) => {
|
|
|
29
26
|
return { isOnboarded: false };
|
|
30
27
|
}
|
|
31
28
|
};
|
|
32
|
-
export const buildOnboardAccount = (signerContext) => (deviceId, derivationPath) => new Observable(observer => {
|
|
29
|
+
export const buildOnboardAccount = (signerContext) => (currency, deviceId, derivationPath) => new Observable(observer => {
|
|
33
30
|
async function main() {
|
|
34
31
|
observer.next({
|
|
35
32
|
status: OnboardStatus.INIT,
|
|
36
33
|
});
|
|
34
|
+
const derivationMode = getDerivationModesForCurrency(currency)[0];
|
|
37
35
|
const getAddress = resolver(signerContext);
|
|
38
36
|
const { address, publicKey } = await getAddress(deviceId, {
|
|
39
37
|
path: derivationPath,
|
|
@@ -43,9 +41,15 @@ export const buildOnboardAccount = (signerContext) => (deviceId, derivationPath)
|
|
|
43
41
|
observer.next({
|
|
44
42
|
status: OnboardStatus.PREPARE,
|
|
45
43
|
});
|
|
46
|
-
const { party_id: partyId } = await isAccountOnboarded(publicKey);
|
|
44
|
+
const { party_id: partyId } = await isAccountOnboarded(currency, publicKey);
|
|
47
45
|
if (partyId) {
|
|
48
|
-
const account = await createAccount({
|
|
46
|
+
const account = await createAccount({
|
|
47
|
+
address,
|
|
48
|
+
derivationPath,
|
|
49
|
+
partyId,
|
|
50
|
+
currency,
|
|
51
|
+
derivationMode,
|
|
52
|
+
});
|
|
49
53
|
observer.next({
|
|
50
54
|
partyId,
|
|
51
55
|
account,
|
|
@@ -53,7 +57,7 @@ export const buildOnboardAccount = (signerContext) => (deviceId, derivationPath)
|
|
|
53
57
|
observer.complete();
|
|
54
58
|
return;
|
|
55
59
|
}
|
|
56
|
-
const preparedTransaction = await prepareOnboarding(publicKey, "ed25519");
|
|
60
|
+
const preparedTransaction = await prepareOnboarding(currency, publicKey, "ed25519");
|
|
57
61
|
observer.next({
|
|
58
62
|
status: OnboardStatus.SIGN,
|
|
59
63
|
});
|
|
@@ -61,12 +65,14 @@ export const buildOnboardAccount = (signerContext) => (deviceId, derivationPath)
|
|
|
61
65
|
observer.next({
|
|
62
66
|
status: OnboardStatus.SUBMIT,
|
|
63
67
|
});
|
|
64
|
-
const result = await submitOnboarding({ public_key: publicKey, public_key_type: "ed25519" }, preparedTransaction, signature).catch(async (err) => {
|
|
68
|
+
const result = await submitOnboarding(currency, { public_key: publicKey, public_key_type: "ed25519" }, preparedTransaction, signature).catch(async (err) => {
|
|
65
69
|
if (err.type === "PARTY_ALREADY_EXISTS") {
|
|
66
70
|
const account = await createAccount({
|
|
67
71
|
address,
|
|
68
72
|
derivationPath,
|
|
69
73
|
partyId: preparedTransaction.party_id,
|
|
74
|
+
currency,
|
|
75
|
+
derivationMode,
|
|
70
76
|
});
|
|
71
77
|
observer.next({
|
|
72
78
|
partyId: preparedTransaction.party_id,
|
|
@@ -84,6 +90,8 @@ export const buildOnboardAccount = (signerContext) => (deviceId, derivationPath)
|
|
|
84
90
|
address,
|
|
85
91
|
derivationPath,
|
|
86
92
|
partyId: result.party.party_id,
|
|
93
|
+
currency,
|
|
94
|
+
derivationMode,
|
|
87
95
|
});
|
|
88
96
|
observer.next({
|
|
89
97
|
partyId: result.party.party_id,
|
|
@@ -97,12 +105,12 @@ export const buildOnboardAccount = (signerContext) => (deviceId, derivationPath)
|
|
|
97
105
|
observer.error(error);
|
|
98
106
|
});
|
|
99
107
|
});
|
|
100
|
-
export const buildAuthorizePreapproval = (signerContext) => (deviceId, derivationPath, partyId) => new Observable(observer => {
|
|
108
|
+
export const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, derivationPath, partyId) => new Observable(observer => {
|
|
101
109
|
async function main() {
|
|
102
110
|
observer.next({
|
|
103
111
|
status: PreApprovalStatus.PREPARE,
|
|
104
112
|
});
|
|
105
|
-
const preparedTransaction = await preparePreApprovalTransaction(partyId);
|
|
113
|
+
const preparedTransaction = await preparePreApprovalTransaction(currency, partyId);
|
|
106
114
|
observer.next({
|
|
107
115
|
status: PreApprovalStatus.SIGN,
|
|
108
116
|
});
|
|
@@ -110,7 +118,7 @@ export const buildAuthorizePreapproval = (signerContext) => (deviceId, derivatio
|
|
|
110
118
|
observer.next({
|
|
111
119
|
status: PreApprovalStatus.SUBMIT,
|
|
112
120
|
});
|
|
113
|
-
const { isApproved } = await submitPreApprovalTransaction(partyId, preparedTransaction, signature);
|
|
121
|
+
const { isApproved } = await submitPreApprovalTransaction(currency, partyId, preparedTransaction, signature);
|
|
114
122
|
observer.next({
|
|
115
123
|
status: PreApprovalStatus.SUCCESS,
|
|
116
124
|
});
|
|
@@ -119,7 +127,7 @@ export const buildAuthorizePreapproval = (signerContext) => (deviceId, derivatio
|
|
|
119
127
|
});
|
|
120
128
|
const handleTapRequest = async () => {
|
|
121
129
|
try {
|
|
122
|
-
const { serialized, hash } = await prepareTapRequest({
|
|
130
|
+
const { serialized, hash } = await prepareTapRequest(currency, {
|
|
123
131
|
partyId,
|
|
124
132
|
});
|
|
125
133
|
if (serialized && hash) {
|
|
@@ -130,7 +138,7 @@ export const buildAuthorizePreapproval = (signerContext) => (deviceId, derivatio
|
|
|
130
138
|
observer.next({
|
|
131
139
|
status: PreApprovalStatus.SUBMIT,
|
|
132
140
|
});
|
|
133
|
-
await submitTapRequest({
|
|
141
|
+
await submitTapRequest(currency, {
|
|
134
142
|
partyId,
|
|
135
143
|
serialized,
|
|
136
144
|
signature,
|
|
@@ -152,7 +160,7 @@ export const buildAuthorizePreapproval = (signerContext) => (deviceId, derivatio
|
|
|
152
160
|
observer.error(error);
|
|
153
161
|
});
|
|
154
162
|
});
|
|
155
|
-
const createAccount = async ({ address, partyId, derivationPath, index = 0, }) => {
|
|
163
|
+
const createAccount = async ({ address, partyId, derivationPath, currency, derivationMode, index = 0, }) => {
|
|
156
164
|
const accountShape = await getAccountShape({
|
|
157
165
|
address,
|
|
158
166
|
currency,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { updateTransaction } from "./updateTransaction";
|
|
|
4
4
|
export const prepareTransaction = async (account, transaction) => {
|
|
5
5
|
let fee = transaction.fee;
|
|
6
6
|
if (!fee || fee.eq(0)) {
|
|
7
|
-
fee = BigNumber((await estimateFees(
|
|
7
|
+
fee = BigNumber((await estimateFees(account.currency)).toString());
|
|
8
8
|
}
|
|
9
9
|
return updateTransaction(transaction, { fee });
|
|
10
10
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,CAAC,MAAM,kBAAkB,GAAqD,KAAK,EACvF,OAAO,EACP,WAAW,EACX,EAAE;IACF,IAAI,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC;IAC1B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,GAAG,GAAG,SAAS,CAAC,CAAC,MAAM,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,CAAC,MAAM,kBAAkB,GAAqD,KAAK,EACvF,OAAO,EACP,WAAW,EACX,EAAE;IACF,IAAI,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC;IAC1B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,GAAG,GAAG,SAAS,CAAC,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,iBAAiB,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AACjD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAa,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,kBAAkB,GAC5B,eAAe,aAAa,CAAC,YAAY,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAwFpF,CAAC"}
|
|
@@ -14,15 +14,20 @@ export const buildSignOperation = (signerContext) => ({ account, deviceId, trans
|
|
|
14
14
|
});
|
|
15
15
|
const signature = await signerContext(deviceId, async (signer) => {
|
|
16
16
|
const { freshAddressPath: derivationPath } = account;
|
|
17
|
-
const partyId = account
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}, {
|
|
17
|
+
const partyId = account
|
|
18
|
+
.cantonResources.partyId;
|
|
19
|
+
const params = {
|
|
21
20
|
recipient: transaction.recipient,
|
|
22
21
|
amount: transaction.amount,
|
|
23
22
|
expireInSeconds: 60 * 60,
|
|
24
23
|
tokenId: "Amulet",
|
|
25
|
-
}
|
|
24
|
+
};
|
|
25
|
+
if (transaction.memo) {
|
|
26
|
+
params.memo = transaction.memo;
|
|
27
|
+
}
|
|
28
|
+
const { hash, serializedTransaction } = await craftTransaction(account.currency, {
|
|
29
|
+
address: partyId,
|
|
30
|
+
}, params);
|
|
26
31
|
const transactionSignature = await signer.signTransaction(derivationPath, hash);
|
|
27
32
|
return combine(serializedTransaction, `${transactionSignature}__PARTY__${partyId}`);
|
|
28
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAGtF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAGtF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAwDzC,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,aAAa,CAoE1D,CAAC"}
|
package/lib-es/bridge/sync.js
CHANGED
|
@@ -5,10 +5,17 @@ import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
|
5
5
|
import { getBalance, getLedgerEnd, getOperations } from "../network/gateway";
|
|
6
6
|
import coinConfig from "../config";
|
|
7
7
|
const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
|
|
8
|
-
const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue }], } = txInfo;
|
|
9
|
-
|
|
8
|
+
const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue, details }], } = txInfo;
|
|
9
|
+
let type = "UNKNOWN";
|
|
10
|
+
if (txInfo.type === "Send") {
|
|
11
|
+
type = senders.includes(partyId) ? "OUT" : "IN";
|
|
12
|
+
}
|
|
13
|
+
else if (txInfo.type === "Receive") {
|
|
14
|
+
type = "IN";
|
|
15
|
+
}
|
|
10
16
|
const value = new BigNumber(transferValue);
|
|
11
17
|
const feeValue = new BigNumber(fee);
|
|
18
|
+
const memo = details.metadata.reason;
|
|
12
19
|
const op = {
|
|
13
20
|
id: encodeOperationId(accountId, transaction_hash, type),
|
|
14
21
|
hash: transaction_hash,
|
|
@@ -24,14 +31,13 @@ const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
|
|
|
24
31
|
transactionSequenceNumber: height,
|
|
25
32
|
extra: {
|
|
26
33
|
uid,
|
|
34
|
+
memo,
|
|
27
35
|
},
|
|
28
36
|
};
|
|
29
37
|
return op;
|
|
30
38
|
};
|
|
31
39
|
const filterOperations = (transactions, accountId, partyId) => {
|
|
32
|
-
return transactions
|
|
33
|
-
.filter(tx => tx.type === "Receive" || tx.type === "Send")
|
|
34
|
-
.map(txInfoToOperationAdapter(accountId, partyId));
|
|
40
|
+
return transactions.map(txInfoToOperationAdapter(accountId, partyId));
|
|
35
41
|
};
|
|
36
42
|
export const getAccountShape = async (info) => {
|
|
37
43
|
const { address, initialAccount, currency, derivationMode, derivationPath, rest } = info;
|
|
@@ -47,28 +53,27 @@ export const getAccountShape = async (info) => {
|
|
|
47
53
|
xpubOrAddress,
|
|
48
54
|
derivationMode,
|
|
49
55
|
});
|
|
50
|
-
// blockheight retrieval
|
|
51
|
-
const blockHeight = await getLedgerEnd();
|
|
52
56
|
// Account info retrieval + spendable balance calculation
|
|
53
57
|
// const accountInfo = await getAccountInfo(address);
|
|
54
|
-
const balances = await getBalance(partyId);
|
|
55
|
-
|
|
56
|
-
const balanceData = balances.find(balance => balance.instrument_id.includes("Amulet")) || {
|
|
58
|
+
const balances = await getBalance(currency, partyId);
|
|
59
|
+
const balanceData = balances.find(balance => balance.instrument_id === "Amulet") || {
|
|
57
60
|
instrument_id: "Amulet",
|
|
58
61
|
amount: 0,
|
|
59
62
|
locked: false,
|
|
60
63
|
};
|
|
61
64
|
const balance = new BigNumber(balanceData.amount);
|
|
62
|
-
const reserveMin = coinConfig.getCoinConfig().minReserve || 0;
|
|
65
|
+
const reserveMin = coinConfig.getCoinConfig(currency).minReserve || 0;
|
|
63
66
|
const lockedAmount = balanceData.locked ? balance : new BigNumber(0);
|
|
64
67
|
const spendableBalance = BigNumber.max(0, balance.minus(lockedAmount).minus(BigNumber(reserveMin)));
|
|
65
68
|
// Tx history fetching
|
|
66
69
|
const oldOperations = initialAccount?.operations || [];
|
|
67
70
|
const startAt = oldOperations.length ? (oldOperations[0].blockHeight || 0) + 1 : 0;
|
|
68
|
-
const transactionData = await getOperations(partyId, {
|
|
71
|
+
const transactionData = await getOperations(currency, partyId, {
|
|
69
72
|
cursor: startAt,
|
|
70
73
|
limit: 100,
|
|
71
74
|
});
|
|
75
|
+
// blockheight retrieval
|
|
76
|
+
const blockHeight = await getLedgerEnd(currency);
|
|
72
77
|
const newOperations = filterOperations(transactionData.operations, accountId, partyId);
|
|
73
78
|
const operations = mergeOps(oldOperations, newOperations);
|
|
74
79
|
// We return the new account shape
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAmB,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAsB,MAAM,oBAAoB,CAAC;AAEjG,OAAO,UAAU,MAAM,WAAW,CAAC;AAEnC,MAAM,wBAAwB,GAC5B,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CACvC,CAAC,MAAqB,EAAa,EAAE;IACnC,MAAM,EACJ,gBAAgB,EAChB,GAAG,EACH,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EACvB,OAAO,EACP,UAAU,EACV,qBAAqB,EACrB,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EACnB,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Balance } from "@ledgerhq/coin-framework/api/types";
|
|
2
|
-
|
|
2
|
+
import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
|
|
3
|
+
export declare function getBalance(currency: CryptoCurrency, partyId: string): Promise<Balance[]>;
|
|
3
4
|
//# sourceMappingURL=getBalance.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalance.d.ts","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"getBalance.d.ts","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAG7D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAkB9D,wBAAsB,UAAU,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAM9F"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { getBalance as gatewayGetBalance } from "../../network/gateway";
|
|
2
2
|
import coinConfig from "../../config";
|
|
3
|
-
const useGateway = () => coinConfig.getCoinConfig().useGateway === true;
|
|
4
|
-
const getNativeId = () => coinConfig.getCoinConfig().nativeInstrumentId;
|
|
5
|
-
function adaptInstrument(instrument) {
|
|
3
|
+
const useGateway = (currency) => coinConfig.getCoinConfig(currency).useGateway === true;
|
|
4
|
+
const getNativeId = (currency) => coinConfig.getCoinConfig(currency).nativeInstrumentId;
|
|
5
|
+
function adaptInstrument(currency, instrument) {
|
|
6
6
|
return {
|
|
7
7
|
value: BigInt(instrument.amount),
|
|
8
8
|
locked: instrument.locked === true ? BigInt(instrument.amount) : BigInt(0),
|
|
9
|
-
asset: getNativeId() === instrument.instrument_id
|
|
9
|
+
asset: getNativeId(currency) === instrument.instrument_id
|
|
10
10
|
? { type: "native" }
|
|
11
11
|
: { type: "token", assetReference: instrument.instrument_id },
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
|
-
export async function getBalance(partyId) {
|
|
15
|
-
if (useGateway())
|
|
16
|
-
return (await gatewayGetBalance(partyId)).map(instrument => adaptInstrument(instrument));
|
|
14
|
+
export async function getBalance(currency, partyId) {
|
|
15
|
+
if (useGateway(currency))
|
|
16
|
+
return (await gatewayGetBalance(currency, partyId)).map(instrument => adaptInstrument(currency, instrument));
|
|
17
17
|
else
|
|
18
18
|
throw new Error("Not implemented");
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAA0B,MAAM,uBAAuB,CAAC;AAChG,OAAO,UAAU,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAA0B,MAAM,uBAAuB,CAAC;AAChG,OAAO,UAAU,MAAM,cAAc,CAAC;AAGtC,MAAM,UAAU,GAAG,CAAC,QAAwB,EAAE,EAAE,CAC9C,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;AACzD,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAE,EAAE,CAC/C,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC;AAExD,SAAS,eAAe,CAAC,QAAwB,EAAE,UAA6B;IAC9E,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;QAChC,MAAM,EAAE,UAAU,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1E,KAAK,EACH,WAAW,CAAC,QAAQ,CAAC,KAAK,UAAU,CAAC,aAAa;YAChD,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;YACpB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,aAAa,EAAE;KAClE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,QAAwB,EAAE,OAAe;IACxE,IAAI,UAAU,CAAC,QAAQ,CAAC;QACtB,OAAO,CAAC,MAAM,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CACnE,eAAe,CAAC,QAAQ,EAAE,UAAU,CAAC,CACtC,CAAC;;QACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { getBalance as getBalanceFromNetwork } from "../../network/gateway";
|
|
2
2
|
import * as coinConfigModule from "../../config";
|
|
3
3
|
import { getBalance } from "./getBalance";
|
|
4
|
+
const mockCurrency = {
|
|
5
|
+
id: "canton_network",
|
|
6
|
+
};
|
|
4
7
|
jest.mock("../../network/gateway", () => ({
|
|
5
8
|
getBalance: jest.fn(),
|
|
6
9
|
}));
|
|
@@ -27,8 +30,8 @@ describe("getBalance", () => {
|
|
|
27
30
|
},
|
|
28
31
|
];
|
|
29
32
|
getBalanceFromNetwork.mockResolvedValue(mockInstruments);
|
|
30
|
-
const result = await getBalance("party-id");
|
|
31
|
-
expect(getBalanceFromNetwork).toHaveBeenCalledWith("party-id");
|
|
33
|
+
const result = await getBalance(mockCurrency, "party-id");
|
|
34
|
+
expect(getBalanceFromNetwork).toHaveBeenCalledWith(mockCurrency, "party-id");
|
|
32
35
|
expect(result).toEqual([
|
|
33
36
|
{
|
|
34
37
|
value: BigInt(1000),
|
|
@@ -46,7 +49,7 @@ describe("getBalance", () => {
|
|
|
46
49
|
mockGetCoinConfig.mockReturnValue({
|
|
47
50
|
useGateway: false,
|
|
48
51
|
});
|
|
49
|
-
await expect(getBalance("party-id")).rejects.toThrow("Not implemented");
|
|
52
|
+
await expect(getBalance(mockCurrency, "party-id")).rejects.toThrow("Not implemented");
|
|
50
53
|
expect(getBalanceFromNetwork).not.toHaveBeenCalled();
|
|
51
54
|
});
|
|
52
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalance.unit.test.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,gBAAgB,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"getBalance.unit.test.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,gBAAgB,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,MAAM,YAAY,GAAG;IACnB,EAAE,EAAE,gBAAgB;CACQ,CAAC;AAE/B,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;CACtB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAEhF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,iBAAiB,CAAC,eAAe,CAAC;YAChC,UAAU,EAAE,IAAI;YAChB,kBAAkB,EAAE,WAAW;SACzB,CAAC,CAAC;QAEV,MAAM,eAAe,GAAG;YACtB;gBACE,aAAa,EAAE,WAAW;gBAC1B,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,KAAK;aACd;YACD;gBACE,aAAa,EAAE,WAAW;gBAC1B,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,IAAI;aACb;SACF,CAAC;QAED,qBAAmC,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAExE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAE1D,MAAM,CAAC,qBAAqB,CAAC,CAAC,oBAAoB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAC7E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAY;YAChC;gBACE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;gBACjB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aAC1B;YACD;gBACE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;gBACpB,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE;aACtD;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;QAC1F,iBAAiB,CAAC,eAAe,CAAC;YAChC,UAAU,EAAE,KAAK;SACX,CAAC,CAAC;QAEV,MAAM,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACtF,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { BlockInfo } from "@ledgerhq/coin-framework/api/index";
|
|
2
|
-
|
|
2
|
+
import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
|
|
3
|
+
export declare function lastBlock(currency: CryptoCurrency): Promise<BlockInfo>;
|
|
3
4
|
//# sourceMappingURL=lastBlock.d.ts.map
|