@ledgerhq/coin-canton 0.5.0-nightly.5 → 0.5.0
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 +32 -47
- package/lib/api/getBalance.integ.test.js +5 -9
- package/lib/api/getBalance.integ.test.js.map +1 -1
- package/lib/api/index.d.ts.map +1 -1
- package/lib/api/index.js +25 -20
- 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 -3
- package/lib/bridge/broadcast.js.map +1 -1
- package/lib/bridge/broadcast.test.js +0 -9
- 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 +0 -3
- package/lib/bridge/index.js.map +1 -1
- package/lib/bridge/onboard.d.ts +5 -7
- package/lib/bridge/onboard.d.ts.map +1 -1
- package/lib/bridge/onboard.integ.test.js +11 -14
- package/lib/bridge/onboard.integ.test.js.map +1 -1
- package/lib/bridge/onboard.js +42 -110
- package/lib/bridge/onboard.js.map +1 -1
- package/lib/bridge/prepareTransaction.d.ts.map +1 -1
- package/lib/bridge/prepareTransaction.js +7 -5
- package/lib/bridge/prepareTransaction.js.map +1 -1
- package/lib/bridge/signOperation.d.ts.map +1 -1
- package/lib/bridge/signOperation.js +11 -14
- package/lib/bridge/signOperation.js.map +1 -1
- package/lib/bridge/sync.d.ts +1 -2
- package/lib/bridge/sync.d.ts.map +1 -1
- package/lib/bridge/sync.js +21 -41
- package/lib/bridge/sync.js.map +1 -1
- package/lib/bridge/updateTransaction.d.ts.map +1 -1
- package/lib/bridge/updateTransaction.js +4 -0
- package/lib/bridge/updateTransaction.js.map +1 -1
- package/lib/common-logic/account/getBalance.d.ts +1 -2
- 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 +3 -6
- package/lib/common-logic/account/getBalance.unit.test.js.map +1 -1
- package/lib/common-logic/history/lastBlock.d.ts +1 -2
- 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 +2 -5
- package/lib/common-logic/history/lastBlock.test.js.map +1 -1
- package/lib/common-logic/history/listOperations.d.ts +1 -2
- 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 +1 -2
- package/lib/common-logic/transaction/broadcast.d.ts.map +1 -1
- package/lib/common-logic/transaction/broadcast.js +4 -5
- package/lib/common-logic/transaction/broadcast.js.map +1 -1
- package/lib/common-logic/transaction/broadcast.test.js +5 -8
- package/lib/common-logic/transaction/broadcast.test.js.map +1 -1
- package/lib/common-logic/transaction/combine.d.ts +1 -1
- package/lib/common-logic/transaction/combine.d.ts.map +1 -1
- package/lib/common-logic/transaction/combine.js +3 -2
- package/lib/common-logic/transaction/combine.js.map +1 -1
- package/lib/common-logic/transaction/combine.test.js +13 -3
- package/lib/common-logic/transaction/combine.test.js.map +1 -1
- package/lib/common-logic/transaction/craftTransaction.d.ts +4 -8
- package/lib/common-logic/transaction/craftTransaction.d.ts.map +1 -1
- package/lib/common-logic/transaction/craftTransaction.js +12 -15
- package/lib/common-logic/transaction/craftTransaction.js.map +1 -1
- package/lib/common-logic/transaction/estimateFees.d.ts +1 -2
- package/lib/common-logic/transaction/estimateFees.d.ts.map +1 -1
- package/lib/common-logic/transaction/estimateFees.js +3 -7
- package/lib/common-logic/transaction/estimateFees.js.map +1 -1
- package/lib/config.d.ts +0 -1
- package/lib/config.d.ts.map +1 -1
- package/lib/config.js.map +1 -1
- package/lib/network/gateway.d.ts +17 -41
- package/lib/network/gateway.d.ts.map +1 -1
- package/lib/network/gateway.integ.test.js +15 -19
- package/lib/network/gateway.integ.test.js.map +1 -1
- package/lib/network/gateway.js +48 -74
- package/lib/network/gateway.js.map +1 -1
- package/lib/network/node.d.ts +2 -2
- package/lib/network/node.d.ts.map +1 -1
- package/lib/network/node.js.map +1 -1
- package/lib/network/types.d.ts +1 -1
- package/lib/network/types.d.ts.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 +3 -18
- package/lib/types/bridge.d.ts.map +1 -1
- package/lib/types/index.d.ts +10 -0
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/onboard.d.ts +0 -2
- package/lib/types/onboard.d.ts.map +1 -1
- package/lib/types/onboard.js.map +1 -1
- package/lib/types/signer.d.ts +1 -2
- package/lib/types/signer.d.ts.map +1 -1
- package/lib-es/api/getBalance.integ.test.js +5 -9
- 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 +24 -19
- 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 -3
- package/lib-es/bridge/broadcast.js.map +1 -1
- package/lib-es/bridge/broadcast.test.js +0 -9
- 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 +0 -3
- package/lib-es/bridge/index.js.map +1 -1
- package/lib-es/bridge/onboard.d.ts +5 -7
- package/lib-es/bridge/onboard.d.ts.map +1 -1
- package/lib-es/bridge/onboard.integ.test.js +11 -14
- package/lib-es/bridge/onboard.integ.test.js.map +1 -1
- package/lib-es/bridge/onboard.js +42 -107
- package/lib-es/bridge/onboard.js.map +1 -1
- package/lib-es/bridge/prepareTransaction.d.ts.map +1 -1
- package/lib-es/bridge/prepareTransaction.js +8 -6
- package/lib-es/bridge/prepareTransaction.js.map +1 -1
- package/lib-es/bridge/signOperation.d.ts.map +1 -1
- package/lib-es/bridge/signOperation.js +12 -15
- package/lib-es/bridge/signOperation.js.map +1 -1
- package/lib-es/bridge/sync.d.ts +1 -2
- package/lib-es/bridge/sync.d.ts.map +1 -1
- package/lib-es/bridge/sync.js +22 -42
- package/lib-es/bridge/sync.js.map +1 -1
- package/lib-es/bridge/updateTransaction.d.ts.map +1 -1
- package/lib-es/bridge/updateTransaction.js +4 -0
- package/lib-es/bridge/updateTransaction.js.map +1 -1
- package/lib-es/common-logic/account/getBalance.d.ts +1 -2
- 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 +3 -6
- package/lib-es/common-logic/account/getBalance.unit.test.js.map +1 -1
- package/lib-es/common-logic/history/lastBlock.d.ts +1 -2
- 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 +2 -5
- package/lib-es/common-logic/history/lastBlock.test.js.map +1 -1
- package/lib-es/common-logic/history/listOperations.d.ts +1 -2
- 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 +1 -2
- package/lib-es/common-logic/transaction/broadcast.d.ts.map +1 -1
- package/lib-es/common-logic/transaction/broadcast.js +4 -5
- package/lib-es/common-logic/transaction/broadcast.js.map +1 -1
- package/lib-es/common-logic/transaction/broadcast.test.js +5 -8
- package/lib-es/common-logic/transaction/broadcast.test.js.map +1 -1
- package/lib-es/common-logic/transaction/combine.d.ts +1 -1
- package/lib-es/common-logic/transaction/combine.d.ts.map +1 -1
- package/lib-es/common-logic/transaction/combine.js +3 -2
- package/lib-es/common-logic/transaction/combine.js.map +1 -1
- package/lib-es/common-logic/transaction/combine.test.js +13 -3
- package/lib-es/common-logic/transaction/combine.test.js.map +1 -1
- package/lib-es/common-logic/transaction/craftTransaction.d.ts +4 -8
- package/lib-es/common-logic/transaction/craftTransaction.d.ts.map +1 -1
- package/lib-es/common-logic/transaction/craftTransaction.js +12 -15
- package/lib-es/common-logic/transaction/craftTransaction.js.map +1 -1
- package/lib-es/common-logic/transaction/estimateFees.d.ts +1 -2
- package/lib-es/common-logic/transaction/estimateFees.d.ts.map +1 -1
- package/lib-es/common-logic/transaction/estimateFees.js +3 -4
- package/lib-es/common-logic/transaction/estimateFees.js.map +1 -1
- package/lib-es/config.d.ts +0 -1
- package/lib-es/config.d.ts.map +1 -1
- package/lib-es/config.js.map +1 -1
- package/lib-es/network/gateway.d.ts +17 -41
- package/lib-es/network/gateway.d.ts.map +1 -1
- package/lib-es/network/gateway.integ.test.js +15 -19
- package/lib-es/network/gateway.integ.test.js.map +1 -1
- package/lib-es/network/gateway.js +48 -73
- package/lib-es/network/gateway.js.map +1 -1
- package/lib-es/network/node.d.ts +2 -2
- package/lib-es/network/node.d.ts.map +1 -1
- package/lib-es/network/node.js.map +1 -1
- package/lib-es/network/types.d.ts +1 -1
- package/lib-es/network/types.d.ts.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 +3 -18
- package/lib-es/types/bridge.d.ts.map +1 -1
- package/lib-es/types/index.d.ts +10 -0
- package/lib-es/types/index.d.ts.map +1 -1
- package/lib-es/types/onboard.d.ts +0 -2
- 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 +1 -2
- package/lib-es/types/signer.d.ts.map +1 -1
- package/package.json +7 -7
- package/src/api/getBalance.integ.test.ts +6 -9
- package/src/api/index.ts +44 -22
- package/src/api/lastBlock.integ.test.ts +1 -1
- package/src/api/listOperations.integ.test.ts +1 -1
- package/src/bridge/broadcast.test.ts +0 -11
- package/src/bridge/broadcast.ts +2 -4
- package/src/bridge/createTransaction.ts +1 -1
- package/src/bridge/getTransactionStatus.ts +1 -1
- package/src/bridge/index.ts +0 -3
- package/src/bridge/onboard.integ.test.ts +13 -25
- package/src/bridge/onboard.ts +51 -143
- package/src/bridge/prepareTransaction.ts +15 -6
- package/src/bridge/signOperation.ts +20 -26
- package/src/bridge/sync.ts +27 -53
- package/src/bridge/updateTransaction.ts +5 -0
- package/src/common-logic/account/getBalance.ts +7 -12
- package/src/common-logic/account/getBalance.unit.test.ts +3 -8
- package/src/common-logic/history/lastBlock.test.ts +2 -7
- package/src/common-logic/history/lastBlock.ts +3 -5
- package/src/common-logic/history/listOperations.ts +2 -3
- package/src/common-logic/transaction/broadcast.test.ts +5 -10
- package/src/common-logic/transaction/broadcast.ts +3 -7
- package/src/common-logic/transaction/combine.test.ts +13 -3
- package/src/common-logic/transaction/combine.ts +4 -2
- package/src/common-logic/transaction/craftTransaction.ts +15 -30
- package/src/common-logic/transaction/estimateFees.ts +3 -7
- package/src/config.ts +0 -1
- package/src/network/gateway.integ.test.ts +12 -31
- package/src/network/gateway.ts +62 -141
- package/src/network/node.ts +3 -3
- package/src/network/types.ts +1 -1
- package/src/signer/getAddress.ts +4 -6
- package/src/types/bridge.ts +0 -21
- package/src/types/index.ts +11 -0
- package/src/types/onboard.ts +0 -3
- package/src/types/signer.ts +1 -2
- 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/bridge/sync.integ.test.d.ts +0 -2
- package/lib/bridge/sync.integ.test.d.ts.map +0 -1
- package/lib/bridge/sync.integ.test.js +0 -175
- package/lib/bridge/sync.integ.test.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/lib-es/bridge/sync.integ.test.d.ts +0 -2
- package/lib-es/bridge/sync.integ.test.d.ts.map +0 -1
- package/lib-es/bridge/sync.integ.test.js +0 -137
- package/lib-es/bridge/sync.integ.test.js.map +0 -1
- package/src/bridge/serialization.ts +0 -36
- package/src/bridge/sync.integ.test.ts +0 -180
package/lib-es/bridge/onboard.js
CHANGED
|
@@ -1,63 +1,45 @@
|
|
|
1
1
|
import { Observable } from "rxjs";
|
|
2
|
-
import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
|
|
3
|
-
import { getDerivationModesForCurrency } from "@ledgerhq/coin-framework/derivation";
|
|
4
|
-
import { getAccountShape } from "./sync";
|
|
5
2
|
import { prepareOnboarding, submitOnboarding, getPartyByPubKey, preparePreApprovalTransaction, submitPreApprovalTransaction, prepareTapRequest, submitTapRequest, } from "../network/gateway";
|
|
6
3
|
import { OnboardStatus, PreApprovalStatus, } from "../types/onboard";
|
|
7
|
-
|
|
8
|
-
async function _getKeypair(signerContext, deviceId, derivationPath) {
|
|
4
|
+
async function getKeypair(signerContext, deviceId, derivationPath) {
|
|
9
5
|
return signerContext(deviceId, async (signer) => {
|
|
10
6
|
const { publicKey, address } = await signer.getAddress(derivationPath);
|
|
11
7
|
return { signer, publicKey: publicKey.replace("0x", ""), address };
|
|
12
8
|
});
|
|
13
9
|
}
|
|
14
|
-
export const isAccountOnboarded = async (
|
|
10
|
+
export const isAccountOnboarded = async (publicKey) => {
|
|
15
11
|
try {
|
|
16
|
-
const { party_id } = await getPartyByPubKey(
|
|
12
|
+
const { party_id } = await getPartyByPubKey(publicKey);
|
|
17
13
|
if (party_id) {
|
|
18
|
-
return {
|
|
14
|
+
return { party_id };
|
|
19
15
|
}
|
|
20
16
|
else {
|
|
21
|
-
return
|
|
17
|
+
return false;
|
|
22
18
|
}
|
|
23
19
|
}
|
|
24
20
|
catch (err) {
|
|
25
21
|
log("[isAccountOnboarded] Error checking party status (likely not onboarded):", err);
|
|
26
|
-
return
|
|
22
|
+
return false;
|
|
27
23
|
}
|
|
28
24
|
};
|
|
29
|
-
export const buildOnboardAccount = (signerContext) => (
|
|
25
|
+
export const buildOnboardAccount = (signerContext) => (deviceId, derivationPath) => new Observable(observer => {
|
|
30
26
|
async function main() {
|
|
31
27
|
observer.next({
|
|
32
28
|
status: OnboardStatus.INIT,
|
|
33
29
|
});
|
|
34
|
-
const
|
|
35
|
-
const getAddress = resolver(signerContext);
|
|
36
|
-
const { address, publicKey } = await getAddress(deviceId, {
|
|
37
|
-
path: derivationPath,
|
|
38
|
-
currency,
|
|
39
|
-
derivationMode: derivationMode || "",
|
|
40
|
-
});
|
|
30
|
+
const keypair = await getKeypair(signerContext, deviceId, derivationPath);
|
|
41
31
|
observer.next({
|
|
42
32
|
status: OnboardStatus.PREPARE,
|
|
43
33
|
});
|
|
44
|
-
const
|
|
45
|
-
if (
|
|
46
|
-
const account = await createAccount({
|
|
47
|
-
address,
|
|
48
|
-
derivationPath,
|
|
49
|
-
partyId,
|
|
50
|
-
currency,
|
|
51
|
-
derivationMode,
|
|
52
|
-
});
|
|
34
|
+
const isOnboardedResult = await isAccountOnboarded(keypair.publicKey);
|
|
35
|
+
if (isOnboardedResult && isOnboardedResult.party_id) {
|
|
53
36
|
observer.next({
|
|
54
|
-
partyId,
|
|
55
|
-
account,
|
|
37
|
+
partyId: isOnboardedResult.party_id,
|
|
56
38
|
});
|
|
57
39
|
observer.complete();
|
|
58
40
|
return;
|
|
59
41
|
}
|
|
60
|
-
const preparedTransaction = await prepareOnboarding(
|
|
42
|
+
const preparedTransaction = await prepareOnboarding(keypair.publicKey, "ed25519");
|
|
61
43
|
observer.next({
|
|
62
44
|
status: OnboardStatus.SIGN,
|
|
63
45
|
});
|
|
@@ -65,39 +47,21 @@ export const buildOnboardAccount = (signerContext) => (currency, deviceId, deriv
|
|
|
65
47
|
observer.next({
|
|
66
48
|
status: OnboardStatus.SUBMIT,
|
|
67
49
|
});
|
|
68
|
-
const result = await submitOnboarding(
|
|
50
|
+
const result = await submitOnboarding({ public_key: keypair.publicKey, public_key_type: "ed25519" }, preparedTransaction, signature).catch(err => {
|
|
69
51
|
if (err.type === "PARTY_ALREADY_EXISTS") {
|
|
70
|
-
const account = await createAccount({
|
|
71
|
-
address,
|
|
72
|
-
derivationPath,
|
|
73
|
-
partyId: preparedTransaction.party_id,
|
|
74
|
-
currency,
|
|
75
|
-
derivationMode,
|
|
76
|
-
});
|
|
77
52
|
observer.next({
|
|
78
53
|
partyId: preparedTransaction.party_id,
|
|
79
|
-
account,
|
|
80
54
|
});
|
|
81
55
|
return observer.complete();
|
|
82
56
|
}
|
|
83
57
|
throw err;
|
|
84
58
|
});
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
derivationPath,
|
|
92
|
-
partyId: result.party.party_id,
|
|
93
|
-
currency,
|
|
94
|
-
derivationMode,
|
|
95
|
-
});
|
|
96
|
-
observer.next({
|
|
97
|
-
partyId: result.party.party_id,
|
|
98
|
-
account,
|
|
99
|
-
});
|
|
100
|
-
}
|
|
59
|
+
observer.next({
|
|
60
|
+
status: OnboardStatus.SUCCESS,
|
|
61
|
+
});
|
|
62
|
+
observer.next({
|
|
63
|
+
partyId: result?.party?.party_id || "unknown",
|
|
64
|
+
});
|
|
101
65
|
observer.complete();
|
|
102
66
|
}
|
|
103
67
|
main().then(() => observer.complete(), error => {
|
|
@@ -105,12 +69,12 @@ export const buildOnboardAccount = (signerContext) => (currency, deviceId, deriv
|
|
|
105
69
|
observer.error(error);
|
|
106
70
|
});
|
|
107
71
|
});
|
|
108
|
-
export const buildAuthorizePreapproval = (signerContext) => (
|
|
72
|
+
export const buildAuthorizePreapproval = (signerContext) => (deviceId, derivationPath, partyId) => new Observable(observer => {
|
|
109
73
|
async function main() {
|
|
110
74
|
observer.next({
|
|
111
75
|
status: PreApprovalStatus.PREPARE,
|
|
112
76
|
});
|
|
113
|
-
const preparedTransaction = await preparePreApprovalTransaction(
|
|
77
|
+
const preparedTransaction = await preparePreApprovalTransaction(partyId);
|
|
114
78
|
observer.next({
|
|
115
79
|
status: PreApprovalStatus.SIGN,
|
|
116
80
|
});
|
|
@@ -118,35 +82,37 @@ export const buildAuthorizePreapproval = (signerContext) => (currency, deviceId,
|
|
|
118
82
|
observer.next({
|
|
119
83
|
status: PreApprovalStatus.SUBMIT,
|
|
120
84
|
});
|
|
121
|
-
const { isApproved } = await submitPreApprovalTransaction(
|
|
85
|
+
const { isApproved } = await submitPreApprovalTransaction(partyId, preparedTransaction, signature);
|
|
122
86
|
observer.next({
|
|
123
87
|
status: PreApprovalStatus.SUCCESS,
|
|
124
88
|
});
|
|
125
89
|
observer.next({
|
|
126
90
|
isApproved,
|
|
127
91
|
});
|
|
92
|
+
// TODO: remove after demo
|
|
128
93
|
const handleTapRequest = async () => {
|
|
129
94
|
try {
|
|
130
|
-
|
|
95
|
+
observer.next({
|
|
96
|
+
status: PreApprovalStatus.PREPARE,
|
|
97
|
+
});
|
|
98
|
+
const { serialized, hash } = await prepareTapRequest({
|
|
99
|
+
partyId,
|
|
100
|
+
});
|
|
101
|
+
observer.next({
|
|
102
|
+
status: PreApprovalStatus.SIGN,
|
|
103
|
+
});
|
|
104
|
+
const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, hash));
|
|
105
|
+
observer.next({
|
|
106
|
+
status: PreApprovalStatus.SUBMIT,
|
|
107
|
+
});
|
|
108
|
+
await submitTapRequest({
|
|
131
109
|
partyId,
|
|
110
|
+
serialized,
|
|
111
|
+
signature,
|
|
112
|
+
});
|
|
113
|
+
observer.next({
|
|
114
|
+
status: PreApprovalStatus.SUCCESS,
|
|
132
115
|
});
|
|
133
|
-
if (serialized && hash) {
|
|
134
|
-
observer.next({
|
|
135
|
-
status: PreApprovalStatus.SIGN,
|
|
136
|
-
});
|
|
137
|
-
const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, hash));
|
|
138
|
-
observer.next({
|
|
139
|
-
status: PreApprovalStatus.SUBMIT,
|
|
140
|
-
});
|
|
141
|
-
await submitTapRequest(currency, {
|
|
142
|
-
partyId,
|
|
143
|
-
serialized,
|
|
144
|
-
signature,
|
|
145
|
-
});
|
|
146
|
-
observer.next({
|
|
147
|
-
status: PreApprovalStatus.SUCCESS,
|
|
148
|
-
});
|
|
149
|
-
}
|
|
150
116
|
}
|
|
151
117
|
catch (err) {
|
|
152
118
|
// Tap request failure should not break the pre-approval flow
|
|
@@ -160,37 +126,6 @@ export const buildAuthorizePreapproval = (signerContext) => (currency, deviceId,
|
|
|
160
126
|
observer.error(error);
|
|
161
127
|
});
|
|
162
128
|
});
|
|
163
|
-
const createAccount = async ({ address, partyId, derivationPath, currency, derivationMode, index = 0, }) => {
|
|
164
|
-
const accountShape = await getAccountShape({
|
|
165
|
-
address,
|
|
166
|
-
currency,
|
|
167
|
-
derivationMode,
|
|
168
|
-
derivationPath,
|
|
169
|
-
index,
|
|
170
|
-
rest: {
|
|
171
|
-
cantonResources: {
|
|
172
|
-
partyId,
|
|
173
|
-
},
|
|
174
|
-
},
|
|
175
|
-
}, { paginationConfig: {} });
|
|
176
|
-
const account = {
|
|
177
|
-
...accountShape,
|
|
178
|
-
type: "Account",
|
|
179
|
-
xpub: partyId.replace(/:/g, "_"),
|
|
180
|
-
index,
|
|
181
|
-
// operations: [],
|
|
182
|
-
currency,
|
|
183
|
-
derivationMode,
|
|
184
|
-
lastSyncDate: new Date(),
|
|
185
|
-
pendingOperations: [],
|
|
186
|
-
seedIdentifier: address,
|
|
187
|
-
balanceHistoryCache: emptyHistoryCache,
|
|
188
|
-
cantonResources: {
|
|
189
|
-
partyId,
|
|
190
|
-
},
|
|
191
|
-
};
|
|
192
|
-
return account;
|
|
193
|
-
};
|
|
194
129
|
const log = (message, ...rest) => {
|
|
195
130
|
// eslint-disable-next-line no-console
|
|
196
131
|
console.log(message, ...rest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAKvC,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAKvC,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAkB/E,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import { estimateFees } from "../common-logic";
|
|
1
|
+
import { craftTransaction, estimateFees } from "../common-logic";
|
|
2
|
+
import { getNextSequence } from "../network/node";
|
|
2
3
|
import BigNumber from "bignumber.js";
|
|
3
|
-
import { updateTransaction } from "./updateTransaction";
|
|
4
4
|
export const prepareTransaction = async (account, transaction) => {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
const seq = await getNextSequence(account.freshAddress);
|
|
6
|
+
const craftedTransaction = await craftTransaction({ address: account.freshAddress, nextSequenceNumber: seq }, { amount: transaction.amount, recipient: transaction.recipient });
|
|
7
|
+
const fee = await estimateFees(craftedTransaction.serializedTransaction);
|
|
8
|
+
if (transaction.fee !== new BigNumber(fee.toString())) {
|
|
9
|
+
return { ...transaction, fee: new BigNumber(fee.toString()) };
|
|
8
10
|
}
|
|
9
|
-
return
|
|
11
|
+
return transaction;
|
|
10
12
|
};
|
|
11
13
|
//# sourceMappingURL=prepareTransaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,CAAC,MAAM,kBAAkB,GAAqD,KAAK,EACvF,OAAO,EACP,WAAW,EACX,EAAE;IACF,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAExD,MAAM,kBAAkB,GAAG,MAAM,gBAAgB,CAC/C,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,EAAE,kBAAkB,EAAE,GAAG,EAAE,EAC1D,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,CACjE,CAAC;IAEF,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;IAEzE,IAAI,WAAW,CAAC,GAAG,KAAK,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;QACtD,OAAO,EAAE,GAAG,WAAW,EAAE,GAAG,EAAE,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;IAChE,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAa,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAgC,MAAM,UAAU,CAAC;AAEnF,eAAO,MAAM,kBAAkB,GAC5B,eAAe,aAAa,CAAC,YAAY,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAmFpF,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Observable } from "rxjs";
|
|
2
2
|
import { FeeNotLoaded } from "@ledgerhq/errors";
|
|
3
3
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
4
|
-
import { combine, craftTransaction } from "../common-logic";
|
|
4
|
+
import { combine, craftTransaction, getNextValidSequence } from "../common-logic";
|
|
5
5
|
export const buildSignOperation = (signerContext) => ({ account, deviceId, transaction }) => new Observable(o => {
|
|
6
6
|
async function main() {
|
|
7
7
|
const { fee } = transaction;
|
|
@@ -12,24 +12,20 @@ export const buildSignOperation = (signerContext) => ({ account, deviceId, trans
|
|
|
12
12
|
o.next({
|
|
13
13
|
type: "device-signature-requested",
|
|
14
14
|
});
|
|
15
|
+
const nextSequenceNumber = await getNextValidSequence(account.freshAddress);
|
|
15
16
|
const signature = await signerContext(deviceId, async (signer) => {
|
|
16
17
|
const { freshAddressPath: derivationPath } = account;
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
const { publicKey } = await signer.getAddress(derivationPath);
|
|
19
|
+
const { nativeTransaction, serializedTransaction } = await craftTransaction({
|
|
20
|
+
address: account.freshAddress,
|
|
21
|
+
publicKey,
|
|
22
|
+
}, {
|
|
20
23
|
recipient: transaction.recipient,
|
|
21
24
|
amount: transaction.amount,
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
params.memo = transaction.memo;
|
|
27
|
-
}
|
|
28
|
-
const { hash, serializedTransaction } = await craftTransaction(account.currency, {
|
|
29
|
-
address: partyId,
|
|
30
|
-
}, params);
|
|
31
|
-
const transactionSignature = await signer.signTransaction(derivationPath, hash);
|
|
32
|
-
return combine(serializedTransaction, `${transactionSignature}__PARTY__${partyId}`);
|
|
25
|
+
fee: fee,
|
|
26
|
+
});
|
|
27
|
+
const transactionSignature = await signer.signTransaction(derivationPath, serializedTransaction);
|
|
28
|
+
return combine(serializedTransaction, transactionSignature);
|
|
33
29
|
});
|
|
34
30
|
o.next({
|
|
35
31
|
type: "device-signature-granted",
|
|
@@ -48,6 +44,7 @@ export const buildSignOperation = (signerContext) => ({ account, deviceId, trans
|
|
|
48
44
|
senders: [account.freshAddress],
|
|
49
45
|
recipients: [transaction.recipient],
|
|
50
46
|
date: new Date(),
|
|
47
|
+
transactionSequenceNumber: nextSequenceNumber,
|
|
51
48
|
extra: {},
|
|
52
49
|
};
|
|
53
50
|
o.next({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
|
package/lib-es/bridge/sync.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
import { GetAccountShape } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
2
|
-
|
|
3
|
-
export declare const getAccountShape: GetAccountShape<CantonAccount>;
|
|
2
|
+
export declare const getAccountShape: GetAccountShape;
|
|
4
3
|
//# sourceMappingURL=sync.d.ts.map
|
|
@@ -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;AAuDtF,eAAO,MAAM,eAAe,EAAE,eA8C7B,CAAC"}
|
package/lib-es/bridge/sync.js
CHANGED
|
@@ -1,21 +1,14 @@
|
|
|
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
|
-
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
5
4
|
import { getBalance, getLedgerEnd, getOperations } from "../network/gateway";
|
|
5
|
+
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
6
6
|
import coinConfig from "../config";
|
|
7
|
-
const txInfoToOperationAdapter = (accountId,
|
|
8
|
-
const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue
|
|
9
|
-
|
|
10
|
-
if (txInfo.type === "Send") {
|
|
11
|
-
type = senders.includes(partyId) ? "OUT" : "IN";
|
|
12
|
-
}
|
|
13
|
-
else if (txInfo.type === "Receive") {
|
|
14
|
-
type = "IN";
|
|
15
|
-
}
|
|
7
|
+
const txInfoToOperationAdapter = (accountId, address) => (txInfo) => {
|
|
8
|
+
const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue }], } = txInfo;
|
|
9
|
+
const type = senders.includes(address) ? "OUT" : "IN";
|
|
16
10
|
const value = new BigNumber(transferValue);
|
|
17
11
|
const feeValue = new BigNumber(fee);
|
|
18
|
-
const memo = details.metadata.reason;
|
|
19
12
|
const op = {
|
|
20
13
|
id: encodeOperationId(accountId, transaction_hash, type),
|
|
21
14
|
hash: transaction_hash,
|
|
@@ -31,50 +24,42 @@ const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
|
|
|
31
24
|
transactionSequenceNumber: height,
|
|
32
25
|
extra: {
|
|
33
26
|
uid,
|
|
34
|
-
memo,
|
|
35
27
|
},
|
|
36
28
|
};
|
|
37
29
|
return op;
|
|
38
30
|
};
|
|
39
|
-
const filterOperations = (transactions, accountId,
|
|
40
|
-
return transactions
|
|
31
|
+
const filterOperations = (transactions, accountId, address) => {
|
|
32
|
+
return transactions
|
|
33
|
+
.filter(tx => tx.type === "Receive" || tx.type === "Send")
|
|
34
|
+
.map(txInfoToOperationAdapter(accountId, address));
|
|
41
35
|
};
|
|
42
36
|
export const getAccountShape = async (info) => {
|
|
43
|
-
const { address, initialAccount, currency, derivationMode
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const partyId = rest?.cantonResources?.partyId ||
|
|
47
|
-
initialAccount?.cantonResources?.partyId ||
|
|
48
|
-
xpubOrAddress.replace(/_/g, ":");
|
|
37
|
+
const { address, initialAccount, currency, derivationMode } = info;
|
|
38
|
+
// TODO: we need better solution ?
|
|
39
|
+
const xpubOrAddress = address?.replace(/:/g, "_") || "";
|
|
49
40
|
const accountId = encodeAccountId({
|
|
50
41
|
type: "js",
|
|
51
42
|
version: "2",
|
|
52
43
|
currencyId: currency.id,
|
|
53
44
|
xpubOrAddress,
|
|
54
|
-
derivationMode,
|
|
45
|
+
derivationMode: "",
|
|
55
46
|
});
|
|
47
|
+
// blockheight retrieval
|
|
48
|
+
const blockHeight = await getLedgerEnd();
|
|
56
49
|
// Account info retrieval + spendable balance calculation
|
|
57
50
|
// const accountInfo = await getAccountInfo(address);
|
|
58
|
-
const
|
|
59
|
-
const
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
locked: false,
|
|
63
|
-
};
|
|
64
|
-
const balance = new BigNumber(balanceData.amount);
|
|
65
|
-
const reserveMin = coinConfig.getCoinConfig(currency).minReserve || 0;
|
|
66
|
-
const lockedAmount = balanceData.locked ? balance : new BigNumber(0);
|
|
67
|
-
const spendableBalance = BigNumber.max(0, balance.minus(lockedAmount).minus(BigNumber(reserveMin)));
|
|
51
|
+
const balanceData = await getBalance(address);
|
|
52
|
+
const balance = new BigNumber(balanceData[0]?.amount || "0");
|
|
53
|
+
const reserveMin = coinConfig.getCoinConfig().minReserve || 0;
|
|
54
|
+
const spendableBalance = balance.minus(BigNumber(reserveMin));
|
|
68
55
|
// Tx history fetching
|
|
69
56
|
const oldOperations = initialAccount?.operations || [];
|
|
70
57
|
const startAt = oldOperations.length ? (oldOperations[0].blockHeight || 0) + 1 : 0;
|
|
71
|
-
const transactionData = await getOperations(
|
|
72
|
-
cursor:
|
|
58
|
+
const transactionData = await getOperations(address, {
|
|
59
|
+
cursor: 0,
|
|
73
60
|
limit: 100,
|
|
74
61
|
});
|
|
75
|
-
|
|
76
|
-
const blockHeight = await getLedgerEnd(currency);
|
|
77
|
-
const newOperations = filterOperations(transactionData.operations, accountId, partyId);
|
|
62
|
+
const newOperations = filterOperations(transactionData.operations, accountId, address);
|
|
78
63
|
const operations = mergeOps(oldOperations, newOperations);
|
|
79
64
|
// We return the new account shape
|
|
80
65
|
const shape = {
|
|
@@ -85,11 +70,6 @@ export const getAccountShape = async (info) => {
|
|
|
85
70
|
spendableBalance,
|
|
86
71
|
operations,
|
|
87
72
|
operationsCount: operations.length,
|
|
88
|
-
freshAddress: address,
|
|
89
|
-
freshAddressPath: derivationPath,
|
|
90
|
-
cantonResources: {
|
|
91
|
-
partyId,
|
|
92
|
-
},
|
|
93
73
|
};
|
|
94
74
|
return shape;
|
|
95
75
|
};
|
|
@@ -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":"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,UAAU,EAAE,YAAY,EAAE,aAAa,EAAsB,MAAM,oBAAoB,CAAC;AAEjG,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,UAAU,MAAM,WAAW,CAAC;AAEnC,MAAM,wBAAwB,GAC5B,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CACvC,CAAC,MAAqB,EAAa,EAAE;IACnC,MAAM,EACJ,gBAAgB,EAChB,GAAG,EACH,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EACvB,OAAO,EACP,UAAU,EACV,qBAAqB,EACrB,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EACnB,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,GACtC,GAAG,MAAM,CAAC;IAEX,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IAEpC,MAAM,EAAE,GAAc;QACpB,EAAE,EAAE,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,CAAC;QACxD,IAAI,EAAE,gBAAgB;QACtB,SAAS;QACT,IAAI;QACJ,KAAK;QACL,GAAG,EAAE,QAAQ;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,MAAM;QACnB,OAAO;QACP,UAAU;QACV,IAAI,EAAE,IAAI,IAAI,CAAC,qBAAqB,CAAC;QACrC,yBAAyB,EAAE,MAAM;QACjC,KAAK,EAAE;YACL,GAAG;SACJ;KACF,CAAC;IAEF,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEJ,MAAM,gBAAgB,GAAG,CACvB,YAA6B,EAC7B,SAAiB,EACjB,OAAe,EACF,EAAE;IACf,OAAO,YAAY;SAChB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC;SACzD,GAAG,CAAC,wBAAwB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAoB,KAAK,EAAC,IAAI,EAAC,EAAE;IAC3D,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACnE,kCAAkC;IAClC,MAAM,aAAa,GAAG,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;IAExD,MAAM,SAAS,GAAG,eAAe,CAAC;QAChC,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,GAAG;QACZ,UAAU,EAAE,QAAQ,CAAC,EAAE;QACvB,aAAa;QACb,cAAc,EAAE,EAAE;KACnB,CAAC,CAAC;IAEH,wBAAwB;IACxB,MAAM,WAAW,GAAG,MAAM,YAAY,EAAE,CAAC;IAEzC,yDAAyD;IACzD,qDAAqD;IACrD,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,GAAG,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC;IAC9D,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IAE9D,sBAAsB;IACtB,MAAM,aAAa,GAAG,cAAc,EAAE,UAAU,IAAI,EAAE,CAAC;IACvD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnF,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE;QACnD,MAAM,EAAE,CAAC;QACT,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,gBAAgB,CAAC,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACvF,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAE1D,kCAAkC;IAClC,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,SAAS;QACb,IAAI,EAAE,aAAa;QACnB,WAAW;QACX,OAAO;QACP,gBAAgB;QAChB,UAAU;QACV,eAAe,EAAE,UAAU,CAAC,MAAM;KACnC,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/updateTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAO5C,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"updateTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/updateTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAO5C,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,mBAAmB,CAO7E,CAAC"}
|
|
@@ -4,6 +4,10 @@ import { updateTransaction as defaultUpdateTransaction } from "@ledgerhq/coin-fr
|
|
|
4
4
|
// NOTE: here is an example transaction updater function
|
|
5
5
|
// in this case, it resets fee to null depending on the patch content
|
|
6
6
|
export const updateTransaction = (tx, patch) => {
|
|
7
|
+
// eslint-disable-next-line no-constant-condition
|
|
8
|
+
if (patch.recipient === "boilerplate1" || true) {
|
|
9
|
+
patch = { ...patch, fee: null };
|
|
10
|
+
}
|
|
7
11
|
return defaultUpdateTransaction(tx, patch);
|
|
8
12
|
};
|
|
9
13
|
//# sourceMappingURL=updateTransaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateTransaction.js","sourceRoot":"","sources":["../../src/bridge/updateTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAI1G,8DAA8D;AAC9D,8DAA8D;AAE9D,wDAAwD;AACxD,qEAAqE;AACrE,MAAM,CAAC,MAAM,iBAAiB,GAAoD,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;IAC9F,OAAO,wBAAwB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"updateTransaction.js","sourceRoot":"","sources":["../../src/bridge/updateTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAI1G,8DAA8D;AAC9D,8DAA8D;AAE9D,wDAAwD;AACxD,qEAAqE;AACrE,MAAM,CAAC,MAAM,iBAAiB,GAAoD,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;IAC9F,iDAAiD;IACjD,IAAI,KAAK,CAAC,SAAS,KAAK,cAAc,IAAI,IAAI,EAAE,CAAC;QAC/C,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,wBAAwB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
import { Balance } from "@ledgerhq/coin-framework/api/types";
|
|
2
|
-
|
|
3
|
-
export declare function getBalance(currency: CryptoCurrency, partyId: string): Promise<Balance[]>;
|
|
2
|
+
export declare function getBalance(partyId: string): Promise<Balance[]>;
|
|
4
3
|
//# 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;AAkB7D,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAIpE"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { getBalance as gatewayGetBalance } from "../../network/gateway";
|
|
2
2
|
import coinConfig from "../../config";
|
|
3
|
-
const useGateway = (
|
|
4
|
-
const getNativeId = (
|
|
5
|
-
function adaptInstrument(
|
|
3
|
+
const useGateway = () => coinConfig.getCoinConfig().useGateway === true;
|
|
4
|
+
const getNativeId = () => coinConfig.getCoinConfig().nativeInstrumentId;
|
|
5
|
+
function adaptInstrument(instrument) {
|
|
6
6
|
return {
|
|
7
7
|
value: BigInt(instrument.amount),
|
|
8
8
|
locked: instrument.locked === true ? BigInt(instrument.amount) : BigInt(0),
|
|
9
|
-
asset: getNativeId(
|
|
9
|
+
asset: getNativeId() === instrument.instrument_id
|
|
10
10
|
? { type: "native" }
|
|
11
11
|
: { type: "token", assetReference: instrument.instrument_id },
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
|
-
export async function getBalance(
|
|
15
|
-
if (useGateway(
|
|
16
|
-
return (await gatewayGetBalance(
|
|
14
|
+
export async function getBalance(partyId) {
|
|
15
|
+
if (useGateway())
|
|
16
|
+
return (await gatewayGetBalance(partyId)).map(instrument => adaptInstrument(instrument));
|
|
17
17
|
else
|
|
18
18
|
throw new Error("Not implemented");
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAA0B,MAAM,uBAAuB,CAAC;AAChG,OAAO,UAAU,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAA0B,MAAM,uBAAuB,CAAC;AAChG,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,UAAU,KAAK,IAAI,CAAC;AACxE,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,kBAAkB,CAAC;AAExE,SAAS,eAAe,CAAC,UAA6B;IACpD,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,EAAE,KAAK,UAAU,CAAC,aAAa;YACxC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;YACpB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,aAAa,EAAE;KAClE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAe;IAC9C,IAAI,UAAU,EAAE;QACd,OAAO,CAAC,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;;QACtF,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { getBalance as getBalanceFromNetwork } from "../../network/gateway";
|
|
2
2
|
import * as coinConfigModule from "../../config";
|
|
3
3
|
import { getBalance } from "./getBalance";
|
|
4
|
-
const mockCurrency = {
|
|
5
|
-
id: "canton_network",
|
|
6
|
-
};
|
|
7
4
|
jest.mock("../../network/gateway", () => ({
|
|
8
5
|
getBalance: jest.fn(),
|
|
9
6
|
}));
|
|
@@ -30,8 +27,8 @@ describe("getBalance", () => {
|
|
|
30
27
|
},
|
|
31
28
|
];
|
|
32
29
|
getBalanceFromNetwork.mockResolvedValue(mockInstruments);
|
|
33
|
-
const result = await getBalance(
|
|
34
|
-
expect(getBalanceFromNetwork).toHaveBeenCalledWith(
|
|
30
|
+
const result = await getBalance("party-id");
|
|
31
|
+
expect(getBalanceFromNetwork).toHaveBeenCalledWith("party-id");
|
|
35
32
|
expect(result).toEqual([
|
|
36
33
|
{
|
|
37
34
|
value: BigInt(1000),
|
|
@@ -49,7 +46,7 @@ describe("getBalance", () => {
|
|
|
49
46
|
mockGetCoinConfig.mockReturnValue({
|
|
50
47
|
useGateway: false,
|
|
51
48
|
});
|
|
52
|
-
await expect(getBalance(
|
|
49
|
+
await expect(getBalance("party-id")).rejects.toThrow("Not implemented");
|
|
53
50
|
expect(getBalanceFromNetwork).not.toHaveBeenCalled();
|
|
54
51
|
});
|
|
55
52
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalance.unit.test.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,gBAAgB,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"getBalance.unit.test.js","sourceRoot":"","sources":["../../../src/common-logic/account/getBalance.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,gBAAgB,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;CACtB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAEhF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,iBAAiB,CAAC,eAAe,CAAC;YAChC,UAAU,EAAE,IAAI;YAChB,kBAAkB,EAAE,WAAW;SACzB,CAAC,CAAC;QAEV,MAAM,eAAe,GAAG;YACtB;gBACE,aAAa,EAAE,WAAW;gBAC1B,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,KAAK;aACd;YACD;gBACE,aAAa,EAAE,WAAW;gBAC1B,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,IAAI;aACb;SACF,CAAC;QAED,qBAAmC,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAExE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,CAAC;QAE5C,MAAM,CAAC,qBAAqB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAY;YAChC;gBACE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;gBACjB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aAC1B;YACD;gBACE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;gBACpB,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE;aACtD;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;QAC1F,iBAAiB,CAAC,eAAe,CAAC;YAChC,UAAU,EAAE,KAAK;SACX,CAAC,CAAC;QAEV,MAAM,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACxE,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|