@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
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-celo@1.
|
|
2
|
+
> @ledgerhq/coin-celo@1.3.0 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-celo
|
|
3
3
|
> tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es
|
|
4
4
|
|
package/.unimportedrc.json
CHANGED
|
@@ -12,10 +12,13 @@
|
|
|
12
12
|
"**/*.mock.ts",
|
|
13
13
|
"**/*.test.{js,jsx,ts,tsx}"
|
|
14
14
|
],
|
|
15
|
-
"ignoreUnresolved": [
|
|
15
|
+
"ignoreUnresolved": [
|
|
16
|
+
"jest-get-type",
|
|
17
|
+
"jest-matcher-utils",
|
|
18
|
+
"jest-message-util"
|
|
19
|
+
],
|
|
16
20
|
"ignoreUnimported": [
|
|
17
21
|
"src/bridge/transaction.ts",
|
|
18
|
-
"src/bridge/fixtures.ts",
|
|
19
22
|
"src/config.ts",
|
|
20
23
|
"src/datasets/celo.scanAccounts.1.ts",
|
|
21
24
|
"src/errors.ts",
|
|
@@ -50,4 +53,4 @@
|
|
|
50
53
|
"rlp",
|
|
51
54
|
"rxjs"
|
|
52
55
|
]
|
|
53
|
-
}
|
|
56
|
+
}
|
package/CHANGELOG.md
CHANGED
|
@@ -1,52 +1,44 @@
|
|
|
1
1
|
# @ledgerhq/coin-celo
|
|
2
2
|
|
|
3
|
-
## 1.3.0
|
|
3
|
+
## 1.3.0
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
7
|
-
- [#
|
|
7
|
+
- [#11454](https://github.com/LedgerHQ/ledger-live/pull/11454) [`212f772`](https://github.com/LedgerHQ/ledger-live/commit/212f772b17dc3db97009ebe62912f8f183c1ef2e) Thanks [@francois-guerin-ledger](https://github.com/francois-guerin-ledger)! - chore(coin-modules): add `eqeqeq` ESLint rule
|
|
8
8
|
|
|
9
9
|
### Patch Changes
|
|
10
10
|
|
|
11
|
-
- Updated dependencies [[`
|
|
12
|
-
- @ledgerhq/
|
|
13
|
-
- @ledgerhq/coin-evm@2.29.0
|
|
14
|
-
- @ledgerhq/coin-framework@6.3.0
|
|
15
|
-
- @ledgerhq/
|
|
11
|
+
- Updated dependencies [[`12277dc`](https://github.com/LedgerHQ/ledger-live/commit/12277dcb478f24152060e3e11e2eb37d650b5b60), [`212f772`](https://github.com/LedgerHQ/ledger-live/commit/212f772b17dc3db97009ebe62912f8f183c1ef2e), [`acdc089`](https://github.com/LedgerHQ/ledger-live/commit/acdc089f934461dd2fdfdfd61aa907f1520a5d7b), [`a9a0c18`](https://github.com/LedgerHQ/ledger-live/commit/a9a0c18d91cac8d4bb805d558d3d0bd50337d98a), [`87617a9`](https://github.com/LedgerHQ/ledger-live/commit/87617a9930be43a6cdbc5cc5711cc24b00309184), [`9fcc4eb`](https://github.com/LedgerHQ/ledger-live/commit/9fcc4eb5cd6e96e772daa154bd87ae374f925ddc), [`e9fa7aa`](https://github.com/LedgerHQ/ledger-live/commit/e9fa7aa8c8d0414416ec7c12acf30b7623b2eda3), [`d6a6a94`](https://github.com/LedgerHQ/ledger-live/commit/d6a6a949d45fdd2f97f15842c808bf6d1058403f), [`2834ca4`](https://github.com/LedgerHQ/ledger-live/commit/2834ca443fe9071979d3b506e4ca4fbc17aeca7b), [`e8899f0`](https://github.com/LedgerHQ/ledger-live/commit/e8899f0dac12c6ca9c655c121eeb907f6bbad844), [`8936f39`](https://github.com/LedgerHQ/ledger-live/commit/8936f390edbe9cbc36ac6590b01562daf5c580e1), [`2a4070b`](https://github.com/LedgerHQ/ledger-live/commit/2a4070b594271007fa47dc7451b612008a233006), [`0356d19`](https://github.com/LedgerHQ/ledger-live/commit/0356d1904dbb5e856970fa7e7ebb206eed7b4c5d), [`516176d`](https://github.com/LedgerHQ/ledger-live/commit/516176d18c7f53961799e92e8804c4a756684266)]:
|
|
12
|
+
- @ledgerhq/cryptoassets@13.27.0
|
|
13
|
+
- @ledgerhq/coin-evm@2.29.0
|
|
14
|
+
- @ledgerhq/coin-framework@6.3.0
|
|
15
|
+
- @ledgerhq/live-env@2.15.0
|
|
16
|
+
- @ledgerhq/types-live@6.83.0
|
|
17
|
+
- @ledgerhq/live-config@3.2.0
|
|
18
|
+
- @ledgerhq/errors@6.25.0
|
|
19
|
+
- @ledgerhq/live-network@2.0.16
|
|
20
|
+
- @ledgerhq/hw-app-eth@6.45.17
|
|
21
|
+
- @ledgerhq/devices@8.5.1
|
|
16
22
|
|
|
17
|
-
## 1.
|
|
23
|
+
## 1.3.0-next.0
|
|
18
24
|
|
|
19
|
-
###
|
|
20
|
-
|
|
21
|
-
- Updated dependencies [[`776fae2`](https://github.com/LedgerHQ/ledger-live/commit/776fae24bf98f4695ea729885259e6b1b0a2fc14)]:
|
|
22
|
-
- @ledgerhq/coin-evm@2.29.0-nightly.3
|
|
23
|
-
|
|
24
|
-
## 1.2.2-nightly.2
|
|
25
|
-
|
|
26
|
-
### Patch Changes
|
|
27
|
-
|
|
28
|
-
- Updated dependencies [[`66f17a3`](https://github.com/LedgerHQ/ledger-live/commit/66f17a31349c518c232934b68269d84fa5b6ab0f)]:
|
|
29
|
-
- @ledgerhq/coin-evm@2.29.0-nightly.2
|
|
30
|
-
|
|
31
|
-
## 1.2.2-nightly.1
|
|
32
|
-
|
|
33
|
-
### Patch Changes
|
|
34
|
-
|
|
35
|
-
- Updated dependencies [[`2482195`](https://github.com/LedgerHQ/ledger-live/commit/24821957c838a304be60ff6e16798ef3cac987cd), [`228ed30`](https://github.com/LedgerHQ/ledger-live/commit/228ed3030601644e807e85a1693276b788b5cd2a), [`89fc31e`](https://github.com/LedgerHQ/ledger-live/commit/89fc31e8ecfc5e2fd679a2694b3514f8fb19d7b7), [`544edf6`](https://github.com/LedgerHQ/ledger-live/commit/544edf6bb461d48e743dc410c6bc95dc35b5fa70)]:
|
|
36
|
-
- @ledgerhq/coin-evm@2.29.0-nightly.1
|
|
37
|
-
- @ledgerhq/coin-framework@6.3.0-nightly.1
|
|
38
|
-
- @ledgerhq/types-live@6.83.0-nightly.0
|
|
39
|
-
- @ledgerhq/hw-app-eth@6.45.17-nightly.0
|
|
25
|
+
### Minor Changes
|
|
40
26
|
|
|
41
|
-
|
|
27
|
+
- [#11454](https://github.com/LedgerHQ/ledger-live/pull/11454) [`212f772`](https://github.com/LedgerHQ/ledger-live/commit/212f772b17dc3db97009ebe62912f8f183c1ef2e) Thanks [@francois-guerin-ledger](https://github.com/francois-guerin-ledger)! - chore(coin-modules): add `eqeqeq` ESLint rule
|
|
42
28
|
|
|
43
29
|
### Patch Changes
|
|
44
30
|
|
|
45
|
-
- Updated dependencies [[`12277dc`](https://github.com/LedgerHQ/ledger-live/commit/12277dcb478f24152060e3e11e2eb37d650b5b60), [`a9a0c18`](https://github.com/LedgerHQ/ledger-live/commit/a9a0c18d91cac8d4bb805d558d3d0bd50337d98a)]:
|
|
46
|
-
- @ledgerhq/cryptoassets@13.27.0-
|
|
47
|
-
- @ledgerhq/coin-evm@2.29.0-
|
|
48
|
-
- @ledgerhq/coin-framework@6.
|
|
49
|
-
- @ledgerhq/
|
|
31
|
+
- Updated dependencies [[`12277dc`](https://github.com/LedgerHQ/ledger-live/commit/12277dcb478f24152060e3e11e2eb37d650b5b60), [`212f772`](https://github.com/LedgerHQ/ledger-live/commit/212f772b17dc3db97009ebe62912f8f183c1ef2e), [`acdc089`](https://github.com/LedgerHQ/ledger-live/commit/acdc089f934461dd2fdfdfd61aa907f1520a5d7b), [`a9a0c18`](https://github.com/LedgerHQ/ledger-live/commit/a9a0c18d91cac8d4bb805d558d3d0bd50337d98a), [`87617a9`](https://github.com/LedgerHQ/ledger-live/commit/87617a9930be43a6cdbc5cc5711cc24b00309184), [`9fcc4eb`](https://github.com/LedgerHQ/ledger-live/commit/9fcc4eb5cd6e96e772daa154bd87ae374f925ddc), [`e9fa7aa`](https://github.com/LedgerHQ/ledger-live/commit/e9fa7aa8c8d0414416ec7c12acf30b7623b2eda3), [`d6a6a94`](https://github.com/LedgerHQ/ledger-live/commit/d6a6a949d45fdd2f97f15842c808bf6d1058403f), [`2834ca4`](https://github.com/LedgerHQ/ledger-live/commit/2834ca443fe9071979d3b506e4ca4fbc17aeca7b), [`e8899f0`](https://github.com/LedgerHQ/ledger-live/commit/e8899f0dac12c6ca9c655c121eeb907f6bbad844), [`8936f39`](https://github.com/LedgerHQ/ledger-live/commit/8936f390edbe9cbc36ac6590b01562daf5c580e1), [`2a4070b`](https://github.com/LedgerHQ/ledger-live/commit/2a4070b594271007fa47dc7451b612008a233006), [`0356d19`](https://github.com/LedgerHQ/ledger-live/commit/0356d1904dbb5e856970fa7e7ebb206eed7b4c5d), [`516176d`](https://github.com/LedgerHQ/ledger-live/commit/516176d18c7f53961799e92e8804c4a756684266)]:
|
|
32
|
+
- @ledgerhq/cryptoassets@13.27.0-next.0
|
|
33
|
+
- @ledgerhq/coin-evm@2.29.0-next.0
|
|
34
|
+
- @ledgerhq/coin-framework@6.3.0-next.0
|
|
35
|
+
- @ledgerhq/live-env@2.15.0-next.0
|
|
36
|
+
- @ledgerhq/types-live@6.83.0-next.0
|
|
37
|
+
- @ledgerhq/live-config@3.2.0-next.0
|
|
38
|
+
- @ledgerhq/errors@6.25.0-next.0
|
|
39
|
+
- @ledgerhq/live-network@2.0.16-next.0
|
|
40
|
+
- @ledgerhq/hw-app-eth@6.45.17-next.0
|
|
41
|
+
- @ledgerhq/devices@8.5.1-next.0
|
|
50
42
|
|
|
51
43
|
## 1.2.1
|
|
52
44
|
|
|
@@ -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"}
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.buildOptimisticOperation = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const operation_1 = require("@ledgerhq/coin-framework/operation");
|
|
9
|
-
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
10
9
|
const MODE_TO_TYPE = {
|
|
11
10
|
send: "OUT",
|
|
12
11
|
lock: "LOCK",
|
|
@@ -20,10 +19,8 @@ const MODE_TO_TYPE = {
|
|
|
20
19
|
};
|
|
21
20
|
const buildOptimisticOperation = (account, transaction, fee) => {
|
|
22
21
|
const type = MODE_TO_TYPE[transaction.mode] ?? MODE_TO_TYPE.default;
|
|
23
|
-
const tokenAccount = (0, index_1.findSubAccountById)(account, transaction.subAccountId || "");
|
|
24
|
-
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
25
22
|
const value = type === "OUT" || type === "LOCK"
|
|
26
|
-
? new bignumber_js_1.default(transaction.amount).plus(
|
|
23
|
+
? new bignumber_js_1.default(transaction.amount).plus(fee)
|
|
27
24
|
: new bignumber_js_1.default(transaction.amount);
|
|
28
25
|
const operation = {
|
|
29
26
|
id: (0, operation_1.encodeOperationId)(account.id, "", type),
|
|
@@ -35,7 +32,7 @@ const buildOptimisticOperation = (account, transaction, fee) => {
|
|
|
35
32
|
blockHeight: null,
|
|
36
33
|
senders: [account.freshAddress],
|
|
37
34
|
recipients: [transaction.recipient].filter(Boolean),
|
|
38
|
-
accountId:
|
|
35
|
+
accountId: account.id,
|
|
39
36
|
date: new Date(),
|
|
40
37
|
extra: {
|
|
41
38
|
celoOperationValue: new bignumber_js_1.default(transaction.amount),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildOptimisticOperation.js","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAGrC,kEAAuE;
|
|
1
|
+
{"version":3,"file":"buildOptimisticOperation.js","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAGrC,kEAAuE;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;AAEK,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,sBAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC7C,CAAC,CAAC,IAAI,sBAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,SAAS,GAAkB;QAC/B,EAAE,EAAE,IAAA,6BAAiB,EAAC,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,sBAAS,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;AAnCW,QAAA,wBAAwB,4BAmCnC"}
|
|
@@ -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"}
|
|
@@ -3,13 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const sdk_1 = require("../network/sdk");
|
|
4
4
|
const bignumber_js_1 = require("bignumber.js");
|
|
5
5
|
const logic_1 = require("../logic");
|
|
6
|
-
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
7
|
-
const constants_1 = require("../constants");
|
|
8
6
|
const buildTransaction = async (account, transaction) => {
|
|
9
7
|
const kit = (0, sdk_1.celoKit)();
|
|
10
|
-
const
|
|
11
|
-
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
12
|
-
let value = transactionValue(account, transaction);
|
|
8
|
+
const value = transactionValue(account, transaction);
|
|
13
9
|
let celoTransaction;
|
|
14
10
|
if (transaction.mode === "lock") {
|
|
15
11
|
const lockedGold = await kit.contracts.getLockedGold();
|
|
@@ -101,27 +97,6 @@ const buildTransaction = async (account, transaction) => {
|
|
|
101
97
|
gas: await accounts.createAccount().txo.estimateGas({ from: account.freshAddress }),
|
|
102
98
|
};
|
|
103
99
|
}
|
|
104
|
-
else if (isTokenTransaction) {
|
|
105
|
-
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
106
|
-
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
107
|
-
const baseFee = BigInt(block.baseFeePerGas || constants_1.MAX_PRIORITY_FEE_PER_GAS);
|
|
108
|
-
const maxFeePerGas = baseFee + constants_1.MAX_PRIORITY_FEE_PER_GAS;
|
|
109
|
-
let token;
|
|
110
|
-
if (constants_1.CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
111
|
-
token = await kit.contracts.getStableToken((0, constants_1.getStableTokenEnum)(tokenAccount.token.id));
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
|
|
115
|
-
}
|
|
116
|
-
celoTransaction = {
|
|
117
|
-
from: account.freshAddress,
|
|
118
|
-
to: transaction.recipient,
|
|
119
|
-
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
120
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
121
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
122
|
-
value: value.toFixed(),
|
|
123
|
-
};
|
|
124
|
-
}
|
|
125
100
|
else {
|
|
126
101
|
// Send
|
|
127
102
|
celoTransaction = {
|
|
@@ -129,12 +104,14 @@ const buildTransaction = async (account, transaction) => {
|
|
|
129
104
|
to: transaction.recipient,
|
|
130
105
|
value: value.toFixed(),
|
|
131
106
|
};
|
|
107
|
+
const gas = await kit.connection.estimateGasWithInflationFactor(celoTransaction);
|
|
108
|
+
celoTransaction = {
|
|
109
|
+
...celoTransaction,
|
|
110
|
+
gas,
|
|
111
|
+
};
|
|
132
112
|
}
|
|
133
|
-
const gas = ((await kit.connection.estimateGasWithInflationFactor(celoTransaction)) *
|
|
134
|
-
constants_1.MAX_FEES_THRESHOLD_MULTIPLIER).toFixed();
|
|
135
113
|
const tx = {
|
|
136
114
|
...celoTransaction,
|
|
137
|
-
gas,
|
|
138
115
|
chainId: await kit.connection.chainId(),
|
|
139
116
|
nonce: await kit.connection.nonce(account.freshAddress),
|
|
140
117
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":";;AAEA,wCAAyC;AACzC,+CAAyC;AACzC,oCAAsE;
|
|
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"}
|
|
@@ -8,23 +8,15 @@ const getTransactionStatus_1 = __importDefault(require("./getTransactionStatus")
|
|
|
8
8
|
const prepareTransaction_1 = __importDefault(require("./prepareTransaction"));
|
|
9
9
|
const createTransaction_1 = __importDefault(require("./createTransaction"));
|
|
10
10
|
const helpers_1 = require("@ledgerhq/coin-framework/account/helpers");
|
|
11
|
-
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
12
11
|
const estimateMaxSpendable = async ({ account, parentAccount, transaction }) => {
|
|
13
12
|
const mainAccount = (0, helpers_1.getMainAccount)(account, parentAccount);
|
|
14
|
-
const tokenAccount = (0, helpers_1.findSubAccountById)(mainAccount, transaction?.subAccountId ?? "");
|
|
15
|
-
const fromTokenAccount = tokenAccount && (0, helpers_1.isTokenAccount)(tokenAccount);
|
|
16
13
|
const t = await (0, prepareTransaction_1.default)(mainAccount, {
|
|
17
14
|
...(0, createTransaction_1.default)(account),
|
|
18
15
|
...transaction,
|
|
19
16
|
useAllAmount: true,
|
|
20
17
|
});
|
|
21
18
|
const { amount } = await (0, getTransactionStatus_1.default)(mainAccount, t);
|
|
22
|
-
|
|
23
|
-
return fromTokenAccount
|
|
24
|
-
? tokenAccount.spendableBalance
|
|
25
|
-
: account.spendableBalance.gt(fees)
|
|
26
|
-
? amount.minus(fees)
|
|
27
|
-
: new bignumber_js_1.default(0);
|
|
19
|
+
return amount;
|
|
28
20
|
};
|
|
29
21
|
exports.estimateMaxSpendable = estimateMaxSpendable;
|
|
30
22
|
exports.default = exports.estimateMaxSpendable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":";;;;;;AAEA,kFAA0D;AAC1D,8EAAsD;AACtD,4EAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":";;;;;;AAEA,kFAA0D;AAC1D,8EAAsD;AACtD,4EAAoD;AACpD,sEAA0E;AAEnE,MAAM,oBAAoB,GAGL,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,EAAE;IAC5E,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3D,MAAM,CAAC,GAAG,MAAM,IAAA,4BAAkB,EAAC,WAAW,EAAE;QAC9C,GAAG,IAAA,2BAAiB,EAAC,OAAO,CAAC;QAC7B,GAAG,WAAW;QACd,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,8BAAoB,EAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAZW,QAAA,oBAAoB,wBAY/B;AAEF,kBAAe,4BAAoB,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,14 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
7
3
|
const bignumber_js_1 = require("bignumber.js");
|
|
8
4
|
const sdk_1 = require("../network/sdk");
|
|
9
5
|
const logic_1 = require("../logic");
|
|
10
|
-
const buildTransaction_1 = __importDefault(require("./buildTransaction"));
|
|
11
|
-
const constants_1 = require("../constants");
|
|
12
6
|
const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
13
7
|
const { amount, index } = transaction;
|
|
14
8
|
const kit = (0, sdk_1.celoKit)();
|
|
@@ -21,8 +15,6 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
21
15
|
const totalNonVotingLockedBalance = nonvotingLockedGoldBalance.minus(pendingOperationAmounts.vote);
|
|
22
16
|
// Deduct pending lock operations from the spendable balance
|
|
23
17
|
const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
|
|
24
|
-
const tokenAccount = (0, index_1.findSubAccountById)(account, transaction.subAccountId || "");
|
|
25
|
-
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
26
18
|
if ((transaction.mode === "unlock" || transaction.mode === "vote") && account.celoResources) {
|
|
27
19
|
value = transaction.useAllAmount
|
|
28
20
|
? totalNonVotingLockedBalance
|
|
@@ -85,33 +77,14 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
85
77
|
const accounts = await kit.contracts.getAccounts();
|
|
86
78
|
gas = await accounts.createAccount().txo.estimateGas({ from: account.freshAddress });
|
|
87
79
|
}
|
|
88
|
-
else
|
|
89
|
-
|
|
90
|
-
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
91
|
-
const baseFee = BigInt(block.baseFeePerGas || constants_1.MAX_PRIORITY_FEE_PER_GAS);
|
|
92
|
-
const maxFeePerGas = baseFee + constants_1.MAX_PRIORITY_FEE_PER_GAS;
|
|
93
|
-
let token;
|
|
94
|
-
if (constants_1.CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
95
|
-
token = await kit.contracts.getStableToken((0, constants_1.getStableTokenEnum)(tokenAccount.token.id));
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
98
|
-
token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
|
|
99
|
-
}
|
|
80
|
+
else {
|
|
81
|
+
const celoToken = await kit.contracts.getGoldToken();
|
|
100
82
|
const celoTransaction = {
|
|
101
83
|
from: account.freshAddress,
|
|
102
|
-
to:
|
|
103
|
-
data:
|
|
104
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
105
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
106
|
-
value: value.toFixed(),
|
|
84
|
+
to: celoToken.address,
|
|
85
|
+
data: celoToken.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
107
86
|
};
|
|
108
|
-
gas =
|
|
109
|
-
constants_1.MAX_FEES_THRESHOLD_MULTIPLIER).toFixed());
|
|
110
|
-
}
|
|
111
|
-
else {
|
|
112
|
-
// Send
|
|
113
|
-
const tx = await (0, buildTransaction_1.default)(account, transaction);
|
|
114
|
-
gas = tx.gas ? Number(tx.gas) : 0;
|
|
87
|
+
gas = await kit.connection.estimateGasWithInflationFactor(celoTransaction);
|
|
115
88
|
}
|
|
116
89
|
const gasPrice = new bignumber_js_1.BigNumber(await kit.connection.gasPrice());
|
|
117
90
|
return gasPrice.times(gas);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.js","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -7,7 +7,6 @@ const address_1 = require("@celo/utils/lib/address");
|
|
|
7
7
|
const logic_1 = require("../logic");
|
|
8
8
|
const errors_2 = require("../errors");
|
|
9
9
|
const sdk_1 = require("../network/sdk");
|
|
10
|
-
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
11
10
|
const kit = (0, sdk_1.celoKit)();
|
|
12
11
|
// Arbitrary buffer for paying fees of next transactions. 0.05 Celo for ~100 transactions
|
|
13
12
|
const FEES_SAFETY_BUFFER = new bignumber_js_1.BigNumber(5000000000000000);
|
|
@@ -29,8 +28,6 @@ const getTransactionStatus = async (account, transaction) => {
|
|
|
29
28
|
// Deduct pending lock operations from the spendable balance
|
|
30
29
|
const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
|
|
31
30
|
const estimatedFees = transaction.fees || new bignumber_js_1.BigNumber(0);
|
|
32
|
-
const tokenAccount = (0, index_1.findSubAccountById)(account, transaction.subAccountId || "");
|
|
33
|
-
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
34
31
|
let amount = new bignumber_js_1.BigNumber(0);
|
|
35
32
|
if (useAllAmount && (transaction.mode === "unlock" || transaction.mode === "vote")) {
|
|
36
33
|
amount = totalNonVotingLockedBalance ?? new bignumber_js_1.BigNumber(0);
|
|
@@ -41,9 +38,7 @@ const getTransactionStatus = async (account, transaction) => {
|
|
|
41
38
|
amount = revoke.amount;
|
|
42
39
|
}
|
|
43
40
|
else if (useAllAmount) {
|
|
44
|
-
amount =
|
|
45
|
-
? tokenAccount.spendableBalance
|
|
46
|
-
: totalSpendableBalance.minus(estimatedFees);
|
|
41
|
+
amount = totalSpendableBalance.minus(estimatedFees);
|
|
47
42
|
}
|
|
48
43
|
else {
|
|
49
44
|
amount = new bignumber_js_1.BigNumber(transaction.amount);
|
|
@@ -57,7 +52,7 @@ const getTransactionStatus = async (account, transaction) => {
|
|
|
57
52
|
warnings.amount = new errors_2.CeloAllFundsWarning();
|
|
58
53
|
}
|
|
59
54
|
if (!["register", "withdraw", "activate"].includes(transaction.mode)) {
|
|
60
|
-
if (amount.lte(0) && !useAllAmount) {
|
|
55
|
+
if (!errors.amount && amount.lte(0) && !useAllAmount) {
|
|
61
56
|
errors.amount = new errors_1.AmountRequired();
|
|
62
57
|
}
|
|
63
58
|
}
|
|
@@ -81,23 +76,14 @@ const getTransactionStatus = async (account, transaction) => {
|
|
|
81
76
|
errors.amount = new errors_1.NotEnoughBalance();
|
|
82
77
|
}
|
|
83
78
|
if (transaction.mode === "send") {
|
|
84
|
-
if (!transaction.recipient
|
|
79
|
+
if (!transaction.recipient) {
|
|
85
80
|
errors.recipient = new errors_1.RecipientRequired();
|
|
86
81
|
}
|
|
87
|
-
else if (!(0, address_1.isValidAddress)(transaction.recipient)
|
|
82
|
+
else if (!(0, address_1.isValidAddress)(transaction.recipient)) {
|
|
88
83
|
errors.recipient = new errors_1.InvalidAddress("", {
|
|
89
84
|
currencyName: account.currency.name,
|
|
90
85
|
});
|
|
91
86
|
}
|
|
92
|
-
if (isTokenTransaction) {
|
|
93
|
-
return {
|
|
94
|
-
errors,
|
|
95
|
-
warnings,
|
|
96
|
-
estimatedFees,
|
|
97
|
-
amount,
|
|
98
|
-
totalSpent: amount,
|
|
99
|
-
};
|
|
100
|
-
}
|
|
101
87
|
}
|
|
102
88
|
return {
|
|
103
89
|
errors,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":";;;AAAA,6CAO0B;AAC1B,+CAAyC;AAEzC,qDAAyD;AACzD,oCAAsE;AAEtE,sCAAgD;AAChD,wCAAyC;
|
|
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"}
|
package/lib/bridge/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":";;;;;AA8BA,kDAaC;AAED,gDAwBC;AAED,sCAKC;AA3ED,yEAKmD;AACnD,uCAAiE;AACjE,iEAA8D;AAC9D,iEAA8D;AAC9D,6DAA0D;AAC1D,2DAAwD;AACxD,mDAKyB;AAEzB,4EAA+C;AAE/C,2CAAwC;AAGxC,0GAAkF;AAClF,uDAAoD;AACpD,mDAAqD;AACrD,uDAAyC;AAGzC,SAAgB,mBAAmB,CAAC,aAAwC;IAC1E,MAAM,UAAU,GAAG,IAAA,uBAAQ,EAAC,aAAa,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC;QACpC,eAAe,EAAf,iCAAe;QACf,YAAY,EAAE,IAAA,2BAAiB,EAAC,UAAU,CAAC;KAC5C,CAAC,CAAC;IAEH,OAAO;QACL,kBAAkB,EAAlB,4BAAkB;QAClB,OAAO,EAAP,iBAAO;QACP,OAAO,EAAP,iBAAO;QACP,YAAY;KACb,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAChC,aAAwC;IAExC,MAAM,UAAU,GAAG,IAAA,uBAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAG,IAAA,oCAAwB,EAAC,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC,CAAC;IACxE,MAAM,aAAa,GAAG,IAAA,kCAAkB,EAAC,aAAa,CAAC,CAAC;IAExD,OAAO;QACL,oBAAoB,EAApB,2CAAoB;QACpB,iBAAiB,EAAjB,qCAAiB;QACjB,iBAAiB,EAAjB,6BAAiB;QACjB,oBAAoB,EAApB,2CAAoB;QACpB,kBAAkB,EAAlB,uCAAkB;QAClB,IAAI,EAAJ,sBAAI;QACJ,OAAO;QACP,aAAa;QACb,SAAS,EAAT,qBAAS;QACT,8BAA8B,EAA9B,0CAA8B;QAC9B,oBAAoB,EAApB,oCAAoB;QACpB,kBAAkB,EAAlB,kCAAkB;QAClB,mBAAmB,EAAnB,mCAAmB;QACnB,qBAAqB,EAArB,qCAAqB;KACtB,CAAC;AACJ,CAAC;AAED,SAAgB,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"}
|
|
@@ -7,11 +7,8 @@ exports.prepareTransaction = void 0;
|
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const address_1 = require("@celo/utils/lib/address");
|
|
9
9
|
const getFeesForTransaction_1 = __importDefault(require("./getFeesForTransaction"));
|
|
10
|
-
const
|
|
11
|
-
const constants_1 = require("../constants");
|
|
12
|
-
const sdk_1 = require("../network/sdk");
|
|
10
|
+
const sameFees = (a, b) => (!a || !b ? a === b : a.eq(b));
|
|
13
11
|
const prepareTransaction = async (account, transaction) => {
|
|
14
|
-
const kit = (0, sdk_1.celoKit)();
|
|
15
12
|
if (transaction.recipient && !(0, address_1.isValidAddress)(transaction.recipient))
|
|
16
13
|
return transaction;
|
|
17
14
|
if (["send", "vote"].includes(transaction.mode) && !transaction.recipient)
|
|
@@ -21,36 +18,10 @@ const prepareTransaction = async (account, transaction) => {
|
|
|
21
18
|
new bignumber_js_1.default(transaction.amount).lte(0))
|
|
22
19
|
return transaction;
|
|
23
20
|
const fees = await (0, getFeesForTransaction_1.default)({ account, transaction });
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
const amount = transaction.useAllAmount && isTokenTransaction ? tokenAccount.balance : transaction.amount;
|
|
27
|
-
let token;
|
|
28
|
-
if (isTokenTransaction) {
|
|
29
|
-
if (constants_1.CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
30
|
-
token = await kit.contracts.getStableToken();
|
|
31
|
-
}
|
|
32
|
-
else {
|
|
33
|
-
token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
|
|
34
|
-
}
|
|
21
|
+
if (!sameFees(transaction.fees, fees)) {
|
|
22
|
+
return { ...transaction, fees };
|
|
35
23
|
}
|
|
36
|
-
|
|
37
|
-
token = await kit.contracts.getGoldToken();
|
|
38
|
-
}
|
|
39
|
-
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
40
|
-
const baseFee = BigInt(block.baseFeePerGas || constants_1.MAX_PRIORITY_FEE_PER_GAS);
|
|
41
|
-
const maxFeePerGas = baseFee + constants_1.MAX_PRIORITY_FEE_PER_GAS;
|
|
42
|
-
return {
|
|
43
|
-
...transaction,
|
|
44
|
-
amount,
|
|
45
|
-
fees,
|
|
46
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
47
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
48
|
-
...(isTokenTransaction
|
|
49
|
-
? {
|
|
50
|
-
data: Buffer.from(token.transfer(transaction.recipient, amount.toFixed()).txo.encodeABI()),
|
|
51
|
-
}
|
|
52
|
-
: {}),
|
|
53
|
-
};
|
|
24
|
+
return transaction;
|
|
54
25
|
};
|
|
55
26
|
exports.prepareTransaction = prepareTransaction;
|
|
56
27
|
exports.default = exports.prepareTransaction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,qDAAyD;AACzD,oFAA4D;AAG5D,MAAM,QAAQ,GAAG,CAAC,CAA+B,EAAE,CAAY,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAE5F,MAAM,kBAAkB,GAGL,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IACvD,IAAI,WAAW,CAAC,SAAS,IAAI,CAAC,IAAA,wBAAc,EAAC,WAAW,CAAC,SAAS,CAAC;QAAE,OAAO,WAAW,CAAC;IAExF,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS;QAAE,OAAO,WAAW,CAAC;IAE9F,IACE,WAAW,CAAC,IAAI,KAAK,MAAM;QAC3B,CAAC,WAAW,CAAC,YAAY;QACzB,IAAI,sBAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAExC,OAAO,WAAW,CAAC;IAErB,MAAM,IAAI,GAAG,MAAM,IAAA,+BAAqB,EAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAEnE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,GAAG,WAAW,EAAE,IAAI,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAtBW,QAAA,kBAAkB,sBAsB7B;AAEF,kBAAe,0BAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,aAAa,EAAgC,MAAM,sBAAsB,CAAC;AAIjG,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,aAAa,EAAgC,MAAM,sBAAsB,CAAC;AAIjG,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC;;GAEG;AACH,eAAO,MAAM,kBAAkB,kBACb,aAAa,CAAC,UAAU,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAyElF,CAAC;AA6BP,eAAe,kBAAkB,CAAC"}
|
|
@@ -8,7 +8,6 @@ const bignumber_js_1 = require("bignumber.js");
|
|
|
8
8
|
const rxjs_1 = require("rxjs");
|
|
9
9
|
const errors_1 = require("@ledgerhq/errors");
|
|
10
10
|
const wallet_base_1 = require("@celo/wallet-base");
|
|
11
|
-
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
12
11
|
const buildOptimisticOperation_1 = require("./buildOptimisticOperation");
|
|
13
12
|
const buildTransaction_1 = __importDefault(require("./buildTransaction"));
|
|
14
13
|
const sdk_1 = require("../network/sdk");
|
|
@@ -23,19 +22,12 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId,
|
|
|
23
22
|
throw new errors_1.FeeNotLoaded();
|
|
24
23
|
const unsignedTransaction = await (0, buildTransaction_1.default)(account, transaction);
|
|
25
24
|
const { chainId, to } = unsignedTransaction;
|
|
26
|
-
const subAccount = (0, index_1.findSubAccountById)(account, transaction.subAccountId ?? "");
|
|
27
|
-
const isTokenTransaction = subAccount?.type === "TokenAccount";
|
|
28
25
|
await signerContext(deviceId, signer => {
|
|
29
|
-
return signer.verifyTokenInfo(
|
|
26
|
+
return signer.verifyTokenInfo(to, chainId);
|
|
30
27
|
});
|
|
31
|
-
|
|
32
|
-
...unsignedTransaction,
|
|
33
|
-
to: isTokenTransaction ? subAccount.token.contractAddress : to,
|
|
34
|
-
value: isTokenTransaction ? 0 : unsignedTransaction.value,
|
|
35
|
-
};
|
|
36
|
-
await (0, sdk_1.determineFees)(finalTransaction);
|
|
28
|
+
await (0, sdk_1.determineFees)(unsignedTransaction);
|
|
37
29
|
const rlpEncodedTransaction = await signerContext(deviceId, signer => {
|
|
38
|
-
return signer.rlpEncodedTxForLedger(
|
|
30
|
+
return signer.rlpEncodedTxForLedger(unsignedTransaction);
|
|
39
31
|
});
|
|
40
32
|
o.next({ type: "device-signature-requested" });
|
|
41
33
|
const response = (await signerContext(deviceId, signer => {
|