@ledgerhq/coin-celo 1.2.2-nightly.3 → 1.3.0-nightly.4
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 +3 -6
- package/CHANGELOG.md +14 -0
- package/lib/__tests__/bridge/buildOptimisticOperation.test.d.ts +2 -0
- package/lib/__tests__/bridge/buildOptimisticOperation.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/buildOptimisticOperation.test.js +23 -0
- package/lib/__tests__/bridge/buildOptimisticOperation.test.js.map +1 -0
- package/lib/__tests__/bridge/buildTransaction.test.d.ts +2 -0
- package/lib/__tests__/bridge/buildTransaction.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/buildTransaction.test.js +412 -0
- package/lib/__tests__/bridge/buildTransaction.test.js.map +1 -0
- package/lib/__tests__/bridge/createTransaction.test.d.ts +2 -0
- package/lib/__tests__/bridge/createTransaction.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/createTransaction.test.js +22 -0
- package/lib/__tests__/bridge/createTransaction.test.js.map +1 -0
- package/lib/__tests__/bridge/deviceTransactionConfig.test.d.ts +2 -0
- package/lib/__tests__/bridge/deviceTransactionConfig.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/deviceTransactionConfig.test.js +21 -0
- package/lib/__tests__/bridge/deviceTransactionConfig.test.js.map +1 -0
- package/lib/__tests__/bridge/estimateMaxSpendable.test.d.ts +2 -0
- package/lib/__tests__/bridge/estimateMaxSpendable.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/estimateMaxSpendable.test.js +108 -0
- package/lib/__tests__/bridge/estimateMaxSpendable.test.js.map +1 -0
- package/lib/__tests__/bridge/getFeesForTransaction.test.d.ts +2 -0
- package/lib/__tests__/bridge/getFeesForTransaction.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/getFeesForTransaction.test.js +211 -0
- package/lib/__tests__/bridge/getFeesForTransaction.test.js.map +1 -0
- package/lib/__tests__/bridge/getTransactionStatus.test.d.ts +2 -0
- package/lib/__tests__/bridge/getTransactionStatus.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/getTransactionStatus.test.js +214 -0
- package/lib/__tests__/bridge/getTransactionStatus.test.js.map +1 -0
- package/lib/__tests__/bridge/logic.test.d.ts +2 -0
- package/lib/__tests__/bridge/logic.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/logic.test.js +490 -0
- package/lib/__tests__/bridge/logic.test.js.map +1 -0
- package/lib/__tests__/bridge/prepareTransaction.test.d.ts +2 -0
- package/lib/__tests__/bridge/prepareTransaction.test.d.ts.map +1 -0
- package/lib/__tests__/bridge/prepareTransaction.test.js +239 -0
- package/lib/__tests__/bridge/prepareTransaction.test.js.map +1 -0
- package/lib/bridge/buildOptimisticOperation.d.ts.map +1 -1
- package/lib/bridge/buildOptimisticOperation.js +5 -2
- package/lib/bridge/buildOptimisticOperation.js.map +1 -1
- package/lib/bridge/buildTransaction.d.ts.map +1 -1
- package/lib/bridge/buildTransaction.js +29 -6
- package/lib/bridge/buildTransaction.js.map +1 -1
- package/lib/bridge/estimateMaxSpendable.d.ts.map +1 -1
- package/lib/bridge/estimateMaxSpendable.js +9 -1
- package/lib/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib/bridge/fixtures.d.ts +36 -0
- package/lib/bridge/fixtures.d.ts.map +1 -0
- package/lib/bridge/fixtures.js +98 -0
- package/lib/bridge/fixtures.js.map +1 -0
- package/lib/bridge/getFeesForTransaction.d.ts.map +1 -1
- package/lib/bridge/getFeesForTransaction.js +32 -5
- package/lib/bridge/getFeesForTransaction.js.map +1 -1
- package/lib/bridge/getTransactionStatus.d.ts.map +1 -1
- package/lib/bridge/getTransactionStatus.js +18 -4
- 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 +33 -4
- package/lib/bridge/prepareTransaction.js.map +1 -1
- package/lib/bridge/signOperation.d.ts.map +1 -1
- package/lib/bridge/signOperation.js +11 -3
- package/lib/bridge/signOperation.js.map +1 -1
- package/lib/bridge/synchronisation.d.ts.map +1 -1
- package/lib/bridge/synchronisation.js +7 -3
- package/lib/bridge/synchronisation.js.map +1 -1
- package/lib/config.d.ts.map +1 -1
- package/lib/config.js +8 -0
- package/lib/config.js.map +1 -1
- package/lib/constants.d.ts +6 -0
- package/lib/constants.d.ts.map +1 -0
- package/lib/constants.js +15 -0
- package/lib/constants.js.map +1 -0
- package/lib/types/types.d.ts +1 -0
- package/lib/types/types.d.ts.map +1 -1
- package/lib/types/types.js.map +1 -1
- package/lib-es/__tests__/bridge/buildOptimisticOperation.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/buildOptimisticOperation.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/buildOptimisticOperation.test.js +18 -0
- package/lib-es/__tests__/bridge/buildOptimisticOperation.test.js.map +1 -0
- package/lib-es/__tests__/bridge/buildTransaction.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/buildTransaction.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/buildTransaction.test.js +407 -0
- package/lib-es/__tests__/bridge/buildTransaction.test.js.map +1 -0
- package/lib-es/__tests__/bridge/createTransaction.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/createTransaction.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/createTransaction.test.js +17 -0
- package/lib-es/__tests__/bridge/createTransaction.test.js.map +1 -0
- package/lib-es/__tests__/bridge/deviceTransactionConfig.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/deviceTransactionConfig.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/deviceTransactionConfig.test.js +16 -0
- package/lib-es/__tests__/bridge/deviceTransactionConfig.test.js.map +1 -0
- package/lib-es/__tests__/bridge/estimateMaxSpendable.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/estimateMaxSpendable.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/estimateMaxSpendable.test.js +103 -0
- package/lib-es/__tests__/bridge/estimateMaxSpendable.test.js.map +1 -0
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.js +206 -0
- package/lib-es/__tests__/bridge/getFeesForTransaction.test.js.map +1 -0
- package/lib-es/__tests__/bridge/getTransactionStatus.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/getTransactionStatus.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/getTransactionStatus.test.js +209 -0
- package/lib-es/__tests__/bridge/getTransactionStatus.test.js.map +1 -0
- package/lib-es/__tests__/bridge/logic.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/logic.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/logic.test.js +485 -0
- package/lib-es/__tests__/bridge/logic.test.js.map +1 -0
- package/lib-es/__tests__/bridge/prepareTransaction.test.d.ts +2 -0
- package/lib-es/__tests__/bridge/prepareTransaction.test.d.ts.map +1 -0
- package/lib-es/__tests__/bridge/prepareTransaction.test.js +234 -0
- package/lib-es/__tests__/bridge/prepareTransaction.test.js.map +1 -0
- package/lib-es/bridge/buildOptimisticOperation.d.ts.map +1 -1
- package/lib-es/bridge/buildOptimisticOperation.js +5 -2
- 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 +29 -6
- 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 +10 -2
- package/lib-es/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib-es/bridge/fixtures.d.ts +36 -0
- package/lib-es/bridge/fixtures.d.ts.map +1 -0
- package/lib-es/bridge/fixtures.js +89 -0
- package/lib-es/bridge/fixtures.js.map +1 -0
- package/lib-es/bridge/getFeesForTransaction.d.ts.map +1 -1
- package/lib-es/bridge/getFeesForTransaction.js +29 -5
- 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 +18 -4
- 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 +33 -4
- 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 +11 -3
- 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 +7 -3
- package/lib-es/bridge/synchronisation.js.map +1 -1
- package/lib-es/config.d.ts.map +1 -1
- package/lib-es/config.js +8 -0
- package/lib-es/config.js.map +1 -1
- package/lib-es/constants.d.ts +6 -0
- package/lib-es/constants.d.ts.map +1 -0
- package/lib-es/constants.js +11 -0
- package/lib-es/constants.js.map +1 -0
- package/lib-es/types/types.d.ts +1 -0
- package/lib-es/types/types.d.ts.map +1 -1
- package/lib-es/types/types.js.map +1 -1
- package/package.json +11 -10
- package/src/__tests__/bridge/buildOptimisticOperation.test.ts +29 -0
- package/src/__tests__/bridge/buildTransaction.test.ts +502 -0
- package/src/__tests__/bridge/createTransaction.test.ts +17 -0
- package/src/__tests__/bridge/deviceTransactionConfig.test.ts +16 -0
- package/src/__tests__/bridge/estimateMaxSpendable.test.ts +112 -0
- package/src/__tests__/bridge/getFeesForTransaction.test.ts +233 -0
- package/src/__tests__/bridge/getTransactionStatus.test.ts +261 -0
- package/src/__tests__/bridge/logic.test.ts +538 -0
- package/src/__tests__/bridge/prepareTransaction.test.ts +261 -0
- package/src/bridge/buildOptimisticOperation.ts +6 -2
- package/src/bridge/buildTransaction.ts +38 -7
- package/src/bridge/estimateMaxSpendable.ts +18 -2
- package/src/bridge/fixtures.ts +103 -0
- package/src/bridge/getFeesForTransaction.ts +39 -5
- package/src/bridge/getTransactionStatus.ts +21 -4
- package/src/bridge/index.ts +0 -1
- package/src/bridge/prepareTransaction.ts +39 -6
- package/src/bridge/signOperation.ts +19 -4
- package/src/bridge/synchronisation.ts +10 -4
- package/src/config.ts +8 -0
- package/src/constants.ts +15 -0
- package/src/logic.ts +1 -1
- package/src/types/types.ts +1 -0
- package/lib/test/please-add-coverage.test.d.ts +0 -2
- package/lib/test/please-add-coverage.test.d.ts.map +0 -1
- package/lib/test/please-add-coverage.test.js +0 -6
- package/lib/test/please-add-coverage.test.js.map +0 -1
- package/lib-es/test/please-add-coverage.test.d.ts +0 -1
- package/lib-es/test/please-add-coverage.test.d.ts.map +0 -1
- package/lib-es/test/please-add-coverage.test.js +0 -5
- package/lib-es/test/please-add-coverage.test.js.map +0 -1
- package/src/test/please-add-coverage.test.ts +0 -3
|
@@ -0,0 +1,234 @@
|
|
|
1
|
+
import BigNumber from "bignumber.js";
|
|
2
|
+
import { accountFixture, accountWithTokenAccountFixture, tokenTransactionFixture, transactionFixture, } from "../../bridge/fixtures";
|
|
3
|
+
import prepareTransaction from "../../bridge/prepareTransaction";
|
|
4
|
+
const chainIdMock = jest.fn();
|
|
5
|
+
const nonceMock = jest.fn();
|
|
6
|
+
jest.mock("../../network/sdk", () => {
|
|
7
|
+
return {
|
|
8
|
+
celoKit: jest.fn(() => ({
|
|
9
|
+
contracts: {
|
|
10
|
+
getLockedGold: jest.fn(async () => ({
|
|
11
|
+
address: "address",
|
|
12
|
+
lock: jest.fn(() => ({
|
|
13
|
+
txo: {
|
|
14
|
+
encodeABI: jest.fn(() => "0x6C6F636B5F64617461"), // lock_data
|
|
15
|
+
estimateGas: jest.fn(async () => 2),
|
|
16
|
+
},
|
|
17
|
+
})),
|
|
18
|
+
unlock: jest.fn(() => ({
|
|
19
|
+
txo: {
|
|
20
|
+
encodeABI: jest.fn(() => "0x756E6C6F636B5F64617461"), // unlock_data
|
|
21
|
+
estimateGas: jest.fn(async () => 3),
|
|
22
|
+
},
|
|
23
|
+
})),
|
|
24
|
+
withdraw: jest.fn(() => ({
|
|
25
|
+
txo: {
|
|
26
|
+
encodeABI: jest.fn(() => "0x77697468647261775F64617461"), // withdraw_data
|
|
27
|
+
estimateGas: jest.fn(async () => 3),
|
|
28
|
+
},
|
|
29
|
+
})),
|
|
30
|
+
vote: jest.fn(() => ({
|
|
31
|
+
txo: {
|
|
32
|
+
encodeABI: jest.fn(() => "0x766F74655F64617461"), // vote_data
|
|
33
|
+
estimateGas: jest.fn(async () => 3),
|
|
34
|
+
},
|
|
35
|
+
})),
|
|
36
|
+
getAccountNonvotingLockedGold: jest.fn(() => BigNumber(0)),
|
|
37
|
+
})),
|
|
38
|
+
getGoldToken: jest.fn(async () => ({
|
|
39
|
+
address: "gold_token_address",
|
|
40
|
+
transfer: jest.fn(() => ({
|
|
41
|
+
txo: {
|
|
42
|
+
encodeABI: jest.fn(() => "0x73656E645F64617461"), // send_data
|
|
43
|
+
},
|
|
44
|
+
})),
|
|
45
|
+
})),
|
|
46
|
+
getStableToken: jest.fn(async () => ({
|
|
47
|
+
address: "stable_token_address",
|
|
48
|
+
transfer: jest.fn(() => ({
|
|
49
|
+
txo: {
|
|
50
|
+
encodeABI: jest.fn(() => "0x73656E645F746F6B656E5F64617461"), // stable_token_data
|
|
51
|
+
},
|
|
52
|
+
})),
|
|
53
|
+
})),
|
|
54
|
+
getErc20: jest.fn(async () => ({
|
|
55
|
+
address: "erc20_token_address",
|
|
56
|
+
transfer: jest.fn(() => ({
|
|
57
|
+
txo: {
|
|
58
|
+
encodeABI: jest.fn(() => "0x73656E645F65726332305F746F6B656E5F64617461"), // send_erc20_token_data
|
|
59
|
+
},
|
|
60
|
+
})),
|
|
61
|
+
})),
|
|
62
|
+
},
|
|
63
|
+
connection: {
|
|
64
|
+
chainId: chainIdMock,
|
|
65
|
+
nonce: nonceMock,
|
|
66
|
+
estimateGasWithInflationFactor: jest.fn().mockReturnValue(3),
|
|
67
|
+
gasPrice: jest.fn(async () => BigNumber(2)),
|
|
68
|
+
web3: { eth: { getBlock: jest.fn().mockResolvedValue({ baseFeePerGas: 10 }) } },
|
|
69
|
+
getMaxPriorityFeePerGas: jest.fn().mockResolvedValue(1),
|
|
70
|
+
},
|
|
71
|
+
})),
|
|
72
|
+
};
|
|
73
|
+
});
|
|
74
|
+
describe("prepareTransaction", () => {
|
|
75
|
+
it("should return the transaction if the address is invalid", async () => {
|
|
76
|
+
const transaction = await prepareTransaction(accountFixture, transactionFixture);
|
|
77
|
+
expect(transaction).toMatchObject({
|
|
78
|
+
amount: BigNumber(10),
|
|
79
|
+
recipient: "recipient",
|
|
80
|
+
useAllAmount: false,
|
|
81
|
+
family: "celo",
|
|
82
|
+
mode: "send",
|
|
83
|
+
index: 0,
|
|
84
|
+
fees: null,
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
it("should return the transaction if it doesn't have a recipient", async () => {
|
|
88
|
+
const transaction = await prepareTransaction(accountFixture, {
|
|
89
|
+
...transactionFixture,
|
|
90
|
+
recipient: "",
|
|
91
|
+
});
|
|
92
|
+
expect(transaction).toMatchObject({
|
|
93
|
+
amount: BigNumber(10),
|
|
94
|
+
recipient: "",
|
|
95
|
+
useAllAmount: false,
|
|
96
|
+
family: "celo",
|
|
97
|
+
mode: "send",
|
|
98
|
+
index: 0,
|
|
99
|
+
fees: null,
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
it("should return the vote transaction if it doesn't have a recipient", async () => {
|
|
103
|
+
const transaction = await prepareTransaction(accountFixture, {
|
|
104
|
+
...transactionFixture,
|
|
105
|
+
recipient: "",
|
|
106
|
+
mode: "vote",
|
|
107
|
+
});
|
|
108
|
+
expect(transaction).toMatchObject({
|
|
109
|
+
amount: BigNumber(10),
|
|
110
|
+
recipient: "",
|
|
111
|
+
useAllAmount: false,
|
|
112
|
+
family: "celo",
|
|
113
|
+
mode: "vote",
|
|
114
|
+
index: 0,
|
|
115
|
+
fees: null,
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
it("should return the vote transaction if the amount is less than or equal to zero", async () => {
|
|
119
|
+
const transaction = await prepareTransaction(accountFixture, {
|
|
120
|
+
...transactionFixture,
|
|
121
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
122
|
+
mode: "vote",
|
|
123
|
+
amount: BigNumber(0),
|
|
124
|
+
});
|
|
125
|
+
expect(transaction).toMatchObject({
|
|
126
|
+
amount: BigNumber(0),
|
|
127
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
128
|
+
useAllAmount: false,
|
|
129
|
+
family: "celo",
|
|
130
|
+
mode: "vote",
|
|
131
|
+
index: 0,
|
|
132
|
+
fees: null,
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
it("should return the prepared transaction", async () => {
|
|
136
|
+
const transaction = await prepareTransaction({ ...accountFixture, balance: BigNumber(222222), spendableBalance: BigNumber(222222) }, {
|
|
137
|
+
...transactionFixture,
|
|
138
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
139
|
+
amount: BigNumber(22),
|
|
140
|
+
});
|
|
141
|
+
expect(transaction).toMatchObject({
|
|
142
|
+
amount: BigNumber(22),
|
|
143
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
144
|
+
useAllAmount: false,
|
|
145
|
+
family: "celo",
|
|
146
|
+
mode: "send",
|
|
147
|
+
index: 0,
|
|
148
|
+
fees: BigNumber(24),
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
it("should return the prepared stable token transaction", async () => {
|
|
152
|
+
const transaction = await prepareTransaction({
|
|
153
|
+
...accountWithTokenAccountFixture,
|
|
154
|
+
balance: BigNumber(222222),
|
|
155
|
+
spendableBalance: BigNumber(222222),
|
|
156
|
+
subAccounts: [
|
|
157
|
+
{
|
|
158
|
+
...accountWithTokenAccountFixture.subAccounts[0],
|
|
159
|
+
token: {
|
|
160
|
+
...accountWithTokenAccountFixture.subAccounts[0].token,
|
|
161
|
+
id: "cEUR",
|
|
162
|
+
},
|
|
163
|
+
},
|
|
164
|
+
],
|
|
165
|
+
}, {
|
|
166
|
+
...tokenTransactionFixture,
|
|
167
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
168
|
+
amount: BigNumber(22),
|
|
169
|
+
});
|
|
170
|
+
expect(transaction).toMatchObject({
|
|
171
|
+
amount: BigNumber(22),
|
|
172
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
173
|
+
useAllAmount: false,
|
|
174
|
+
family: "celo",
|
|
175
|
+
mode: "send",
|
|
176
|
+
index: 0,
|
|
177
|
+
fees: BigNumber(24),
|
|
178
|
+
subAccountId: "subAccountId",
|
|
179
|
+
maxFeePerGas: "1000000010",
|
|
180
|
+
maxPriorityFeePerGas: 1,
|
|
181
|
+
data: Buffer.from("0x73656E645F746F6B656E5F64617461"),
|
|
182
|
+
});
|
|
183
|
+
});
|
|
184
|
+
it("should return the prepared token transaction", async () => {
|
|
185
|
+
const transaction = await prepareTransaction({
|
|
186
|
+
...accountWithTokenAccountFixture,
|
|
187
|
+
balance: BigNumber(222222),
|
|
188
|
+
spendableBalance: BigNumber(222222),
|
|
189
|
+
}, {
|
|
190
|
+
...tokenTransactionFixture,
|
|
191
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
192
|
+
amount: BigNumber(22),
|
|
193
|
+
});
|
|
194
|
+
expect(transaction).toMatchObject({
|
|
195
|
+
amount: BigNumber(22),
|
|
196
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
197
|
+
useAllAmount: false,
|
|
198
|
+
family: "celo",
|
|
199
|
+
mode: "send",
|
|
200
|
+
index: 0,
|
|
201
|
+
fees: BigNumber(24),
|
|
202
|
+
subAccountId: "subAccountId",
|
|
203
|
+
maxFeePerGas: "1000000010",
|
|
204
|
+
maxPriorityFeePerGas: 1,
|
|
205
|
+
data: Buffer.from("0x73656E645F65726332305F746F6B656E5F64617461"),
|
|
206
|
+
});
|
|
207
|
+
});
|
|
208
|
+
it("should return the prepared token transaction with useAllAmount", async () => {
|
|
209
|
+
const transaction = await prepareTransaction({
|
|
210
|
+
...accountWithTokenAccountFixture,
|
|
211
|
+
balance: BigNumber(222222),
|
|
212
|
+
spendableBalance: BigNumber(222222),
|
|
213
|
+
}, {
|
|
214
|
+
...tokenTransactionFixture,
|
|
215
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
216
|
+
amount: BigNumber(22),
|
|
217
|
+
useAllAmount: true,
|
|
218
|
+
});
|
|
219
|
+
expect(transaction).toMatchObject({
|
|
220
|
+
amount: BigNumber(212),
|
|
221
|
+
recipient: "0x79D5A290D7ba4b99322d91b577589e8d0BF87072",
|
|
222
|
+
useAllAmount: true,
|
|
223
|
+
family: "celo",
|
|
224
|
+
mode: "send",
|
|
225
|
+
index: 0,
|
|
226
|
+
fees: BigNumber(24),
|
|
227
|
+
subAccountId: "subAccountId",
|
|
228
|
+
maxFeePerGas: "1000000010",
|
|
229
|
+
maxPriorityFeePerGas: 1,
|
|
230
|
+
data: Buffer.from("0x73656E645F65726332305F746F6B656E5F64617461"),
|
|
231
|
+
});
|
|
232
|
+
});
|
|
233
|
+
});
|
|
234
|
+
//# sourceMappingURL=prepareTransaction.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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":"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;AAgBtF,eAAO,MAAM,wBAAwB,YAC1B,WAAW,eACP,WAAW,OACnB,SAAS,KACb,aAkCF,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
2
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
3
|
+
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
3
4
|
const MODE_TO_TYPE = {
|
|
4
5
|
send: "OUT",
|
|
5
6
|
lock: "LOCK",
|
|
@@ -13,8 +14,10 @@ const MODE_TO_TYPE = {
|
|
|
13
14
|
};
|
|
14
15
|
export const buildOptimisticOperation = (account, transaction, fee) => {
|
|
15
16
|
const type = MODE_TO_TYPE[transaction.mode] ?? MODE_TO_TYPE.default;
|
|
17
|
+
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
18
|
+
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
16
19
|
const value = type === "OUT" || type === "LOCK"
|
|
17
|
-
? new BigNumber(transaction.amount).plus(fee)
|
|
20
|
+
? new BigNumber(transaction.amount).plus(isTokenTransaction ? 0 : fee)
|
|
18
21
|
: new BigNumber(transaction.amount);
|
|
19
22
|
const operation = {
|
|
20
23
|
id: encodeOperationId(account.id, "", type),
|
|
@@ -26,7 +29,7 @@ export const buildOptimisticOperation = (account, transaction, fee) => {
|
|
|
26
29
|
blockHeight: null,
|
|
27
30
|
senders: [account.freshAddress],
|
|
28
31
|
recipients: [transaction.recipient].filter(Boolean),
|
|
29
|
-
accountId: account.id,
|
|
32
|
+
accountId: isTokenTransaction ? tokenAccount.id : account.id,
|
|
30
33
|
date: new Date(),
|
|
31
34
|
extra: {
|
|
32
35
|
celoOperationValue: new BigNumber(transaction.amount),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildOptimisticOperation.js","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"buildOptimisticOperation.js","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,MAAM,YAAY,GAA8D;IAC9E,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,OAAoB,EACpB,WAAwB,EACxB,GAAc,EACC,EAAE;IACjB,MAAM,IAAI,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC;IAEpE,MAAM,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,KAAK,GACT,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,MAAM;QAC/B,CAAC,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACtE,CAAC,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,SAAS,GAAkB;QAC/B,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC;QAC3C,IAAI,EAAE,EAAE;QACR,IAAI;QACJ,KAAK;QACL,GAAG;QACH,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC;QAC/B,UAAU,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QACnD,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;QAC5D,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,KAAK,EAAE;YACL,kBAAkB,EAAE,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;YACrD,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC/C,CAAC,CAAC;oBACE,mBAAmB,EAAE,WAAW,CAAC,SAAS;iBAC3C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;KACF,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAYvC,QAAA,MAAM,gBAAgB,YAAmB,WAAW,eAAe,WAAW,oBAmJ7E,CAAC;AAwBF,eAAe,gBAAgB,CAAC"}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
import { celoKit } from "../network/sdk";
|
|
2
2
|
import { BigNumber } from "bignumber.js";
|
|
3
3
|
import { getPendingStakingOperationAmounts, getVote } from "../logic";
|
|
4
|
+
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
5
|
+
import { CELO_STABLE_TOKENS, getStableTokenEnum, MAX_FEES_THRESHOLD_MULTIPLIER, MAX_PRIORITY_FEE_PER_GAS, } from "../constants";
|
|
4
6
|
const buildTransaction = async (account, transaction) => {
|
|
5
7
|
const kit = celoKit();
|
|
6
|
-
const
|
|
8
|
+
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
9
|
+
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
10
|
+
let value = transactionValue(account, transaction);
|
|
7
11
|
let celoTransaction;
|
|
8
12
|
if (transaction.mode === "lock") {
|
|
9
13
|
const lockedGold = await kit.contracts.getLockedGold();
|
|
@@ -95,21 +99,40 @@ const buildTransaction = async (account, transaction) => {
|
|
|
95
99
|
gas: await accounts.createAccount().txo.estimateGas({ from: account.freshAddress }),
|
|
96
100
|
};
|
|
97
101
|
}
|
|
98
|
-
else {
|
|
99
|
-
|
|
102
|
+
else if (isTokenTransaction) {
|
|
103
|
+
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
104
|
+
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
105
|
+
const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
|
|
106
|
+
const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
|
|
107
|
+
let token;
|
|
108
|
+
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
109
|
+
token = await kit.contracts.getStableToken(getStableTokenEnum(tokenAccount.token.id));
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
|
|
113
|
+
}
|
|
100
114
|
celoTransaction = {
|
|
101
115
|
from: account.freshAddress,
|
|
102
116
|
to: transaction.recipient,
|
|
117
|
+
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
118
|
+
maxFeePerGas: maxFeePerGas.toString(),
|
|
119
|
+
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
103
120
|
value: value.toFixed(),
|
|
104
121
|
};
|
|
105
|
-
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
// Send
|
|
106
125
|
celoTransaction = {
|
|
107
|
-
|
|
108
|
-
|
|
126
|
+
from: account.freshAddress,
|
|
127
|
+
to: transaction.recipient,
|
|
128
|
+
value: value.toFixed(),
|
|
109
129
|
};
|
|
110
130
|
}
|
|
131
|
+
const gas = ((await kit.connection.estimateGasWithInflationFactor(celoTransaction)) *
|
|
132
|
+
MAX_FEES_THRESHOLD_MULTIPLIER).toFixed();
|
|
111
133
|
const tx = {
|
|
112
134
|
...celoTransaction,
|
|
135
|
+
gas,
|
|
113
136
|
chainId: await kit.connection.chainId(),
|
|
114
137
|
nonce: await kit.connection.nonce(account.freshAddress),
|
|
115
138
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAWpD,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAC9C,WAAW,EACX,WAAW,CACZ,CAAC,sBAAsB,CAoBvB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -1,16 +1,24 @@
|
|
|
1
1
|
import getTransactionStatus from "./getTransactionStatus";
|
|
2
2
|
import prepareTransaction from "./prepareTransaction";
|
|
3
3
|
import createTransaction from "./createTransaction";
|
|
4
|
-
import { getMainAccount } from "@ledgerhq/coin-framework/account/helpers";
|
|
4
|
+
import { findSubAccountById, getMainAccount, isTokenAccount, } from "@ledgerhq/coin-framework/account/helpers";
|
|
5
|
+
import BigNumber from "bignumber.js";
|
|
5
6
|
export const estimateMaxSpendable = async ({ account, parentAccount, transaction }) => {
|
|
6
7
|
const mainAccount = getMainAccount(account, parentAccount);
|
|
8
|
+
const tokenAccount = findSubAccountById(mainAccount, transaction?.subAccountId ?? "");
|
|
9
|
+
const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
|
|
7
10
|
const t = await prepareTransaction(mainAccount, {
|
|
8
11
|
...createTransaction(account),
|
|
9
12
|
...transaction,
|
|
10
13
|
useAllAmount: true,
|
|
11
14
|
});
|
|
12
15
|
const { amount } = await getTransactionStatus(mainAccount, t);
|
|
13
|
-
|
|
16
|
+
const fees = t.fees ?? BigNumber(0);
|
|
17
|
+
return fromTokenAccount
|
|
18
|
+
? tokenAccount.spendableBalance
|
|
19
|
+
: account.spendableBalance.gt(fees)
|
|
20
|
+
? amount.minus(fees)
|
|
21
|
+
: new BigNumber(0);
|
|
14
22
|
};
|
|
15
23
|
export default estimateMaxSpendable;
|
|
16
24
|
//# sourceMappingURL=estimateMaxSpendable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAEA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAEA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,cAAc,GACf,MAAM,0CAA0C,CAAC;AAClD,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,CAAC,MAAM,oBAAoB,GAGL,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,EAAE;IAC5E,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAE3D,MAAM,YAAY,GAAG,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC;IACtF,MAAM,gBAAgB,GAAG,YAAY,IAAI,cAAc,CAAC,YAAY,CAAC,CAAC;IAEtE,MAAM,CAAC,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE;QAC9C,GAAG,iBAAiB,CAAC,OAAO,CAAC;QAC7B,GAAG,WAAW;QACd,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IAEpC,OAAO,gBAAgB;QACrB,CAAC,CAAC,YAAY,CAAC,gBAAgB;QAC/B,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,IAAI,CAAC;YACjC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;YACpB,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AACzB,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { CeloAccount, Transaction } from "../types";
|
|
2
|
+
import BigNumber from "bignumber.js";
|
|
3
|
+
import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
|
|
4
|
+
import { TokenAccount } from "@ledgerhq/types-live";
|
|
5
|
+
declare const accountFixture: CeloAccount;
|
|
6
|
+
declare const accountWithTokenAccountFixture: {
|
|
7
|
+
subAccounts: TokenAccount[];
|
|
8
|
+
type: "Account";
|
|
9
|
+
id: string;
|
|
10
|
+
seedIdentifier: string;
|
|
11
|
+
xpub?: string;
|
|
12
|
+
derivationMode: import("@ledgerhq/types-live").DerivationMode;
|
|
13
|
+
index: number;
|
|
14
|
+
freshAddress: string;
|
|
15
|
+
freshAddressPath: string;
|
|
16
|
+
used: boolean;
|
|
17
|
+
balance: BigNumber;
|
|
18
|
+
spendableBalance: BigNumber;
|
|
19
|
+
creationDate: Date;
|
|
20
|
+
blockHeight: number;
|
|
21
|
+
currency: import("@ledgerhq/types-cryptoassets").CryptoCurrency;
|
|
22
|
+
feesCurrency?: import("@ledgerhq/types-cryptoassets").CryptoCurrency | TokenCurrency | undefined;
|
|
23
|
+
operationsCount: number;
|
|
24
|
+
operations: import("@ledgerhq/types-live").Operation[];
|
|
25
|
+
pendingOperations: import("@ledgerhq/types-live").Operation[];
|
|
26
|
+
lastSyncDate: Date;
|
|
27
|
+
balanceHistoryCache: import("@ledgerhq/types-live").BalanceHistoryCache;
|
|
28
|
+
swapHistory: import("@ledgerhq/types-live").SwapOperation[];
|
|
29
|
+
syncHash?: string | undefined;
|
|
30
|
+
nfts?: import("@ledgerhq/types-live").ProtoNFT[];
|
|
31
|
+
celoResources: import("../types").CeloResources;
|
|
32
|
+
};
|
|
33
|
+
declare const transactionFixture: Transaction;
|
|
34
|
+
declare const tokenTransactionFixture: Transaction;
|
|
35
|
+
export { accountFixture, accountWithTokenAccountFixture, transactionFixture, tokenTransactionFixture, };
|
|
36
|
+
//# sourceMappingURL=fixtures.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/bridge/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGpD,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIpD,QAAA,MAAM,cAAc,EAAE,WA8BrB,CAAC;AAqCF,QAAA,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;CAGnC,CAAC;AAEF,QAAA,MAAM,kBAAkB,EAAE,WAQzB,CAAC;AAEF,QAAA,MAAM,uBAAuB,EAAE,WAG9B,CAAC;AAEF,OAAO,EACL,cAAc,EACd,8BAA8B,EAC9B,kBAAkB,EAClB,uBAAuB,GACxB,CAAC"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
|
|
2
|
+
import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/lib/currencies";
|
|
3
|
+
import BigNumber from "bignumber.js";
|
|
4
|
+
import { faker } from "@faker-js/faker";
|
|
5
|
+
const currency = getCryptoCurrencyById("celo");
|
|
6
|
+
const accountFixture = {
|
|
7
|
+
type: "Account",
|
|
8
|
+
id: faker.string.uuid(),
|
|
9
|
+
seedIdentifier: faker.string.uuid(),
|
|
10
|
+
derivationMode: "",
|
|
11
|
+
index: faker.number.int(),
|
|
12
|
+
freshAddress: "address",
|
|
13
|
+
freshAddressPath: "derivationPath",
|
|
14
|
+
used: true,
|
|
15
|
+
balance: new BigNumber(0),
|
|
16
|
+
spendableBalance: new BigNumber(0),
|
|
17
|
+
creationDate: faker.date.past(),
|
|
18
|
+
blockHeight: faker.number.int({ min: 100_000, max: 200_000 }),
|
|
19
|
+
currency,
|
|
20
|
+
operationsCount: 0,
|
|
21
|
+
operations: [],
|
|
22
|
+
pendingOperations: [],
|
|
23
|
+
lastSyncDate: new Date(),
|
|
24
|
+
balanceHistoryCache: emptyHistoryCache,
|
|
25
|
+
swapHistory: [],
|
|
26
|
+
celoResources: {
|
|
27
|
+
registrationStatus: false,
|
|
28
|
+
lockedBalance: BigNumber(0),
|
|
29
|
+
nonvotingLockedBalance: BigNumber(0),
|
|
30
|
+
pendingWithdrawals: null,
|
|
31
|
+
votes: null,
|
|
32
|
+
electionAddress: null,
|
|
33
|
+
lockedGoldAddress: null,
|
|
34
|
+
maxNumGroupsVotedFor: BigNumber(0),
|
|
35
|
+
},
|
|
36
|
+
};
|
|
37
|
+
const subAccounts = [
|
|
38
|
+
{
|
|
39
|
+
id: "subAccountId",
|
|
40
|
+
type: "TokenAccount",
|
|
41
|
+
parentId: accountFixture.id,
|
|
42
|
+
token: {
|
|
43
|
+
type: "TokenCurrency",
|
|
44
|
+
id: "celoToken",
|
|
45
|
+
contractAddress: "contract_address",
|
|
46
|
+
parentCurrency: currency,
|
|
47
|
+
},
|
|
48
|
+
balance: BigNumber(212),
|
|
49
|
+
spendableBalance: BigNumber(212),
|
|
50
|
+
creationDate: faker.date.past(),
|
|
51
|
+
operationsCount: 0,
|
|
52
|
+
operations: [],
|
|
53
|
+
pendingOperations: [],
|
|
54
|
+
balanceHistoryCache: {
|
|
55
|
+
HOUR: {
|
|
56
|
+
latestDate: null,
|
|
57
|
+
balances: [],
|
|
58
|
+
},
|
|
59
|
+
DAY: {
|
|
60
|
+
latestDate: null,
|
|
61
|
+
balances: [],
|
|
62
|
+
},
|
|
63
|
+
WEEK: {
|
|
64
|
+
latestDate: null,
|
|
65
|
+
balances: [],
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
|
+
swapHistory: [],
|
|
69
|
+
},
|
|
70
|
+
];
|
|
71
|
+
const accountWithTokenAccountFixture = {
|
|
72
|
+
...accountFixture,
|
|
73
|
+
subAccounts,
|
|
74
|
+
};
|
|
75
|
+
const transactionFixture = {
|
|
76
|
+
amount: new BigNumber(10),
|
|
77
|
+
recipient: "recipient",
|
|
78
|
+
useAllAmount: false,
|
|
79
|
+
family: "celo",
|
|
80
|
+
mode: "send",
|
|
81
|
+
index: 0,
|
|
82
|
+
fees: null,
|
|
83
|
+
};
|
|
84
|
+
const tokenTransactionFixture = {
|
|
85
|
+
...transactionFixture,
|
|
86
|
+
subAccountId: "subAccountId",
|
|
87
|
+
};
|
|
88
|
+
export { accountFixture, accountWithTokenAccountFixture, transactionFixture, tokenTransactionFixture, };
|
|
89
|
+
//# sourceMappingURL=fixtures.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../src/bridge/fixtures.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAWzD,QAAA,MAAM,qBAAqB,8BAGxB;IACD,OAAO,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;CAC1B,KAAG,OAAO,CAAC,SAAS,CA+HpB,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
1
2
|
import { BigNumber } from "bignumber.js";
|
|
2
3
|
import { celoKit } from "../network/sdk";
|
|
3
4
|
import { getPendingStakingOperationAmounts, getVote } from "../logic";
|
|
5
|
+
import buildTransaction from "./buildTransaction";
|
|
6
|
+
import { CELO_STABLE_TOKENS, getStableTokenEnum, MAX_FEES_THRESHOLD_MULTIPLIER, MAX_PRIORITY_FEE_PER_GAS, } from "../constants";
|
|
4
7
|
const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
5
8
|
const { amount, index } = transaction;
|
|
6
9
|
const kit = celoKit();
|
|
@@ -13,6 +16,8 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
13
16
|
const totalNonVotingLockedBalance = nonvotingLockedGoldBalance.minus(pendingOperationAmounts.vote);
|
|
14
17
|
// Deduct pending lock operations from the spendable balance
|
|
15
18
|
const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
|
|
19
|
+
const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
|
|
20
|
+
const isTokenTransaction = tokenAccount?.type === "TokenAccount";
|
|
16
21
|
if ((transaction.mode === "unlock" || transaction.mode === "vote") && account.celoResources) {
|
|
17
22
|
value = transaction.useAllAmount
|
|
18
23
|
? totalNonVotingLockedBalance
|
|
@@ -75,14 +80,33 @@ const getFeesForTransaction = async ({ account, transaction, }) => {
|
|
|
75
80
|
const accounts = await kit.contracts.getAccounts();
|
|
76
81
|
gas = await accounts.createAccount().txo.estimateGas({ from: account.freshAddress });
|
|
77
82
|
}
|
|
78
|
-
else {
|
|
79
|
-
|
|
83
|
+
else if (isTokenTransaction) {
|
|
84
|
+
value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
|
|
85
|
+
const block = await kit.connection.web3.eth.getBlock("latest");
|
|
86
|
+
const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
|
|
87
|
+
const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
|
|
88
|
+
let token;
|
|
89
|
+
if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
|
|
90
|
+
token = await kit.contracts.getStableToken(getStableTokenEnum(tokenAccount.token.id));
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
|
|
94
|
+
}
|
|
80
95
|
const celoTransaction = {
|
|
81
96
|
from: account.freshAddress,
|
|
82
|
-
to:
|
|
83
|
-
data:
|
|
97
|
+
to: transaction.recipient,
|
|
98
|
+
data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
|
|
99
|
+
maxFeePerGas: maxFeePerGas.toString(),
|
|
100
|
+
maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
|
|
101
|
+
value: value.toFixed(),
|
|
84
102
|
};
|
|
85
|
-
gas = await kit.connection.estimateGasWithInflationFactor(celoTransaction)
|
|
103
|
+
gas = Number(((await kit.connection.estimateGasWithInflationFactor(celoTransaction)) *
|
|
104
|
+
MAX_FEES_THRESHOLD_MULTIPLIER).toFixed());
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
// Send
|
|
108
|
+
const tx = await buildTransaction(account, transaction);
|
|
109
|
+
gas = tx.gas ? Number(tx.gas) : 0;
|
|
86
110
|
}
|
|
87
111
|
const gasPrice = new BigNumber(await kit.connection.gasPrice());
|
|
88
112
|
return gasPrice.times(gas);
|