@ledgerhq/coin-canton 0.5.0-nightly.3 → 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 +24 -0
- package/lib/api/getBalance.integ.test.js +8 -4
- 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/index.d.ts.map +1 -1
- package/lib/bridge/index.js +3 -0
- package/lib/bridge/index.js.map +1 -1
- package/lib/bridge/onboard.d.ts +7 -5
- package/lib/bridge/onboard.d.ts.map +1 -1
- package/lib/bridge/onboard.integ.test.js +13 -10
- package/lib/bridge/onboard.integ.test.js.map +1 -1
- package/lib/bridge/onboard.js +110 -42
- 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/serialization.d.ts +4 -0
- package/lib/bridge/serialization.d.ts.map +1 -0
- package/lib/bridge/serialization.js +31 -0
- package/lib/bridge/serialization.js.map +1 -0
- 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 +2 -1
- package/lib/bridge/sync.d.ts.map +1 -1
- package/lib/bridge/sync.integ.test.js +2 -2
- package/lib/bridge/sync.integ.test.js.map +1 -1
- package/lib/bridge/sync.js +33 -20
- 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 +7 -3
- package/lib/common-logic/transaction/estimateFees.js.map +1 -1
- package/lib/config.d.ts +1 -0
- package/lib/config.d.ts.map +1 -1
- package/lib/config.js.map +1 -1
- package/lib/network/gateway.d.ts +28 -26
- package/lib/network/gateway.d.ts.map +1 -1
- package/lib/network/gateway.integ.test.js +19 -15
- package/lib/network/gateway.integ.test.js.map +1 -1
- package/lib/network/gateway.js +40 -33
- package/lib/network/gateway.js.map +1 -1
- package/lib/signer/getAddress.d.ts.map +1 -1
- package/lib/signer/getAddress.js +2 -2
- package/lib/signer/getAddress.js.map +1 -1
- package/lib/types/bridge.d.ts +18 -3
- package/lib/types/bridge.d.ts.map +1 -1
- package/lib/types/onboard.d.ts +2 -0
- package/lib/types/onboard.d.ts.map +1 -1
- package/lib/types/onboard.js.map +1 -1
- package/lib/types/signer.d.ts +2 -1
- package/lib/types/signer.d.ts.map +1 -1
- package/lib-es/api/getBalance.integ.test.js +8 -4
- 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/index.d.ts.map +1 -1
- package/lib-es/bridge/index.js +3 -0
- package/lib-es/bridge/index.js.map +1 -1
- package/lib-es/bridge/onboard.d.ts +7 -5
- package/lib-es/bridge/onboard.d.ts.map +1 -1
- package/lib-es/bridge/onboard.integ.test.js +13 -10
- package/lib-es/bridge/onboard.integ.test.js.map +1 -1
- package/lib-es/bridge/onboard.js +107 -42
- 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/serialization.d.ts +4 -0
- package/lib-es/bridge/serialization.d.ts.map +1 -0
- package/lib-es/bridge/serialization.js +27 -0
- package/lib-es/bridge/serialization.js.map +1 -0
- 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 +2 -1
- package/lib-es/bridge/sync.d.ts.map +1 -1
- package/lib-es/bridge/sync.integ.test.js +2 -2
- package/lib-es/bridge/sync.integ.test.js.map +1 -1
- package/lib-es/bridge/sync.js +34 -21
- 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 +4 -3
- package/lib-es/common-logic/transaction/estimateFees.js.map +1 -1
- package/lib-es/config.d.ts +1 -0
- package/lib-es/config.d.ts.map +1 -1
- package/lib-es/config.js.map +1 -1
- package/lib-es/network/gateway.d.ts +28 -26
- package/lib-es/network/gateway.d.ts.map +1 -1
- package/lib-es/network/gateway.integ.test.js +19 -15
- package/lib-es/network/gateway.integ.test.js.map +1 -1
- package/lib-es/network/gateway.js +40 -33
- package/lib-es/network/gateway.js.map +1 -1
- package/lib-es/signer/getAddress.d.ts.map +1 -1
- package/lib-es/signer/getAddress.js +2 -2
- package/lib-es/signer/getAddress.js.map +1 -1
- package/lib-es/types/bridge.d.ts +18 -3
- package/lib-es/types/bridge.d.ts.map +1 -1
- package/lib-es/types/onboard.d.ts +2 -0
- package/lib-es/types/onboard.d.ts.map +1 -1
- package/lib-es/types/onboard.js.map +1 -1
- package/lib-es/types/signer.d.ts +2 -1
- package/lib-es/types/signer.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/api/getBalance.integ.test.ts +8 -4
- 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/index.ts +3 -0
- package/src/bridge/onboard.integ.test.ts +24 -12
- package/src/bridge/onboard.ts +143 -51
- package/src/bridge/prepareTransaction.ts +1 -1
- package/src/bridge/serialization.ts +36 -0
- package/src/bridge/signOperation.ts +20 -7
- package/src/bridge/sync.integ.test.ts +2 -2
- package/src/bridge/sync.ts +40 -29
- 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 +7 -3
- package/src/config.ts +1 -0
- package/src/network/gateway.integ.test.ts +31 -12
- package/src/network/gateway.ts +78 -53
- package/src/signer/getAddress.ts +6 -4
- package/src/types/bridge.ts +21 -0
- package/src/types/onboard.ts +3 -0
- package/src/types/signer.ts +2 -1
package/lib/bridge/onboard.js
CHANGED
|
@@ -1,49 +1,70 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.buildAuthorizePreapproval = exports.buildOnboardAccount = exports.isAccountOnboarded = void 0;
|
|
4
7
|
const rxjs_1 = require("rxjs");
|
|
8
|
+
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
9
|
+
const derivation_1 = require("@ledgerhq/coin-framework/derivation");
|
|
10
|
+
const sync_1 = require("./sync");
|
|
5
11
|
const gateway_1 = require("../network/gateway");
|
|
6
12
|
const onboard_1 = require("../types/onboard");
|
|
7
|
-
|
|
13
|
+
const signer_1 = __importDefault(require("../signer"));
|
|
14
|
+
async function _getKeypair(signerContext, deviceId, derivationPath) {
|
|
8
15
|
return signerContext(deviceId, async (signer) => {
|
|
9
16
|
const { publicKey, address } = await signer.getAddress(derivationPath);
|
|
10
17
|
return { signer, publicKey: publicKey.replace("0x", ""), address };
|
|
11
18
|
});
|
|
12
19
|
}
|
|
13
|
-
const isAccountOnboarded = async (publicKey) => {
|
|
20
|
+
const isAccountOnboarded = async (currency, publicKey) => {
|
|
14
21
|
try {
|
|
15
|
-
const { party_id } = await (0, gateway_1.getPartyByPubKey)(publicKey);
|
|
22
|
+
const { party_id } = await (0, gateway_1.getPartyByPubKey)(currency, publicKey);
|
|
16
23
|
if (party_id) {
|
|
17
|
-
return { party_id };
|
|
24
|
+
return { isOnboarded: true, party_id };
|
|
18
25
|
}
|
|
19
26
|
else {
|
|
20
|
-
return false;
|
|
27
|
+
return { isOnboarded: false };
|
|
21
28
|
}
|
|
22
29
|
}
|
|
23
30
|
catch (err) {
|
|
24
31
|
log("[isAccountOnboarded] Error checking party status (likely not onboarded):", err);
|
|
25
|
-
return false;
|
|
32
|
+
return { isOnboarded: false };
|
|
26
33
|
}
|
|
27
34
|
};
|
|
28
35
|
exports.isAccountOnboarded = isAccountOnboarded;
|
|
29
|
-
const buildOnboardAccount = (signerContext) => (deviceId, derivationPath) => new rxjs_1.Observable(observer => {
|
|
36
|
+
const buildOnboardAccount = (signerContext) => (currency, deviceId, derivationPath) => new rxjs_1.Observable(observer => {
|
|
30
37
|
async function main() {
|
|
31
38
|
observer.next({
|
|
32
39
|
status: onboard_1.OnboardStatus.INIT,
|
|
33
40
|
});
|
|
34
|
-
const
|
|
41
|
+
const derivationMode = (0, derivation_1.getDerivationModesForCurrency)(currency)[0];
|
|
42
|
+
const getAddress = (0, signer_1.default)(signerContext);
|
|
43
|
+
const { address, publicKey } = await getAddress(deviceId, {
|
|
44
|
+
path: derivationPath,
|
|
45
|
+
currency,
|
|
46
|
+
derivationMode: derivationMode || "",
|
|
47
|
+
});
|
|
35
48
|
observer.next({
|
|
36
49
|
status: onboard_1.OnboardStatus.PREPARE,
|
|
37
50
|
});
|
|
38
|
-
const
|
|
39
|
-
if (
|
|
51
|
+
const { party_id: partyId } = await (0, exports.isAccountOnboarded)(currency, publicKey);
|
|
52
|
+
if (partyId) {
|
|
53
|
+
const account = await createAccount({
|
|
54
|
+
address,
|
|
55
|
+
derivationPath,
|
|
56
|
+
partyId,
|
|
57
|
+
currency,
|
|
58
|
+
derivationMode,
|
|
59
|
+
});
|
|
40
60
|
observer.next({
|
|
41
|
-
partyId
|
|
61
|
+
partyId,
|
|
62
|
+
account,
|
|
42
63
|
});
|
|
43
64
|
observer.complete();
|
|
44
65
|
return;
|
|
45
66
|
}
|
|
46
|
-
const preparedTransaction = await (0, gateway_1.prepareOnboarding)(
|
|
67
|
+
const preparedTransaction = await (0, gateway_1.prepareOnboarding)(currency, publicKey, "ed25519");
|
|
47
68
|
observer.next({
|
|
48
69
|
status: onboard_1.OnboardStatus.SIGN,
|
|
49
70
|
});
|
|
@@ -51,21 +72,39 @@ const buildOnboardAccount = (signerContext) => (deviceId, derivationPath) => new
|
|
|
51
72
|
observer.next({
|
|
52
73
|
status: onboard_1.OnboardStatus.SUBMIT,
|
|
53
74
|
});
|
|
54
|
-
const result = await (0, gateway_1.submitOnboarding)({ public_key:
|
|
75
|
+
const result = await (0, gateway_1.submitOnboarding)(currency, { public_key: publicKey, public_key_type: "ed25519" }, preparedTransaction, signature).catch(async (err) => {
|
|
55
76
|
if (err.type === "PARTY_ALREADY_EXISTS") {
|
|
77
|
+
const account = await createAccount({
|
|
78
|
+
address,
|
|
79
|
+
derivationPath,
|
|
80
|
+
partyId: preparedTransaction.party_id,
|
|
81
|
+
currency,
|
|
82
|
+
derivationMode,
|
|
83
|
+
});
|
|
56
84
|
observer.next({
|
|
57
85
|
partyId: preparedTransaction.party_id,
|
|
86
|
+
account,
|
|
58
87
|
});
|
|
59
88
|
return observer.complete();
|
|
60
89
|
}
|
|
61
90
|
throw err;
|
|
62
91
|
});
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
92
|
+
if (result) {
|
|
93
|
+
observer.next({
|
|
94
|
+
status: onboard_1.OnboardStatus.SUCCESS,
|
|
95
|
+
});
|
|
96
|
+
const account = await createAccount({
|
|
97
|
+
address,
|
|
98
|
+
derivationPath,
|
|
99
|
+
partyId: result.party.party_id,
|
|
100
|
+
currency,
|
|
101
|
+
derivationMode,
|
|
102
|
+
});
|
|
103
|
+
observer.next({
|
|
104
|
+
partyId: result.party.party_id,
|
|
105
|
+
account,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
69
108
|
observer.complete();
|
|
70
109
|
}
|
|
71
110
|
main().then(() => observer.complete(), error => {
|
|
@@ -74,12 +113,12 @@ const buildOnboardAccount = (signerContext) => (deviceId, derivationPath) => new
|
|
|
74
113
|
});
|
|
75
114
|
});
|
|
76
115
|
exports.buildOnboardAccount = buildOnboardAccount;
|
|
77
|
-
const buildAuthorizePreapproval = (signerContext) => (deviceId, derivationPath, partyId) => new rxjs_1.Observable(observer => {
|
|
116
|
+
const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, derivationPath, partyId) => new rxjs_1.Observable(observer => {
|
|
78
117
|
async function main() {
|
|
79
118
|
observer.next({
|
|
80
119
|
status: onboard_1.PreApprovalStatus.PREPARE,
|
|
81
120
|
});
|
|
82
|
-
const preparedTransaction = await (0, gateway_1.preparePreApprovalTransaction)(partyId);
|
|
121
|
+
const preparedTransaction = await (0, gateway_1.preparePreApprovalTransaction)(currency, partyId);
|
|
83
122
|
observer.next({
|
|
84
123
|
status: onboard_1.PreApprovalStatus.SIGN,
|
|
85
124
|
});
|
|
@@ -87,37 +126,35 @@ const buildAuthorizePreapproval = (signerContext) => (deviceId, derivationPath,
|
|
|
87
126
|
observer.next({
|
|
88
127
|
status: onboard_1.PreApprovalStatus.SUBMIT,
|
|
89
128
|
});
|
|
90
|
-
const { isApproved } = await (0, gateway_1.submitPreApprovalTransaction)(partyId, preparedTransaction, signature);
|
|
129
|
+
const { isApproved } = await (0, gateway_1.submitPreApprovalTransaction)(currency, partyId, preparedTransaction, signature);
|
|
91
130
|
observer.next({
|
|
92
131
|
status: onboard_1.PreApprovalStatus.SUCCESS,
|
|
93
132
|
});
|
|
94
133
|
observer.next({
|
|
95
134
|
isApproved,
|
|
96
135
|
});
|
|
97
|
-
// TODO: remove after demo
|
|
98
136
|
const handleTapRequest = async () => {
|
|
99
137
|
try {
|
|
100
|
-
|
|
101
|
-
status: onboard_1.PreApprovalStatus.PREPARE,
|
|
102
|
-
});
|
|
103
|
-
const { serialized, hash } = await (0, gateway_1.prepareTapRequest)({
|
|
138
|
+
const { serialized, hash } = await (0, gateway_1.prepareTapRequest)(currency, {
|
|
104
139
|
partyId,
|
|
105
140
|
});
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
141
|
+
if (serialized && hash) {
|
|
142
|
+
observer.next({
|
|
143
|
+
status: onboard_1.PreApprovalStatus.SIGN,
|
|
144
|
+
});
|
|
145
|
+
const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, hash));
|
|
146
|
+
observer.next({
|
|
147
|
+
status: onboard_1.PreApprovalStatus.SUBMIT,
|
|
148
|
+
});
|
|
149
|
+
await (0, gateway_1.submitTapRequest)(currency, {
|
|
150
|
+
partyId,
|
|
151
|
+
serialized,
|
|
152
|
+
signature,
|
|
153
|
+
});
|
|
154
|
+
observer.next({
|
|
155
|
+
status: onboard_1.PreApprovalStatus.SUCCESS,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
121
158
|
}
|
|
122
159
|
catch (err) {
|
|
123
160
|
// Tap request failure should not break the pre-approval flow
|
|
@@ -132,6 +169,37 @@ const buildAuthorizePreapproval = (signerContext) => (deviceId, derivationPath,
|
|
|
132
169
|
});
|
|
133
170
|
});
|
|
134
171
|
exports.buildAuthorizePreapproval = buildAuthorizePreapproval;
|
|
172
|
+
const createAccount = async ({ address, partyId, derivationPath, currency, derivationMode, index = 0, }) => {
|
|
173
|
+
const accountShape = await (0, sync_1.getAccountShape)({
|
|
174
|
+
address,
|
|
175
|
+
currency,
|
|
176
|
+
derivationMode,
|
|
177
|
+
derivationPath,
|
|
178
|
+
index,
|
|
179
|
+
rest: {
|
|
180
|
+
cantonResources: {
|
|
181
|
+
partyId,
|
|
182
|
+
},
|
|
183
|
+
},
|
|
184
|
+
}, { paginationConfig: {} });
|
|
185
|
+
const account = {
|
|
186
|
+
...accountShape,
|
|
187
|
+
type: "Account",
|
|
188
|
+
xpub: partyId.replace(/:/g, "_"),
|
|
189
|
+
index,
|
|
190
|
+
// operations: [],
|
|
191
|
+
currency,
|
|
192
|
+
derivationMode,
|
|
193
|
+
lastSyncDate: new Date(),
|
|
194
|
+
pendingOperations: [],
|
|
195
|
+
seedIdentifier: address,
|
|
196
|
+
balanceHistoryCache: index_1.emptyHistoryCache,
|
|
197
|
+
cantonResources: {
|
|
198
|
+
partyId,
|
|
199
|
+
},
|
|
200
|
+
};
|
|
201
|
+
return account;
|
|
202
|
+
};
|
|
135
203
|
const log = (message, ...rest) => {
|
|
136
204
|
// eslint-disable-next-line no-console
|
|
137
205
|
console.log(message, ...rest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const updateTransaction_1 = require("./updateTransaction");
|
|
|
10
10
|
const prepareTransaction = async (account, transaction) => {
|
|
11
11
|
let fee = transaction.fee;
|
|
12
12
|
if (!fee || fee.eq(0)) {
|
|
13
|
-
fee = (0, bignumber_js_1.default)((await (0, common_logic_1.estimateFees)(
|
|
13
|
+
fee = (0, bignumber_js_1.default)((await (0, common_logic_1.estimateFees)(account.currency)).toString());
|
|
14
14
|
}
|
|
15
15
|
return (0, updateTransaction_1.updateTransaction)(transaction, { fee });
|
|
16
16
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;;AAEA,kDAA+C;AAC/C,gEAAqC;AACrC,2DAAwD;AAEjD,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,IAAA,sBAAS,EAAC,CAAC,MAAM,IAAA,2BAAY,EAAC,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;;AAEA,kDAA+C;AAC/C,gEAAqC;AACrC,2DAAwD;AAEjD,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,IAAA,sBAAS,EAAC,CAAC,MAAM,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,IAAA,qCAAiB,EAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AACjD,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { Account, AccountRaw } from "@ledgerhq/types-live";
|
|
2
|
+
export declare function assignToAccountRaw(account: Account, accountRaw: AccountRaw): void;
|
|
3
|
+
export declare function assignFromAccountRaw(accountRaw: AccountRaw, account: Account): void;
|
|
4
|
+
//# sourceMappingURL=serialization.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serialization.d.ts","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAqBhE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAMjF;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAMnF"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.assignToAccountRaw = assignToAccountRaw;
|
|
4
|
+
exports.assignFromAccountRaw = assignFromAccountRaw;
|
|
5
|
+
function toResourcesRaw(r) {
|
|
6
|
+
const { partyId } = r;
|
|
7
|
+
return {
|
|
8
|
+
partyId,
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
function fromResourcesRaw(r) {
|
|
12
|
+
const { partyId } = r;
|
|
13
|
+
return {
|
|
14
|
+
partyId,
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
function assignToAccountRaw(account, accountRaw) {
|
|
18
|
+
const cantonAccount = account;
|
|
19
|
+
const cantonAccountRaw = accountRaw;
|
|
20
|
+
if (cantonAccount.cantonResources) {
|
|
21
|
+
cantonAccountRaw.cantonResources = toResourcesRaw(cantonAccount.cantonResources);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
function assignFromAccountRaw(accountRaw, account) {
|
|
25
|
+
const cantonResourcesRaw = accountRaw.cantonResources;
|
|
26
|
+
const cantonAccount = account;
|
|
27
|
+
if (cantonResourcesRaw) {
|
|
28
|
+
cantonAccount.cantonResources = fromResourcesRaw(cantonResourcesRaw);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=serialization.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":";;AAqBA,gDAMC;AAED,oDAMC;AA3BD,SAAS,cAAc,CAAC,CAAkB;IACxC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACtB,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AACD,SAAS,gBAAgB,CAAC,CAAqB;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACtB,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IACzE,MAAM,aAAa,GAAG,OAAwB,CAAC;IAC/C,MAAM,gBAAgB,GAAG,UAA8B,CAAC;IACxD,IAAI,aAAa,CAAC,eAAe,EAAE,CAAC;QAClC,gBAAgB,CAAC,eAAe,GAAG,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IACnF,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,UAAsB,EAAE,OAAgB;IAC3E,MAAM,kBAAkB,GAAI,UAA+B,CAAC,eAAe,CAAC;IAC5E,MAAM,aAAa,GAAG,OAAwB,CAAC;IAC/C,IAAI,kBAAkB,EAAE,CAAC;QACvB,aAAa,CAAC,eAAe,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACvE,CAAC;AACH,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"}
|
|
@@ -17,15 +17,20 @@ const buildSignOperation = (signerContext) => ({ account, deviceId, transaction
|
|
|
17
17
|
});
|
|
18
18
|
const signature = await signerContext(deviceId, async (signer) => {
|
|
19
19
|
const { freshAddressPath: derivationPath } = account;
|
|
20
|
-
const partyId = account
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}, {
|
|
20
|
+
const partyId = account
|
|
21
|
+
.cantonResources.partyId;
|
|
22
|
+
const params = {
|
|
24
23
|
recipient: transaction.recipient,
|
|
25
24
|
amount: transaction.amount,
|
|
26
25
|
expireInSeconds: 60 * 60,
|
|
27
26
|
tokenId: "Amulet",
|
|
28
|
-
}
|
|
27
|
+
};
|
|
28
|
+
if (transaction.memo) {
|
|
29
|
+
params.memo = transaction.memo;
|
|
30
|
+
}
|
|
31
|
+
const { hash, serializedTransaction } = await (0, common_logic_1.craftTransaction)(account.currency, {
|
|
32
|
+
address: partyId,
|
|
33
|
+
}, params);
|
|
29
34
|
const transactionSignature = await signer.signTransaction(derivationPath, hash);
|
|
30
35
|
return (0, common_logic_1.combine)(serializedTransaction, `${transactionSignature}__PARTY__${partyId}`);
|
|
31
36
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
|
package/lib/bridge/sync.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { GetAccountShape } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
2
|
-
|
|
2
|
+
import { CantonAccount } from "../types";
|
|
3
|
+
export declare const getAccountShape: GetAccountShape<CantonAccount>;
|
|
3
4
|
//# sourceMappingURL=sync.d.ts.map
|
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;
|
|
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"}
|
|
@@ -119,7 +119,7 @@ describe("sync (devnet)", () => {
|
|
|
119
119
|
const mockGetBalance = jest.spyOn(gateway, "getBalance");
|
|
120
120
|
mockGetBalance.mockResolvedValue([
|
|
121
121
|
{
|
|
122
|
-
instrument_id: "
|
|
122
|
+
instrument_id: "Amulet",
|
|
123
123
|
amount: 1000000,
|
|
124
124
|
locked: true,
|
|
125
125
|
},
|
|
@@ -163,7 +163,7 @@ describe("sync (devnet)", () => {
|
|
|
163
163
|
const mockGetOperations = jest.spyOn(gateway, "getOperations");
|
|
164
164
|
const result = await (0, sync_1.getAccountShape)(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
|
|
165
165
|
expect(result.operations).toBeDefined();
|
|
166
|
-
expect(result.operationsCount).
|
|
166
|
+
expect(result.operationsCount).toBeGreaterThanOrEqual(1);
|
|
167
167
|
expect(mockGetOperations).toHaveBeenCalledWith(TEST_ADDRESS, {
|
|
168
168
|
cursor: 0,
|
|
169
169
|
limit: 100,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.integ.test.js","sourceRoot":"","sources":["../../src/bridge/sync.integ.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAqC;AAErC,oEAI6C;AAC7C,kEAA0E;AAE1E,uDAAmC;AACnC,4DAA8C;AAC9C,iCAAyC;AAEzC,MAAM,YAAY,GAChB,wIAAwI,CAAC;AAC3I,MAAM,QAAQ,GAAG,IAAA,kCAAqB,EAAC,gBAAgB,CAAC,CAAC;AACzD,MAAM,cAAc,GAAG,IAAA,0CAA6B,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,MAAM,cAAc,GAAG,IAAA,gCAAmB,EACxC,IAAA,gCAAmB,EAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,EACjD,QAAQ,EACR;IACE,OAAO,EAAE,CAAC;CACX,CACF,CAAC;AACF,MAAM,kBAAkB,GAAqB;IAC3C,OAAO,EAAE,YAAY;IACrB,QAAQ;IACR,cAAc;IACd,cAAc;IACd,KAAK,EAAE,CAAC;CACT,CAAC;AAEF,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,gBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9B,UAAU,EAAE,iDAAiD;YAC7D,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,QAAQ;YACrB,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;aACf;SACF,CAAC,CAAC,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC9D,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAe,EAAC,kBAAkB,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC;YAEnF,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YAChC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;YAEzD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAExD,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,mBAAmB,CAC7D,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAChC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAe,EAAC,kBAAkB,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC;YAEnF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,MAAM,UAAU,GAAgB;gBAC9B;oBACE,EAAE,EAAE,WAAW;oBACf,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,cAAc;oBACzB,IAAI,EAAE,KAAc;oBACpB,KAAK,EAAE,IAAI,sBAAS,CAAC,OAAO,CAAC;oBAC7B,GAAG,EAAE,IAAI,sBAAS,CAAC,MAAM,CAAC;oBAC1B,SAAS,EAAE,cAAc;oBACzB,WAAW,EAAE,GAAG;oBAChB,OAAO,EAAE,CAAC,YAAY,CAAC;oBACvB,UAAU,EAAE,CAAC,aAAa,CAAC;oBAC3B,IAAI,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC;oBAC5B,yBAAyB,EAAE,GAAG;oBAC9B,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;iBACxB;aACF,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAe,EAClC;gBACE,GAAG,kBAAkB;gBACrB,yEAAyE;gBACzE,cAAc,EAAE,EAAE,UAAU,EAAa;aAC1C,EACD,EAAE,gBAAgB,EAAE,EAAE,EAAE,CACzB,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACzD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC;YACvE,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;YAC1F,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAEzD,cAAc,CAAC,iBAAiB,CAAC;gBAC/B;oBACE,aAAa,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/bridge/sync.js
CHANGED
|
@@ -7,14 +7,21 @@ exports.getAccountShape = void 0;
|
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
9
9
|
const jsHelpers_1 = require("@ledgerhq/coin-framework/bridge/jsHelpers");
|
|
10
|
-
const gateway_1 = require("../network/gateway");
|
|
11
10
|
const operation_1 = require("@ledgerhq/coin-framework/operation");
|
|
11
|
+
const gateway_1 = require("../network/gateway");
|
|
12
12
|
const config_1 = __importDefault(require("../config"));
|
|
13
|
-
const txInfoToOperationAdapter = (accountId,
|
|
14
|
-
const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue }], } = txInfo;
|
|
15
|
-
|
|
13
|
+
const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
|
|
14
|
+
const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue, details }], } = txInfo;
|
|
15
|
+
let type = "UNKNOWN";
|
|
16
|
+
if (txInfo.type === "Send") {
|
|
17
|
+
type = senders.includes(partyId) ? "OUT" : "IN";
|
|
18
|
+
}
|
|
19
|
+
else if (txInfo.type === "Receive") {
|
|
20
|
+
type = "IN";
|
|
21
|
+
}
|
|
16
22
|
const value = new bignumber_js_1.default(transferValue);
|
|
17
23
|
const feeValue = new bignumber_js_1.default(fee);
|
|
24
|
+
const memo = details.metadata.reason;
|
|
18
25
|
const op = {
|
|
19
26
|
id: (0, operation_1.encodeOperationId)(accountId, transaction_hash, type),
|
|
20
27
|
hash: transaction_hash,
|
|
@@ -30,49 +37,50 @@ const txInfoToOperationAdapter = (accountId, address) => (txInfo) => {
|
|
|
30
37
|
transactionSequenceNumber: height,
|
|
31
38
|
extra: {
|
|
32
39
|
uid,
|
|
40
|
+
memo,
|
|
33
41
|
},
|
|
34
42
|
};
|
|
35
43
|
return op;
|
|
36
44
|
};
|
|
37
|
-
const filterOperations = (transactions, accountId,
|
|
38
|
-
return transactions
|
|
39
|
-
.filter(tx => tx.type === "Receive" || tx.type === "Send")
|
|
40
|
-
.map(txInfoToOperationAdapter(accountId, address));
|
|
45
|
+
const filterOperations = (transactions, accountId, partyId) => {
|
|
46
|
+
return transactions.map(txInfoToOperationAdapter(accountId, partyId));
|
|
41
47
|
};
|
|
42
48
|
const getAccountShape = async (info) => {
|
|
43
|
-
const { address, initialAccount, currency, derivationMode } = info;
|
|
44
|
-
|
|
45
|
-
|
|
49
|
+
const { address, initialAccount, currency, derivationMode, derivationPath, rest } = info;
|
|
50
|
+
const xpubOrAddress = ((initialAccount && initialAccount.id && (0, index_1.decodeAccountId)(initialAccount.id).xpubOrAddress) ||
|
|
51
|
+
"").replace(/:/g, "_");
|
|
52
|
+
const partyId = rest?.cantonResources?.partyId ||
|
|
53
|
+
initialAccount?.cantonResources?.partyId ||
|
|
54
|
+
xpubOrAddress.replace(/_/g, ":");
|
|
46
55
|
const accountId = (0, index_1.encodeAccountId)({
|
|
47
56
|
type: "js",
|
|
48
57
|
version: "2",
|
|
49
58
|
currencyId: currency.id,
|
|
50
59
|
xpubOrAddress,
|
|
51
|
-
derivationMode
|
|
60
|
+
derivationMode,
|
|
52
61
|
});
|
|
53
|
-
// blockheight retrieval
|
|
54
|
-
const blockHeight = await (0, gateway_1.getLedgerEnd)();
|
|
55
62
|
// Account info retrieval + spendable balance calculation
|
|
56
63
|
// const accountInfo = await getAccountInfo(address);
|
|
57
|
-
const balances = await (0, gateway_1.getBalance)(
|
|
58
|
-
|
|
59
|
-
const balanceData = balances.find(balance => balance.instrument_id.includes("Amulet")) || {
|
|
64
|
+
const balances = await (0, gateway_1.getBalance)(currency, partyId);
|
|
65
|
+
const balanceData = balances.find(balance => balance.instrument_id === "Amulet") || {
|
|
60
66
|
instrument_id: "Amulet",
|
|
61
67
|
amount: 0,
|
|
62
68
|
locked: false,
|
|
63
69
|
};
|
|
64
70
|
const balance = new bignumber_js_1.default(balanceData.amount);
|
|
65
|
-
const reserveMin = config_1.default.getCoinConfig().minReserve || 0;
|
|
71
|
+
const reserveMin = config_1.default.getCoinConfig(currency).minReserve || 0;
|
|
66
72
|
const lockedAmount = balanceData.locked ? balance : new bignumber_js_1.default(0);
|
|
67
73
|
const spendableBalance = bignumber_js_1.default.max(0, balance.minus(lockedAmount).minus((0, bignumber_js_1.default)(reserveMin)));
|
|
68
74
|
// Tx history fetching
|
|
69
75
|
const oldOperations = initialAccount?.operations || [];
|
|
70
76
|
const startAt = oldOperations.length ? (oldOperations[0].blockHeight || 0) + 1 : 0;
|
|
71
|
-
const transactionData = await (0, gateway_1.getOperations)(
|
|
77
|
+
const transactionData = await (0, gateway_1.getOperations)(currency, partyId, {
|
|
72
78
|
cursor: startAt,
|
|
73
79
|
limit: 100,
|
|
74
80
|
});
|
|
75
|
-
|
|
81
|
+
// blockheight retrieval
|
|
82
|
+
const blockHeight = await (0, gateway_1.getLedgerEnd)(currency);
|
|
83
|
+
const newOperations = filterOperations(transactionData.operations, accountId, partyId);
|
|
76
84
|
const operations = (0, jsHelpers_1.mergeOps)(oldOperations, newOperations);
|
|
77
85
|
// We return the new account shape
|
|
78
86
|
const shape = {
|
|
@@ -83,6 +91,11 @@ const getAccountShape = async (info) => {
|
|
|
83
91
|
spendableBalance,
|
|
84
92
|
operations,
|
|
85
93
|
operationsCount: operations.length,
|
|
94
|
+
freshAddress: address,
|
|
95
|
+
freshAddressPath: derivationPath,
|
|
96
|
+
cantonResources: {
|
|
97
|
+
partyId,
|
|
98
|
+
},
|
|
86
99
|
};
|
|
87
100
|
return shape;
|
|
88
101
|
};
|
package/lib/bridge/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,
|
|
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"}
|
|
@@ -6,20 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.getBalance = getBalance;
|
|
7
7
|
const gateway_1 = require("../../network/gateway");
|
|
8
8
|
const config_1 = __importDefault(require("../../config"));
|
|
9
|
-
const useGateway = () => config_1.default.getCoinConfig().useGateway === true;
|
|
10
|
-
const getNativeId = () => config_1.default.getCoinConfig().nativeInstrumentId;
|
|
11
|
-
function adaptInstrument(instrument) {
|
|
9
|
+
const useGateway = (currency) => config_1.default.getCoinConfig(currency).useGateway === true;
|
|
10
|
+
const getNativeId = (currency) => config_1.default.getCoinConfig(currency).nativeInstrumentId;
|
|
11
|
+
function adaptInstrument(currency, instrument) {
|
|
12
12
|
return {
|
|
13
13
|
value: BigInt(instrument.amount),
|
|
14
14
|
locked: instrument.locked === true ? BigInt(instrument.amount) : BigInt(0),
|
|
15
|
-
asset: getNativeId() === instrument.instrument_id
|
|
15
|
+
asset: getNativeId(currency) === instrument.instrument_id
|
|
16
16
|
? { type: "native" }
|
|
17
17
|
: { type: "token", assetReference: instrument.instrument_id },
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
|
-
async function getBalance(partyId) {
|
|
21
|
-
if (useGateway())
|
|
22
|
-
return (await (0, gateway_1.getBalance)(partyId)).map(instrument => adaptInstrument(instrument));
|
|
20
|
+
async function getBalance(currency, partyId) {
|
|
21
|
+
if (useGateway(currency))
|
|
22
|
+
return (await (0, gateway_1.getBalance)(currency, partyId)).map(instrument => adaptInstrument(currency, instrument));
|
|
23
23
|
else
|
|
24
24
|
throw new Error("Not implemented");
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.ts"],"names":[],"mappings":";;;;;AAqBA,gCAMC;AA1BD,mDAAgG;AAChG,0DAAsC;AAGtC,MAAM,UAAU,GAAG,CAAC,QAAwB,EAAE,EAAE,CAC9C,gBAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;AACzD,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAE,EAAE,CAC/C,gBAAU,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;AAEM,KAAK,UAAU,UAAU,CAAC,QAAwB,EAAE,OAAe;IACxE,IAAI,UAAU,CAAC,QAAQ,CAAC;QACtB,OAAO,CAAC,MAAM,IAAA,oBAAiB,EAAC,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"}
|