@ledgerhq/coin-celo 1.3.0-nightly.4 → 1.3.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/.unimportedrc.json +6 -3
- package/CHANGELOG.md +27 -35
- package/lib/bridge/buildOptimisticOperation.d.ts.map +1 -1
- package/lib/bridge/buildOptimisticOperation.js +2 -5
- package/lib/bridge/buildOptimisticOperation.js.map +1 -1
- package/lib/bridge/buildTransaction.d.ts.map +1 -1
- package/lib/bridge/buildTransaction.js +6 -29
- package/lib/bridge/buildTransaction.js.map +1 -1
- package/lib/bridge/estimateMaxSpendable.d.ts.map +1 -1
- package/lib/bridge/estimateMaxSpendable.js +1 -9
- package/lib/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib/bridge/getFeesForTransaction.d.ts.map +1 -1
- package/lib/bridge/getFeesForTransaction.js +5 -32
- package/lib/bridge/getFeesForTransaction.js.map +1 -1
- package/lib/bridge/getTransactionStatus.d.ts.map +1 -1
- package/lib/bridge/getTransactionStatus.js +4 -18
- package/lib/bridge/getTransactionStatus.js.map +1 -1
- package/lib/bridge/index.d.ts.map +1 -1
- package/lib/bridge/index.js.map +1 -1
- package/lib/bridge/prepareTransaction.d.ts.map +1 -1
- package/lib/bridge/prepareTransaction.js +4 -33
- package/lib/bridge/prepareTransaction.js.map +1 -1
- package/lib/bridge/signOperation.d.ts.map +1 -1
- package/lib/bridge/signOperation.js +3 -11
- package/lib/bridge/signOperation.js.map +1 -1
- package/lib/bridge/synchronisation.d.ts.map +1 -1
- package/lib/bridge/synchronisation.js +3 -7
- package/lib/bridge/synchronisation.js.map +1 -1
- package/lib/config.d.ts.map +1 -1
- package/lib/config.js +0 -8
- package/lib/config.js.map +1 -1
- package/lib/test/please-add-coverage.test.d.ts +2 -0
- package/lib/test/please-add-coverage.test.d.ts.map +1 -0
- package/lib/test/please-add-coverage.test.js +6 -0
- package/lib/test/please-add-coverage.test.js.map +1 -0
- package/lib/types/types.d.ts +0 -1
- package/lib/types/types.d.ts.map +1 -1
- package/lib/types/types.js.map +1 -1
- package/lib-es/bridge/buildOptimisticOperation.d.ts.map +1 -1
- package/lib-es/bridge/buildOptimisticOperation.js +2 -5
- package/lib-es/bridge/buildOptimisticOperation.js.map +1 -1
- package/lib-es/bridge/buildTransaction.d.ts.map +1 -1
- package/lib-es/bridge/buildTransaction.js +6 -29
- package/lib-es/bridge/buildTransaction.js.map +1 -1
- package/lib-es/bridge/estimateMaxSpendable.d.ts.map +1 -1
- package/lib-es/bridge/estimateMaxSpendable.js +2 -10
- package/lib-es/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib-es/bridge/getFeesForTransaction.d.ts.map +1 -1
- package/lib-es/bridge/getFeesForTransaction.js +5 -29
- package/lib-es/bridge/getFeesForTransaction.js.map +1 -1
- package/lib-es/bridge/getTransactionStatus.d.ts.map +1 -1
- package/lib-es/bridge/getTransactionStatus.js +4 -18
- 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.map +1 -1
- package/lib-es/bridge/prepareTransaction.d.ts.map +1 -1
- package/lib-es/bridge/prepareTransaction.js +4 -33
- 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 +3 -11
- package/lib-es/bridge/signOperation.js.map +1 -1
- package/lib-es/bridge/synchronisation.d.ts.map +1 -1
- package/lib-es/bridge/synchronisation.js +3 -7
- package/lib-es/bridge/synchronisation.js.map +1 -1
- package/lib-es/config.d.ts.map +1 -1
- package/lib-es/config.js +0 -8
- package/lib-es/config.js.map +1 -1
- package/lib-es/test/please-add-coverage.test.d.ts +1 -0
- package/lib-es/test/please-add-coverage.test.d.ts.map +1 -0
- package/lib-es/test/please-add-coverage.test.js +5 -0
- package/lib-es/test/please-add-coverage.test.js.map +1 -0
- package/lib-es/types/types.d.ts +0 -1
- package/lib-es/types/types.d.ts.map +1 -1
- package/lib-es/types/types.js.map +1 -1
- package/package.json +17 -18
- package/src/bridge/buildOptimisticOperation.ts +2 -6
- package/src/bridge/buildTransaction.ts +7 -38
- package/src/bridge/estimateMaxSpendable.ts +2 -18
- package/src/bridge/getFeesForTransaction.ts +5 -39
- package/src/bridge/getTransactionStatus.ts +4 -21
- package/src/bridge/index.ts +1 -0
- package/src/bridge/prepareTransaction.ts +6 -39
- package/src/bridge/signOperation.ts +4 -19
- package/src/bridge/synchronisation.ts +4 -10
- package/src/config.ts +0 -8
- package/src/logic.ts +1 -1
- package/src/test/please-add-coverage.test.ts +3 -0
- package/src/types/types.ts +0 -1
- package/lib/__tests__/bridge/buildOptimisticOperation.test.d.ts +0 -2
- package/lib/__tests__/bridge/buildOptimisticOperation.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/buildOptimisticOperation.test.js +0 -23
- package/lib/__tests__/bridge/buildOptimisticOperation.test.js.map +0 -1
- package/lib/__tests__/bridge/buildTransaction.test.d.ts +0 -2
- package/lib/__tests__/bridge/buildTransaction.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/buildTransaction.test.js +0 -412
- package/lib/__tests__/bridge/buildTransaction.test.js.map +0 -1
- package/lib/__tests__/bridge/createTransaction.test.d.ts +0 -2
- package/lib/__tests__/bridge/createTransaction.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/createTransaction.test.js +0 -22
- package/lib/__tests__/bridge/createTransaction.test.js.map +0 -1
- package/lib/__tests__/bridge/deviceTransactionConfig.test.d.ts +0 -2
- package/lib/__tests__/bridge/deviceTransactionConfig.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/deviceTransactionConfig.test.js +0 -21
- package/lib/__tests__/bridge/deviceTransactionConfig.test.js.map +0 -1
- package/lib/__tests__/bridge/estimateMaxSpendable.test.d.ts +0 -2
- package/lib/__tests__/bridge/estimateMaxSpendable.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/estimateMaxSpendable.test.js +0 -108
- package/lib/__tests__/bridge/estimateMaxSpendable.test.js.map +0 -1
- package/lib/__tests__/bridge/getFeesForTransaction.test.d.ts +0 -2
- package/lib/__tests__/bridge/getFeesForTransaction.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/getFeesForTransaction.test.js +0 -211
- package/lib/__tests__/bridge/getFeesForTransaction.test.js.map +0 -1
- package/lib/__tests__/bridge/getTransactionStatus.test.d.ts +0 -2
- package/lib/__tests__/bridge/getTransactionStatus.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/getTransactionStatus.test.js +0 -214
- package/lib/__tests__/bridge/getTransactionStatus.test.js.map +0 -1
- package/lib/__tests__/bridge/logic.test.d.ts +0 -2
- package/lib/__tests__/bridge/logic.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/logic.test.js +0 -490
- package/lib/__tests__/bridge/logic.test.js.map +0 -1
- package/lib/__tests__/bridge/prepareTransaction.test.d.ts +0 -2
- package/lib/__tests__/bridge/prepareTransaction.test.d.ts.map +0 -1
- package/lib/__tests__/bridge/prepareTransaction.test.js +0 -239
- package/lib/__tests__/bridge/prepareTransaction.test.js.map +0 -1
- package/lib/bridge/fixtures.d.ts +0 -36
- package/lib/bridge/fixtures.d.ts.map +0 -1
- package/lib/bridge/fixtures.js +0 -98
- package/lib/bridge/fixtures.js.map +0 -1
- package/lib/constants.d.ts +0 -6
- package/lib/constants.d.ts.map +0 -1
- package/lib/constants.js +0 -15
- package/lib/constants.js.map +0 -1
- package/lib-es/__tests__/bridge/buildOptimisticOperation.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/buildOptimisticOperation.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/buildOptimisticOperation.test.js +0 -18
- package/lib-es/__tests__/bridge/buildOptimisticOperation.test.js.map +0 -1
- package/lib-es/__tests__/bridge/buildTransaction.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/buildTransaction.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/buildTransaction.test.js +0 -407
- package/lib-es/__tests__/bridge/buildTransaction.test.js.map +0 -1
- package/lib-es/__tests__/bridge/createTransaction.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/createTransaction.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/createTransaction.test.js +0 -17
- package/lib-es/__tests__/bridge/createTransaction.test.js.map +0 -1
- package/lib-es/__tests__/bridge/deviceTransactionConfig.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/deviceTransactionConfig.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/deviceTransactionConfig.test.js +0 -16
- package/lib-es/__tests__/bridge/deviceTransactionConfig.test.js.map +0 -1
- package/lib-es/__tests__/bridge/estimateMaxSpendable.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/estimateMaxSpendable.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/estimateMaxSpendable.test.js +0 -103
- package/lib-es/__tests__/bridge/estimateMaxSpendable.test.js.map +0 -1
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.js +0 -206
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.js.map +0 -1
- package/lib-es/__tests__/bridge/getTransactionStatus.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/getTransactionStatus.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/getTransactionStatus.test.js +0 -209
- package/lib-es/__tests__/bridge/getTransactionStatus.test.js.map +0 -1
- package/lib-es/__tests__/bridge/logic.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/logic.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/logic.test.js +0 -485
- package/lib-es/__tests__/bridge/logic.test.js.map +0 -1
- package/lib-es/__tests__/bridge/prepareTransaction.test.d.ts +0 -2
- package/lib-es/__tests__/bridge/prepareTransaction.test.d.ts.map +0 -1
- package/lib-es/__tests__/bridge/prepareTransaction.test.js +0 -234
- package/lib-es/__tests__/bridge/prepareTransaction.test.js.map +0 -1
- package/lib-es/bridge/fixtures.d.ts +0 -36
- package/lib-es/bridge/fixtures.d.ts.map +0 -1
- package/lib-es/bridge/fixtures.js +0 -89
- package/lib-es/bridge/fixtures.js.map +0 -1
- package/lib-es/constants.d.ts +0 -6
- package/lib-es/constants.d.ts.map +0 -1
- package/lib-es/constants.js +0 -11
- package/lib-es/constants.js.map +0 -1
- package/src/__tests__/bridge/buildOptimisticOperation.test.ts +0 -29
- package/src/__tests__/bridge/buildTransaction.test.ts +0 -502
- package/src/__tests__/bridge/createTransaction.test.ts +0 -17
- package/src/__tests__/bridge/deviceTransactionConfig.test.ts +0 -16
- package/src/__tests__/bridge/estimateMaxSpendable.test.ts +0 -112
- package/src/__tests__/bridge/getFeesForTransaction.test.ts +0 -233
- package/src/__tests__/bridge/getTransactionStatus.test.ts +0 -261
- package/src/__tests__/bridge/logic.test.ts +0 -538
- package/src/__tests__/bridge/prepareTransaction.test.ts +0 -261
- package/src/bridge/fixtures.ts +0 -103
- package/src/constants.ts +0 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AACzC,+BAAkC;AAClC,6CAAgD;AAEhD,mDAA0E;
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAGjF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAGjF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,CA+CxD,CAAC;AAEF,eAAO,MAAM,IAAI,uJAAgC,CAAC"}
|
|
@@ -6,9 +6,8 @@ const jsHelpers_1 = require("@ledgerhq/coin-framework/bridge/jsHelpers");
|
|
|
6
6
|
const account_1 = require("@ledgerhq/coin-framework/account");
|
|
7
7
|
const network_1 = require("../network");
|
|
8
8
|
const sdk_2 = require("../network/sdk");
|
|
9
|
-
const synchronization_1 = require("@ledgerhq/coin-evm/bridge/synchronization");
|
|
10
9
|
const kit = (0, sdk_2.celoKit)();
|
|
11
|
-
const getAccountShape = async (info
|
|
10
|
+
const getAccountShape = async (info) => {
|
|
12
11
|
const { address, currency, initialAccount, derivationMode } = info;
|
|
13
12
|
const oldOperations = initialAccount?.operations || [];
|
|
14
13
|
const election = await kit.contracts.getElection();
|
|
@@ -25,16 +24,13 @@ const getAccountShape = async (info, config) => {
|
|
|
25
24
|
const accountRegistrationStatus = await (0, sdk_1.getAccountRegistrationStatus)(address);
|
|
26
25
|
const pendingWithdrawals = accountRegistrationStatus ? await (0, sdk_1.getPendingWithdrawals)(address) : [];
|
|
27
26
|
const votes = accountRegistrationStatus ? await (0, sdk_1.getVotes)(address) : [];
|
|
28
|
-
const fromEvm = await (0, synchronization_1.getAccountShape)(info, config);
|
|
29
27
|
const operations = (0, jsHelpers_1.mergeOps)(oldOperations, newOperations);
|
|
30
28
|
const shape = {
|
|
31
29
|
id: accountId,
|
|
32
30
|
balance,
|
|
33
|
-
blockHeight,
|
|
34
|
-
operationsCount: operations.length,
|
|
35
31
|
spendableBalance,
|
|
36
|
-
|
|
37
|
-
|
|
32
|
+
operationsCount: operations.length,
|
|
33
|
+
blockHeight,
|
|
38
34
|
celoResources: {
|
|
39
35
|
registrationStatus: accountRegistrationStatus,
|
|
40
36
|
lockedBalance,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":";;;AAAA,wCAA+F;AAC/F,yEAA+E;AAE/E,8DAAmE;AACnE,wCAA+C;AAE/C,wCAAyC;
|
|
1
|
+
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":";;;AAAA,wCAA+F;AAC/F,yEAA+E;AAE/E,8DAAmE;AACnE,wCAA+C;AAE/C,wCAAyC;AAEzC,MAAM,GAAG,GAAG,IAAA,aAAO,GAAE,CAAC;AAEf,MAAM,eAAe,GAAiC,KAAK,EAAC,IAAI,EAAC,EAAE;IACxE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACnE,MAAM,aAAa,GAAG,cAAc,EAAE,UAAU,IAAI,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC;IAClD,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IACvD,MAAM,SAAS,GAAG,IAAA,yBAAe,EAAC;QAChC,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,GAAG;QACZ,UAAU,EAAE,QAAQ,CAAC,EAAE;QACvB,aAAa,EAAE,OAAO;QACtB,cAAc;KACf,CAAC,CAAC;IACH,MAAM,EACJ,WAAW,EACX,OAAO,EACP,gBAAgB,EAChB,UAAU,EAAE,aAAa,EACzB,aAAa,EACb,sBAAsB,GACvB,GAAG,MAAM,IAAA,2BAAiB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEhD,MAAM,yBAAyB,GAAG,MAAM,IAAA,kCAA4B,EAAC,OAAO,CAAC,CAAC;IAE9E,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,CAAC,CAAC,MAAM,IAAA,2BAAqB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEjG,MAAM,KAAK,GAAG,yBAAyB,CAAC,CAAC,CAAC,MAAM,IAAA,cAAQ,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvE,MAAM,UAAU,GAAG,IAAA,oBAAQ,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,SAAS;QACb,OAAO;QACP,gBAAgB;QAChB,eAAe,EAAE,UAAU,CAAC,MAAM;QAClC,WAAW;QACX,aAAa,EAAE;YACb,kBAAkB,EAAE,yBAAyB;YAC7C,aAAa;YACb,sBAAsB;YACtB,kBAAkB;YAClB,KAAK;YACL,eAAe,EAAE,QAAQ,CAAC,OAAO;YACjC,iBAAiB,EAAE,UAAU,CAAC,OAAO;YACrC,oBAAoB,EAAE,cAAc,CAAC,oBAAoB;SAC1D;KACF,CAAC;IACF,OAAO,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC;AAClC,CAAC,CAAC;AA/CW,QAAA,eAAe,mBA+C1B;AAEW,QAAA,IAAI,GAAG,IAAA,oBAAQ,EAAC,EAAE,eAAe,EAAf,uBAAe,EAAE,CAAC,CAAC"}
|
package/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CASjD,CAAC"}
|
package/lib/config.js
CHANGED
package/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAA+B;IACpD,oBAAoB,EAAE;QACpB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;aACf;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAA+B;IACpD,oBAAoB,EAAE;QACpB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;aACf;SACF;KACF;CACF,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"please-add-coverage.test.d.ts","sourceRoot":"","sources":["../../src/test/please-add-coverage.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"please-add-coverage.test.js","sourceRoot":"","sources":["../../src/test/please-add-coverage.test.ts"],"names":[],"mappings":";;AAAA,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC"}
|
package/lib/types/types.d.ts
CHANGED
|
@@ -38,7 +38,6 @@ export type Transaction = TransactionCommon & {
|
|
|
38
38
|
fees: BigNumber | null | undefined;
|
|
39
39
|
mode: CeloOperationMode;
|
|
40
40
|
index: number | null | undefined;
|
|
41
|
-
data?: Buffer | null | undefined;
|
|
42
41
|
};
|
|
43
42
|
export type TransactionRaw = TransactionCommonRaw & {
|
|
44
43
|
family: "celo";
|
package/lib/types/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,UAAU,EACV,SAAS,EACT,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,MAAM,iBAAiB,GACzB,MAAM,GACN,MAAM,GACN,QAAQ,GACR,UAAU,GACV,MAAM,GACN,QAAQ,GACR,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,QAAQ,CAAC;AAChD,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,oBAAoB,CAAC;AAEjE,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,aAAa,EAAE,SAAS,CAAC;IACzB,sBAAsB,EAAE,SAAS,CAAC;IAClC,kBAAkB,EAAE,qBAAqB,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IAC/D,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IACrC,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3C,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC7C,oBAAoB,EAAE,SAAS,CAAC;CACjC,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,wBAAwB,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IAClE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3C,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC7C,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AACF,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"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"}
|
package/lib/types/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":";;AAiJA,oDAEC;AAKD,0DAEC;AATD,SAAgB,oBAAoB,CAAC,EAAkB;IACrD,OAAO,EAAE,KAAK,IAAI,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,oBAAoB,IAAI,EAAE,CAAC;AAC7E,CAAC;AAKD,SAAgB,uBAAuB,CAAC,EAAqB;IAC3D,OAAO,EAAE,KAAK,IAAI,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,oBAAoB,IAAI,EAAE,CAAC;AAC7E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildOptimisticOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAqB,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"buildOptimisticOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAqB,WAAW,EAAE,MAAM,UAAU,CAAC;AAetF,eAAO,MAAM,wBAAwB,YAC1B,WAAW,eACP,WAAW,OACnB,SAAS,KACb,aA+BF,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
2
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
3
|
-
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
4
3
|
const MODE_TO_TYPE = {
|
|
5
4
|
send: "OUT",
|
|
6
5
|
lock: "LOCK",
|
|
@@ -14,10 +13,8 @@ const MODE_TO_TYPE = {
|
|
|
14
13
|
};
|
|
15
14
|
export const buildOptimisticOperation = (account, transaction, fee) => {
|
|
16
15
|
const type = MODE_TO_TYPE[transaction.mode] ?? MODE_TO_TYPE.default;
|
|
17
|
-
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
18
|
-
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
19
16
|
const value = type === "OUT" || type === "LOCK"
|
|
20
|
-
? new BigNumber(transaction.amount).plus(
|
|
17
|
+
? new BigNumber(transaction.amount).plus(fee)
|
|
21
18
|
: new BigNumber(transaction.amount);
|
|
22
19
|
const operation = {
|
|
23
20
|
id: encodeOperationId(account.id, "", type),
|
|
@@ -29,7 +26,7 @@ export const buildOptimisticOperation = (account, transaction, fee) => {
|
|
|
29
26
|
blockHeight: null,
|
|
30
27
|
senders: [account.freshAddress],
|
|
31
28
|
recipients: [transaction.recipient].filter(Boolean),
|
|
32
|
-
accountId:
|
|
29
|
+
accountId: account.id,
|
|
33
30
|
date: new Date(),
|
|
34
31
|
extra: {
|
|
35
32
|
celoOperationValue: new BigNumber(transaction.amount),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildOptimisticOperation.js","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"buildOptimisticOperation.js","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAEvE,MAAM,YAAY,GAA8D;IAC9E,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,OAAoB,EACpB,WAAwB,EACxB,GAAc,EACC,EAAE;IACjB,MAAM,IAAI,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC;IAEpE,MAAM,KAAK,GACT,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,MAAM;QAC/B,CAAC,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC7C,CAAC,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,SAAS,GAAkB;QAC/B,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC;QAC3C,IAAI,EAAE,EAAE;QACR,IAAI;QACJ,KAAK;QACL,GAAG;QACH,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC;QAC/B,UAAU,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QACnD,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,KAAK,EAAE;YACL,kBAAkB,EAAE,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;YACrD,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC/C,CAAC,CAAC;oBACE,mBAAmB,EAAE,WAAW,CAAC,SAAS;iBAC3C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;KACF,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAKvC,QAAA,MAAM,gBAAgB,YAAmB,WAAW,eAAe,WAAW,oBA2H7E,CAAC;AAwBF,eAAe,gBAAgB,CAAC"}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
import { celoKit } from "../network/sdk";
|
|
2
2
|
import { BigNumber } from "bignumber.js";
|
|
3
3
|
import { getPendingStakingOperationAmounts, getVote } from "../logic";
|
|
4
|
-
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
5
|
-
import { CELO_STABLE_TOKENS, getStableTokenEnum, MAX_FEES_THRESHOLD_MULTIPLIER, MAX_PRIORITY_FEE_PER_GAS, } from "../constants";
|
|
6
4
|
const buildTransaction = async (account, transaction) => {
|
|
7
5
|
const kit = celoKit();
|
|
8
|
-
const
|
|
9
|
-
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
10
|
-
let value = transactionValue(account, transaction);
|
|
6
|
+
const value = transactionValue(account, transaction);
|
|
11
7
|
let celoTransaction;
|
|
12
8
|
if (transaction.mode === "lock") {
|
|
13
9
|
const lockedGold = await kit.contracts.getLockedGold();
|
|
@@ -99,27 +95,6 @@ const buildTransaction = async (account, transaction) => {
|
|
|
99
95
|
gas: await accounts.createAccount().txo.estimateGas({ from: account.freshAddress }),
|
|
100
96
|
};
|
|
101
97
|
}
|
|
102
|
-
else if (isTokenTransaction) {
|
|
103
|
-
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
104
|
-
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
105
|
-
const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
|
|
106
|
-
const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
|
|
107
|
-
let token;
|
|
108
|
-
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
109
|
-
token = await kit.contracts.getStableToken(getStableTokenEnum(tokenAccount.token.id));
|
|
110
|
-
}
|
|
111
|
-
else {
|
|
112
|
-
token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
|
|
113
|
-
}
|
|
114
|
-
celoTransaction = {
|
|
115
|
-
from: account.freshAddress,
|
|
116
|
-
to: transaction.recipient,
|
|
117
|
-
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
118
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
119
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
120
|
-
value: value.toFixed(),
|
|
121
|
-
};
|
|
122
|
-
}
|
|
123
98
|
else {
|
|
124
99
|
// Send
|
|
125
100
|
celoTransaction = {
|
|
@@ -127,12 +102,14 @@ const buildTransaction = async (account, transaction) => {
|
|
|
127
102
|
to: transaction.recipient,
|
|
128
103
|
value: value.toFixed(),
|
|
129
104
|
};
|
|
105
|
+
const gas = await kit.connection.estimateGasWithInflationFactor(celoTransaction);
|
|
106
|
+
celoTransaction = {
|
|
107
|
+
...celoTransaction,
|
|
108
|
+
gas,
|
|
109
|
+
};
|
|
130
110
|
}
|
|
131
|
-
const gas = ((await kit.connection.estimateGasWithInflationFactor(celoTransaction)) *
|
|
132
|
-
MAX_FEES_THRESHOLD_MULTIPLIER).toFixed();
|
|
133
111
|
const tx = {
|
|
134
112
|
...celoTransaction,
|
|
135
|
-
gas,
|
|
136
113
|
chainId: await kit.connection.chainId(),
|
|
137
114
|
nonce: await kit.connection.nonce(account.freshAddress),
|
|
138
115
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAMpD,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAC9C,WAAW,EACX,WAAW,CACZ,CAAC,sBAAsB,CASvB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -1,24 +1,16 @@
|
|
|
1
1
|
import getTransactionStatus from "./getTransactionStatus";
|
|
2
2
|
import prepareTransaction from "./prepareTransaction";
|
|
3
3
|
import createTransaction from "./createTransaction";
|
|
4
|
-
import {
|
|
5
|
-
import BigNumber from "bignumber.js";
|
|
4
|
+
import { getMainAccount } from "@ledgerhq/coin-framework/account/helpers";
|
|
6
5
|
export const estimateMaxSpendable = async ({ account, parentAccount, transaction }) => {
|
|
7
6
|
const mainAccount = getMainAccount(account, parentAccount);
|
|
8
|
-
const tokenAccount = findSubAccountById(mainAccount, transaction?.subAccountId ?? "");
|
|
9
|
-
const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
|
|
10
7
|
const t = await prepareTransaction(mainAccount, {
|
|
11
8
|
...createTransaction(account),
|
|
12
9
|
...transaction,
|
|
13
10
|
useAllAmount: true,
|
|
14
11
|
});
|
|
15
12
|
const { amount } = await getTransactionStatus(mainAccount, t);
|
|
16
|
-
|
|
17
|
-
return fromTokenAccount
|
|
18
|
-
? tokenAccount.spendableBalance
|
|
19
|
-
: account.spendableBalance.gt(fees)
|
|
20
|
-
? amount.minus(fees)
|
|
21
|
-
: new BigNumber(0);
|
|
13
|
+
return amount;
|
|
22
14
|
};
|
|
23
15
|
export default estimateMaxSpendable;
|
|
24
16
|
//# sourceMappingURL=estimateMaxSpendable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAEA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAEA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAE1E,MAAM,CAAC,MAAM,oBAAoB,GAGL,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,EAAE;IAC5E,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3D,MAAM,CAAC,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE;QAC9C,GAAG,iBAAiB,CAAC,OAAO,CAAC;QAC7B,GAAG,WAAW;QACd,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getFeesForTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIzD,QAAA,MAAM,qBAAqB,8BAGxB;IACD,OAAO,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;CAC1B,KAAG,OAAO,CAAC,SAAS,CAqGpB,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
2
1
|
import { BigNumber } from "bignumber.js";
|
|
3
2
|
import { celoKit } from "../network/sdk";
|
|
4
3
|
import { getPendingStakingOperationAmounts, getVote } from "../logic";
|
|
5
|
-
import buildTransaction from "./buildTransaction";
|
|
6
|
-
import { CELO_STABLE_TOKENS, getStableTokenEnum, MAX_FEES_THRESHOLD_MULTIPLIER, MAX_PRIORITY_FEE_PER_GAS, } from "../constants";
|
|
7
4
|
const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
8
5
|
const { amount, index } = transaction;
|
|
9
6
|
const kit = celoKit();
|
|
@@ -16,8 +13,6 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
16
13
|
const totalNonVotingLockedBalance = nonvotingLockedGoldBalance.minus(pendingOperationAmounts.vote);
|
|
17
14
|
// Deduct pending lock operations from the spendable balance
|
|
18
15
|
const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
|
|
19
|
-
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
20
|
-
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
21
16
|
if ((transaction.mode === "unlock" || transaction.mode === "vote") && account.celoResources) {
|
|
22
17
|
value = transaction.useAllAmount
|
|
23
18
|
? totalNonVotingLockedBalance
|
|
@@ -80,33 +75,14 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
80
75
|
const accounts = await kit.contracts.getAccounts();
|
|
81
76
|
gas = await accounts.createAccount().txo.estimateGas({ from: account.freshAddress });
|
|
82
77
|
}
|
|
83
|
-
else
|
|
84
|
-
|
|
85
|
-
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
86
|
-
const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
|
|
87
|
-
const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
|
|
88
|
-
let token;
|
|
89
|
-
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
90
|
-
token = await kit.contracts.getStableToken(getStableTokenEnum(tokenAccount.token.id));
|
|
91
|
-
}
|
|
92
|
-
else {
|
|
93
|
-
token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
|
|
94
|
-
}
|
|
78
|
+
else {
|
|
79
|
+
const celoToken = await kit.contracts.getGoldToken();
|
|
95
80
|
const celoTransaction = {
|
|
96
81
|
from: account.freshAddress,
|
|
97
|
-
to:
|
|
98
|
-
data:
|
|
99
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
100
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
101
|
-
value: value.toFixed(),
|
|
82
|
+
to: celoToken.address,
|
|
83
|
+
data: celoToken.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
102
84
|
};
|
|
103
|
-
gas =
|
|
104
|
-
MAX_FEES_THRESHOLD_MULTIPLIER).toFixed());
|
|
105
|
-
}
|
|
106
|
-
else {
|
|
107
|
-
// Send
|
|
108
|
-
const tx = await buildTransaction(account, transaction);
|
|
109
|
-
gas = tx.gas ? Number(tx.gas) : 0;
|
|
85
|
+
gas = await kit.connection.estimateGasWithInflationFactor(celoTransaction);
|
|
110
86
|
}
|
|
111
87
|
const gasPrice = new BigNumber(await kit.connection.gasPrice());
|
|
112
88
|
return gasPrice.times(gas);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.js","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"getFeesForTransaction.js","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AASvE,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAC9C,WAAW,EACX,WAAW,EACX,iBAAiB,CAClB,CAAC,sBAAsB,CA4FvB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -4,7 +4,6 @@ import { isValidAddress } from "@celo/utils/lib/address";
|
|
|
4
4
|
import { getPendingStakingOperationAmounts, getVote } from "../logic";
|
|
5
5
|
import { CeloAllFundsWarning } from "../errors";
|
|
6
6
|
import { celoKit } from "../network/sdk";
|
|
7
|
-
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
8
7
|
const kit = celoKit();
|
|
9
8
|
// Arbitrary buffer for paying fees of next transactions. 0.05 Celo for ~100 transactions
|
|
10
9
|
const FEES_SAFETY_BUFFER = new BigNumber(5000000000000000);
|
|
@@ -26,8 +25,6 @@ export const getTransactionStatus = async (account, transaction) => {
|
|
|
26
25
|
// Deduct pending lock operations from the spendable balance
|
|
27
26
|
const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
|
|
28
27
|
const estimatedFees = transaction.fees || new BigNumber(0);
|
|
29
|
-
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
30
|
-
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
31
28
|
let amount = new BigNumber(0);
|
|
32
29
|
if (useAllAmount && (transaction.mode === "unlock" || transaction.mode === "vote")) {
|
|
33
30
|
amount = totalNonVotingLockedBalance ?? new BigNumber(0);
|
|
@@ -38,9 +35,7 @@ export const getTransactionStatus = async (account, transaction) => {
|
|
|
38
35
|
amount = revoke.amount;
|
|
39
36
|
}
|
|
40
37
|
else if (useAllAmount) {
|
|
41
|
-
amount =
|
|
42
|
-
? tokenAccount.spendableBalance
|
|
43
|
-
: totalSpendableBalance.minus(estimatedFees);
|
|
38
|
+
amount = totalSpendableBalance.minus(estimatedFees);
|
|
44
39
|
}
|
|
45
40
|
else {
|
|
46
41
|
amount = new BigNumber(transaction.amount);
|
|
@@ -54,7 +49,7 @@ export const getTransactionStatus = async (account, transaction) => {
|
|
|
54
49
|
warnings.amount = new CeloAllFundsWarning();
|
|
55
50
|
}
|
|
56
51
|
if (!["register", "withdraw", "activate"].includes(transaction.mode)) {
|
|
57
|
-
if (amount.lte(0) && !useAllAmount) {
|
|
52
|
+
if (!errors.amount && amount.lte(0) && !useAllAmount) {
|
|
58
53
|
errors.amount = new AmountRequired();
|
|
59
54
|
}
|
|
60
55
|
}
|
|
@@ -78,23 +73,14 @@ export const getTransactionStatus = async (account, transaction) => {
|
|
|
78
73
|
errors.amount = new NotEnoughBalance();
|
|
79
74
|
}
|
|
80
75
|
if (transaction.mode === "send") {
|
|
81
|
-
if (!transaction.recipient
|
|
76
|
+
if (!transaction.recipient) {
|
|
82
77
|
errors.recipient = new RecipientRequired();
|
|
83
78
|
}
|
|
84
|
-
else if (!isValidAddress(transaction.recipient)
|
|
79
|
+
else if (!isValidAddress(transaction.recipient)) {
|
|
85
80
|
errors.recipient = new InvalidAddress("", {
|
|
86
81
|
currencyName: account.currency.name,
|
|
87
82
|
});
|
|
88
83
|
}
|
|
89
|
-
if (isTokenTransaction) {
|
|
90
|
-
return {
|
|
91
|
-
errors,
|
|
92
|
-
warnings,
|
|
93
|
-
estimatedFees,
|
|
94
|
-
amount,
|
|
95
|
-
totalSpent: amount,
|
|
96
|
-
};
|
|
97
|
-
}
|
|
98
84
|
}
|
|
99
85
|
return {
|
|
100
86
|
errors,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,cAAc,EACd,4CAA4C,EAC5C,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iCAAiC,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAQ5E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,cAAc,CAa5F;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,CAAC,UAAU,CAAC,GACvC,aAAa,CAAC,WAAW,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAsB5D;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC,UAAU,CAAC;;;EAKrE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,8BAA8B,EAC9B,iBAAiB,EACjB,wBAAwB,EACxB,gBAAgB,GACjB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,8BAA8B,EAC9B,iBAAiB,EACjB,wBAAwB,EACxB,gBAAgB,GACjB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,iBAAiB,MAAM,mDAAmD,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,MAAM,UAAU,mBAAmB,CAAC,aAAwC;IAC1E,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,gBAAgB,CAAC;QACpC,eAAe;QACf,YAAY,EAAE,iBAAiB,CAAC,UAAU,CAAC;KAC5C,CAAC,CAAC;IAEH,OAAO;QACL,kBAAkB;QAClB,OAAO;QACP,OAAO;QACP,YAAY;KACb,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,aAAwC;IAExC,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;IACxE,MAAM,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAExD,OAAO;QACL,oBAAoB;QACpB,iBAAiB;QACjB,iBAAiB;QACjB,oBAAoB;QACpB,kBAAkB;QAClB,IAAI;QACJ,OAAO;QACP,aAAa;QACb,SAAS;QACT,8BAA8B;QAC9B,oBAAoB;QACpB,kBAAkB;QAClB,mBAAmB;QACnB,qBAAqB;KACtB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,aAAwC;IACpE,OAAO;QACL,cAAc,EAAE,mBAAmB,CAAC,aAAa,CAAC;QAClD,aAAa,EAAE,kBAAkB,CAAC,aAAa,CAAC;KACjD,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIpD,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAC5C,WAAW,EACX,WAAW,CACZ,CAAC,oBAAoB,CAmBrB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
2
|
import { isValidAddress } from "@celo/utils/lib/address";
|
|
3
3
|
import getFeesForTransaction from "./getFeesForTransaction";
|
|
4
|
-
|
|
5
|
-
import { CELO_STABLE_TOKENS, MAX_PRIORITY_FEE_PER_GAS } from "../constants";
|
|
6
|
-
import { celoKit } from "../network/sdk";
|
|
4
|
+
const sameFees = (a, b) => (!a || !b ? a === b : a.eq(b));
|
|
7
5
|
export const prepareTransaction = async (account, transaction) => {
|
|
8
|
-
const kit = celoKit();
|
|
9
6
|
if (transaction.recipient && !isValidAddress(transaction.recipient))
|
|
10
7
|
return transaction;
|
|
11
8
|
if (["send", "vote"].includes(transaction.mode) && !transaction.recipient)
|
|
@@ -15,36 +12,10 @@ export const prepareTransaction = async (account, transaction) => {
|
|
|
15
12
|
new BigNumber(transaction.amount).lte(0))
|
|
16
13
|
return transaction;
|
|
17
14
|
const fees = await getFeesForTransaction({ account, transaction });
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const amount = transaction.useAllAmount && isTokenTransaction ? tokenAccount.balance : transaction.amount;
|
|
21
|
-
let token;
|
|
22
|
-
if (isTokenTransaction) {
|
|
23
|
-
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
24
|
-
token = await kit.contracts.getStableToken();
|
|
25
|
-
}
|
|
26
|
-
else {
|
|
27
|
-
token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
|
|
28
|
-
}
|
|
15
|
+
if (!sameFees(transaction.fees, fees)) {
|
|
16
|
+
return { ...transaction, fees };
|
|
29
17
|
}
|
|
30
|
-
|
|
31
|
-
token = await kit.contracts.getGoldToken();
|
|
32
|
-
}
|
|
33
|
-
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
34
|
-
const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
|
|
35
|
-
const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
|
|
36
|
-
return {
|
|
37
|
-
...transaction,
|
|
38
|
-
amount,
|
|
39
|
-
fees,
|
|
40
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
41
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
42
|
-
...(isTokenTransaction
|
|
43
|
-
? {
|
|
44
|
-
data: Buffer.from(token.transfer(transaction.recipient, amount.toFixed()).txo.encodeABI()),
|
|
45
|
-
}
|
|
46
|
-
: {}),
|
|
47
|
-
};
|
|
18
|
+
return transaction;
|
|
48
19
|
};
|
|
49
20
|
export default prepareTransaction;
|
|
50
21
|
//# sourceMappingURL=prepareTransaction.js.map
|