@ledgerhq/coin-celo 1.4.2-nightly.1 → 1.5.0-nightly.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +16 -0
- package/lib/__tests__/bridge/getFeesForTransaction.test.js +1 -0
- package/lib/__tests__/bridge/getFeesForTransaction.test.js.map +1 -1
- package/lib/__tests__/bridge/prepareTransaction.test.js +1 -7
- package/lib/__tests__/bridge/prepareTransaction.test.js.map +1 -1
- package/lib/bridge/buildTransaction.d.ts.map +1 -1
- package/lib/bridge/buildTransaction.js +3 -4
- package/lib/bridge/buildTransaction.js.map +1 -1
- package/lib/bridge/getFeesForTransaction.d.ts.map +1 -1
- package/lib/bridge/getFeesForTransaction.js +11 -5
- package/lib/bridge/getFeesForTransaction.js.map +1 -1
- package/lib/bridge/prepareTransaction.d.ts.map +1 -1
- package/lib/bridge/prepareTransaction.js +0 -5
- package/lib/bridge/prepareTransaction.js.map +1 -1
- package/lib/bridge/signOperation.js +3 -3
- package/lib/bridge/signOperation.js.map +1 -1
- package/lib/constants.d.ts +0 -1
- package/lib/constants.d.ts.map +1 -1
- package/lib/constants.js +1 -2
- package/lib/constants.js.map +1 -1
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.js +1 -0
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.js.map +1 -1
- package/lib-es/__tests__/bridge/prepareTransaction.test.js +1 -7
- package/lib-es/__tests__/bridge/prepareTransaction.test.js.map +1 -1
- package/lib-es/bridge/buildTransaction.d.ts.map +1 -1
- package/lib-es/bridge/buildTransaction.js +4 -5
- package/lib-es/bridge/buildTransaction.js.map +1 -1
- package/lib-es/bridge/getFeesForTransaction.d.ts.map +1 -1
- package/lib-es/bridge/getFeesForTransaction.js +12 -6
- package/lib-es/bridge/getFeesForTransaction.js.map +1 -1
- package/lib-es/bridge/prepareTransaction.d.ts.map +1 -1
- package/lib-es/bridge/prepareTransaction.js +1 -6
- package/lib-es/bridge/prepareTransaction.js.map +1 -1
- package/lib-es/bridge/signOperation.js +3 -3
- package/lib-es/bridge/signOperation.js.map +1 -1
- package/lib-es/constants.d.ts +0 -1
- package/lib-es/constants.d.ts.map +1 -1
- package/lib-es/constants.js +0 -1
- package/lib-es/constants.js.map +1 -1
- package/package.json +5 -5
- package/src/__tests__/bridge/getFeesForTransaction.test.ts +1 -0
- package/src/__tests__/bridge/prepareTransaction.test.ts +1 -7
- package/src/bridge/buildTransaction.ts +3 -5
- package/src/bridge/getFeesForTransaction.ts +12 -6
- package/src/bridge/prepareTransaction.ts +1 -7
- package/src/bridge/signOperation.ts +3 -3
- package/src/constants.ts +0 -1
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-celo@1.
|
|
2
|
+
> @ledgerhq/coin-celo@1.5.0-nightly.2 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/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# @ledgerhq/coin-celo
|
|
2
2
|
|
|
3
|
+
## 1.5.0-nightly.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`2bdc741`](https://github.com/LedgerHQ/ledger-live/commit/2bdc741cf7ae42ca2a7d0eebbe9515d9fdd69603), [`1d9860c`](https://github.com/LedgerHQ/ledger-live/commit/1d9860cd1688131d391579955b40c6710b667db8), [`c8dbf40`](https://github.com/LedgerHQ/ledger-live/commit/c8dbf402268359e225a94782420111e786f875fa)]:
|
|
8
|
+
- @ledgerhq/coin-evm@2.32.0-nightly.2
|
|
9
|
+
- @ledgerhq/cryptoassets@13.30.0-nightly.1
|
|
10
|
+
- @ledgerhq/coin-framework@6.6.0-nightly.2
|
|
11
|
+
- @ledgerhq/types-live@6.86.0-nightly.0
|
|
12
|
+
|
|
13
|
+
## 1.5.0-nightly.2
|
|
14
|
+
|
|
15
|
+
### Minor Changes
|
|
16
|
+
|
|
17
|
+
- [#12025](https://github.com/LedgerHQ/ledger-live/pull/12025) [`30506ec`](https://github.com/LedgerHQ/ledger-live/commit/30506ec9f9327a26ed8d74d13120f450716e365b) Thanks [@may01](https://github.com/may01)! - Update coin-celo to support swap on the device app
|
|
18
|
+
|
|
3
19
|
## 1.4.2-nightly.1
|
|
4
20
|
|
|
5
21
|
### Patch Changes
|
|
@@ -93,6 +93,7 @@ jest.mock("../../network/sdk", () => {
|
|
|
93
93
|
nonce: nonceMock,
|
|
94
94
|
estimateGasWithInflationFactor: jest.fn().mockReturnValue(3),
|
|
95
95
|
gasPrice: jest.fn(async () => (0, bignumber_js_1.default)(2)),
|
|
96
|
+
getMaxPriorityFeePerGas: jest.fn().mockResolvedValue(1),
|
|
96
97
|
},
|
|
97
98
|
})),
|
|
98
99
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.test.js","sourceRoot":"","sources":["../../../src/__tests__/bridge/getFeesForTransaction.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getFeesForTransaction.test.js","sourceRoot":"","sources":["../../../src/__tests__/bridge/getFeesForTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ jest.mock("../../network/sdk", () => {
|
|
|
71
71
|
estimateGasWithInflationFactor: jest.fn().mockReturnValue(3),
|
|
72
72
|
gasPrice: jest.fn(async () => (0, bignumber_js_1.default)(2)),
|
|
73
73
|
web3: { eth: { getBlock: jest.fn().mockResolvedValue({ baseFeePerGas: 10 }) } },
|
|
74
|
-
getMaxPriorityFeePerGas: jest.fn().
|
|
74
|
+
getMaxPriorityFeePerGas: jest.fn().mockReturnValue(1),
|
|
75
75
|
},
|
|
76
76
|
})),
|
|
77
77
|
};
|
|
@@ -181,8 +181,6 @@ describe("prepareTransaction", () => {
|
|
|
181
181
|
index: 0,
|
|
182
182
|
fees: (0, bignumber_js_1.default)(24),
|
|
183
183
|
subAccountId: "subAccountId",
|
|
184
|
-
maxFeePerGas: "1000000010",
|
|
185
|
-
maxPriorityFeePerGas: 1,
|
|
186
184
|
data: Buffer.from("0x73656E645F746F6B656E5F64617461"),
|
|
187
185
|
});
|
|
188
186
|
});
|
|
@@ -205,8 +203,6 @@ describe("prepareTransaction", () => {
|
|
|
205
203
|
index: 0,
|
|
206
204
|
fees: (0, bignumber_js_1.default)(24),
|
|
207
205
|
subAccountId: "subAccountId",
|
|
208
|
-
maxFeePerGas: "1000000010",
|
|
209
|
-
maxPriorityFeePerGas: 1,
|
|
210
206
|
data: Buffer.from("0x73656E645F65726332305F746F6B656E5F64617461"),
|
|
211
207
|
});
|
|
212
208
|
});
|
|
@@ -230,8 +226,6 @@ describe("prepareTransaction", () => {
|
|
|
230
226
|
index: 0,
|
|
231
227
|
fees: (0, bignumber_js_1.default)(24),
|
|
232
228
|
subAccountId: "subAccountId",
|
|
233
|
-
maxFeePerGas: "1000000010",
|
|
234
|
-
maxPriorityFeePerGas: 1,
|
|
235
229
|
data: Buffer.from("0x73656E645F65726332305F746F6B656E5F64617461"),
|
|
236
230
|
});
|
|
237
231
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../../src/__tests__/bridge/prepareTransaction.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../../src/__tests__/bridge/prepareTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAWvC,QAAA,MAAM,gBAAgB,YAAmB,WAAW,eAAe,WAAW,oBAkJ7E,CAAC;AAwBF,eAAe,gBAAgB,CAAC"}
|
|
@@ -104,8 +104,9 @@ const buildTransaction = async (account, transaction) => {
|
|
|
104
104
|
else if (isTokenTransaction) {
|
|
105
105
|
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
106
106
|
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
107
|
-
const
|
|
108
|
-
const
|
|
107
|
+
const maxPriorityFeePerGas = await kit.connection.getMaxPriorityFeePerGas();
|
|
108
|
+
const baseFee = BigInt(block.baseFeePerGas || maxPriorityFeePerGas);
|
|
109
|
+
const maxFeePerGas = baseFee + BigInt(maxPriorityFeePerGas);
|
|
109
110
|
let token;
|
|
110
111
|
if (constants_1.CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
111
112
|
token = await kit.contracts.getStableToken((0, constants_1.getStableTokenEnum)(tokenAccount.token.id));
|
|
@@ -117,8 +118,6 @@ const buildTransaction = async (account, transaction) => {
|
|
|
117
118
|
from: account.freshAddress,
|
|
118
119
|
to: transaction.recipient,
|
|
119
120
|
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
120
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
121
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
122
121
|
value: value.toFixed(),
|
|
123
122
|
};
|
|
124
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":";;AAEA,wCAAyC;AACzC,+CAAyC;AACzC,oCAAsE;AACtE,kEAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":";;AAEA,wCAAyC;AACzC,+CAAyC;AACzC,oCAAsE;AACtE,kEAA4E;AAC5E,4CAIsB;AAEtB,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAAoB,EAAE,WAAwB,EAAE,EAAE;IAChF,MAAM,GAAG,GAAG,IAAA,aAAO,GAAE,CAAC;IAEtB,MAAM,YAAY,GAAG,IAAA,0BAAkB,EAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,YAAY,EAAE,IAAI,KAAK,cAAc,CAAC;IAEjE,IAAI,KAAK,GAAG,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACnD,IAAI,eAAuB,CAAC;IAE5B,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAChC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QACvD,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;YACtB,EAAE,EAAE,UAAU,CAAC,OAAO;YACtB,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE;YACvC,GAAG,EAAE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC;gBAC3C,IAAI,EAAE,OAAO,CAAC,YAAY;gBAC1B,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;aACvB,CAAC;SACH,CAAC;IACJ,CAAC;SAAM,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QACvD,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,EAAE,EAAE,UAAU,CAAC,OAAO;YACtB,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;YAC9C,GAAG,EAAE,MAAM,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;gBAClD,IAAI,EAAE,OAAO,CAAC,YAAY;aAC3B,CAAC;SACH,CAAC;IACJ,CAAC;SAAM,IAAI,WAAW,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QAEvD,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,EAAE,EAAE,UAAU,CAAC,OAAO;YACtB,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;YACjE,GAAG,EAAE,MAAM,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;gBACrE,IAAI,EAAE,OAAO,CAAC,YAAY;gBAC1B,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;aACvB,CAAC;SACH,CAAC;IACJ,CAAC;SAAM,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,wBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAE9E,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,EAAE,EAAE,QAAQ,CAAC,OAAO;YACpB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;YAC1B,GAAG,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC;SAChE,CAAC;IACJ,CAAC;SAAM,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QACnD,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEnF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CACnC,iBAAiB,EACjB,WAAW,CAAC,SAAS,EACrB,IAAI,wBAAS,CAAC,KAAK,CAAC,CACrB,CAAC;QAEF,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;YAC9C,OAAO,CACJ,iBAAiB,CAAC,GAAW,CAAC,OAAO,CAAC,IAAI;gBAC3C,CAAC,WAAW,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAC7D,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAEnD,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,EAAE,EAAE,QAAQ,CAAC,OAAO;YACpB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE;YAC5B,GAAG,EAAE,MAAM,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC;SAClE,CAAC;IACJ,CAAC;SAAM,IAAI,WAAW,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QACnD,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEnF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,SAAS,CAAC,CAAC;QACnF,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAEvD,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,EAAE,EAAE,QAAQ,CAAC,OAAO;YACpB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE;YAC9B,GAAG,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC;gBAClC,IAAI,EAAE,OAAO,CAAC,YAAY;aAC3B,CAAC;SACH,CAAC;IACJ,CAAC;SAAM,IAAI,WAAW,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QACnD,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,EAAE,EAAE,QAAQ,CAAC,OAAO;YACpB,IAAI,EAAE,QAAQ,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE;YAC9C,GAAG,EAAE,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC;SACpF,CAAC;IACJ,CAAC;SAAM,IAAI,kBAAkB,EAAE,CAAC;QAC9B,KAAK,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;QAE7E,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,oBAAoB,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC;QAC5E,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,IAAI,oBAAoB,CAAC,CAAC;QACpE,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAE5D,IAAI,KAAK,CAAC;QACV,IAAI,8BAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACvD,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,IAAA,8BAAkB,EAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QACxF,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC3E,CAAC;QAED,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,EAAE,EAAE,WAAW,CAAC,SAAS;YACzB,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;YAC5E,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;SACvB,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO;QACP,eAAe,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,YAAY;YAC1B,EAAE,EAAE,WAAW,CAAC,SAAS;YACzB,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;SACvB,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,CACV,CAAC,MAAM,GAAG,CAAC,UAAU,CAAC,8BAA8B,CAAC,eAAe,CAAC,CAAC;QACtE,yCAA6B,CAC9B,CAAC,OAAO,EAAE,CAAC;IAEZ,MAAM,EAAE,GAAW;QACjB,GAAG,eAAe;QAClB,GAAG;QACH,OAAO,EAAE,MAAM,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE;QACvC,KAAK,EAAE,MAAM,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;KACxD,CAAC;IAEF,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAAoB,EAAE,WAAwB,EAAa,EAAE;IACrF,IAAI,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;IAE/B,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC5F,sDAAsD;YACtD,iFAAiF;YACjF,MAAM,uBAAuB,GAAG,IAAA,yCAAiC,EAAC,OAAO,CAAC,CAAC;YAC3E,MAAM,sBAAsB,GAC1B,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,wBAAS,CAAC,CAAC,CAAC,CAAC;YAChF,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,sBAAsB,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACrF,CAAC;aAAM,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAClE,MAAM,MAAM,GAAG,IAAA,eAAO,EAAC,OAAO,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;YAC1E,IAAI,MAAM,EAAE,MAAM;gBAAE,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"getFeesForTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAUzD,QAAA,MAAM,qBAAqB,8BAGxB;IACD,OAAO,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;CAC1B,KAAG,OAAO,CAAC,SAAS,CAsIpB,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
|
|
@@ -23,6 +23,7 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
23
23
|
const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
|
|
24
24
|
const tokenAccount = (0, index_1.findSubAccountById)(account, transaction.subAccountId || "");
|
|
25
25
|
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
26
|
+
const maxPriorityFeePerGas = await kit.connection.getMaxPriorityFeePerGas();
|
|
26
27
|
if ((transaction.mode === "unlock" || transaction.mode === "vote") && account.celoResources) {
|
|
27
28
|
value = transaction.useAllAmount
|
|
28
29
|
? totalNonVotingLockedBalance
|
|
@@ -88,8 +89,8 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
88
89
|
else if (isTokenTransaction) {
|
|
89
90
|
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
90
91
|
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
91
|
-
const baseFee = BigInt(block.baseFeePerGas ||
|
|
92
|
-
const maxFeePerGas = baseFee +
|
|
92
|
+
const baseFee = BigInt(block.baseFeePerGas || maxPriorityFeePerGas);
|
|
93
|
+
const maxFeePerGas = baseFee + BigInt(maxPriorityFeePerGas);
|
|
93
94
|
let token;
|
|
94
95
|
if (constants_1.CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
95
96
|
token = await kit.contracts.getStableToken((0, constants_1.getStableTokenEnum)(tokenAccount.token.id));
|
|
@@ -102,7 +103,7 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
102
103
|
to: transaction.recipient,
|
|
103
104
|
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
104
105
|
maxFeePerGas: maxFeePerGas.toString(),
|
|
105
|
-
maxPriorityFeePerGas
|
|
106
|
+
maxPriorityFeePerGas,
|
|
106
107
|
value: value.toFixed(),
|
|
107
108
|
};
|
|
108
109
|
gas = Number(((await kit.connection.estimateGasWithInflationFactor(celoTransaction)) *
|
|
@@ -113,8 +114,13 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
113
114
|
const tx = await (0, buildTransaction_1.default)(account, transaction);
|
|
114
115
|
gas = tx.gas ? Number(tx.gas) : 0;
|
|
115
116
|
}
|
|
116
|
-
|
|
117
|
-
|
|
117
|
+
// TODO: Should implement more clear logic for all flows
|
|
118
|
+
// current FIX is to align with node_modules/.pnpm/@celo+connect@7.0.0/node_modules/@celo/connect/lib/connection.js : setFeeMarketGas
|
|
119
|
+
const gasPrice = await kit.connection.gasPrice();
|
|
120
|
+
const maxFeePerGas = ((BigInt(gasPrice) - BigInt(maxPriorityFeePerGas)) * BigInt(120)) / BigInt(100) +
|
|
121
|
+
BigInt(maxPriorityFeePerGas);
|
|
122
|
+
const maxFeePerGasNumber = new bignumber_js_1.BigNumber(maxFeePerGas.toString());
|
|
123
|
+
return maxFeePerGasNumber.times(gas);
|
|
118
124
|
};
|
|
119
125
|
exports.default = getFeesForTransaction;
|
|
120
126
|
//# sourceMappingURL=getFeesForTransaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.js","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":";;;;;AAAA,kEAA4E;AAC5E,+CAAyC;AAEzC,wCAAyC;AACzC,oCAAsE;AACtE,0EAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"getFeesForTransaction.js","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAKpD,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAC5C,WAAW,EACX,WAAW,CACZ,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAKpD,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAC5C,WAAW,EACX,WAAW,CACZ,CAAC,oBAAoB,CA6CrB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -36,15 +36,10 @@ const prepareTransaction = async (account, transaction) => {
|
|
|
36
36
|
else {
|
|
37
37
|
token = await kit.contracts.getGoldToken();
|
|
38
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
39
|
return {
|
|
43
40
|
...transaction,
|
|
44
41
|
amount,
|
|
45
42
|
fees,
|
|
46
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
47
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
48
43
|
...(isTokenTransaction
|
|
49
44
|
? {
|
|
50
45
|
data: Buffer.from(token.transfer(transaction.recipient, amount.toFixed()).txo.encodeABI()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;;AACA,gEAAqC;AACrC,qDAAyD;AACzD,oFAA4D;AAE5D,kEAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;;AACA,gEAAqC;AACrC,qDAAyD;AACzD,oFAA4D;AAE5D,kEAA4E;AAC5E,4CAAkD;AAClD,wCAAyC;AAElC,MAAM,kBAAkB,GAGL,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,IAAA,aAAO,GAAE,CAAC;IAEtB,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,MAAM,YAAY,GAAG,IAAA,0BAAkB,EAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,YAAY,EAAE,IAAI,KAAK,cAAc,CAAC;IAEjE,MAAM,MAAM,GACV,WAAW,CAAC,YAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IAE7F,IAAI,KAAK,CAAC;IACV,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,8BAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACvD,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;IAC7C,CAAC;IAED,OAAO;QACL,GAAG,WAAW;QACd,MAAM;QACN,IAAI;QACJ,GAAG,CAAC,kBAAkB;YACpB,CAAC,CAAC;gBACE,IAAI,EAAE,MAAM,CAAC,IAAI,CACf,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CACxE;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAhDW,QAAA,kBAAkB,sBAgD7B;AAEF,kBAAe,0BAAkB,CAAC"}
|
|
@@ -30,6 +30,9 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId,
|
|
|
30
30
|
to: isTokenTransaction ? subAccount.token.contractAddress : to,
|
|
31
31
|
value: isTokenTransaction ? 0 : unsignedTransaction.value,
|
|
32
32
|
};
|
|
33
|
+
const { address } = await signerContext(deviceId, signer => {
|
|
34
|
+
return signer.getAddress(account.freshAddressPath);
|
|
35
|
+
});
|
|
33
36
|
await (0, sdk_1.determineFees)(finalTransaction);
|
|
34
37
|
const rlpEncodedTransaction = await signerContext(deviceId, signer => {
|
|
35
38
|
return signer.rlpEncodedTxForLedger(finalTransaction);
|
|
@@ -38,9 +41,6 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId,
|
|
|
38
41
|
const response = (await signerContext(deviceId, signer => {
|
|
39
42
|
return signer.signTransaction(account.freshAddressPath, trimLeading0x(rlpEncodedTransaction.rlpEncode));
|
|
40
43
|
}));
|
|
41
|
-
const { address } = await signerContext(deviceId, signer => {
|
|
42
|
-
return signer.getAddress(account.freshAddressPath);
|
|
43
|
-
});
|
|
44
44
|
const convertedResponse = { ...response, v: response.v.toString() };
|
|
45
45
|
if (cancelled)
|
|
46
46
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AACzC,+BAAkC;AAClC,6CAAgD;AAEhD,mDAA0E;AAC1E,kEAA4E;AAC5E,yEAAsE;AAEtE,0EAAkD;AAGlD,wCAA+C;AAI/C;;GAEG;AACI,MAAM,kBAAkB,GAC7B,CAAC,aAAwC,EAA+C,EAAE,CAC1F,CAAC,EACC,OAAO,EACP,WAAW,EACX,QAAQ,GAKT,EAAkC,EAAE,CACnC,IAAI,iBAAU,CAAC,CAAC,CAAC,EAAE;IACjB,IAAI,SAAkB,CAAC;IAEvB,KAAK,UAAU,IAAI;QACjB,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QAC7B,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,qBAAY,EAAE,CAAC;QACpC,MAAM,mBAAmB,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAsB,EAAE,WAAW,CAAC,CAAC;QAExF,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,mBAAmB,CAAC;QAE5C,MAAM,UAAU,GAAG,IAAA,0BAAkB,EAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;QAC/E,MAAM,kBAAkB,GAAG,UAAU,EAAE,IAAI,KAAK,cAAc,CAAC;QAE/D,MAAM,gBAAgB,GAAW;YAC/B,GAAG,mBAAmB;YACtB,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,EAAG;YAC/D,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAM;SAC3D,CAAC;QAEF,MAAM,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC;QAEtC,MAAM,qBAAqB,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnE,OAAO,MAAM,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAG,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YACvD,OAAO,MAAM,CAAC,eAAe,CAC3B,OAAO,CAAC,gBAAgB,EACxB,aAAa,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAC/C,CAAC;QACJ,CAAC,CAAC,CAAiB,CAAC;QAEpB,MAAM,
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
|
package/lib/constants.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { StableToken } from "@celo/contractkit";
|
|
2
2
|
export declare const CELO_STABLE_TOKENS: string[];
|
|
3
3
|
export declare const getStableTokenEnum: (tokenTicker: string) => StableToken;
|
|
4
|
-
export declare const MAX_PRIORITY_FEE_PER_GAS = 1000000000n;
|
|
5
4
|
export declare const MAX_FEES_THRESHOLD_MULTIPLIER = 4;
|
|
6
5
|
//# sourceMappingURL=constants.d.ts.map
|
package/lib/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQhD,eAAO,MAAM,kBAAkB,UAAsC,CAAC;AAEtE,eAAO,MAAM,kBAAkB,gBAAiB,MAAM,KAAG,WACpB,CAAC;AAEtC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQhD,eAAO,MAAM,kBAAkB,UAAsC,CAAC;AAEtE,eAAO,MAAM,kBAAkB,gBAAiB,MAAM,KAAG,WACpB,CAAC;AAEtC,eAAO,MAAM,6BAA6B,IAAI,CAAC"}
|
package/lib/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MAX_FEES_THRESHOLD_MULTIPLIER = exports.
|
|
3
|
+
exports.MAX_FEES_THRESHOLD_MULTIPLIER = exports.getStableTokenEnum = exports.CELO_STABLE_TOKENS = void 0;
|
|
4
4
|
const contractkit_1 = require("@celo/contractkit");
|
|
5
5
|
const CELO_STAKE_TOKENS_PAIR = {
|
|
6
6
|
cEUR: contractkit_1.StableToken.cEUR,
|
|
@@ -10,6 +10,5 @@ const CELO_STAKE_TOKENS_PAIR = {
|
|
|
10
10
|
exports.CELO_STABLE_TOKENS = Object.keys(CELO_STAKE_TOKENS_PAIR);
|
|
11
11
|
const getStableTokenEnum = (tokenTicker) => CELO_STAKE_TOKENS_PAIR[tokenTicker];
|
|
12
12
|
exports.getStableTokenEnum = getStableTokenEnum;
|
|
13
|
-
exports.MAX_PRIORITY_FEE_PER_GAS = 1000000000n;
|
|
14
13
|
exports.MAX_FEES_THRESHOLD_MULTIPLIER = 4;
|
|
15
14
|
//# sourceMappingURL=constants.js.map
|
package/lib/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAEhD,MAAM,sBAAsB,GAAgC;IAC1D,IAAI,EAAE,yBAAW,CAAC,IAAI;IACtB,KAAK,EAAE,yBAAW,CAAC,KAAK;IACxB,IAAI,EAAE,yBAAW,CAAC,IAAI;CACvB,CAAC;AAEW,QAAA,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAE/D,MAAM,kBAAkB,GAAG,CAAC,WAAmB,EAAe,EAAE,CACrE,sBAAsB,CAAC,WAAW,CAAC,CAAC;AADzB,QAAA,kBAAkB,sBACO;AAEzB,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAEhD,MAAM,sBAAsB,GAAgC;IAC1D,IAAI,EAAE,yBAAW,CAAC,IAAI;IACtB,KAAK,EAAE,yBAAW,CAAC,KAAK;IACxB,IAAI,EAAE,yBAAW,CAAC,IAAI;CACvB,CAAC;AAEW,QAAA,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAE/D,MAAM,kBAAkB,GAAG,CAAC,WAAmB,EAAe,EAAE,CACrE,sBAAsB,CAAC,WAAW,CAAC,CAAC;AADzB,QAAA,kBAAkB,sBACO;AAEzB,QAAA,6BAA6B,GAAG,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.test.js","sourceRoot":"","sources":["../../../src/__tests__/bridge/getFeesForTransaction.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getFeesForTransaction.test.js","sourceRoot":"","sources":["../../../src/__tests__/bridge/getFeesForTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,7 @@ jest.mock("../../network/sdk", () => {
|
|
|
66
66
|
estimateGasWithInflationFactor: jest.fn().mockReturnValue(3),
|
|
67
67
|
gasPrice: jest.fn(async () => BigNumber(2)),
|
|
68
68
|
web3: { eth: { getBlock: jest.fn().mockResolvedValue({ baseFeePerGas: 10 }) } },
|
|
69
|
-
getMaxPriorityFeePerGas: jest.fn().
|
|
69
|
+
getMaxPriorityFeePerGas: jest.fn().mockReturnValue(1),
|
|
70
70
|
},
|
|
71
71
|
})),
|
|
72
72
|
};
|
|
@@ -176,8 +176,6 @@ describe("prepareTransaction", () => {
|
|
|
176
176
|
index: 0,
|
|
177
177
|
fees: BigNumber(24),
|
|
178
178
|
subAccountId: "subAccountId",
|
|
179
|
-
maxFeePerGas: "1000000010",
|
|
180
|
-
maxPriorityFeePerGas: 1,
|
|
181
179
|
data: Buffer.from("0x73656E645F746F6B656E5F64617461"),
|
|
182
180
|
});
|
|
183
181
|
});
|
|
@@ -200,8 +198,6 @@ describe("prepareTransaction", () => {
|
|
|
200
198
|
index: 0,
|
|
201
199
|
fees: BigNumber(24),
|
|
202
200
|
subAccountId: "subAccountId",
|
|
203
|
-
maxFeePerGas: "1000000010",
|
|
204
|
-
maxPriorityFeePerGas: 1,
|
|
205
201
|
data: Buffer.from("0x73656E645F65726332305F746F6B656E5F64617461"),
|
|
206
202
|
});
|
|
207
203
|
});
|
|
@@ -225,8 +221,6 @@ describe("prepareTransaction", () => {
|
|
|
225
221
|
index: 0,
|
|
226
222
|
fees: BigNumber(24),
|
|
227
223
|
subAccountId: "subAccountId",
|
|
228
|
-
maxFeePerGas: "1000000010",
|
|
229
|
-
maxPriorityFeePerGas: 1,
|
|
230
224
|
data: Buffer.from("0x73656E645F65726332305F746F6B656E5F64617461"),
|
|
231
225
|
});
|
|
232
226
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../../src/__tests__/bridge/prepareTransaction.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../../src/__tests__/bridge/prepareTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAWvC,QAAA,MAAM,gBAAgB,YAAmB,WAAW,eAAe,WAAW,oBAkJ7E,CAAC;AAwBF,eAAe,gBAAgB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { celoKit } from "../network/sdk";
|
|
|
2
2
|
import { BigNumber } from "bignumber.js";
|
|
3
3
|
import { getPendingStakingOperationAmounts, getVote } from "../logic";
|
|
4
4
|
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
5
|
-
import { CELO_STABLE_TOKENS, getStableTokenEnum, MAX_FEES_THRESHOLD_MULTIPLIER,
|
|
5
|
+
import { CELO_STABLE_TOKENS, getStableTokenEnum, MAX_FEES_THRESHOLD_MULTIPLIER, } from "../constants";
|
|
6
6
|
const buildTransaction = async (account, transaction) => {
|
|
7
7
|
const kit = celoKit();
|
|
8
8
|
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
@@ -102,8 +102,9 @@ const buildTransaction = async (account, transaction) => {
|
|
|
102
102
|
else if (isTokenTransaction) {
|
|
103
103
|
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
104
104
|
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
105
|
-
const
|
|
106
|
-
const
|
|
105
|
+
const maxPriorityFeePerGas = await kit.connection.getMaxPriorityFeePerGas();
|
|
106
|
+
const baseFee = BigInt(block.baseFeePerGas || maxPriorityFeePerGas);
|
|
107
|
+
const maxFeePerGas = baseFee + BigInt(maxPriorityFeePerGas);
|
|
107
108
|
let token;
|
|
108
109
|
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
109
110
|
token = await kit.contracts.getStableToken(getStableTokenEnum(tokenAccount.token.id));
|
|
@@ -115,8 +116,6 @@ const buildTransaction = async (account, transaction) => {
|
|
|
115
116
|
from: account.freshAddress,
|
|
116
117
|
to: transaction.recipient,
|
|
117
118
|
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
118
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
119
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
120
119
|
value: value.toFixed(),
|
|
121
120
|
};
|
|
122
121
|
}
|
|
@@ -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;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,6BAA6B,
|
|
1
|
+
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"getFeesForTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAUzD,QAAA,MAAM,qBAAqB,8BAGxB;IACD,OAAO,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;CAC1B,KAAG,OAAO,CAAC,SAAS,CAsIpB,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { BigNumber } from "bignumber.js";
|
|
|
3
3
|
import { celoKit } from "../network/sdk";
|
|
4
4
|
import { getPendingStakingOperationAmounts, getVote } from "../logic";
|
|
5
5
|
import buildTransaction from "./buildTransaction";
|
|
6
|
-
import { CELO_STABLE_TOKENS, getStableTokenEnum, MAX_FEES_THRESHOLD_MULTIPLIER,
|
|
6
|
+
import { CELO_STABLE_TOKENS, getStableTokenEnum, MAX_FEES_THRESHOLD_MULTIPLIER, } from "../constants";
|
|
7
7
|
const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
8
8
|
const { amount, index } = transaction;
|
|
9
9
|
const kit = celoKit();
|
|
@@ -18,6 +18,7 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
18
18
|
const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
|
|
19
19
|
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
20
20
|
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
21
|
+
const maxPriorityFeePerGas = await kit.connection.getMaxPriorityFeePerGas();
|
|
21
22
|
if ((transaction.mode === "unlock" || transaction.mode === "vote") && account.celoResources) {
|
|
22
23
|
value = transaction.useAllAmount
|
|
23
24
|
? totalNonVotingLockedBalance
|
|
@@ -83,8 +84,8 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
83
84
|
else if (isTokenTransaction) {
|
|
84
85
|
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
85
86
|
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
86
|
-
const baseFee = BigInt(block.baseFeePerGas ||
|
|
87
|
-
const maxFeePerGas = baseFee +
|
|
87
|
+
const baseFee = BigInt(block.baseFeePerGas || maxPriorityFeePerGas);
|
|
88
|
+
const maxFeePerGas = baseFee + BigInt(maxPriorityFeePerGas);
|
|
88
89
|
let token;
|
|
89
90
|
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
90
91
|
token = await kit.contracts.getStableToken(getStableTokenEnum(tokenAccount.token.id));
|
|
@@ -97,7 +98,7 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
97
98
|
to: transaction.recipient,
|
|
98
99
|
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
99
100
|
maxFeePerGas: maxFeePerGas.toString(),
|
|
100
|
-
maxPriorityFeePerGas
|
|
101
|
+
maxPriorityFeePerGas,
|
|
101
102
|
value: value.toFixed(),
|
|
102
103
|
};
|
|
103
104
|
gas = Number(((await kit.connection.estimateGasWithInflationFactor(celoTransaction)) *
|
|
@@ -108,8 +109,13 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
108
109
|
const tx = await buildTransaction(account, transaction);
|
|
109
110
|
gas = tx.gas ? Number(tx.gas) : 0;
|
|
110
111
|
}
|
|
111
|
-
|
|
112
|
-
|
|
112
|
+
// TODO: Should implement more clear logic for all flows
|
|
113
|
+
// current FIX is to align with node_modules/.pnpm/@celo+connect@7.0.0/node_modules/@celo/connect/lib/connection.js : setFeeMarketGas
|
|
114
|
+
const gasPrice = await kit.connection.gasPrice();
|
|
115
|
+
const maxFeePerGas = ((BigInt(gasPrice) - BigInt(maxPriorityFeePerGas)) * BigInt(120)) / BigInt(100) +
|
|
116
|
+
BigInt(maxPriorityFeePerGas);
|
|
117
|
+
const maxFeePerGasNumber = new BigNumber(maxFeePerGas.toString());
|
|
118
|
+
return maxFeePerGasNumber.times(gas);
|
|
113
119
|
};
|
|
114
120
|
export default getFeesForTransaction;
|
|
115
121
|
//# sourceMappingURL=getFeesForTransaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeesForTransaction.js","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,6BAA6B,
|
|
1
|
+
{"version":3,"file":"getFeesForTransaction.js","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAKpD,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAC5C,WAAW,EACX,WAAW,CACZ,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAKpD,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAC5C,WAAW,EACX,WAAW,CACZ,CAAC,oBAAoB,CA6CrB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import BigNumber from "bignumber.js";
|
|
|
2
2
|
import { isValidAddress } from "@celo/utils/lib/address";
|
|
3
3
|
import getFeesForTransaction from "./getFeesForTransaction";
|
|
4
4
|
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
5
|
-
import { CELO_STABLE_TOKENS
|
|
5
|
+
import { CELO_STABLE_TOKENS } from "../constants";
|
|
6
6
|
import { celoKit } from "../network/sdk";
|
|
7
7
|
export const prepareTransaction = async (account, transaction) => {
|
|
8
8
|
const kit = celoKit();
|
|
@@ -30,15 +30,10 @@ export const prepareTransaction = async (account, transaction) => {
|
|
|
30
30
|
else {
|
|
31
31
|
token = await kit.contracts.getGoldToken();
|
|
32
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
33
|
return {
|
|
37
34
|
...transaction,
|
|
38
35
|
amount,
|
|
39
36
|
fees,
|
|
40
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
41
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
42
37
|
...(isTokenTransaction
|
|
43
38
|
? {
|
|
44
39
|
data: Buffer.from(token.transfer(transaction.recipient, amount.toFixed()).txo.encodeABI()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,CAAC,MAAM,kBAAkB,GAGL,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,IAAI,WAAW,CAAC,SAAS,IAAI,CAAC,cAAc,CAAC,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,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAExC,OAAO,WAAW,CAAC;IAErB,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAEnE,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,YAAY,EAAE,IAAI,KAAK,cAAc,CAAC;IAEjE,MAAM,MAAM,GACV,WAAW,CAAC,YAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IAE7F,IAAI,KAAK,CAAC;IACV,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACvD,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;IAC7C,CAAC;IAED,OAAO;QACL,GAAG,WAAW;QACd,MAAM;QACN,IAAI;QACJ,GAAG,CAAC,kBAAkB;YACpB,CAAC,CAAC;gBACE,IAAI,EAAE,MAAM,CAAC,IAAI,CACf,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CACxE;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -24,6 +24,9 @@ export const buildSignOperation = (signerContext) => ({ account, transaction, de
|
|
|
24
24
|
to: isTokenTransaction ? subAccount.token.contractAddress : to,
|
|
25
25
|
value: isTokenTransaction ? 0 : unsignedTransaction.value,
|
|
26
26
|
};
|
|
27
|
+
const { address } = await signerContext(deviceId, signer => {
|
|
28
|
+
return signer.getAddress(account.freshAddressPath);
|
|
29
|
+
});
|
|
27
30
|
await determineFees(finalTransaction);
|
|
28
31
|
const rlpEncodedTransaction = await signerContext(deviceId, signer => {
|
|
29
32
|
return signer.rlpEncodedTxForLedger(finalTransaction);
|
|
@@ -32,9 +35,6 @@ export const buildSignOperation = (signerContext) => ({ account, transaction, de
|
|
|
32
35
|
const response = (await signerContext(deviceId, signer => {
|
|
33
36
|
return signer.signTransaction(account.freshAddressPath, trimLeading0x(rlpEncodedTransaction.rlpEncode));
|
|
34
37
|
}));
|
|
35
|
-
const { address } = await signerContext(deviceId, signer => {
|
|
36
|
-
return signer.getAddress(account.freshAddressPath);
|
|
37
|
-
});
|
|
38
38
|
const convertedResponse = { ...response, v: response.v.toString() };
|
|
39
39
|
if (cancelled)
|
|
40
40
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAC7B,CAAC,aAAwC,EAA+C,EAAE,CAC1F,CAAC,EACC,OAAO,EACP,WAAW,EACX,QAAQ,GAKT,EAAkC,EAAE,CACnC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;IACjB,IAAI,SAAkB,CAAC;IAEvB,KAAK,UAAU,IAAI;QACjB,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QAC7B,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,YAAY,EAAE,CAAC;QACpC,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,CAAC,OAAsB,EAAE,WAAW,CAAC,CAAC;QAExF,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,mBAAmB,CAAC;QAE5C,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;QAC/E,MAAM,kBAAkB,GAAG,UAAU,EAAE,IAAI,KAAK,cAAc,CAAC;QAE/D,MAAM,gBAAgB,GAAW;YAC/B,GAAG,mBAAmB;YACtB,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,EAAG;YAC/D,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAM;SAC3D,CAAC;QAEF,MAAM,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAEtC,MAAM,qBAAqB,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnE,OAAO,MAAM,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAG,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YACvD,OAAO,MAAM,CAAC,eAAe,CAC3B,OAAO,CAAC,gBAAgB,EACxB,aAAa,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAC/C,CAAC;QACJ,CAAC,CAAC,CAAiB,CAAC;QAEpB,MAAM,
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
|
package/lib-es/constants.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { StableToken } from "@celo/contractkit";
|
|
2
2
|
export declare const CELO_STABLE_TOKENS: string[];
|
|
3
3
|
export declare const getStableTokenEnum: (tokenTicker: string) => StableToken;
|
|
4
|
-
export declare const MAX_PRIORITY_FEE_PER_GAS = 1000000000n;
|
|
5
4
|
export declare const MAX_FEES_THRESHOLD_MULTIPLIER = 4;
|
|
6
5
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQhD,eAAO,MAAM,kBAAkB,UAAsC,CAAC;AAEtE,eAAO,MAAM,kBAAkB,gBAAiB,MAAM,KAAG,WACpB,CAAC;AAEtC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQhD,eAAO,MAAM,kBAAkB,UAAsC,CAAC;AAEtE,eAAO,MAAM,kBAAkB,gBAAiB,MAAM,KAAG,WACpB,CAAC;AAEtC,eAAO,MAAM,6BAA6B,IAAI,CAAC"}
|
package/lib-es/constants.js
CHANGED
|
@@ -6,6 +6,5 @@ const CELO_STAKE_TOKENS_PAIR = {
|
|
|
6
6
|
};
|
|
7
7
|
export const CELO_STABLE_TOKENS = Object.keys(CELO_STAKE_TOKENS_PAIR);
|
|
8
8
|
export const getStableTokenEnum = (tokenTicker) => CELO_STAKE_TOKENS_PAIR[tokenTicker];
|
|
9
|
-
export const MAX_PRIORITY_FEE_PER_GAS = 1000000000n;
|
|
10
9
|
export const MAX_FEES_THRESHOLD_MULTIPLIER = 4;
|
|
11
10
|
//# sourceMappingURL=constants.js.map
|
package/lib-es/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,sBAAsB,GAAgC;IAC1D,IAAI,EAAE,WAAW,CAAC,IAAI;IACtB,KAAK,EAAE,WAAW,CAAC,KAAK;IACxB,IAAI,EAAE,WAAW,CAAC,IAAI;CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,WAAmB,EAAe,EAAE,CACrE,sBAAsB,CAAC,WAAW,CAAC,CAAC;AAEtC,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,sBAAsB,GAAgC;IAC1D,IAAI,EAAE,WAAW,CAAC,IAAI;IACtB,KAAK,EAAE,WAAW,CAAC,KAAK;IACxB,IAAI,EAAE,WAAW,CAAC,IAAI;CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,WAAmB,EAAe,EAAE,CACrE,sBAAsB,CAAC,WAAW,CAAC,CAAC;AAEtC,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-celo",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0-nightly.3",
|
|
4
4
|
"description": "celo coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -114,9 +114,9 @@
|
|
|
114
114
|
"invariant": "^2.2.4",
|
|
115
115
|
"lodash": "^4.17.21",
|
|
116
116
|
"rxjs": "^7.8.1",
|
|
117
|
-
"@ledgerhq/coin-evm": "^2.32.0-nightly.
|
|
118
|
-
"@ledgerhq/coin-framework": "^6.6.0-nightly.
|
|
119
|
-
"@ledgerhq/cryptoassets": "^13.30.0-nightly.
|
|
117
|
+
"@ledgerhq/coin-evm": "^2.32.0-nightly.2",
|
|
118
|
+
"@ledgerhq/coin-framework": "^6.6.0-nightly.2",
|
|
119
|
+
"@ledgerhq/cryptoassets": "^13.30.0-nightly.1",
|
|
120
120
|
"@ledgerhq/devices": "^8.6.0",
|
|
121
121
|
"@ledgerhq/errors": "^6.26.0-nightly.0",
|
|
122
122
|
"@ledgerhq/hw-app-eth": "^6.45.20-nightly.0",
|
|
@@ -137,7 +137,7 @@
|
|
|
137
137
|
"ts-jest": "^29.1.1",
|
|
138
138
|
"typescript": "^5.4.5",
|
|
139
139
|
"@ledgerhq/disable-network-setup": "^0.0.0",
|
|
140
|
-
"@ledgerhq/types-cryptoassets": "^7.28.0-nightly.
|
|
140
|
+
"@ledgerhq/types-cryptoassets": "^7.28.0-nightly.1"
|
|
141
141
|
},
|
|
142
142
|
"scripts": {
|
|
143
143
|
"clean": "rimraf lib lib-es",
|
|
@@ -73,7 +73,7 @@ jest.mock("../../network/sdk", () => {
|
|
|
73
73
|
estimateGasWithInflationFactor: jest.fn().mockReturnValue(3),
|
|
74
74
|
gasPrice: jest.fn(async () => BigNumber(2)),
|
|
75
75
|
web3: { eth: { getBlock: jest.fn().mockResolvedValue({ baseFeePerGas: 10 }) } },
|
|
76
|
-
getMaxPriorityFeePerGas: jest.fn().
|
|
76
|
+
getMaxPriorityFeePerGas: jest.fn().mockReturnValue(1),
|
|
77
77
|
},
|
|
78
78
|
})),
|
|
79
79
|
};
|
|
@@ -195,8 +195,6 @@ describe("prepareTransaction", () => {
|
|
|
195
195
|
index: 0,
|
|
196
196
|
fees: BigNumber(24),
|
|
197
197
|
subAccountId: "subAccountId",
|
|
198
|
-
maxFeePerGas: "1000000010",
|
|
199
|
-
maxPriorityFeePerGas: 1,
|
|
200
198
|
data: Buffer.from("0x73656E645F746F6B656E5F64617461"),
|
|
201
199
|
});
|
|
202
200
|
});
|
|
@@ -223,8 +221,6 @@ describe("prepareTransaction", () => {
|
|
|
223
221
|
index: 0,
|
|
224
222
|
fees: BigNumber(24),
|
|
225
223
|
subAccountId: "subAccountId",
|
|
226
|
-
maxFeePerGas: "1000000010",
|
|
227
|
-
maxPriorityFeePerGas: 1,
|
|
228
224
|
data: Buffer.from("0x73656E645F65726332305F746F6B656E5F64617461"),
|
|
229
225
|
});
|
|
230
226
|
});
|
|
@@ -253,8 +249,6 @@ describe("prepareTransaction", () => {
|
|
|
253
249
|
index: 0,
|
|
254
250
|
fees: BigNumber(24),
|
|
255
251
|
subAccountId: "subAccountId",
|
|
256
|
-
maxFeePerGas: "1000000010",
|
|
257
|
-
maxPriorityFeePerGas: 1,
|
|
258
252
|
data: Buffer.from("0x73656E645F65726332305F746F6B656E5F64617461"),
|
|
259
253
|
});
|
|
260
254
|
});
|
|
@@ -8,7 +8,6 @@ import {
|
|
|
8
8
|
CELO_STABLE_TOKENS,
|
|
9
9
|
getStableTokenEnum,
|
|
10
10
|
MAX_FEES_THRESHOLD_MULTIPLIER,
|
|
11
|
-
MAX_PRIORITY_FEE_PER_GAS,
|
|
12
11
|
} from "../constants";
|
|
13
12
|
|
|
14
13
|
const buildTransaction = async (account: CeloAccount, transaction: Transaction) => {
|
|
@@ -118,8 +117,9 @@ const buildTransaction = async (account: CeloAccount, transaction: Transaction)
|
|
|
118
117
|
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
119
118
|
|
|
120
119
|
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
121
|
-
const
|
|
122
|
-
const
|
|
120
|
+
const maxPriorityFeePerGas = await kit.connection.getMaxPriorityFeePerGas();
|
|
121
|
+
const baseFee = BigInt(block.baseFeePerGas || maxPriorityFeePerGas);
|
|
122
|
+
const maxFeePerGas = baseFee + BigInt(maxPriorityFeePerGas);
|
|
123
123
|
|
|
124
124
|
let token;
|
|
125
125
|
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
@@ -132,8 +132,6 @@ const buildTransaction = async (account: CeloAccount, transaction: Transaction)
|
|
|
132
132
|
from: account.freshAddress,
|
|
133
133
|
to: transaction.recipient,
|
|
134
134
|
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
135
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
136
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
137
135
|
value: value.toFixed(),
|
|
138
136
|
};
|
|
139
137
|
} else {
|
|
@@ -8,7 +8,6 @@ import {
|
|
|
8
8
|
CELO_STABLE_TOKENS,
|
|
9
9
|
getStableTokenEnum,
|
|
10
10
|
MAX_FEES_THRESHOLD_MULTIPLIER,
|
|
11
|
-
MAX_PRIORITY_FEE_PER_GAS,
|
|
12
11
|
} from "../constants";
|
|
13
12
|
|
|
14
13
|
const getFeesForTransaction = async ({
|
|
@@ -38,6 +37,7 @@ const getFeesForTransaction = async ({
|
|
|
38
37
|
|
|
39
38
|
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
40
39
|
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
40
|
+
const maxPriorityFeePerGas = await kit.connection.getMaxPriorityFeePerGas();
|
|
41
41
|
|
|
42
42
|
if ((transaction.mode === "unlock" || transaction.mode === "vote") && account.celoResources) {
|
|
43
43
|
value = transaction.useAllAmount
|
|
@@ -111,8 +111,8 @@ const getFeesForTransaction = async ({
|
|
|
111
111
|
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
112
112
|
|
|
113
113
|
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
114
|
-
const baseFee = BigInt(block.baseFeePerGas ||
|
|
115
|
-
const maxFeePerGas = baseFee +
|
|
114
|
+
const baseFee = BigInt(block.baseFeePerGas || maxPriorityFeePerGas);
|
|
115
|
+
const maxFeePerGas = baseFee + BigInt(maxPriorityFeePerGas);
|
|
116
116
|
|
|
117
117
|
let token;
|
|
118
118
|
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
@@ -126,7 +126,7 @@ const getFeesForTransaction = async ({
|
|
|
126
126
|
to: transaction.recipient,
|
|
127
127
|
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
128
128
|
maxFeePerGas: maxFeePerGas.toString(),
|
|
129
|
-
maxPriorityFeePerGas
|
|
129
|
+
maxPriorityFeePerGas,
|
|
130
130
|
value: value.toFixed(),
|
|
131
131
|
};
|
|
132
132
|
|
|
@@ -142,8 +142,14 @@ const getFeesForTransaction = async ({
|
|
|
142
142
|
gas = tx.gas ? Number(tx.gas) : 0;
|
|
143
143
|
}
|
|
144
144
|
|
|
145
|
-
|
|
146
|
-
|
|
145
|
+
// TODO: Should implement more clear logic for all flows
|
|
146
|
+
// current FIX is to align with node_modules/.pnpm/@celo+connect@7.0.0/node_modules/@celo/connect/lib/connection.js : setFeeMarketGas
|
|
147
|
+
const gasPrice = await kit.connection.gasPrice();
|
|
148
|
+
const maxFeePerGas =
|
|
149
|
+
((BigInt(gasPrice) - BigInt(maxPriorityFeePerGas)) * BigInt(120)) / BigInt(100) +
|
|
150
|
+
BigInt(maxPriorityFeePerGas);
|
|
151
|
+
const maxFeePerGasNumber = new BigNumber(maxFeePerGas.toString());
|
|
152
|
+
return maxFeePerGasNumber.times(gas);
|
|
147
153
|
};
|
|
148
154
|
|
|
149
155
|
export default getFeesForTransaction;
|
|
@@ -4,7 +4,7 @@ import { isValidAddress } from "@celo/utils/lib/address";
|
|
|
4
4
|
import getFeesForTransaction from "./getFeesForTransaction";
|
|
5
5
|
import { CeloAccount, Transaction } from "../types";
|
|
6
6
|
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
7
|
-
import { CELO_STABLE_TOKENS
|
|
7
|
+
import { CELO_STABLE_TOKENS } from "../constants";
|
|
8
8
|
import { celoKit } from "../network/sdk";
|
|
9
9
|
|
|
10
10
|
export const prepareTransaction: AccountBridge<
|
|
@@ -43,16 +43,10 @@ export const prepareTransaction: AccountBridge<
|
|
|
43
43
|
token = await kit.contracts.getGoldToken();
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
47
|
-
const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
|
|
48
|
-
const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
|
|
49
|
-
|
|
50
46
|
return {
|
|
51
47
|
...transaction,
|
|
52
48
|
amount,
|
|
53
49
|
fees,
|
|
54
|
-
maxFeePerGas: maxFeePerGas.toString(),
|
|
55
|
-
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
56
50
|
...(isTokenTransaction
|
|
57
51
|
? {
|
|
58
52
|
data: Buffer.from(
|
|
@@ -46,6 +46,9 @@ export const buildSignOperation =
|
|
|
46
46
|
value: isTokenTransaction ? 0 : unsignedTransaction.value!,
|
|
47
47
|
};
|
|
48
48
|
|
|
49
|
+
const { address } = await signerContext(deviceId, signer => {
|
|
50
|
+
return signer.getAddress(account.freshAddressPath);
|
|
51
|
+
});
|
|
49
52
|
await determineFees(finalTransaction);
|
|
50
53
|
|
|
51
54
|
const rlpEncodedTransaction = await signerContext(deviceId, signer => {
|
|
@@ -60,9 +63,6 @@ export const buildSignOperation =
|
|
|
60
63
|
);
|
|
61
64
|
})) as EvmSignature;
|
|
62
65
|
|
|
63
|
-
const { address } = await signerContext(deviceId, signer => {
|
|
64
|
-
return signer.getAddress(account.freshAddressPath);
|
|
65
|
-
});
|
|
66
66
|
const convertedResponse = { ...response, v: response.v.toString() };
|
|
67
67
|
if (cancelled) return;
|
|
68
68
|
|
package/src/constants.ts
CHANGED
|
@@ -11,5 +11,4 @@ export const CELO_STABLE_TOKENS = Object.keys(CELO_STAKE_TOKENS_PAIR);
|
|
|
11
11
|
export const getStableTokenEnum = (tokenTicker: string): StableToken =>
|
|
12
12
|
CELO_STAKE_TOKENS_PAIR[tokenTicker];
|
|
13
13
|
|
|
14
|
-
export const MAX_PRIORITY_FEE_PER_GAS = 1_000_000_000n;
|
|
15
14
|
export const MAX_FEES_THRESHOLD_MULTIPLIER = 4;
|