@ledgerhq/coin-canton 0.7.0-nightly.2 → 0.7.0-nightly.3
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 +17 -0
- package/lib/api/lastBlock.integ.test.js +0 -15
- package/lib/api/lastBlock.integ.test.js.map +1 -1
- package/lib/bridge/index.d.ts.map +1 -1
- package/lib/bridge/index.js +2 -5
- package/lib/bridge/index.js.map +1 -1
- package/lib/bridge/onboard.d.ts +11 -6
- package/lib/bridge/onboard.d.ts.map +1 -1
- package/lib/bridge/onboard.integ.test.js +49 -27
- package/lib/bridge/onboard.integ.test.js.map +1 -1
- package/lib/bridge/onboard.js +45 -152
- package/lib/bridge/onboard.js.map +1 -1
- package/lib/bridge/signOperation.d.ts.map +1 -1
- package/lib/bridge/signOperation.js +5 -5
- package/lib/bridge/signOperation.js.map +1 -1
- package/lib/bridge/sync.d.ts +3 -2
- package/lib/bridge/sync.d.ts.map +1 -1
- package/lib/bridge/sync.integ.test.js +31 -14
- package/lib/bridge/sync.integ.test.js.map +1 -1
- package/lib/bridge/sync.js +71 -57
- package/lib/bridge/sync.js.map +1 -1
- package/lib/common-logic/utils.js +2 -2
- package/lib/common-logic/utils.js.map +1 -1
- package/lib/common-logic/utils.test.js +21 -6
- package/lib/common-logic/utils.test.js.map +1 -1
- package/lib/config.d.ts +1 -1
- package/lib/config.d.ts.map +1 -1
- package/lib/network/gateway.d.ts +9 -9
- package/lib/network/gateway.d.ts.map +1 -1
- package/lib/network/gateway.integ.test.js +31 -17
- package/lib/network/gateway.integ.test.js.map +1 -1
- package/lib/network/gateway.js +33 -15
- package/lib/network/gateway.js.map +1 -1
- package/lib/types/bridge.d.ts +6 -16
- package/lib/types/bridge.d.ts.map +1 -1
- package/lib/types/onboard.d.ts +5 -5
- package/lib/types/onboard.d.ts.map +1 -1
- package/lib/types/onboard.js +10 -10
- package/lib/types/onboard.js.map +1 -1
- package/lib-es/api/lastBlock.integ.test.js +0 -15
- package/lib-es/api/lastBlock.integ.test.js.map +1 -1
- package/lib-es/bridge/index.d.ts.map +1 -1
- package/lib-es/bridge/index.js +3 -6
- package/lib-es/bridge/index.js.map +1 -1
- package/lib-es/bridge/onboard.d.ts +11 -6
- package/lib-es/bridge/onboard.d.ts.map +1 -1
- package/lib-es/bridge/onboard.integ.test.js +37 -15
- package/lib-es/bridge/onboard.integ.test.js.map +1 -1
- package/lib-es/bridge/onboard.js +44 -152
- package/lib-es/bridge/onboard.js.map +1 -1
- package/lib-es/bridge/signOperation.d.ts.map +1 -1
- package/lib-es/bridge/signOperation.js +5 -5
- package/lib-es/bridge/signOperation.js.map +1 -1
- package/lib-es/bridge/sync.d.ts +3 -2
- package/lib-es/bridge/sync.d.ts.map +1 -1
- package/lib-es/bridge/sync.integ.test.js +26 -9
- package/lib-es/bridge/sync.integ.test.js.map +1 -1
- package/lib-es/bridge/sync.js +71 -56
- package/lib-es/bridge/sync.js.map +1 -1
- package/lib-es/common-logic/utils.js +2 -2
- package/lib-es/common-logic/utils.js.map +1 -1
- package/lib-es/common-logic/utils.test.js +21 -6
- package/lib-es/common-logic/utils.test.js.map +1 -1
- package/lib-es/config.d.ts +1 -1
- package/lib-es/config.d.ts.map +1 -1
- package/lib-es/network/gateway.d.ts +9 -9
- package/lib-es/network/gateway.d.ts.map +1 -1
- package/lib-es/network/gateway.integ.test.js +31 -17
- package/lib-es/network/gateway.integ.test.js.map +1 -1
- package/lib-es/network/gateway.js +33 -15
- package/lib-es/network/gateway.js.map +1 -1
- package/lib-es/types/bridge.d.ts +6 -16
- package/lib-es/types/bridge.d.ts.map +1 -1
- package/lib-es/types/onboard.d.ts +5 -5
- package/lib-es/types/onboard.d.ts.map +1 -1
- package/lib-es/types/onboard.js +9 -9
- package/lib-es/types/onboard.js.map +1 -1
- package/package.json +5 -4
- package/src/api/lastBlock.integ.test.ts +0 -18
- package/src/bridge/index.ts +3 -6
- package/src/bridge/onboard.integ.test.ts +44 -31
- package/src/bridge/onboard.ts +61 -209
- package/src/bridge/signOperation.ts +5 -6
- package/src/bridge/sync.integ.test.ts +30 -10
- package/src/bridge/sync.ts +87 -72
- package/src/common-logic/utils.test.ts +21 -6
- package/src/common-logic/utils.ts +2 -2
- package/src/config.ts +1 -1
- package/src/network/gateway.integ.test.ts +48 -21
- package/src/network/gateway.ts +49 -34
- package/src/types/bridge.ts +8 -19
- package/src/types/onboard.ts +5 -5
- package/lib/bridge/serialization.d.ts +0 -4
- package/lib/bridge/serialization.d.ts.map +0 -1
- package/lib/bridge/serialization.js +0 -31
- package/lib/bridge/serialization.js.map +0 -1
- package/lib-es/bridge/serialization.d.ts +0 -4
- package/lib-es/bridge/serialization.d.ts.map +0 -1
- package/lib-es/bridge/serialization.js +0 -27
- package/lib-es/bridge/serialization.js.map +0 -1
- package/src/bridge/serialization.ts +0 -36
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.integ.test.js","sourceRoot":"","sources":["../../src/bridge/sync.integ.test.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,UAAU,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sync.integ.test.js","sourceRoot":"","sources":["../../src/bridge/sync.integ.test.ts"],"names":[],"mappings":"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"}
|
package/lib-es/bridge/sync.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
|
-
import {
|
|
2
|
+
import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
|
|
3
3
|
import { mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
4
4
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
5
5
|
import { getBalance, getLedgerEnd, getOperations } from "../network/gateway";
|
|
6
6
|
import coinConfig from "../config";
|
|
7
|
+
import resolver from "../signer";
|
|
8
|
+
import { isAccountOnboarded, isAccountAuthorized } from "./onboard";
|
|
7
9
|
const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
|
|
8
10
|
const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue, details }], } = txInfo;
|
|
9
11
|
let type = "UNKNOWN";
|
|
@@ -45,61 +47,74 @@ const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
|
|
|
45
47
|
const filterOperations = (transactions, accountId, partyId) => {
|
|
46
48
|
return transactions.map(txInfoToOperationAdapter(accountId, partyId));
|
|
47
49
|
};
|
|
48
|
-
export
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
const reserveMin = coinConfig.getCoinConfig(currency).minReserve || 0;
|
|
72
|
-
const lockedAmount = balanceData.locked ? balance : new BigNumber(0);
|
|
73
|
-
const spendableBalance = BigNumber.max(0, balance.minus(lockedAmount).minus(BigNumber(reserveMin)));
|
|
74
|
-
let operations = [];
|
|
75
|
-
// Tx history fetching if xpubOrAddress is not empty
|
|
76
|
-
if (xpubOrAddress) {
|
|
77
|
-
const oldOperations = initialAccount?.operations || [];
|
|
78
|
-
const startAt = oldOperations.length ? (oldOperations[0].blockHeight || 0) + 1 : 0;
|
|
79
|
-
const transactionData = await getOperations(currency, partyId, {
|
|
80
|
-
cursor: startAt,
|
|
81
|
-
limit: 100,
|
|
50
|
+
export function makeGetAccountShape(signerContext) {
|
|
51
|
+
return async (info) => {
|
|
52
|
+
const { address, currency, derivationMode, derivationPath, initialAccount } = info;
|
|
53
|
+
let xpubOrAddress = initialAccount?.xpub || "";
|
|
54
|
+
if (!xpubOrAddress) {
|
|
55
|
+
const getAddress = resolver(signerContext);
|
|
56
|
+
const { publicKey } = await getAddress(info.deviceId || "", {
|
|
57
|
+
path: derivationPath,
|
|
58
|
+
currency: currency,
|
|
59
|
+
derivationMode: derivationMode,
|
|
60
|
+
verify: false,
|
|
61
|
+
});
|
|
62
|
+
const { isOnboarded, partyId } = await isAccountOnboarded(currency, publicKey);
|
|
63
|
+
if (isOnboarded && partyId) {
|
|
64
|
+
xpubOrAddress = partyId;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
const accountId = encodeAccountId({
|
|
68
|
+
type: "js",
|
|
69
|
+
version: "2",
|
|
70
|
+
currencyId: currency.id,
|
|
71
|
+
xpubOrAddress: xpubOrAddress,
|
|
72
|
+
derivationMode,
|
|
82
73
|
});
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
balance
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
74
|
+
const { nativeInstrumentId } = coinConfig.getCoinConfig(currency);
|
|
75
|
+
const balances = xpubOrAddress ? await getBalance(currency, xpubOrAddress) : [];
|
|
76
|
+
const balanceData = balances.find(balance => balance.instrument_id.includes(nativeInstrumentId)) || {
|
|
77
|
+
instrument_id: nativeInstrumentId,
|
|
78
|
+
amount: 0,
|
|
79
|
+
locked: false,
|
|
80
|
+
};
|
|
81
|
+
const balance = new BigNumber(balanceData.amount);
|
|
82
|
+
const reserveMin = new BigNumber(coinConfig.getCoinConfig(currency).minReserve || 0);
|
|
83
|
+
const lockedAmount = balanceData.locked ? balance : new BigNumber(0);
|
|
84
|
+
const spendableBalance = BigNumber.max(0, balance.minus(lockedAmount).minus(reserveMin));
|
|
85
|
+
let operations = [];
|
|
86
|
+
if (xpubOrAddress) {
|
|
87
|
+
const oldOperations = initialAccount?.operations || [];
|
|
88
|
+
const startAt = oldOperations.length ? (oldOperations[0].blockHeight || 0) + 1 : 0;
|
|
89
|
+
const transactionData = await getOperations(currency, xpubOrAddress, {
|
|
90
|
+
cursor: startAt,
|
|
91
|
+
limit: 100,
|
|
92
|
+
});
|
|
93
|
+
const newOperations = filterOperations(transactionData.operations, accountId, xpubOrAddress);
|
|
94
|
+
operations = mergeOps(oldOperations, newOperations);
|
|
95
|
+
}
|
|
96
|
+
const isAuthorized = await isAccountAuthorized(operations, xpubOrAddress);
|
|
97
|
+
const used = isAuthorized && balance.gt(0);
|
|
98
|
+
const blockHeight = await getLedgerEnd(currency);
|
|
99
|
+
const creationDate = operations.length > 0
|
|
100
|
+
? new Date(Math.min(...operations.map(op => op.date.getTime())))
|
|
101
|
+
: new Date();
|
|
102
|
+
const shape = {
|
|
103
|
+
id: accountId,
|
|
104
|
+
type: "Account",
|
|
105
|
+
balance,
|
|
106
|
+
blockHeight,
|
|
107
|
+
creationDate,
|
|
108
|
+
lastSyncDate: new Date(),
|
|
109
|
+
freshAddress: address,
|
|
110
|
+
seedIdentifier: address,
|
|
111
|
+
operations,
|
|
112
|
+
operationsCount: operations.length,
|
|
113
|
+
spendableBalance,
|
|
114
|
+
xpub: xpubOrAddress,
|
|
115
|
+
used,
|
|
116
|
+
};
|
|
117
|
+
return shape;
|
|
102
118
|
};
|
|
103
|
-
|
|
104
|
-
};
|
|
119
|
+
}
|
|
105
120
|
//# sourceMappingURL=sync.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ export const UINT32_MAX = new BigNumber(2).pow(32).minus(1);
|
|
|
3
3
|
export const validateTag = (tag) => {
|
|
4
4
|
return (!tag.isNaN() && tag.isFinite() && tag.isInteger() && tag.isPositive() && tag.lte(UINT32_MAX));
|
|
5
5
|
};
|
|
6
|
-
const CANTON_ADDRESS_REGEX =
|
|
6
|
+
const CANTON_ADDRESS_REGEX = /^.+::[a-zA-Z0-9]+$/;
|
|
7
7
|
export function isRecipientValid(recipient) {
|
|
8
|
-
// Canton address format: at least 1 character :: at least 1
|
|
8
|
+
// Canton address format: at least 1 character :: at least 1 alphanumeric character
|
|
9
9
|
return CANTON_ADDRESS_REGEX.test(recipient);
|
|
10
10
|
}
|
|
11
11
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common-logic/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAc,EAAE,EAAE;IAC5C,OAAO,CACL,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAC7F,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common-logic/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAc,EAAE,EAAE;IAC5C,OAAO,CACL,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAC7F,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAElD,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,mFAAmF;IACnF,OAAO,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC"}
|
|
@@ -12,6 +12,10 @@ describe("utils", () => {
|
|
|
12
12
|
"user123::42",
|
|
13
13
|
"canton_1a2b3c4d5e6f7g8h9i0j1k2l3m4n5o6p7q8r9s0t1u2v3w4x5y6z::123",
|
|
14
14
|
"test::123456789",
|
|
15
|
+
"abc::abc", // letters after ::
|
|
16
|
+
"test::ABC123", // mixed case letters and numbers
|
|
17
|
+
"user::a1b2c3", // alphanumeric after ::
|
|
18
|
+
"contract::XyZ789", // mixed case with numbers
|
|
15
19
|
];
|
|
16
20
|
validAddresses.forEach(address => {
|
|
17
21
|
expect(isRecipientValid(address)).toBe(true);
|
|
@@ -21,37 +25,48 @@ describe("utils", () => {
|
|
|
21
25
|
const invalidAddresses = [
|
|
22
26
|
"", // empty string
|
|
23
27
|
"::123", // no characters before ::
|
|
24
|
-
"abc::", // no
|
|
28
|
+
"abc::", // no characters after ::
|
|
25
29
|
"abc:123", // single colon instead of double
|
|
26
|
-
"abc::abc", // letters instead of numbers after ::
|
|
27
30
|
"abc::", // empty after ::
|
|
28
31
|
"::", // only colons
|
|
29
32
|
"abc", // no colons
|
|
30
33
|
"123", // no colons
|
|
31
|
-
"abc::123abc", // mixed letters and numbers after ::
|
|
32
34
|
"abc::123.456", // decimal numbers
|
|
33
35
|
"abc::-123", // negative numbers
|
|
34
36
|
"abc::+123", // positive sign
|
|
35
|
-
"abc:: 123", // space before
|
|
36
|
-
"abc::123 ", // space after
|
|
37
|
+
"abc:: 123", // space before alphanumeric
|
|
38
|
+
"abc::123 ", // space after alphanumeric
|
|
37
39
|
"abc:: 123", // space after ::
|
|
40
|
+
"abc::123-abc", // dash in alphanumeric part
|
|
41
|
+
"abc::123_abc", // underscore in alphanumeric part
|
|
42
|
+
"abc::123.abc", // dot in alphanumeric part
|
|
43
|
+
"abc::123 abc", // space in alphanumeric part
|
|
44
|
+
"abc::", // empty after ::
|
|
38
45
|
];
|
|
39
46
|
invalidAddresses.forEach(address => {
|
|
40
47
|
expect(isRecipientValid(address)).toBe(false);
|
|
41
48
|
});
|
|
42
49
|
});
|
|
43
50
|
it("should handle edge cases", () => {
|
|
44
|
-
expect(isRecipientValid("a::1")).toBe(true); // minimum valid case
|
|
51
|
+
expect(isRecipientValid("a::1")).toBe(true); // minimum valid case with number
|
|
52
|
+
expect(isRecipientValid("a::a")).toBe(true); // minimum valid case with letter
|
|
45
53
|
expect(isRecipientValid("1::1")).toBe(true); // number before ::
|
|
54
|
+
expect(isRecipientValid("1::a")).toBe(true); // number before ::, letter after
|
|
46
55
|
expect(isRecipientValid("_::1")).toBe(true); // underscore before ::
|
|
56
|
+
expect(isRecipientValid("_::a")).toBe(true); // underscore before ::, letter after
|
|
47
57
|
expect(isRecipientValid("-::1")).toBe(true); // dash before ::
|
|
58
|
+
expect(isRecipientValid("-::a")).toBe(true); // dash before ::, letter after
|
|
48
59
|
expect(isRecipientValid(".::1")).toBe(true); // dot before ::
|
|
60
|
+
expect(isRecipientValid(".::a")).toBe(true); // dot before ::, letter after
|
|
49
61
|
});
|
|
50
62
|
it("should handle addresses with spaces and multiple colons", () => {
|
|
51
63
|
// These are valid according to our regex but might not be ideal Canton addresses
|
|
52
64
|
expect(isRecipientValid(" abc::123")).toBe(true); // space before address
|
|
65
|
+
expect(isRecipientValid(" abc::abc")).toBe(true); // space before address with letters
|
|
53
66
|
expect(isRecipientValid("abc ::123")).toBe(true); // space before ::
|
|
67
|
+
expect(isRecipientValid("abc ::abc")).toBe(true); // space before :: with letters
|
|
54
68
|
expect(isRecipientValid("abc::123::456")).toBe(true); // multiple ::
|
|
69
|
+
expect(isRecipientValid("abc::abc::def")).toBe(true); // multiple :: with letters
|
|
55
70
|
});
|
|
56
71
|
});
|
|
57
72
|
describe("validateTag", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../src/common-logic/utils.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,MAAM,cAAc,GAAG;gBACrB,UAAU;gBACV,UAAU;gBACV,cAAc;gBACd,MAAM;gBACN,YAAY;gBACZ,aAAa;gBACb,kEAAkE;gBAClE,iBAAiB;
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../src/common-logic/utils.test.ts"],"names":[],"mappings":"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"}
|
package/lib-es/config.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export type CantonConfig = {
|
|
|
5
5
|
nodeId?: string;
|
|
6
6
|
gatewayUrl?: string;
|
|
7
7
|
minReserve?: number;
|
|
8
|
-
networkType: "mainnet" | "devnet" | "localnet";
|
|
8
|
+
networkType: "mainnet" | "devnet" | "testnet" | "localnet";
|
|
9
9
|
useGateway?: boolean;
|
|
10
10
|
nativeInstrumentId: string;
|
|
11
11
|
fee?: number;
|
package/lib-es/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAwB,EAAE,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAwB,EAAE,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;IAC3D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,YAAY,CAAC;AAE7D,QAAA,MAAM,UAAU,EAAE;IAChB,aAAa,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC9D,aAAa,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,KAAK,gBAAgB,CAAC;CAC1B,CAAC;AAExC,eAAe,UAAU,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { PrepareTransactionResponse
|
|
1
|
+
import { PrepareTransactionResponse } from "../types/onboard";
|
|
2
2
|
import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
|
|
3
|
-
type OnboardingPrepareResponse = {
|
|
3
|
+
export type OnboardingPrepareResponse = {
|
|
4
4
|
party_id: string;
|
|
5
5
|
party_name: string;
|
|
6
6
|
public_key_fingerprint: string;
|
|
@@ -23,10 +23,6 @@ type OnboardingPrepareResponse = {
|
|
|
23
23
|
combined_hash: string;
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
|
-
type OnboardingPrepareRequest = {
|
|
27
|
-
public_key: string;
|
|
28
|
-
public_key_type: string;
|
|
29
|
-
};
|
|
30
26
|
export type PrepareTransferResponse = {
|
|
31
27
|
hash: string;
|
|
32
28
|
json: any;
|
|
@@ -236,8 +232,8 @@ export type OperationInfo = {
|
|
|
236
232
|
type: "transfer";
|
|
237
233
|
};
|
|
238
234
|
};
|
|
239
|
-
export declare function prepareOnboarding(currency: CryptoCurrency, pubKey: string
|
|
240
|
-
export declare function submitOnboarding(currency: CryptoCurrency,
|
|
235
|
+
export declare function prepareOnboarding(currency: CryptoCurrency, pubKey: string): Promise<OnboardingPrepareResponse>;
|
|
236
|
+
export declare function submitOnboarding(currency: CryptoCurrency, publicKey: string, prepareResponse: OnboardingPrepareResponse, signature: string): Promise<OnboardingSubmitResponse>;
|
|
241
237
|
export declare function submit(currency: CryptoCurrency, partyId: string, serialized: string, signature: string): Promise<TransactionSubmitResponse>;
|
|
242
238
|
export declare function getBalance(currency: CryptoCurrency, partyId: string): Promise<InstrumentBalance[]>;
|
|
243
239
|
export declare function getPartyById(currency: CryptoCurrency, partyId: string): Promise<PartyInfo>;
|
|
@@ -274,6 +270,10 @@ export declare function submitTapRequest(currency: CryptoCurrency, { partyId, se
|
|
|
274
270
|
export declare function prepareTransferRequest(currency: CryptoCurrency, partyId: string, params: PrepareTransferRequest): Promise<PrepareTransferResponse>;
|
|
275
271
|
export declare function getLedgerEnd(currency: CryptoCurrency): Promise<number>;
|
|
276
272
|
export declare function preparePreApprovalTransaction(currency: CryptoCurrency, partyId: string): Promise<PrepareTransactionResponse>;
|
|
277
|
-
export declare function submitPreApprovalTransaction(currency: CryptoCurrency, partyId: string, { serialized }: PrepareTransactionResponse, signature: string): Promise<
|
|
273
|
+
export declare function submitPreApprovalTransaction(currency: CryptoCurrency, partyId: string, { serialized }: PrepareTransactionResponse, signature: string): Promise<{
|
|
274
|
+
isApproved: true;
|
|
275
|
+
submissionId: string;
|
|
276
|
+
updateId: string;
|
|
277
|
+
}>;
|
|
278
278
|
export {};
|
|
279
279
|
//# sourceMappingURL=gateway.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/network/gateway.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,0BAA0B,
|
|
1
|
+
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/network/gateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const mockCurrency = {
|
|
|
6
6
|
};
|
|
7
7
|
describe("gateway (devnet)", () => {
|
|
8
8
|
let onboardedAccount = null;
|
|
9
|
+
let prepareResponse = null;
|
|
9
10
|
beforeAll(async () => {
|
|
10
11
|
coinConfig.setCoinConfig(() => ({
|
|
11
12
|
gatewayUrl: "https://canton-gateway.api.live.ledger-test.com",
|
|
@@ -16,7 +17,7 @@ describe("gateway (devnet)", () => {
|
|
|
16
17
|
type: "active",
|
|
17
18
|
},
|
|
18
19
|
}));
|
|
19
|
-
}
|
|
20
|
+
});
|
|
20
21
|
const getOnboardedAccount = () => {
|
|
21
22
|
if (!onboardedAccount) {
|
|
22
23
|
throw new Error("Shared onboarded account not available. Check beforeAll setup.");
|
|
@@ -33,7 +34,7 @@ describe("gateway (devnet)", () => {
|
|
|
33
34
|
partyId: "", // set in next test
|
|
34
35
|
};
|
|
35
36
|
// WHEN
|
|
36
|
-
const response = await prepareOnboarding(mockCurrency, keyPair.publicKeyHex
|
|
37
|
+
const response = await prepareOnboarding(mockCurrency, keyPair.publicKeyHex);
|
|
37
38
|
// THEN
|
|
38
39
|
expect(response).toHaveProperty("party_id");
|
|
39
40
|
expect(response).toHaveProperty("party_name");
|
|
@@ -43,18 +44,18 @@ describe("gateway (devnet)", () => {
|
|
|
43
44
|
expect(response.party_name).toBeDefined();
|
|
44
45
|
expect(typeof response.party_name).toBe("string");
|
|
45
46
|
expect(response.public_key_fingerprint).toBe(keyPair.fingerprint);
|
|
46
|
-
}
|
|
47
|
+
});
|
|
47
48
|
});
|
|
48
49
|
describe("submitOnboarding", () => {
|
|
49
50
|
it("should submit onboarding with proper signature", async () => {
|
|
50
51
|
// GIVEN
|
|
51
52
|
const { keyPair } = getOnboardedAccount();
|
|
52
|
-
|
|
53
|
-
|
|
53
|
+
// Save prepare response for next test
|
|
54
|
+
prepareResponse = await prepareOnboarding(mockCurrency, keyPair.publicKeyHex);
|
|
54
55
|
const signature = keyPair.sign(prepareResponse.transactions.combined_hash);
|
|
55
56
|
// WHEN
|
|
56
|
-
const response = await submitOnboarding(mockCurrency,
|
|
57
|
-
// Save onboarded account for
|
|
57
|
+
const response = await submitOnboarding(mockCurrency, keyPair.publicKeyHex, prepareResponse, signature);
|
|
58
|
+
// Save onboarded account for next tests that need a valid party ID
|
|
58
59
|
onboardedAccount = {
|
|
59
60
|
keyPair,
|
|
60
61
|
partyId: response.party.party_id,
|
|
@@ -65,6 +66,19 @@ describe("gateway (devnet)", () => {
|
|
|
65
66
|
expect(response.party).toHaveProperty("public_key");
|
|
66
67
|
expect(response.party.public_key).toBe(keyPair.publicKeyHex);
|
|
67
68
|
}, 30000);
|
|
69
|
+
const testIfPrepared = prepareResponse ? it.skip : it;
|
|
70
|
+
testIfPrepared("should not throw when already onboarded", async () => {
|
|
71
|
+
// GIVEN
|
|
72
|
+
const { keyPair } = getOnboardedAccount();
|
|
73
|
+
const signature = keyPair.sign(prepareResponse.transactions.combined_hash);
|
|
74
|
+
// WHEN
|
|
75
|
+
const response = await submitOnboarding(mockCurrency, keyPair.publicKeyHex, prepareResponse, signature);
|
|
76
|
+
// THEN
|
|
77
|
+
expect(response).toHaveProperty("party");
|
|
78
|
+
expect(response.party).toHaveProperty("party_id");
|
|
79
|
+
expect(response.party).toHaveProperty("public_key");
|
|
80
|
+
expect(response.party.public_key).toBe(keyPair.publicKeyHex);
|
|
81
|
+
}, 30000);
|
|
68
82
|
});
|
|
69
83
|
describe("getLedgerEnd", () => {
|
|
70
84
|
it("should return ledger end", async () => {
|
|
@@ -84,14 +98,14 @@ describe("gateway (devnet)", () => {
|
|
|
84
98
|
});
|
|
85
99
|
});
|
|
86
100
|
describe("getPartyById", () => {
|
|
87
|
-
it
|
|
88
|
-
const party = await getPartyById(mockCurrency, "
|
|
101
|
+
it("should return party info", async () => {
|
|
102
|
+
const party = await getPartyById(mockCurrency, "ldg::12208b12fa34be8a079bcbb68bba828e58313046c4208855b39885fab48661322e68");
|
|
89
103
|
expect(party).toBeDefined();
|
|
90
104
|
});
|
|
91
105
|
});
|
|
92
106
|
describe("getPartyByPubKey", () => {
|
|
93
|
-
it
|
|
94
|
-
const party = await getPartyByPubKey(mockCurrency, "
|
|
107
|
+
it("should return party info", async () => {
|
|
108
|
+
const party = await getPartyByPubKey(mockCurrency, "c5cdb19624833f9a929a0125978c886ec4297320c14cea6bf667dc1d23a8e650");
|
|
95
109
|
expect(party).toBeDefined();
|
|
96
110
|
});
|
|
97
111
|
});
|
|
@@ -102,7 +116,7 @@ describe("gateway (devnet)", () => {
|
|
|
102
116
|
});
|
|
103
117
|
});
|
|
104
118
|
describe("prepareTapRequest", () => {
|
|
105
|
-
it("should prepare tap request for onboarded party", async () => {
|
|
119
|
+
it.skip("should prepare tap request for onboarded party", async () => {
|
|
106
120
|
// GIVEN
|
|
107
121
|
const { partyId } = getOnboardedAccount();
|
|
108
122
|
const amount = 1000;
|
|
@@ -113,10 +127,10 @@ describe("gateway (devnet)", () => {
|
|
|
113
127
|
expect(response).toHaveProperty("hash");
|
|
114
128
|
expect(typeof response.serialized).toBe("string");
|
|
115
129
|
expect(typeof response.hash).toBe("string");
|
|
116
|
-
}
|
|
130
|
+
});
|
|
117
131
|
});
|
|
118
132
|
describe("submitTapRequest", () => {
|
|
119
|
-
it("should submit tap request with proper signature", async () => {
|
|
133
|
+
it.skip("should submit tap request with proper signature", async () => {
|
|
120
134
|
// GIVEN
|
|
121
135
|
const { keyPair, partyId } = getOnboardedAccount();
|
|
122
136
|
const tapPrepareResponse = await prepareTapRequest(mockCurrency, {
|
|
@@ -135,7 +149,7 @@ describe("gateway (devnet)", () => {
|
|
|
135
149
|
expect(response).toHaveProperty("update_id");
|
|
136
150
|
expect(typeof response.submission_id).toBe("string");
|
|
137
151
|
expect(typeof response.update_id).toBe("string");
|
|
138
|
-
}
|
|
152
|
+
});
|
|
139
153
|
});
|
|
140
154
|
describe("preparePreApprovalTransaction", () => {
|
|
141
155
|
it("should prepare pre-approval transaction for onboarded party", async () => {
|
|
@@ -148,7 +162,7 @@ describe("gateway (devnet)", () => {
|
|
|
148
162
|
expect(response).toHaveProperty("hash");
|
|
149
163
|
expect(typeof response.serialized).toBe("string");
|
|
150
164
|
expect(typeof response.hash).toBe("string");
|
|
151
|
-
}
|
|
165
|
+
});
|
|
152
166
|
});
|
|
153
167
|
describe("submitPreApprovalTransaction", () => {
|
|
154
168
|
it("should submit pre-approval transaction with proper signature", async () => {
|
|
@@ -165,7 +179,7 @@ describe("gateway (devnet)", () => {
|
|
|
165
179
|
expect(response.isApproved).toBe(true);
|
|
166
180
|
expect(typeof response.submissionId).toBe("string");
|
|
167
181
|
expect(typeof response.updateId).toBe("string");
|
|
168
|
-
}
|
|
182
|
+
});
|
|
169
183
|
});
|
|
170
184
|
});
|
|
171
185
|
//# sourceMappingURL=gateway.integ.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.integ.test.js","sourceRoot":"","sources":["../../src/network/gateway.integ.test.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,6BAA6B,EAC7B,4BAA4B,
|
|
1
|
+
{"version":3,"file":"gateway.integ.test.js","sourceRoot":"","sources":["../../src/network/gateway.integ.test.ts"],"names":[],"mappings":"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"}
|