@ledgerhq/coin-canton 0.8.0-nightly.3 → 0.8.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 +28 -0
- package/lib/bridge/onboard.d.ts +1 -1
- package/lib/bridge/onboard.d.ts.map +1 -1
- package/lib/bridge/onboard.js +23 -9
- package/lib/bridge/onboard.js.map +1 -1
- package/lib/bridge/onboard.test.js +3 -3
- package/lib/bridge/onboard.test.js.map +1 -1
- package/lib/bridge/sync.d.ts.map +1 -1
- package/lib/bridge/sync.js +4 -2
- package/lib/bridge/sync.js.map +1 -1
- package/lib/bridge/sync.test.js +1 -1
- package/lib/bridge/sync.test.js.map +1 -1
- package/lib-es/bridge/onboard.d.ts +1 -1
- package/lib-es/bridge/onboard.d.ts.map +1 -1
- package/lib-es/bridge/onboard.js +21 -7
- package/lib-es/bridge/onboard.js.map +1 -1
- package/lib-es/bridge/onboard.test.js +4 -4
- package/lib-es/bridge/onboard.test.js.map +1 -1
- package/lib-es/bridge/sync.d.ts.map +1 -1
- package/lib-es/bridge/sync.js +5 -3
- package/lib-es/bridge/sync.js.map +1 -1
- package/lib-es/bridge/sync.test.js +1 -1
- package/lib-es/bridge/sync.test.js.map +1 -1
- package/package.json +8 -8
- package/src/bridge/onboard.test.ts +4 -4
- package/src/bridge/onboard.ts +26 -7
- package/src/bridge/sync.test.ts +1 -1
- package/src/bridge/sync.ts +5 -3
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-canton@0.8.0-nightly.
|
|
2
|
+
> @ledgerhq/coin-canton@0.8.0-nightly.4 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-canton
|
|
3
3
|
> tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,33 @@
|
|
|
1
1
|
# @ledgerhq/coin-canton
|
|
2
2
|
|
|
3
|
+
## 0.8.0-nightly.5
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#12249](https://github.com/LedgerHQ/ledger-live/pull/12249) [`f1dfd9c`](https://github.com/LedgerHQ/ledger-live/commit/f1dfd9c9b4ddb7e9b971370ae7941ca06c01b0b8) Thanks [@ishaba](https://github.com/ishaba)! - fix canton add acciunt after retry
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [[`cadf2e1`](https://github.com/LedgerHQ/ledger-live/commit/cadf2e1dfb09248d3f77d96f94ae774425dbca75)]:
|
|
12
|
+
- @ledgerhq/live-env@2.19.0-nightly.1
|
|
13
|
+
- @ledgerhq/coin-framework@6.7.0-nightly.5
|
|
14
|
+
- @ledgerhq/cryptoassets@13.31.0-nightly.5
|
|
15
|
+
- @ledgerhq/live-network@2.0.20-nightly.2
|
|
16
|
+
|
|
17
|
+
## 0.8.0-nightly.4
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- [#12234](https://github.com/LedgerHQ/ledger-live/pull/12234) [`7aa7af1`](https://github.com/LedgerHQ/ledger-live/commit/7aa7af1a78453f24f8de8d9d4e358fd40497f498) Thanks [@ishaba](https://github.com/ishaba)! - fix canton account sync bug
|
|
22
|
+
|
|
23
|
+
- Updated dependencies [[`7744980`](https://github.com/LedgerHQ/ledger-live/commit/774498090411f1a6d6c06395dda1fc7cd24adf24), [`759064d`](https://github.com/LedgerHQ/ledger-live/commit/759064d4815c636af2d73ba548a85b4f53e7b491)]:
|
|
24
|
+
- @ledgerhq/types-live@6.87.0-nightly.3
|
|
25
|
+
- @ledgerhq/errors@6.27.0-nightly.0
|
|
26
|
+
- @ledgerhq/coin-framework@6.7.0-nightly.4
|
|
27
|
+
- @ledgerhq/cryptoassets@13.31.0-nightly.4
|
|
28
|
+
- @ledgerhq/devices@8.6.2-nightly.0
|
|
29
|
+
- @ledgerhq/live-network@2.0.20-nightly.1
|
|
30
|
+
|
|
3
31
|
## 0.8.0-nightly.3
|
|
4
32
|
|
|
5
33
|
### Minor Changes
|
package/lib/bridge/onboard.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export declare const isAccountOnboarded: (currency: CryptoCurrency, publicKey: s
|
|
|
11
11
|
isOnboarded: boolean;
|
|
12
12
|
partyId?: never;
|
|
13
13
|
}>;
|
|
14
|
-
export declare const
|
|
14
|
+
export declare const isCantonCoinPreapproved: (currency: CryptoCurrency, partyId: string) => Promise<boolean>;
|
|
15
15
|
export declare const buildOnboardAccount: (signerContext: SignerContext<CantonSigner>) => (currency: CryptoCurrency, deviceId: string, account: Account) => Observable<CantonOnboardProgress | CantonOnboardResult>;
|
|
16
16
|
export declare const buildAuthorizePreapproval: (signerContext: SignerContext<CantonSigner>) => (currency: CryptoCurrency, deviceId: string, account: Account, partyId: string) => Observable<CantonAuthorizeProgress | CantonAuthorizeResult>;
|
|
17
17
|
//# 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;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,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;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAanE,OAAO,EAGL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,eAAO,MAAM,kBAAkB,GAAU,UAAU,cAAc,EAAE,WAAW,MAAM;;;;;;EAYnF,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAU,UAAU,cAAc,EAAE,SAAS,MAAM,qBAOtF,CAAC;AAkBF,eAAO,MAAM,mBAAmB,GAC7B,eAAe,aAAa,CAAC,YAAY,CAAC,MAEzC,UAAU,cAAc,EACxB,UAAU,MAAM,EAChB,SAAS,OAAO,KACf,UAAU,CAAC,qBAAqB,GAAG,mBAAmB,CAgDrD,CAAC;AAEP,eAAO,MAAM,yBAAyB,GACnC,eAAe,aAAa,CAAC,YAAY,CAAC,MAEzC,UAAU,cAAc,EACxB,UAAU,MAAM,EAChB,SAAS,OAAO,EAChB,SAAS,MAAM,KACd,UAAU,CAAC,uBAAuB,GAAG,qBAAqB,CA0DzD,CAAC"}
|
package/lib/bridge/onboard.js
CHANGED
|
@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.buildAuthorizePreapproval = exports.buildOnboardAccount = exports.
|
|
6
|
+
exports.buildAuthorizePreapproval = exports.buildOnboardAccount = exports.isCantonCoinPreapproved = exports.isAccountOnboarded = void 0;
|
|
7
7
|
const rxjs_1 = require("rxjs");
|
|
8
8
|
const logs_1 = require("@ledgerhq/logs");
|
|
9
|
+
const accountId_1 = require("@ledgerhq/coin-framework/account/accountId");
|
|
9
10
|
const gateway_1 = require("../network/gateway");
|
|
10
11
|
const onboard_1 = require("../types/onboard");
|
|
11
12
|
const signer_1 = __importDefault(require("../signer"));
|
|
@@ -24,14 +25,25 @@ const isAccountOnboarded = async (currency, publicKey) => {
|
|
|
24
25
|
}
|
|
25
26
|
};
|
|
26
27
|
exports.isAccountOnboarded = isAccountOnboarded;
|
|
27
|
-
const
|
|
28
|
+
const isCantonCoinPreapproved = async (currency, partyId) => {
|
|
28
29
|
const { expires_at, receiver } = await (0, gateway_1.getTransferPreApproval)(currency, partyId);
|
|
29
30
|
const isReceiver = receiver === partyId;
|
|
30
31
|
const isExpired = new Date(expires_at) < new Date();
|
|
31
|
-
const
|
|
32
|
-
return
|
|
32
|
+
const isPreapproved = !isExpired && isReceiver;
|
|
33
|
+
return isPreapproved;
|
|
33
34
|
};
|
|
34
|
-
exports.
|
|
35
|
+
exports.isCantonCoinPreapproved = isCantonCoinPreapproved;
|
|
36
|
+
const createOnboardedAccount = (account, partyId, currency) => ({
|
|
37
|
+
...account,
|
|
38
|
+
xpub: partyId,
|
|
39
|
+
id: (0, accountId_1.encodeAccountId)({
|
|
40
|
+
type: "js",
|
|
41
|
+
version: "2",
|
|
42
|
+
currencyId: currency.id,
|
|
43
|
+
xpubOrAddress: partyId,
|
|
44
|
+
derivationMode: account.derivationMode,
|
|
45
|
+
}),
|
|
46
|
+
});
|
|
35
47
|
const buildOnboardAccount = (signerContext) => (currency, deviceId, account) => new rxjs_1.Observable(o => {
|
|
36
48
|
async function main() {
|
|
37
49
|
o.next({ status: onboard_1.OnboardStatus.INIT });
|
|
@@ -44,7 +56,8 @@ const buildOnboardAccount = (signerContext) => (currency, deviceId, account) =>
|
|
|
44
56
|
o.next({ status: onboard_1.OnboardStatus.PREPARE });
|
|
45
57
|
let { partyId } = await (0, exports.isAccountOnboarded)(currency, publicKey);
|
|
46
58
|
if (partyId) {
|
|
47
|
-
|
|
59
|
+
const onboardedAccount = createOnboardedAccount(account, partyId, currency);
|
|
60
|
+
o.next({ partyId, account: onboardedAccount }); // success
|
|
48
61
|
return;
|
|
49
62
|
}
|
|
50
63
|
const preparedTransaction = await (0, gateway_1.prepareOnboarding)(currency, publicKey);
|
|
@@ -53,7 +66,8 @@ const buildOnboardAccount = (signerContext) => (currency, deviceId, account) =>
|
|
|
53
66
|
const signature = await signerContext(deviceId, signer => signer.signTransaction(account.freshAddressPath, preparedTransaction.transactions.combined_hash));
|
|
54
67
|
o.next({ status: onboard_1.OnboardStatus.SUBMIT });
|
|
55
68
|
await (0, gateway_1.submitOnboarding)(currency, publicKey, preparedTransaction, signature);
|
|
56
|
-
|
|
69
|
+
const onboardedAccount = createOnboardedAccount(account, partyId, currency);
|
|
70
|
+
o.next({ partyId, account: onboardedAccount }); // success
|
|
57
71
|
}
|
|
58
72
|
main().then(() => o.complete(), error => {
|
|
59
73
|
(0, logs_1.log)("[canton:onboard] onboardAccount failed:", error);
|
|
@@ -64,8 +78,8 @@ exports.buildOnboardAccount = buildOnboardAccount;
|
|
|
64
78
|
const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, account, partyId) => new rxjs_1.Observable(o => {
|
|
65
79
|
async function main() {
|
|
66
80
|
o.next({ status: onboard_1.AuthorizeStatus.INIT });
|
|
67
|
-
const
|
|
68
|
-
if (!
|
|
81
|
+
const isPreapproved = await (0, exports.isCantonCoinPreapproved)(currency, partyId);
|
|
82
|
+
if (!isPreapproved) {
|
|
69
83
|
o.next({ status: onboard_1.AuthorizeStatus.PREPARE });
|
|
70
84
|
const preparedTransaction = await (0, gateway_1.preparePreApprovalTransaction)(currency, partyId);
|
|
71
85
|
o.next({ status: onboard_1.AuthorizeStatus.SIGN });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAkC;AAIlC,yCAAqC;AACrC,gDAS4B;AAC5B,8CAO0B;AAC1B,uDAAiC;AAG1B,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAwB,EAAE,SAAiB,EAAE,EAAE;IACtF,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,0BAAgB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAEjE,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,kBAAkB,sBAY7B;AAEK,MAAM,
|
|
1
|
+
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ describe("onboard", () => {
|
|
|
42
42
|
const mockCurrency = {
|
|
43
43
|
id: "canton_network",
|
|
44
44
|
};
|
|
45
|
-
describe("
|
|
45
|
+
describe("isCantonCoinPreapproved", () => {
|
|
46
46
|
it("should return true when contract exists and is not expired", async () => {
|
|
47
47
|
// GIVEN
|
|
48
48
|
const futureDate = new Date();
|
|
@@ -56,7 +56,7 @@ describe("onboard", () => {
|
|
|
56
56
|
expires_at: futureDate.toISOString(),
|
|
57
57
|
});
|
|
58
58
|
// WHEN
|
|
59
|
-
const result = await (0, onboard_1.
|
|
59
|
+
const result = await (0, onboard_1.isCantonCoinPreapproved)(mockCurrency, mockPartyId);
|
|
60
60
|
// THEN
|
|
61
61
|
expect(result).toBe(true);
|
|
62
62
|
expect(mockedGateway.getTransferPreApproval).toHaveBeenCalledWith(mockCurrency, mockPartyId);
|
|
@@ -74,7 +74,7 @@ describe("onboard", () => {
|
|
|
74
74
|
expires_at: pastDate.toISOString(),
|
|
75
75
|
});
|
|
76
76
|
// WHEN
|
|
77
|
-
const result = await (0, onboard_1.
|
|
77
|
+
const result = await (0, onboard_1.isCantonCoinPreapproved)(mockCurrency, mockPartyId);
|
|
78
78
|
// THEN
|
|
79
79
|
expect(result).toBe(false);
|
|
80
80
|
expect(mockedGateway.getTransferPreApproval).toHaveBeenCalledWith(mockCurrency, mockPartyId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"onboard.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAoD;AACpD,4DAA8C;AAE9C,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAChC,MAAM,aAAa,GAAG,OAAsC,CAAC;AAE7D,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,MAAM,WAAW,GAAG,eAAe,CAAC;IACpC,MAAM,YAAY,GAAG;QACnB,EAAE,EAAE,gBAAgB;KACQ,CAAC;IAE/B,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,QAAQ;YACR,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;YAC9B,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAE/C,aAAa,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBACrD,WAAW,EAAE,kBAAkB;gBAC/B,QAAQ,EAAE,WAAW;gBACrB,QAAQ,EAAE,eAAe;gBACzB,UAAU,EAAE,sBAAsB;gBAClC,eAAe,EAAE,sBAAsB;gBACvC,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE;aACrC,CAAC,CAAC;YAEH,OAAO;YACP,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAuB,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAExE,OAAO;YACP,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,QAAQ;YACR,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;YAC5B,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAE3C,aAAa,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBACrD,WAAW,EAAE,kBAAkB;gBAC/B,QAAQ,EAAE,WAAW;gBACrB,QAAQ,EAAE,eAAe;gBACzB,UAAU,EAAE,sBAAsB;gBAClC,eAAe,EAAE,sBAAsB;gBACvC,UAAU,EAAE,QAAQ,CAAC,WAAW,EAAE;aACnC,CAAC,CAAC;YAEH,OAAO;YACP,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAuB,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAExE,OAAO;YACP,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib/bridge/sync.d.ts.map
CHANGED
|
@@ -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;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAkEvD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAkEvD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAwFhC"}
|
package/lib/bridge/sync.js
CHANGED
|
@@ -103,8 +103,10 @@ function makeGetAccountShape(signerContext) {
|
|
|
103
103
|
const newOperations = filterOperations(transactionData.operations, accountId, xpubOrAddress);
|
|
104
104
|
operations = (0, jsHelpers_1.mergeOps)(oldOperations, newOperations);
|
|
105
105
|
}
|
|
106
|
-
const
|
|
107
|
-
|
|
106
|
+
const isPreapproved = xpubOrAddress
|
|
107
|
+
? await (0, onboard_1.isCantonCoinPreapproved)(currency, xpubOrAddress)
|
|
108
|
+
: false;
|
|
109
|
+
const used = isPreapproved && totalBalance.gt(0);
|
|
108
110
|
const blockHeight = await (0, gateway_1.getLedgerEnd)(currency);
|
|
109
111
|
const creationDate = operations.length > 0
|
|
110
112
|
? new Date(Math.min(...operations.map(op => op.date.getTime())))
|
package/lib/bridge/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":";;;;;AA2EA,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"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"}
|
package/lib/bridge/sync.test.js
CHANGED
|
@@ -51,7 +51,7 @@ const mockedGetLedgerEnd = gateway.getLedgerEnd;
|
|
|
51
51
|
const mockedGetOperations = gateway.getOperations;
|
|
52
52
|
const mockedResolver = signer_1.default;
|
|
53
53
|
const mockedIsOnboarded = onboard.isAccountOnboarded;
|
|
54
|
-
const mockedIsAuthorized = onboard.
|
|
54
|
+
const mockedIsAuthorized = onboard.isCantonCoinPreapproved;
|
|
55
55
|
const mockedCoinConfig = config.default.getCoinConfig;
|
|
56
56
|
const sampleCurrency = {
|
|
57
57
|
id: "testcoin",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.test.js","sourceRoot":"","sources":["../../src/bridge/sync.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA6C;AAE7C,4DAA8C;AAC9C,mDAAqC;AACrC,kDAAoC;AACpC,uDAAiC;AAGjC,gEAAqC;AAErC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAChC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACvB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACvB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAEvB,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAuB,CAAC;AACzD,MAAM,kBAAkB,GAAG,OAAO,CAAC,YAAyB,CAAC;AAC7D,MAAM,mBAAmB,GAAG,OAAO,CAAC,aAA0B,CAAC;AAC/D,MAAM,cAAc,GAAG,gBAAqB,CAAC;AAC7C,MAAM,iBAAiB,GAAG,OAAO,CAAC,kBAA+B,CAAC;AAClE,MAAM,kBAAkB,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"sync.test.js","sourceRoot":"","sources":["../../src/bridge/sync.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare const isAccountOnboarded: (currency: CryptoCurrency, publicKey: s
|
|
|
11
11
|
isOnboarded: boolean;
|
|
12
12
|
partyId?: never;
|
|
13
13
|
}>;
|
|
14
|
-
export declare const
|
|
14
|
+
export declare const isCantonCoinPreapproved: (currency: CryptoCurrency, partyId: string) => Promise<boolean>;
|
|
15
15
|
export declare const buildOnboardAccount: (signerContext: SignerContext<CantonSigner>) => (currency: CryptoCurrency, deviceId: string, account: Account) => Observable<CantonOnboardProgress | CantonOnboardResult>;
|
|
16
16
|
export declare const buildAuthorizePreapproval: (signerContext: SignerContext<CantonSigner>) => (currency: CryptoCurrency, deviceId: string, account: Account, partyId: string) => Observable<CantonAuthorizeProgress | CantonAuthorizeResult>;
|
|
17
17
|
//# 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;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,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;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAanE,OAAO,EAGL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,eAAO,MAAM,kBAAkB,GAAU,UAAU,cAAc,EAAE,WAAW,MAAM;;;;;;EAYnF,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAU,UAAU,cAAc,EAAE,SAAS,MAAM,qBAOtF,CAAC;AAkBF,eAAO,MAAM,mBAAmB,GAC7B,eAAe,aAAa,CAAC,YAAY,CAAC,MAEzC,UAAU,cAAc,EACxB,UAAU,MAAM,EAChB,SAAS,OAAO,KACf,UAAU,CAAC,qBAAqB,GAAG,mBAAmB,CAgDrD,CAAC;AAEP,eAAO,MAAM,yBAAyB,GACnC,eAAe,aAAa,CAAC,YAAY,CAAC,MAEzC,UAAU,cAAc,EACxB,UAAU,MAAM,EAChB,SAAS,OAAO,EAChB,SAAS,MAAM,KACd,UAAU,CAAC,uBAAuB,GAAG,qBAAqB,CA0DzD,CAAC"}
|
package/lib-es/bridge/onboard.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Observable } from "rxjs";
|
|
2
2
|
import { log } from "@ledgerhq/logs";
|
|
3
|
+
import { encodeAccountId } from "@ledgerhq/coin-framework/account/accountId";
|
|
3
4
|
import { prepareOnboarding, submitOnboarding, getPartyByPubKey, preparePreApprovalTransaction, submitPreApprovalTransaction, prepareTapRequest, submitTapRequest, getTransferPreApproval, } from "../network/gateway";
|
|
4
5
|
import { OnboardStatus, AuthorizeStatus, } from "../types/onboard";
|
|
5
6
|
import resolver from "../signer";
|
|
@@ -17,13 +18,24 @@ export const isAccountOnboarded = async (currency, publicKey) => {
|
|
|
17
18
|
return { isOnboarded: false };
|
|
18
19
|
}
|
|
19
20
|
};
|
|
20
|
-
export const
|
|
21
|
+
export const isCantonCoinPreapproved = async (currency, partyId) => {
|
|
21
22
|
const { expires_at, receiver } = await getTransferPreApproval(currency, partyId);
|
|
22
23
|
const isReceiver = receiver === partyId;
|
|
23
24
|
const isExpired = new Date(expires_at) < new Date();
|
|
24
|
-
const
|
|
25
|
-
return
|
|
25
|
+
const isPreapproved = !isExpired && isReceiver;
|
|
26
|
+
return isPreapproved;
|
|
26
27
|
};
|
|
28
|
+
const createOnboardedAccount = (account, partyId, currency) => ({
|
|
29
|
+
...account,
|
|
30
|
+
xpub: partyId,
|
|
31
|
+
id: encodeAccountId({
|
|
32
|
+
type: "js",
|
|
33
|
+
version: "2",
|
|
34
|
+
currencyId: currency.id,
|
|
35
|
+
xpubOrAddress: partyId,
|
|
36
|
+
derivationMode: account.derivationMode,
|
|
37
|
+
}),
|
|
38
|
+
});
|
|
27
39
|
export const buildOnboardAccount = (signerContext) => (currency, deviceId, account) => new Observable(o => {
|
|
28
40
|
async function main() {
|
|
29
41
|
o.next({ status: OnboardStatus.INIT });
|
|
@@ -36,7 +48,8 @@ export const buildOnboardAccount = (signerContext) => (currency, deviceId, accou
|
|
|
36
48
|
o.next({ status: OnboardStatus.PREPARE });
|
|
37
49
|
let { partyId } = await isAccountOnboarded(currency, publicKey);
|
|
38
50
|
if (partyId) {
|
|
39
|
-
|
|
51
|
+
const onboardedAccount = createOnboardedAccount(account, partyId, currency);
|
|
52
|
+
o.next({ partyId, account: onboardedAccount }); // success
|
|
40
53
|
return;
|
|
41
54
|
}
|
|
42
55
|
const preparedTransaction = await prepareOnboarding(currency, publicKey);
|
|
@@ -45,7 +58,8 @@ export const buildOnboardAccount = (signerContext) => (currency, deviceId, accou
|
|
|
45
58
|
const signature = await signerContext(deviceId, signer => signer.signTransaction(account.freshAddressPath, preparedTransaction.transactions.combined_hash));
|
|
46
59
|
o.next({ status: OnboardStatus.SUBMIT });
|
|
47
60
|
await submitOnboarding(currency, publicKey, preparedTransaction, signature);
|
|
48
|
-
|
|
61
|
+
const onboardedAccount = createOnboardedAccount(account, partyId, currency);
|
|
62
|
+
o.next({ partyId, account: onboardedAccount }); // success
|
|
49
63
|
}
|
|
50
64
|
main().then(() => o.complete(), error => {
|
|
51
65
|
log("[canton:onboard] onboardAccount failed:", error);
|
|
@@ -55,8 +69,8 @@ export const buildOnboardAccount = (signerContext) => (currency, deviceId, accou
|
|
|
55
69
|
export const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, account, partyId) => new Observable(o => {
|
|
56
70
|
async function main() {
|
|
57
71
|
o.next({ status: AuthorizeStatus.INIT });
|
|
58
|
-
const
|
|
59
|
-
if (!
|
|
72
|
+
const isPreapproved = await isCantonCoinPreapproved(currency, partyId);
|
|
73
|
+
if (!isPreapproved) {
|
|
60
74
|
o.next({ status: AuthorizeStatus.PREPARE });
|
|
61
75
|
const preparedTransaction = await preparePreApprovalTransaction(currency, partyId);
|
|
62
76
|
o.next({ status: AuthorizeStatus.SIGN });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIlC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,6BAA6B,EAC7B,4BAA4B,EAC5B,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,aAAa,EACb,eAAe,GAKhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,QAAQ,MAAM,WAAW,CAAC;AAGjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAwB,EAAE,SAAiB,EAAE,EAAE;IACtF,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAEjE,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isCantonCoinPreapproved } from "./onboard";
|
|
2
2
|
import * as gateway from "../network/gateway";
|
|
3
3
|
jest.mock("../network/gateway");
|
|
4
4
|
const mockedGateway = gateway;
|
|
@@ -7,7 +7,7 @@ describe("onboard", () => {
|
|
|
7
7
|
const mockCurrency = {
|
|
8
8
|
id: "canton_network",
|
|
9
9
|
};
|
|
10
|
-
describe("
|
|
10
|
+
describe("isCantonCoinPreapproved", () => {
|
|
11
11
|
it("should return true when contract exists and is not expired", async () => {
|
|
12
12
|
// GIVEN
|
|
13
13
|
const futureDate = new Date();
|
|
@@ -21,7 +21,7 @@ describe("onboard", () => {
|
|
|
21
21
|
expires_at: futureDate.toISOString(),
|
|
22
22
|
});
|
|
23
23
|
// WHEN
|
|
24
|
-
const result = await
|
|
24
|
+
const result = await isCantonCoinPreapproved(mockCurrency, mockPartyId);
|
|
25
25
|
// THEN
|
|
26
26
|
expect(result).toBe(true);
|
|
27
27
|
expect(mockedGateway.getTransferPreApproval).toHaveBeenCalledWith(mockCurrency, mockPartyId);
|
|
@@ -39,7 +39,7 @@ describe("onboard", () => {
|
|
|
39
39
|
expires_at: pastDate.toISOString(),
|
|
40
40
|
});
|
|
41
41
|
// WHEN
|
|
42
|
-
const result = await
|
|
42
|
+
const result = await isCantonCoinPreapproved(mockCurrency, mockPartyId);
|
|
43
43
|
// THEN
|
|
44
44
|
expect(result).toBe(false);
|
|
45
45
|
expect(mockedGateway.getTransferPreApproval).toHaveBeenCalledWith(mockCurrency, mockPartyId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"onboard.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAE9C,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAChC,MAAM,aAAa,GAAG,OAAsC,CAAC;AAE7D,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,MAAM,WAAW,GAAG,eAAe,CAAC;IACpC,MAAM,YAAY,GAAG;QACnB,EAAE,EAAE,gBAAgB;KACQ,CAAC;IAE/B,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,QAAQ;YACR,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;YAC9B,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAE/C,aAAa,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBACrD,WAAW,EAAE,kBAAkB;gBAC/B,QAAQ,EAAE,WAAW;gBACrB,QAAQ,EAAE,eAAe;gBACzB,UAAU,EAAE,sBAAsB;gBAClC,eAAe,EAAE,sBAAsB;gBACvC,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE;aACrC,CAAC,CAAC;YAEH,OAAO;YACP,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAExE,OAAO;YACP,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,QAAQ;YACR,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;YAC5B,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YAE3C,aAAa,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBACrD,WAAW,EAAE,kBAAkB;gBAC/B,QAAQ,EAAE,WAAW;gBACrB,QAAQ,EAAE,eAAe;gBACzB,UAAU,EAAE,sBAAsB;gBAClC,eAAe,EAAE,sBAAsB;gBACvC,UAAU,EAAE,QAAQ,CAAC,WAAW,EAAE;aACnC,CAAC,CAAC;YAEH,OAAO;YACP,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAExE,OAAO;YACP,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -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;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAkEvD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAkEvD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAwFhC"}
|
package/lib-es/bridge/sync.js
CHANGED
|
@@ -5,7 +5,7 @@ import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
|
5
5
|
import { getBalance, getLedgerEnd, getOperations } from "../network/gateway";
|
|
6
6
|
import coinConfig from "../config";
|
|
7
7
|
import resolver from "../signer";
|
|
8
|
-
import { isAccountOnboarded,
|
|
8
|
+
import { isAccountOnboarded, isCantonCoinPreapproved } from "./onboard";
|
|
9
9
|
const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
|
|
10
10
|
const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue, details }], } = txInfo;
|
|
11
11
|
let type = "UNKNOWN";
|
|
@@ -97,8 +97,10 @@ export function makeGetAccountShape(signerContext) {
|
|
|
97
97
|
const newOperations = filterOperations(transactionData.operations, accountId, xpubOrAddress);
|
|
98
98
|
operations = mergeOps(oldOperations, newOperations);
|
|
99
99
|
}
|
|
100
|
-
const
|
|
101
|
-
|
|
100
|
+
const isPreapproved = xpubOrAddress
|
|
101
|
+
? await isCantonCoinPreapproved(currency, xpubOrAddress)
|
|
102
|
+
: false;
|
|
103
|
+
const used = isPreapproved && totalBalance.gt(0);
|
|
102
104
|
const blockHeight = await getLedgerEnd(currency);
|
|
103
105
|
const creationDate = operations.length > 0
|
|
104
106
|
? new Date(Math.min(...operations.map(op => op.date.getTime())))
|
|
@@ -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,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAmB,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAsB,MAAM,oBAAoB,CAAC;AACjG,OAAO,UAAU,MAAM,WAAW,CAAC;AACnC,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ const mockedGetLedgerEnd = gateway.getLedgerEnd;
|
|
|
13
13
|
const mockedGetOperations = gateway.getOperations;
|
|
14
14
|
const mockedResolver = resolver;
|
|
15
15
|
const mockedIsOnboarded = onboard.isAccountOnboarded;
|
|
16
|
-
const mockedIsAuthorized = onboard.
|
|
16
|
+
const mockedIsAuthorized = onboard.isCantonCoinPreapproved;
|
|
17
17
|
const mockedCoinConfig = config.default.getCoinConfig;
|
|
18
18
|
const sampleCurrency = {
|
|
19
19
|
id: "testcoin",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.test.js","sourceRoot":"","sources":["../../src/bridge/sync.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,QAAQ,MAAM,WAAW,CAAC;AAGjC,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAChC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACvB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACvB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAEvB,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAuB,CAAC;AACzD,MAAM,kBAAkB,GAAG,OAAO,CAAC,YAAyB,CAAC;AAC7D,MAAM,mBAAmB,GAAG,OAAO,CAAC,aAA0B,CAAC;AAC/D,MAAM,cAAc,GAAG,QAAqB,CAAC;AAC7C,MAAM,iBAAiB,GAAG,OAAO,CAAC,kBAA+B,CAAC;AAClE,MAAM,kBAAkB,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"sync.test.js","sourceRoot":"","sources":["../../src/bridge/sync.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-canton",
|
|
3
|
-
"version": "0.8.0-nightly.
|
|
3
|
+
"version": "0.8.0-nightly.5",
|
|
4
4
|
"description": "Canton coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -101,14 +101,14 @@
|
|
|
101
101
|
"bignumber.js": "^9.1.2",
|
|
102
102
|
"invariant": "^2.2.4",
|
|
103
103
|
"rxjs": "^7.8.1",
|
|
104
|
-
"@ledgerhq/coin-framework": "^6.7.0-nightly.
|
|
105
|
-
"@ledgerhq/cryptoassets": "^13.31.0-nightly.
|
|
106
|
-
"@ledgerhq/devices": "8.6.
|
|
107
|
-
"@ledgerhq/errors": "^6.
|
|
108
|
-
"@ledgerhq/live-env": "^2.19.0-nightly.
|
|
109
|
-
"@ledgerhq/live-network": "^2.0.20-nightly.
|
|
104
|
+
"@ledgerhq/coin-framework": "^6.7.0-nightly.5",
|
|
105
|
+
"@ledgerhq/cryptoassets": "^13.31.0-nightly.5",
|
|
106
|
+
"@ledgerhq/devices": "8.6.2-nightly.0",
|
|
107
|
+
"@ledgerhq/errors": "^6.27.0-nightly.0",
|
|
108
|
+
"@ledgerhq/live-env": "^2.19.0-nightly.1",
|
|
109
|
+
"@ledgerhq/live-network": "^2.0.20-nightly.2",
|
|
110
110
|
"@ledgerhq/logs": "^6.13.0",
|
|
111
|
-
"@ledgerhq/types-live": "^6.87.0-nightly.
|
|
111
|
+
"@ledgerhq/types-live": "^6.87.0-nightly.3"
|
|
112
112
|
},
|
|
113
113
|
"devDependencies": {
|
|
114
114
|
"@types/invariant": "^2.2.37",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
|
|
2
|
-
import {
|
|
2
|
+
import { isCantonCoinPreapproved } from "./onboard";
|
|
3
3
|
import * as gateway from "../network/gateway";
|
|
4
4
|
|
|
5
5
|
jest.mock("../network/gateway");
|
|
@@ -11,7 +11,7 @@ describe("onboard", () => {
|
|
|
11
11
|
id: "canton_network",
|
|
12
12
|
} as unknown as CryptoCurrency;
|
|
13
13
|
|
|
14
|
-
describe("
|
|
14
|
+
describe("isCantonCoinPreapproved", () => {
|
|
15
15
|
it("should return true when contract exists and is not expired", async () => {
|
|
16
16
|
// GIVEN
|
|
17
17
|
const futureDate = new Date();
|
|
@@ -27,7 +27,7 @@ describe("onboard", () => {
|
|
|
27
27
|
});
|
|
28
28
|
|
|
29
29
|
// WHEN
|
|
30
|
-
const result = await
|
|
30
|
+
const result = await isCantonCoinPreapproved(mockCurrency, mockPartyId);
|
|
31
31
|
|
|
32
32
|
// THEN
|
|
33
33
|
expect(result).toBe(true);
|
|
@@ -49,7 +49,7 @@ describe("onboard", () => {
|
|
|
49
49
|
});
|
|
50
50
|
|
|
51
51
|
// WHEN
|
|
52
|
-
const result = await
|
|
52
|
+
const result = await isCantonCoinPreapproved(mockCurrency, mockPartyId);
|
|
53
53
|
|
|
54
54
|
// THEN
|
|
55
55
|
expect(result).toBe(false);
|
package/src/bridge/onboard.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { SignerContext } from "@ledgerhq/coin-framework/signer";
|
|
|
3
3
|
import type { Account } from "@ledgerhq/types-live";
|
|
4
4
|
import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
|
|
5
5
|
import { log } from "@ledgerhq/logs";
|
|
6
|
+
import { encodeAccountId } from "@ledgerhq/coin-framework/account/accountId";
|
|
6
7
|
import {
|
|
7
8
|
prepareOnboarding,
|
|
8
9
|
submitOnboarding,
|
|
@@ -38,15 +39,31 @@ export const isAccountOnboarded = async (currency: CryptoCurrency, publicKey: st
|
|
|
38
39
|
}
|
|
39
40
|
};
|
|
40
41
|
|
|
41
|
-
export const
|
|
42
|
+
export const isCantonCoinPreapproved = async (currency: CryptoCurrency, partyId: string) => {
|
|
42
43
|
const { expires_at, receiver } = await getTransferPreApproval(currency, partyId);
|
|
43
44
|
const isReceiver = receiver === partyId;
|
|
44
45
|
const isExpired = new Date(expires_at) < new Date();
|
|
45
46
|
|
|
46
|
-
const
|
|
47
|
-
return
|
|
47
|
+
const isPreapproved = !isExpired && isReceiver;
|
|
48
|
+
return isPreapproved;
|
|
48
49
|
};
|
|
49
50
|
|
|
51
|
+
const createOnboardedAccount = (
|
|
52
|
+
account: Account,
|
|
53
|
+
partyId: string,
|
|
54
|
+
currency: CryptoCurrency,
|
|
55
|
+
): Account => ({
|
|
56
|
+
...account,
|
|
57
|
+
xpub: partyId,
|
|
58
|
+
id: encodeAccountId({
|
|
59
|
+
type: "js",
|
|
60
|
+
version: "2",
|
|
61
|
+
currencyId: currency.id,
|
|
62
|
+
xpubOrAddress: partyId,
|
|
63
|
+
derivationMode: account.derivationMode,
|
|
64
|
+
}),
|
|
65
|
+
});
|
|
66
|
+
|
|
50
67
|
export const buildOnboardAccount =
|
|
51
68
|
(signerContext: SignerContext<CantonSigner>) =>
|
|
52
69
|
(
|
|
@@ -69,7 +86,8 @@ export const buildOnboardAccount =
|
|
|
69
86
|
|
|
70
87
|
let { partyId } = await isAccountOnboarded(currency, publicKey);
|
|
71
88
|
if (partyId) {
|
|
72
|
-
|
|
89
|
+
const onboardedAccount = createOnboardedAccount(account, partyId, currency);
|
|
90
|
+
o.next({ partyId, account: onboardedAccount }); // success
|
|
73
91
|
return;
|
|
74
92
|
}
|
|
75
93
|
|
|
@@ -89,7 +107,8 @@ export const buildOnboardAccount =
|
|
|
89
107
|
|
|
90
108
|
await submitOnboarding(currency, publicKey, preparedTransaction, signature);
|
|
91
109
|
|
|
92
|
-
|
|
110
|
+
const onboardedAccount = createOnboardedAccount(account, partyId, currency);
|
|
111
|
+
o.next({ partyId, account: onboardedAccount }); // success
|
|
93
112
|
}
|
|
94
113
|
|
|
95
114
|
main().then(
|
|
@@ -113,9 +132,9 @@ export const buildAuthorizePreapproval =
|
|
|
113
132
|
async function main() {
|
|
114
133
|
o.next({ status: AuthorizeStatus.INIT });
|
|
115
134
|
|
|
116
|
-
const
|
|
135
|
+
const isPreapproved = await isCantonCoinPreapproved(currency, partyId);
|
|
117
136
|
|
|
118
|
-
if (!
|
|
137
|
+
if (!isPreapproved) {
|
|
119
138
|
o.next({ status: AuthorizeStatus.PREPARE });
|
|
120
139
|
|
|
121
140
|
const preparedTransaction = await preparePreApprovalTransaction(currency, partyId);
|
package/src/bridge/sync.test.ts
CHANGED
|
@@ -18,7 +18,7 @@ const mockedGetLedgerEnd = gateway.getLedgerEnd as jest.Mock;
|
|
|
18
18
|
const mockedGetOperations = gateway.getOperations as jest.Mock;
|
|
19
19
|
const mockedResolver = resolver as jest.Mock;
|
|
20
20
|
const mockedIsOnboarded = onboard.isAccountOnboarded as jest.Mock;
|
|
21
|
-
const mockedIsAuthorized = onboard.
|
|
21
|
+
const mockedIsAuthorized = onboard.isCantonCoinPreapproved as jest.Mock;
|
|
22
22
|
const mockedCoinConfig = config.default.getCoinConfig as jest.Mock;
|
|
23
23
|
|
|
24
24
|
const sampleCurrency = {
|
package/src/bridge/sync.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { getBalance, getLedgerEnd, getOperations, type OperationInfo } from "../
|
|
|
8
8
|
import coinConfig from "../config";
|
|
9
9
|
import resolver from "../signer";
|
|
10
10
|
import { CantonAccount, CantonSigner } from "../types";
|
|
11
|
-
import { isAccountOnboarded,
|
|
11
|
+
import { isAccountOnboarded, isCantonCoinPreapproved } from "./onboard";
|
|
12
12
|
|
|
13
13
|
const txInfoToOperationAdapter =
|
|
14
14
|
(accountId: string, partyId: string) =>
|
|
@@ -133,8 +133,10 @@ export function makeGetAccountShape(
|
|
|
133
133
|
operations = mergeOps(oldOperations, newOperations);
|
|
134
134
|
}
|
|
135
135
|
|
|
136
|
-
const
|
|
137
|
-
|
|
136
|
+
const isPreapproved = xpubOrAddress
|
|
137
|
+
? await isCantonCoinPreapproved(currency, xpubOrAddress)
|
|
138
|
+
: false;
|
|
139
|
+
const used = isPreapproved && totalBalance.gt(0);
|
|
138
140
|
|
|
139
141
|
const blockHeight = await getLedgerEnd(currency);
|
|
140
142
|
|