@ledgerhq/coin-filecoin 1.5.2 → 1.5.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 +2 -2
- package/CHANGELOG.md +14 -0
- package/lib/api/api.js +27 -36
- package/lib/api/api.js.map +1 -1
- package/lib/bridge/broadcast.js +3 -12
- package/lib/bridge/broadcast.js.map +1 -1
- package/lib/bridge/buildOptimisticOperation.js +2 -11
- package/lib/bridge/buildOptimisticOperation.js.map +1 -1
- package/lib/bridge/estimateMaxSpendable.js +14 -17
- package/lib/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib/bridge/getTransactionStatus.js +2 -11
- package/lib/bridge/getTransactionStatus.js.map +1 -1
- package/lib/bridge/prepareTransaction.js +11 -14
- package/lib/bridge/prepareTransaction.js.map +1 -1
- package/lib/bridge/serializer.js +4 -14
- package/lib/bridge/serializer.js.map +1 -1
- package/lib/bridge/signOperation.js +52 -63
- package/lib/bridge/signOperation.js.map +1 -1
- package/lib/bridge/transaction.js +22 -2
- package/lib/bridge/transaction.js.map +1 -1
- package/lib/common-logic/utils.js +7 -16
- package/lib/common-logic/utils.js.map +1 -1
- package/lib/erc20/tokenAccounts.js +54 -65
- package/lib/erc20/tokenAccounts.js.map +1 -1
- package/lib/hw-signMessage.js +3 -12
- package/lib/hw-signMessage.js.map +1 -1
- package/lib/signer/getAddress.js +6 -15
- package/lib/signer/getAddress.js.map +1 -1
- package/lib/test/bot-specs.js +4 -6
- package/lib/test/bot-specs.js.map +1 -1
- package/lib/test/bridgeDatasetTest.js +1 -1
- package/lib/test/bridgeDatasetTest.js.map +1 -1
- package/lib/test/cli.js +5 -1
- package/lib/test/cli.js.map +1 -1
- package/lib-es/api/api.js +27 -36
- package/lib-es/api/api.js.map +1 -1
- package/lib-es/bridge/broadcast.js +3 -12
- package/lib-es/bridge/broadcast.js.map +1 -1
- package/lib-es/bridge/buildOptimisticOperation.js +2 -11
- package/lib-es/bridge/buildOptimisticOperation.js.map +1 -1
- package/lib-es/bridge/estimateMaxSpendable.js +14 -17
- package/lib-es/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib-es/bridge/getTransactionStatus.js +2 -11
- package/lib-es/bridge/getTransactionStatus.js.map +1 -1
- package/lib-es/bridge/prepareTransaction.js +11 -14
- package/lib-es/bridge/prepareTransaction.js.map +1 -1
- package/lib-es/bridge/serializer.js +4 -14
- package/lib-es/bridge/serializer.js.map +1 -1
- package/lib-es/bridge/signOperation.js +52 -63
- package/lib-es/bridge/signOperation.js.map +1 -1
- package/lib-es/bridge/transaction.js +22 -2
- package/lib-es/bridge/transaction.js.map +1 -1
- package/lib-es/common-logic/utils.js +7 -16
- package/lib-es/common-logic/utils.js.map +1 -1
- package/lib-es/erc20/tokenAccounts.js +54 -65
- package/lib-es/erc20/tokenAccounts.js.map +1 -1
- package/lib-es/hw-signMessage.js +3 -12
- package/lib-es/hw-signMessage.js.map +1 -1
- package/lib-es/signer/getAddress.js +6 -15
- package/lib-es/signer/getAddress.js.map +1 -1
- package/lib-es/test/bot-specs.js +4 -6
- package/lib-es/test/bot-specs.js.map +1 -1
- package/lib-es/test/bridgeDatasetTest.js +1 -1
- package/lib-es/test/bridgeDatasetTest.js.map +1 -1
- package/lib-es/test/cli.js +5 -1
- package/lib-es/test/cli.js.map +1 -1
- package/package.json +5 -5
- package/tsconfig.json +3 -2
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { Observable } from "rxjs";
|
|
11
2
|
import { log } from "@ledgerhq/logs";
|
|
12
3
|
import { FeeNotLoaded } from "@ledgerhq/errors";
|
|
@@ -15,60 +6,58 @@ import { toCBOR } from "./serializer";
|
|
|
15
6
|
import { getAddress, getSubAccount } from "../common-logic/utils";
|
|
16
7
|
import { AccountType } from "./utils";
|
|
17
8
|
export const buildSignOperation = (signerContext) => ({ account, deviceId, transaction }) => new Observable(o => {
|
|
18
|
-
function main() {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
},
|
|
71
|
-
});
|
|
9
|
+
async function main() {
|
|
10
|
+
const { method, version, nonce, gasFeeCap, gasLimit, gasPremium } = transaction;
|
|
11
|
+
const { derivationPath } = getAddress(account);
|
|
12
|
+
const subAccount = getSubAccount(account, transaction);
|
|
13
|
+
const tokenAccountTxn = subAccount?.type === AccountType.TokenAccount;
|
|
14
|
+
if (!gasFeeCap.gt(0) || !gasLimit.gt(0)) {
|
|
15
|
+
log("debug", `signOperation missingData --> gasFeeCap=${gasFeeCap} gasLimit=${gasLimit}`);
|
|
16
|
+
throw new FeeNotLoaded();
|
|
17
|
+
}
|
|
18
|
+
o.next({
|
|
19
|
+
type: "device-signature-requested",
|
|
20
|
+
});
|
|
21
|
+
// Serialize tx
|
|
22
|
+
const toCBORResponse = await toCBOR(account, transaction);
|
|
23
|
+
const { txPayload, parsedSender, recipientToBroadcast, encodedParams, amountToBroadcast: finalAmount, } = toCBORResponse;
|
|
24
|
+
log("debug", `[signOperation] serialized CBOR tx: [${txPayload.toString("hex")}]`);
|
|
25
|
+
// Sign by device
|
|
26
|
+
const { r } = await signerContext(deviceId, async (signer) => {
|
|
27
|
+
const r = await signer.sign(derivationPath, txPayload);
|
|
28
|
+
return { r };
|
|
29
|
+
});
|
|
30
|
+
o.next({
|
|
31
|
+
type: "device-signature-granted",
|
|
32
|
+
});
|
|
33
|
+
if (!r.signature_compact) {
|
|
34
|
+
throw new Error("Signature compact is null");
|
|
35
|
+
}
|
|
36
|
+
// build signature on the correct format
|
|
37
|
+
const signature = `${Buffer.from(r.signature_compact).toString("base64")}`;
|
|
38
|
+
const operation = await buildOptimisticOperation(account, transaction, toCBORResponse);
|
|
39
|
+
// Necessary for broadcast
|
|
40
|
+
const additionalTxFields = {
|
|
41
|
+
sender: parsedSender,
|
|
42
|
+
recipient: recipientToBroadcast,
|
|
43
|
+
params: encodedParams,
|
|
44
|
+
gasLimit,
|
|
45
|
+
gasFeeCap,
|
|
46
|
+
gasPremium,
|
|
47
|
+
method,
|
|
48
|
+
version,
|
|
49
|
+
nonce,
|
|
50
|
+
signatureType: 1,
|
|
51
|
+
tokenTransfer: tokenAccountTxn,
|
|
52
|
+
value: finalAmount.toString(),
|
|
53
|
+
};
|
|
54
|
+
o.next({
|
|
55
|
+
type: "signed",
|
|
56
|
+
signedOperation: {
|
|
57
|
+
operation,
|
|
58
|
+
signature,
|
|
59
|
+
rawData: additionalTxFields,
|
|
60
|
+
},
|
|
72
61
|
});
|
|
73
62
|
}
|
|
74
63
|
main().then(() => o.complete(), e => o.error(e));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,11 +16,31 @@ SEND ${useAllAmount
|
|
|
16
16
|
TO ${recipient}`;
|
|
17
17
|
export const fromTransactionRaw = (tr) => {
|
|
18
18
|
const common = fromTransactionCommonRaw(tr);
|
|
19
|
-
return
|
|
19
|
+
return {
|
|
20
|
+
...common,
|
|
21
|
+
family: tr.family,
|
|
22
|
+
version: tr.version,
|
|
23
|
+
method: tr.method,
|
|
24
|
+
nonce: tr.nonce,
|
|
25
|
+
amount: new BigNumber(tr.amount),
|
|
26
|
+
gasFeeCap: new BigNumber(tr.gasFeeCap),
|
|
27
|
+
gasLimit: new BigNumber(tr.gasLimit),
|
|
28
|
+
gasPremium: new BigNumber(tr.gasPremium),
|
|
29
|
+
};
|
|
20
30
|
};
|
|
21
31
|
const toTransactionRaw = (t) => {
|
|
22
32
|
const common = toTransactionCommonRaw(t);
|
|
23
|
-
return
|
|
33
|
+
return {
|
|
34
|
+
...common,
|
|
35
|
+
method: t.method,
|
|
36
|
+
version: t.version,
|
|
37
|
+
family: t.family,
|
|
38
|
+
nonce: t.nonce,
|
|
39
|
+
amount: t.amount.toFixed(),
|
|
40
|
+
gasFeeCap: t.gasFeeCap.toString(),
|
|
41
|
+
gasLimit: t.gasLimit.toNumber(),
|
|
42
|
+
gasPremium: t.gasPremium.toString(),
|
|
43
|
+
};
|
|
24
44
|
};
|
|
25
45
|
export default {
|
|
26
46
|
formatTransaction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/bridge/transaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EACL,wBAAwB,EACxB,8BAA8B,IAAI,wBAAwB,EAC1D,sBAAsB,EACtB,4BAA4B,IAAI,sBAAsB,GACvD,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAe,EAChD,OAAgB,EACR,EAAE,CAAC;OAEX,YAAY;IACV,CAAC,CAAC,KAAK;IACP,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;QACf,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,GAAG;YACH,kBAAkB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE;gBAC/D,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,IAAI;aACtB,CACT;KACK,SAAS,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EAAkB,EAAe,EAAE;IACpE,MAAM,MAAM,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAC;IAC5C,
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/bridge/transaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EACL,wBAAwB,EACxB,8BAA8B,IAAI,wBAAwB,EAC1D,sBAAsB,EACtB,4BAA4B,IAAI,sBAAsB,GACvD,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAe,EAChD,OAAgB,EACR,EAAE,CAAC;OAEX,YAAY;IACV,CAAC,CAAC,KAAK;IACP,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;QACf,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,GAAG;YACH,kBAAkB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE;gBAC/D,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,IAAI;aACtB,CACT;KACK,SAAS,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EAAkB,EAAe,EAAE;IACpE,MAAM,MAAM,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAC;IAC5C,OAAO;QACL,GAAG,MAAM;QACT,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,OAAO,EAAE,EAAE,CAAC,OAAO;QACnB,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,MAAM,EAAE,IAAI,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC;QAChC,SAAS,EAAE,IAAI,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC;QACtC,QAAQ,EAAE,IAAI,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC;QACpC,UAAU,EAAE,IAAI,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC;KACzC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,CAAc,EAAkB,EAAE;IAC1D,MAAM,MAAM,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;IAEzC,OAAO;QACL,GAAG,MAAM;QACT,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE;QAC1B,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE;QACjC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE;QAC/B,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE;KACpC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe;IACb,iBAAiB;IACjB,kBAAkB;IAClB,gBAAgB;IAChB,wBAAwB;IACxB,sBAAsB;IACtB,uBAAuB;CACxB,CAAC"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { log } from "@ledgerhq/logs";
|
|
11
2
|
import { parseCurrencyUnit } from "@ledgerhq/coin-framework/currencies";
|
|
12
3
|
import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
|
|
@@ -123,7 +114,7 @@ export const getTxToBroadcast = (operation, signature, rawData) => {
|
|
|
123
114
|
version,
|
|
124
115
|
method,
|
|
125
116
|
nonce,
|
|
126
|
-
params: params
|
|
117
|
+
params: params ?? "",
|
|
127
118
|
to: recipient,
|
|
128
119
|
from: sender,
|
|
129
120
|
gaslimit: gasLimit.toNumber(),
|
|
@@ -137,7 +128,7 @@ export const getTxToBroadcast = (operation, signature, rawData) => {
|
|
|
137
128
|
},
|
|
138
129
|
};
|
|
139
130
|
};
|
|
140
|
-
export const getAccountShape = (info) =>
|
|
131
|
+
export const getAccountShape = async (info) => {
|
|
141
132
|
const { address, currency, derivationMode } = info;
|
|
142
133
|
const accountId = encodeAccountId({
|
|
143
134
|
type: "js",
|
|
@@ -146,10 +137,10 @@ export const getAccountShape = (info) => __awaiter(void 0, void 0, void 0, funct
|
|
|
146
137
|
xpubOrAddress: address,
|
|
147
138
|
derivationMode,
|
|
148
139
|
});
|
|
149
|
-
const blockHeight =
|
|
150
|
-
const balance =
|
|
151
|
-
const rawTxs =
|
|
152
|
-
const tokenAccounts =
|
|
140
|
+
const blockHeight = await fetchBlockHeight();
|
|
141
|
+
const balance = await fetchBalances(address);
|
|
142
|
+
const rawTxs = await fetchTxs(address);
|
|
143
|
+
const tokenAccounts = await buildTokenAccounts(address, accountId, info.initialAccount);
|
|
153
144
|
const result = {
|
|
154
145
|
id: accountId,
|
|
155
146
|
subAccounts: tokenAccounts,
|
|
@@ -159,7 +150,7 @@ export const getAccountShape = (info) => __awaiter(void 0, void 0, void 0, funct
|
|
|
159
150
|
blockHeight: blockHeight.current_block_identifier.index,
|
|
160
151
|
};
|
|
161
152
|
return result;
|
|
162
|
-
}
|
|
153
|
+
};
|
|
163
154
|
export const getSubAccount = (account, tx) => {
|
|
164
155
|
const subAccount = tx.subAccountId && account.subAccounts
|
|
165
156
|
? account.subAccounts.find(sa => sa.id === tx.subAccountId)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common-logic/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common-logic/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import cbor from "@zondax/cbor";
|
|
11
2
|
import { fetchERC20TokenBalance, fetchERC20Transactions } from "../api";
|
|
12
3
|
import invariant from "invariant";
|
|
@@ -30,7 +21,7 @@ export const erc20TxnToOperation = (tx, address, accountId, unit) => {
|
|
|
30
21
|
const isReceiving = address.toLowerCase() === to.toLowerCase();
|
|
31
22
|
const fee = new BigNumber(0);
|
|
32
23
|
const date = new Date(timestamp * 1000);
|
|
33
|
-
const hash = tx_cid
|
|
24
|
+
const hash = tx_cid ?? tx_hash;
|
|
34
25
|
const hasFailed = status !== TxStatus.Ok;
|
|
35
26
|
const ops = [];
|
|
36
27
|
if (isSending) {
|
|
@@ -75,63 +66,61 @@ export const erc20TxnToOperation = (tx, address, accountId, unit) => {
|
|
|
75
66
|
return [];
|
|
76
67
|
}
|
|
77
68
|
};
|
|
78
|
-
export function buildTokenAccounts(filAddr, parentAccountId, initialAccount) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
prev[curr.contract_address] = [...prev[curr.contract_address], curr];
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
prev[curr.contract_address] = [curr];
|
|
89
|
-
}
|
|
90
|
-
return prev;
|
|
91
|
-
}, {});
|
|
92
|
-
const subs = [];
|
|
93
|
-
for (const [cAddr, txns] of Object.entries(transfersUntangled)) {
|
|
94
|
-
const token = findTokenByAddressInCurrency(cAddr, "filecoin");
|
|
95
|
-
if (!token) {
|
|
96
|
-
log("error", `filecoin token not found, addr: ${cAddr}`);
|
|
97
|
-
continue;
|
|
98
|
-
}
|
|
99
|
-
const balance = yield fetchERC20TokenBalance(filAddr, cAddr);
|
|
100
|
-
const bnBalance = new BigNumber(balance.toString());
|
|
101
|
-
const tokenAccountId = encodeTokenAccountId(parentAccountId, token);
|
|
102
|
-
const operations = txns
|
|
103
|
-
.flatMap(txn => erc20TxnToOperation(txn, filAddr, tokenAccountId, token.units[0]))
|
|
104
|
-
.flat()
|
|
105
|
-
.sort((a, b) => b.date.getTime() - a.date.getTime());
|
|
106
|
-
if (operations.length === 0 && bnBalance.isZero()) {
|
|
107
|
-
continue;
|
|
108
|
-
}
|
|
109
|
-
const maybeExistingSubAccount = initialAccount &&
|
|
110
|
-
initialAccount.subAccounts &&
|
|
111
|
-
initialAccount.subAccounts.find(a => a.id === tokenAccountId);
|
|
112
|
-
const sub = {
|
|
113
|
-
type: AccountType.TokenAccount,
|
|
114
|
-
id: tokenAccountId,
|
|
115
|
-
parentId: parentAccountId,
|
|
116
|
-
token,
|
|
117
|
-
balance: bnBalance,
|
|
118
|
-
spendableBalance: bnBalance,
|
|
119
|
-
operationsCount: txns.length,
|
|
120
|
-
operations,
|
|
121
|
-
pendingOperations: maybeExistingSubAccount ? maybeExistingSubAccount.pendingOperations : [],
|
|
122
|
-
creationDate: operations.length > 0 ? operations[0].date : new Date(),
|
|
123
|
-
swapHistory: maybeExistingSubAccount ? maybeExistingSubAccount.swapHistory : [],
|
|
124
|
-
balanceHistoryCache: emptyHistoryCache, // calculated in the jsHelpers
|
|
125
|
-
};
|
|
126
|
-
subs.push(sub);
|
|
69
|
+
export async function buildTokenAccounts(filAddr, parentAccountId, initialAccount) {
|
|
70
|
+
try {
|
|
71
|
+
const transfers = await fetchERC20Transactions(filAddr);
|
|
72
|
+
const transfersUntangled = transfers.reduce((prev, curr) => {
|
|
73
|
+
curr.contract_address = curr.contract_address.toLowerCase();
|
|
74
|
+
if (prev[curr.contract_address]) {
|
|
75
|
+
prev[curr.contract_address] = [...prev[curr.contract_address], curr];
|
|
127
76
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
77
|
+
else {
|
|
78
|
+
prev[curr.contract_address] = [curr];
|
|
79
|
+
}
|
|
80
|
+
return prev;
|
|
81
|
+
}, {});
|
|
82
|
+
const subs = [];
|
|
83
|
+
for (const [cAddr, txns] of Object.entries(transfersUntangled)) {
|
|
84
|
+
const token = findTokenByAddressInCurrency(cAddr, "filecoin");
|
|
85
|
+
if (!token) {
|
|
86
|
+
log("error", `filecoin token not found, addr: ${cAddr}`);
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
const balance = await fetchERC20TokenBalance(filAddr, cAddr);
|
|
90
|
+
const bnBalance = new BigNumber(balance.toString());
|
|
91
|
+
const tokenAccountId = encodeTokenAccountId(parentAccountId, token);
|
|
92
|
+
const operations = txns
|
|
93
|
+
.flatMap(txn => erc20TxnToOperation(txn, filAddr, tokenAccountId, token.units[0]))
|
|
94
|
+
.flat()
|
|
95
|
+
.sort((a, b) => b.date.getTime() - a.date.getTime());
|
|
96
|
+
if (operations.length === 0 && bnBalance.isZero()) {
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
const maybeExistingSubAccount = initialAccount &&
|
|
100
|
+
initialAccount.subAccounts &&
|
|
101
|
+
initialAccount.subAccounts.find(a => a.id === tokenAccountId);
|
|
102
|
+
const sub = {
|
|
103
|
+
type: AccountType.TokenAccount,
|
|
104
|
+
id: tokenAccountId,
|
|
105
|
+
parentId: parentAccountId,
|
|
106
|
+
token,
|
|
107
|
+
balance: bnBalance,
|
|
108
|
+
spendableBalance: bnBalance,
|
|
109
|
+
operationsCount: txns.length,
|
|
110
|
+
operations,
|
|
111
|
+
pendingOperations: maybeExistingSubAccount ? maybeExistingSubAccount.pendingOperations : [],
|
|
112
|
+
creationDate: operations.length > 0 ? operations[0].date : new Date(),
|
|
113
|
+
swapHistory: maybeExistingSubAccount ? maybeExistingSubAccount.swapHistory : [],
|
|
114
|
+
balanceHistoryCache: emptyHistoryCache, // calculated in the jsHelpers
|
|
115
|
+
};
|
|
116
|
+
subs.push(sub);
|
|
133
117
|
}
|
|
134
|
-
|
|
118
|
+
return subs;
|
|
119
|
+
}
|
|
120
|
+
catch (e) {
|
|
121
|
+
log("error", "filecoin error building token accounts", e);
|
|
122
|
+
return [];
|
|
123
|
+
}
|
|
135
124
|
}
|
|
136
125
|
export const encodeTxnParams = (abiEncodedParams) => {
|
|
137
126
|
log("debug", `filecoin/abiEncodedParams: ${abiEncodedParams}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenAccounts.js","sourceRoot":"","sources":["../../src/erc20/tokenAccounts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tokenAccounts.js","sourceRoot":"","sources":["../../src/erc20/tokenAccounts.ts"],"names":[],"mappings":"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"}
|
package/lib-es/hw-signMessage.js
CHANGED
|
@@ -1,21 +1,12 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { log } from "@ledgerhq/logs";
|
|
11
2
|
import { getBufferFromString } from "./bridge/utils";
|
|
12
|
-
export const signMessage = (signerContext) =>
|
|
3
|
+
export const signMessage = (signerContext) => async (deviceId, account, { message }) => {
|
|
13
4
|
log("debug", "start signMessage process");
|
|
14
5
|
if (typeof message !== "string")
|
|
15
6
|
throw new Error("Invalid message type");
|
|
16
7
|
if (!message)
|
|
17
8
|
throw new Error("Message cannot be empty");
|
|
18
|
-
const r =
|
|
9
|
+
const r = await signerContext(deviceId, signer => signer.sign(account.freshAddressPath, getBufferFromString(message)));
|
|
19
10
|
return {
|
|
20
11
|
rsv: {
|
|
21
12
|
r: Buffer.from(r.signature_compact.slice(0, 32)).toString("hex"),
|
|
@@ -24,5 +15,5 @@ export const signMessage = (signerContext) => (deviceId_1, account_1, _a) => __a
|
|
|
24
15
|
},
|
|
25
16
|
signature: `0x${Buffer.from(r.signature_compact).toString("hex")}`,
|
|
26
17
|
};
|
|
27
|
-
}
|
|
18
|
+
};
|
|
28
19
|
//# sourceMappingURL=hw-signMessage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hw-signMessage.js","sourceRoot":"","sources":["../src/hw-signMessage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hw-signMessage.js","sourceRoot":"","sources":["../src/hw-signMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAGrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAGrD,MAAM,CAAC,MAAM,WAAW,GACtB,CAAC,aAA4C,EAAE,EAAE,CACjD,KAAK,EAAE,QAAgB,EAAE,OAAgB,EAAE,EAAE,OAAO,EAAc,EAAE,EAAE;IACpE,GAAG,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;IAE1C,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACzE,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAEzD,MAAM,CAAC,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAC/C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CACpE,CAAC;IAEF,OAAO;QACL,GAAG,EAAE;YACH,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YAChE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YACjE,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;SAChF;QACD,SAAS,EAAE,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;KACnE,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,28 +1,19 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { log } from "@ledgerhq/logs";
|
|
11
2
|
function resolver(signerContext) {
|
|
12
|
-
return
|
|
3
|
+
return async (deviceId, { path, verify }) => {
|
|
13
4
|
log("debug", "start getAddress process");
|
|
14
|
-
const { r } =
|
|
5
|
+
const { r } = await signerContext(deviceId, async (signer) => {
|
|
15
6
|
const r = verify
|
|
16
|
-
?
|
|
17
|
-
:
|
|
7
|
+
? await signer.showAddressAndPubKey(path)
|
|
8
|
+
: await signer.getAddressAndPubKey(path);
|
|
18
9
|
return { r };
|
|
19
|
-
})
|
|
10
|
+
});
|
|
20
11
|
return {
|
|
21
12
|
path,
|
|
22
13
|
address: r.addrString,
|
|
23
14
|
publicKey: Buffer.from(r.compressed_pk).toString("hex"),
|
|
24
15
|
};
|
|
25
|
-
}
|
|
16
|
+
};
|
|
26
17
|
}
|
|
27
18
|
export default resolver;
|
|
28
19
|
//# sourceMappingURL=getAddress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAddress.js","sourceRoot":"","sources":["../../src/signer/getAddress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getAddress.js","sourceRoot":"","sources":["../../src/signer/getAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAOrC,SAAS,QAAQ,CAAC,aAA4C;IAC5D,OAAO,KAAK,EAAE,QAAgB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAqB,EAAE,EAAE;QACrE,GAAG,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;QAEzC,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YACzD,MAAM,CAAC,GAAG,MAAM;gBACd,CAAC,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC;gBACzC,CAAC,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAE3C,OAAO,EAAE,CAAC,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI;YACJ,OAAO,EAAE,CAAC,CAAC,UAAU;YACrB,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;SACxD,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,eAAe,QAAQ,CAAC"}
|
package/lib-es/test/bot-specs.js
CHANGED
|
@@ -115,9 +115,8 @@ const filecoinSpecs = {
|
|
|
115
115
|
maxRun: 1,
|
|
116
116
|
deviceAction: generateDeviceActionFlow(BotScenario.TOKEN_TRANSFER),
|
|
117
117
|
transaction: ({ account, bridge, maxSpendable }) => {
|
|
118
|
-
var _a;
|
|
119
118
|
invariant(maxSpendable.gt(0), "Spendable balance is too low");
|
|
120
|
-
const subAccount =
|
|
119
|
+
const subAccount = account.subAccounts?.find(a => a.type === AccountType.TokenAccount && a.spendableBalance.gt(0));
|
|
121
120
|
invariant(subAccount && subAccount.type === AccountType.TokenAccount, "no subAccount with WFIL");
|
|
122
121
|
const amount = subAccount.balance.div(1.9 + 0.2 * Math.random()).integerValue();
|
|
123
122
|
return {
|
|
@@ -136,11 +135,10 @@ const filecoinSpecs = {
|
|
|
136
135
|
};
|
|
137
136
|
},
|
|
138
137
|
test: ({ account, accountBeforeTransaction, transaction, status }) => {
|
|
139
|
-
var _a, _b;
|
|
140
138
|
const subAccountId = transaction.subAccountId;
|
|
141
|
-
const subAccount =
|
|
142
|
-
const subAccountBeforeTransaction =
|
|
143
|
-
botTest("subAccount balance moved with the tx status amount", () => expect(subAccount
|
|
139
|
+
const subAccount = account.subAccounts?.find(sa => sa.id === subAccountId);
|
|
140
|
+
const subAccountBeforeTransaction = accountBeforeTransaction.subAccounts?.find(sa => sa.id === subAccountId);
|
|
141
|
+
botTest("subAccount balance moved with the tx status amount", () => expect(subAccount?.balance.toString()).toBe(subAccountBeforeTransaction?.balance.minus(status.amount).toString()));
|
|
144
142
|
},
|
|
145
143
|
},
|
|
146
144
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-specs.js","sourceRoot":"","sources":["../../src/test/bot-specs.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bot-specs.js","sourceRoot":"","sources":["../../src/test/bot-specs.ts"],"names":[],"mappings":"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"}
|
|
@@ -355,7 +355,7 @@ const filecoin = {
|
|
|
355
355
|
expectedStatus: (account, tx) => {
|
|
356
356
|
const subAccount = getSubAccount(account, tx);
|
|
357
357
|
return {
|
|
358
|
-
amount:
|
|
358
|
+
amount: subAccount?.spendableBalance || new BigNumber(0),
|
|
359
359
|
errors: {},
|
|
360
360
|
warnings: {},
|
|
361
361
|
};
|