@ledgerhq/coin-evm 17.1.0 → 17.1.1
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/CHANGELOG.md +6 -0
- package/lib/logic/cip64Fees.d.ts +27 -18
- package/lib/logic/cip64Fees.d.ts.map +1 -1
- package/lib/logic/cip64Fees.js +20 -22
- package/lib/logic/cip64Fees.js.map +1 -1
- package/lib/logic/getBlock.d.ts.map +1 -1
- package/lib/logic/getBlock.js +48 -22
- package/lib/logic/getBlock.js.map +1 -1
- package/lib-es/logic/cip64Fees.d.ts +27 -18
- package/lib-es/logic/cip64Fees.d.ts.map +1 -1
- package/lib-es/logic/cip64Fees.js +20 -22
- package/lib-es/logic/cip64Fees.js.map +1 -1
- package/lib-es/logic/getBlock.d.ts.map +1 -1
- package/lib-es/logic/getBlock.js +48 -22
- package/lib-es/logic/getBlock.js.map +1 -1
- package/package.json +1 -1
- package/src/logic/cip64Fees.ts +42 -30
- package/src/logic/getBlock.ts +74 -34
- package/src/logic/tests/cip64Fees.test.ts +21 -10
- package/src/logic/tests/getBlock.test.ts +45 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @ledgerhq/coin-evm
|
|
2
2
|
|
|
3
|
+
## 17.1.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#1336](https://github.com/LedgerHQ/coin-modules/pull/1336) [`e473586`](https://github.com/LedgerHQ/coin-modules/commit/e473586cb8d64a1be32e76358fc6df9bb049d1fc) Thanks [@lysyi3m](https://github.com/lysyi3m)! - fix(coin-evm): `getBlock` no longer fails a Celo block holding a transaction paid in an unsupported fee currency. The transaction reports no fee, keeps its fee transfers as operations, and names the fee currency in `details.unsupportedFeeCurrency`.
|
|
8
|
+
|
|
3
9
|
## 17.1.0
|
|
4
10
|
|
|
5
11
|
### Minor Changes
|
package/lib/logic/cip64Fees.d.ts
CHANGED
|
@@ -26,23 +26,10 @@ export type TokenFee = {
|
|
|
26
26
|
* @throws UnexpectedFeeLogsError when the fee logs do not match the fee currency
|
|
27
27
|
*/
|
|
28
28
|
export declare function splitTokenFee(feeCurrency: string, payer: string, transfers: readonly ERC20Transfer[], hash?: string): TokenFee;
|
|
29
|
-
/** Reads the token fee of a transaction, or `undefined` when it pays in the native coin. */
|
|
30
|
-
export type ReadTokenFee = (tx: {
|
|
31
|
-
hash: string;
|
|
32
|
-
from: string;
|
|
33
|
-
type?: number | undefined;
|
|
34
|
-
erc20Transfers: readonly ERC20Transfer[];
|
|
35
|
-
}) => Promise<TokenFee | undefined>;
|
|
36
29
|
/**
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
* does not prove the transaction pays in the native coin.
|
|
40
|
-
*
|
|
41
|
-
* @param nodeApi node of the network
|
|
42
|
-
* @param blockHeight height of the block
|
|
30
|
+
* How a Celo transaction paid its fee. A fee currency whose fee logs are not known is reported,
|
|
31
|
+
* not rejected, so that the caller decides how to degrade.
|
|
43
32
|
*/
|
|
44
|
-
export declare function createCeloTokenFeeReader(nodeApi: NodeApi, blockHeight: number): ReadTokenFee;
|
|
45
|
-
/** How a Celo transaction paid its fee. */
|
|
46
33
|
export type CeloTransactionFee = {
|
|
47
34
|
kind: 'native';
|
|
48
35
|
} | {
|
|
@@ -52,14 +39,36 @@ export type CeloTransactionFee = {
|
|
|
52
39
|
kind: 'unsupported';
|
|
53
40
|
feeCurrency: string;
|
|
54
41
|
};
|
|
42
|
+
/** A transaction, with the token transfers of its receipt, whose fee is to be read. */
|
|
43
|
+
type FeeTransaction = {
|
|
44
|
+
hash: string;
|
|
45
|
+
from: string;
|
|
46
|
+
type?: number | undefined;
|
|
47
|
+
erc20Transfers: readonly ERC20Transfer[];
|
|
48
|
+
};
|
|
49
|
+
/**
|
|
50
|
+
* Reads how a transaction paid its fee.
|
|
51
|
+
*
|
|
52
|
+
* @throws UnexpectedFeeLogsError when the fee logs do not match a supported fee currency
|
|
53
|
+
*/
|
|
54
|
+
export type ReadTokenFee = (tx: FeeTransaction) => Promise<CeloTransactionFee>;
|
|
55
|
+
/**
|
|
56
|
+
* Reads the fee of the CIP-64 transactions of a Celo block. The fee currencies of the block are
|
|
57
|
+
* fetched once, at the first transaction that is or may be CIP-64: a receipt without a type does
|
|
58
|
+
* not prove the transaction pays in the native coin.
|
|
59
|
+
*
|
|
60
|
+
* @param nodeApi node of the network
|
|
61
|
+
* @param blockHeight height of the block
|
|
62
|
+
*/
|
|
63
|
+
export declare function createCeloTokenFeeReader(nodeApi: NodeApi, blockHeight: number): ReadTokenFee;
|
|
55
64
|
/**
|
|
56
65
|
* Reads how a Celo transaction paid its fee, fetching its fee currency alone, for transactions
|
|
57
|
-
* that are not read block by block.
|
|
58
|
-
* rejected, so that the caller decides whether the fee matters to it.
|
|
66
|
+
* that are not read block by block.
|
|
59
67
|
*
|
|
60
68
|
* @param nodeApi node of the network
|
|
61
69
|
* @param tx the transaction, with the token transfers of its receipt
|
|
62
70
|
* @throws UnexpectedFeeLogsError when the fee logs do not match a supported fee currency
|
|
63
71
|
*/
|
|
64
|
-
export declare function readCeloTransactionFee(nodeApi: NodeApi, tx:
|
|
72
|
+
export declare function readCeloTransactionFee(nodeApi: NodeApi, tx: FeeTransaction): Promise<CeloTransactionFee>;
|
|
73
|
+
export {};
|
|
65
74
|
//# sourceMappingURL=cip64Fees.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cip64Fees.d.ts","sourceRoot":"","sources":["../../src/logic/cip64Fees.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAO1E,oFAAoF;AACpF,eAAO,MAAM,aAAa,MAAO,CAAA;AAmFjC,gGAAgG;AAChG,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,aAAa,EAAE,CAAA;IAC7B,SAAS,EAAE,aAAa,EAAE,CAAA;CAC3B,CAAA;AAgCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,aAAa,EAAE,EACnC,IAAI,CAAC,EAAE,MAAM,GACZ,QAAQ,CAsCV;AAED
|
|
1
|
+
{"version":3,"file":"cip64Fees.d.ts","sourceRoot":"","sources":["../../src/logic/cip64Fees.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAO1E,oFAAoF;AACpF,eAAO,MAAM,aAAa,MAAO,CAAA;AAmFjC,gGAAgG;AAChG,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,aAAa,EAAE,CAAA;IAC7B,SAAS,EAAE,aAAa,EAAE,CAAA;CAC3B,CAAA;AAgCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,aAAa,EAAE,EACnC,IAAI,CAAC,EAAE,MAAM,GACZ,QAAQ,CAsCV;AAED;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhD,uFAAuF;AACvF,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,cAAc,EAAE,SAAS,aAAa,EAAE,CAAA;CACzC,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,EAAE,EAAE,cAAc,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAY9E;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,YAAY,CAmB5F;AAED;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,EAAE,EAAE,cAAc,GACjB,OAAO,CAAC,kBAAkB,CAAC,CAS7B"}
|
package/lib/logic/cip64Fees.js
CHANGED
|
@@ -139,36 +139,42 @@ function splitTokenFee(feeCurrency, payer, transfers, hash) {
|
|
|
139
139
|
transfers: transfers.slice(1, creditStart),
|
|
140
140
|
};
|
|
141
141
|
}
|
|
142
|
+
function toCeloTransactionFee(feeCurrency, { hash, from, erc20Transfers }) {
|
|
143
|
+
if (feeCurrency === null)
|
|
144
|
+
return { kind: 'native' };
|
|
145
|
+
if (!CELO_FEE_CURRENCIES.has(feeCurrency.toLowerCase()))
|
|
146
|
+
return { kind: 'unsupported', feeCurrency };
|
|
147
|
+
return { kind: 'token', tokenFee: splitTokenFee(feeCurrency, from, erc20Transfers, hash) };
|
|
148
|
+
}
|
|
142
149
|
/**
|
|
143
|
-
* Reads the
|
|
144
|
-
*
|
|
145
|
-
*
|
|
150
|
+
* Reads the fee of the CIP-64 transactions of a Celo block. The fee currencies of the block are
|
|
151
|
+
* fetched once, at the first transaction that is or may be CIP-64: a receipt without a type does
|
|
152
|
+
* not prove the transaction pays in the native coin.
|
|
146
153
|
*
|
|
147
154
|
* @param nodeApi node of the network
|
|
148
155
|
* @param blockHeight height of the block
|
|
149
156
|
*/
|
|
150
157
|
function createCeloTokenFeeReader(nodeApi, blockHeight) {
|
|
151
158
|
let feeCurrencies;
|
|
152
|
-
return async (
|
|
153
|
-
if (type !== undefined && type !== exports.CIP64_TX_TYPE)
|
|
154
|
-
return
|
|
159
|
+
return async (tx) => {
|
|
160
|
+
if (tx.type !== undefined && tx.type !== exports.CIP64_TX_TYPE)
|
|
161
|
+
return { kind: 'native' };
|
|
155
162
|
if (nodeApi.getFeeCurrencies === undefined) {
|
|
156
|
-
throw new errors_1.FeeCurrencyUnavailableError('The node cannot report the fee currency of a transaction', { hash });
|
|
163
|
+
throw new errors_1.FeeCurrencyUnavailableError('The node cannot report the fee currency of a transaction', { hash: tx.hash });
|
|
157
164
|
}
|
|
158
165
|
feeCurrencies ??= nodeApi.getFeeCurrencies(blockHeight);
|
|
159
|
-
const feeCurrency = (await feeCurrencies).get(hash.toLowerCase());
|
|
166
|
+
const feeCurrency = (await feeCurrencies).get(tx.hash.toLowerCase());
|
|
160
167
|
if (feeCurrency === undefined) {
|
|
161
|
-
throw new errors_1.FeeCurrencyUnavailableError(`The node block has no transaction ${hash}`, {
|
|
162
|
-
hash,
|
|
168
|
+
throw new errors_1.FeeCurrencyUnavailableError(`The node block has no transaction ${tx.hash}`, {
|
|
169
|
+
hash: tx.hash,
|
|
163
170
|
});
|
|
164
171
|
}
|
|
165
|
-
return
|
|
172
|
+
return toCeloTransactionFee(feeCurrency, tx);
|
|
166
173
|
};
|
|
167
174
|
}
|
|
168
175
|
/**
|
|
169
176
|
* Reads how a Celo transaction paid its fee, fetching its fee currency alone, for transactions
|
|
170
|
-
* that are not read block by block.
|
|
171
|
-
* rejected, so that the caller decides whether the fee matters to it.
|
|
177
|
+
* that are not read block by block.
|
|
172
178
|
*
|
|
173
179
|
* @param nodeApi node of the network
|
|
174
180
|
* @param tx the transaction, with the token transfers of its receipt
|
|
@@ -180,14 +186,6 @@ async function readCeloTransactionFee(nodeApi, tx) {
|
|
|
180
186
|
if (nodeApi.getFeeCurrency === undefined) {
|
|
181
187
|
throw new errors_1.FeeCurrencyUnavailableError('The node cannot report the fee currency of a transaction', { hash: tx.hash });
|
|
182
188
|
}
|
|
183
|
-
|
|
184
|
-
if (feeCurrency === null)
|
|
185
|
-
return { kind: 'native' };
|
|
186
|
-
if (!CELO_FEE_CURRENCIES.has(feeCurrency.toLowerCase()))
|
|
187
|
-
return { kind: 'unsupported', feeCurrency };
|
|
188
|
-
return {
|
|
189
|
-
kind: 'token',
|
|
190
|
-
tokenFee: splitTokenFee(feeCurrency, tx.from, tx.erc20Transfers, tx.hash),
|
|
191
|
-
};
|
|
189
|
+
return toCeloTransactionFee(await nodeApi.getFeeCurrency(tx.hash), tx);
|
|
192
190
|
}
|
|
193
191
|
//# sourceMappingURL=cip64Fees.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cip64Fees.js","sourceRoot":"","sources":["../../src/logic/cip64Fees.ts"],"names":[],"mappings":";AAAA,4CAA4C;AAC5C,sCAAsC;;;AAoJtC,sCA2CC;
|
|
1
|
+
{"version":3,"file":"cip64Fees.js","sourceRoot":"","sources":["../../src/logic/cip64Fees.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBlock.d.ts","sourceRoot":"","sources":["../../src/logic/getBlock.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,UAAU,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"getBlock.d.ts","sourceRoot":"","sources":["../../src/logic/getBlock.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,UAAU,EAAE,MAAM,WAAW,CAAA;AASpD,OAAO,KAAK,EACV,KAAK,EAKN,MAAM,2CAA2C,CAAA;AAiBlD,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAwFlF"}
|
package/lib/logic/getBlock.js
CHANGED
|
@@ -245,13 +245,13 @@ async function getTransactionsFromPrefetchedData(chainId, chainName, blockHeight
|
|
|
245
245
|
withReceipts.push({ tx, receipt });
|
|
246
246
|
}
|
|
247
247
|
return await Promise.all(withReceipts.map(async ({ tx, receipt }) => {
|
|
248
|
-
const
|
|
248
|
+
const fee = await readTokenFee?.({
|
|
249
249
|
hash: tx.hash,
|
|
250
250
|
from: tx.from,
|
|
251
251
|
type: receipt.type,
|
|
252
252
|
erc20Transfers: receipt.erc20Transfers,
|
|
253
253
|
});
|
|
254
|
-
const blockTx = prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger,
|
|
254
|
+
const blockTx = prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger, fee);
|
|
255
255
|
return {
|
|
256
256
|
...blockTx,
|
|
257
257
|
operations: applyChainSpecificCorrections(chainId, blockTx.operations, receipt.type, logger),
|
|
@@ -269,51 +269,77 @@ async function getTransactionsFromPrefetchedData(chainId, chainName, blockHeight
|
|
|
269
269
|
return null;
|
|
270
270
|
}
|
|
271
271
|
}
|
|
272
|
-
function prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger,
|
|
272
|
+
function prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger, fee) {
|
|
273
273
|
const failed = receipt.status === 0;
|
|
274
274
|
// Some EVM chains (e.g. Cronos) omit `gasPrice` from transaction
|
|
275
275
|
// receipts. In that case, fall back to the prefetched tx's normalized `gasPrice`
|
|
276
276
|
// (the node layer provides `0` when the raw `eth_getBlockByNumber(_, true)` payload omits it).
|
|
277
277
|
const receiptGasPrice = BigInt(receipt.gasPrice);
|
|
278
278
|
const gasPrice = receiptGasPrice > 0n ? receiptGasPrice : BigInt(tx.gasPrice);
|
|
279
|
-
const
|
|
280
|
-
const
|
|
281
|
-
|
|
282
|
-
to: tx.to,
|
|
283
|
-
value: tx.value,
|
|
284
|
-
erc20Transfers: tokenFee?.transfers ?? receipt.erc20Transfers,
|
|
285
|
-
}, logger);
|
|
279
|
+
const nativeFees = BigInt(receipt.gasUsed) * gasPrice + (receipt.l1Fee ? BigInt(receipt.l1Fee) : 0n);
|
|
280
|
+
const { erc20Transfers, feeDetails, ...feeFields } = readFeeFields(tx.hash, nativeFees, receipt.erc20Transfers, fee, logger);
|
|
281
|
+
const operations = (0, blockOperations_1.rpcTransactionToBlockOperations)({ from: tx.from, to: tx.to, value: tx.value, erc20Transfers }, logger);
|
|
286
282
|
const details = buildTransactionDetails(gasPrice, tx.gasLimit, tx.nonce, (0, logic_public_1.buildSmartContractDetails)(tx.to, tx.input, logger, receipt.contractAddress), detectStakingOperationType(chainId, tx.to, tx.input));
|
|
287
283
|
return {
|
|
288
284
|
hash: tx.hash,
|
|
289
285
|
failed,
|
|
290
286
|
operations,
|
|
291
|
-
...
|
|
287
|
+
...feeFields,
|
|
292
288
|
feesPayer: tx.from,
|
|
293
|
-
details,
|
|
289
|
+
details: { ...details, ...feeDetails },
|
|
294
290
|
};
|
|
295
291
|
}
|
|
296
|
-
/**
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
292
|
+
/**
|
|
293
|
+
* The fee fields of a transaction, and the token transfers left for its operations, from how it
|
|
294
|
+
* paid its fee: a token fee without its fee transfers, or else the native fee.
|
|
295
|
+
*
|
|
296
|
+
* A fee currency with unknown fee logs degrades instead of failing the block, which anyone could
|
|
297
|
+
* cause with one transaction. The fee is reported as 0 in the native coin, every token transfer
|
|
298
|
+
* of the receipt stays an operation, fee transfers included, and `unsupportedFeeCurrency` in the
|
|
299
|
+
* details names the fee currency. When the fee currency emits standard Transfer events, applying
|
|
300
|
+
* the operations still gives each account's balance change; a failed transaction loses its fee,
|
|
301
|
+
* because consumers ignore its operations.
|
|
302
|
+
*/
|
|
303
|
+
function readFeeFields(hash, nativeFees, erc20Transfers, fee, logger) {
|
|
304
|
+
switch (fee?.kind) {
|
|
305
|
+
case 'token':
|
|
306
|
+
return {
|
|
307
|
+
fees: fee.tokenFee.fees,
|
|
308
|
+
feesAsset: fee.tokenFee.feesAsset,
|
|
309
|
+
erc20Transfers: fee.tokenFee.transfers,
|
|
310
|
+
feeDetails: {},
|
|
311
|
+
};
|
|
312
|
+
case 'unsupported':
|
|
313
|
+
logger('warn', 'Celo fee currency not supported, reporting no fee', {
|
|
314
|
+
hash,
|
|
315
|
+
feeCurrency: fee.feeCurrency,
|
|
316
|
+
});
|
|
317
|
+
return {
|
|
318
|
+
fees: 0n,
|
|
319
|
+
feesAsset: { type: 'native' },
|
|
320
|
+
erc20Transfers,
|
|
321
|
+
feeDetails: { unsupportedFeeCurrency: fee.feeCurrency },
|
|
322
|
+
};
|
|
323
|
+
default:
|
|
324
|
+
return { fees: nativeFees, feesAsset: { type: 'native' }, erc20Transfers, feeDetails: {} };
|
|
325
|
+
}
|
|
301
326
|
}
|
|
302
327
|
async function getTransactionFromHash(chainId, txHash, nodeApi, logger, readTokenFee) {
|
|
303
328
|
const txInfo = await nodeApi.getTransaction(txHash);
|
|
304
|
-
const
|
|
329
|
+
const fee = await readTokenFee?.(txInfo);
|
|
305
330
|
const failed = txInfo.status === 0;
|
|
306
|
-
const
|
|
307
|
-
const
|
|
331
|
+
const nativeFees = BigInt(txInfo.gasUsed) * BigInt(txInfo.gasPrice) + (txInfo.l1Fee ? BigInt(txInfo.l1Fee) : 0n);
|
|
332
|
+
const { erc20Transfers, feeDetails, ...feeFields } = readFeeFields(txHash, nativeFees, txInfo.erc20Transfers, fee, logger);
|
|
333
|
+
const rawOperations = (0, blockOperations_1.rpcTransactionToBlockOperations)({ ...txInfo, erc20Transfers }, logger);
|
|
308
334
|
const operations = applyChainSpecificCorrections(chainId, rawOperations, txInfo.type, logger);
|
|
309
335
|
const details = buildTransactionDetails(BigInt(txInfo.gasPrice), txInfo.gasLimit, txInfo.nonce, (0, logic_public_1.buildSmartContractDetails)(txInfo.to, txInfo.input, logger, txInfo.contractAddress), detectStakingOperationType(chainId, txInfo.to, txInfo.input));
|
|
310
336
|
return {
|
|
311
337
|
hash: txHash,
|
|
312
338
|
failed,
|
|
313
339
|
operations,
|
|
314
|
-
...
|
|
340
|
+
...feeFields,
|
|
315
341
|
feesPayer: txInfo.from,
|
|
316
|
-
details,
|
|
342
|
+
details: { ...details, ...feeDetails },
|
|
317
343
|
};
|
|
318
344
|
}
|
|
319
345
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBlock.js","sourceRoot":"","sources":["../../src/logic/getBlock.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getBlock.js","sourceRoot":"","sources":["../../src/logic/getBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,23 +26,10 @@ export type TokenFee = {
|
|
|
26
26
|
* @throws UnexpectedFeeLogsError when the fee logs do not match the fee currency
|
|
27
27
|
*/
|
|
28
28
|
export declare function splitTokenFee(feeCurrency: string, payer: string, transfers: readonly ERC20Transfer[], hash?: string): TokenFee;
|
|
29
|
-
/** Reads the token fee of a transaction, or `undefined` when it pays in the native coin. */
|
|
30
|
-
export type ReadTokenFee = (tx: {
|
|
31
|
-
hash: string;
|
|
32
|
-
from: string;
|
|
33
|
-
type?: number | undefined;
|
|
34
|
-
erc20Transfers: readonly ERC20Transfer[];
|
|
35
|
-
}) => Promise<TokenFee | undefined>;
|
|
36
29
|
/**
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
* does not prove the transaction pays in the native coin.
|
|
40
|
-
*
|
|
41
|
-
* @param nodeApi node of the network
|
|
42
|
-
* @param blockHeight height of the block
|
|
30
|
+
* How a Celo transaction paid its fee. A fee currency whose fee logs are not known is reported,
|
|
31
|
+
* not rejected, so that the caller decides how to degrade.
|
|
43
32
|
*/
|
|
44
|
-
export declare function createCeloTokenFeeReader(nodeApi: NodeApi, blockHeight: number): ReadTokenFee;
|
|
45
|
-
/** How a Celo transaction paid its fee. */
|
|
46
33
|
export type CeloTransactionFee = {
|
|
47
34
|
kind: 'native';
|
|
48
35
|
} | {
|
|
@@ -52,14 +39,36 @@ export type CeloTransactionFee = {
|
|
|
52
39
|
kind: 'unsupported';
|
|
53
40
|
feeCurrency: string;
|
|
54
41
|
};
|
|
42
|
+
/** A transaction, with the token transfers of its receipt, whose fee is to be read. */
|
|
43
|
+
type FeeTransaction = {
|
|
44
|
+
hash: string;
|
|
45
|
+
from: string;
|
|
46
|
+
type?: number | undefined;
|
|
47
|
+
erc20Transfers: readonly ERC20Transfer[];
|
|
48
|
+
};
|
|
49
|
+
/**
|
|
50
|
+
* Reads how a transaction paid its fee.
|
|
51
|
+
*
|
|
52
|
+
* @throws UnexpectedFeeLogsError when the fee logs do not match a supported fee currency
|
|
53
|
+
*/
|
|
54
|
+
export type ReadTokenFee = (tx: FeeTransaction) => Promise<CeloTransactionFee>;
|
|
55
|
+
/**
|
|
56
|
+
* Reads the fee of the CIP-64 transactions of a Celo block. The fee currencies of the block are
|
|
57
|
+
* fetched once, at the first transaction that is or may be CIP-64: a receipt without a type does
|
|
58
|
+
* not prove the transaction pays in the native coin.
|
|
59
|
+
*
|
|
60
|
+
* @param nodeApi node of the network
|
|
61
|
+
* @param blockHeight height of the block
|
|
62
|
+
*/
|
|
63
|
+
export declare function createCeloTokenFeeReader(nodeApi: NodeApi, blockHeight: number): ReadTokenFee;
|
|
55
64
|
/**
|
|
56
65
|
* Reads how a Celo transaction paid its fee, fetching its fee currency alone, for transactions
|
|
57
|
-
* that are not read block by block.
|
|
58
|
-
* rejected, so that the caller decides whether the fee matters to it.
|
|
66
|
+
* that are not read block by block.
|
|
59
67
|
*
|
|
60
68
|
* @param nodeApi node of the network
|
|
61
69
|
* @param tx the transaction, with the token transfers of its receipt
|
|
62
70
|
* @throws UnexpectedFeeLogsError when the fee logs do not match a supported fee currency
|
|
63
71
|
*/
|
|
64
|
-
export declare function readCeloTransactionFee(nodeApi: NodeApi, tx:
|
|
72
|
+
export declare function readCeloTransactionFee(nodeApi: NodeApi, tx: FeeTransaction): Promise<CeloTransactionFee>;
|
|
73
|
+
export {};
|
|
65
74
|
//# sourceMappingURL=cip64Fees.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cip64Fees.d.ts","sourceRoot":"","sources":["../../src/logic/cip64Fees.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAO1E,oFAAoF;AACpF,eAAO,MAAM,aAAa,MAAO,CAAA;AAmFjC,gGAAgG;AAChG,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,aAAa,EAAE,CAAA;IAC7B,SAAS,EAAE,aAAa,EAAE,CAAA;CAC3B,CAAA;AAgCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,aAAa,EAAE,EACnC,IAAI,CAAC,EAAE,MAAM,GACZ,QAAQ,CAsCV;AAED
|
|
1
|
+
{"version":3,"file":"cip64Fees.d.ts","sourceRoot":"","sources":["../../src/logic/cip64Fees.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAO1E,oFAAoF;AACpF,eAAO,MAAM,aAAa,MAAO,CAAA;AAmFjC,gGAAgG;AAChG,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,aAAa,EAAE,CAAA;IAC7B,SAAS,EAAE,aAAa,EAAE,CAAA;CAC3B,CAAA;AAgCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,aAAa,EAAE,EACnC,IAAI,CAAC,EAAE,MAAM,GACZ,QAAQ,CAsCV;AAED;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhD,uFAAuF;AACvF,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,cAAc,EAAE,SAAS,aAAa,EAAE,CAAA;CACzC,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,EAAE,EAAE,cAAc,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAY9E;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,YAAY,CAmB5F;AAED;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,EAAE,EAAE,cAAc,GACjB,OAAO,CAAC,kBAAkB,CAAC,CAS7B"}
|
|
@@ -133,36 +133,42 @@ export function splitTokenFee(feeCurrency, payer, transfers, hash) {
|
|
|
133
133
|
transfers: transfers.slice(1, creditStart),
|
|
134
134
|
};
|
|
135
135
|
}
|
|
136
|
+
function toCeloTransactionFee(feeCurrency, { hash, from, erc20Transfers }) {
|
|
137
|
+
if (feeCurrency === null)
|
|
138
|
+
return { kind: 'native' };
|
|
139
|
+
if (!CELO_FEE_CURRENCIES.has(feeCurrency.toLowerCase()))
|
|
140
|
+
return { kind: 'unsupported', feeCurrency };
|
|
141
|
+
return { kind: 'token', tokenFee: splitTokenFee(feeCurrency, from, erc20Transfers, hash) };
|
|
142
|
+
}
|
|
136
143
|
/**
|
|
137
|
-
* Reads the
|
|
138
|
-
*
|
|
139
|
-
*
|
|
144
|
+
* Reads the fee of the CIP-64 transactions of a Celo block. The fee currencies of the block are
|
|
145
|
+
* fetched once, at the first transaction that is or may be CIP-64: a receipt without a type does
|
|
146
|
+
* not prove the transaction pays in the native coin.
|
|
140
147
|
*
|
|
141
148
|
* @param nodeApi node of the network
|
|
142
149
|
* @param blockHeight height of the block
|
|
143
150
|
*/
|
|
144
151
|
export function createCeloTokenFeeReader(nodeApi, blockHeight) {
|
|
145
152
|
let feeCurrencies;
|
|
146
|
-
return async (
|
|
147
|
-
if (type !== undefined && type !== CIP64_TX_TYPE)
|
|
148
|
-
return
|
|
153
|
+
return async (tx) => {
|
|
154
|
+
if (tx.type !== undefined && tx.type !== CIP64_TX_TYPE)
|
|
155
|
+
return { kind: 'native' };
|
|
149
156
|
if (nodeApi.getFeeCurrencies === undefined) {
|
|
150
|
-
throw new FeeCurrencyUnavailableError('The node cannot report the fee currency of a transaction', { hash });
|
|
157
|
+
throw new FeeCurrencyUnavailableError('The node cannot report the fee currency of a transaction', { hash: tx.hash });
|
|
151
158
|
}
|
|
152
159
|
feeCurrencies ??= nodeApi.getFeeCurrencies(blockHeight);
|
|
153
|
-
const feeCurrency = (await feeCurrencies).get(hash.toLowerCase());
|
|
160
|
+
const feeCurrency = (await feeCurrencies).get(tx.hash.toLowerCase());
|
|
154
161
|
if (feeCurrency === undefined) {
|
|
155
|
-
throw new FeeCurrencyUnavailableError(`The node block has no transaction ${hash}`, {
|
|
156
|
-
hash,
|
|
162
|
+
throw new FeeCurrencyUnavailableError(`The node block has no transaction ${tx.hash}`, {
|
|
163
|
+
hash: tx.hash,
|
|
157
164
|
});
|
|
158
165
|
}
|
|
159
|
-
return
|
|
166
|
+
return toCeloTransactionFee(feeCurrency, tx);
|
|
160
167
|
};
|
|
161
168
|
}
|
|
162
169
|
/**
|
|
163
170
|
* Reads how a Celo transaction paid its fee, fetching its fee currency alone, for transactions
|
|
164
|
-
* that are not read block by block.
|
|
165
|
-
* rejected, so that the caller decides whether the fee matters to it.
|
|
171
|
+
* that are not read block by block.
|
|
166
172
|
*
|
|
167
173
|
* @param nodeApi node of the network
|
|
168
174
|
* @param tx the transaction, with the token transfers of its receipt
|
|
@@ -174,14 +180,6 @@ export async function readCeloTransactionFee(nodeApi, tx) {
|
|
|
174
180
|
if (nodeApi.getFeeCurrency === undefined) {
|
|
175
181
|
throw new FeeCurrencyUnavailableError('The node cannot report the fee currency of a transaction', { hash: tx.hash });
|
|
176
182
|
}
|
|
177
|
-
|
|
178
|
-
if (feeCurrency === null)
|
|
179
|
-
return { kind: 'native' };
|
|
180
|
-
if (!CELO_FEE_CURRENCIES.has(feeCurrency.toLowerCase()))
|
|
181
|
-
return { kind: 'unsupported', feeCurrency };
|
|
182
|
-
return {
|
|
183
|
-
kind: 'token',
|
|
184
|
-
tokenFee: splitTokenFee(feeCurrency, tx.from, tx.erc20Transfers, tx.hash),
|
|
185
|
-
};
|
|
183
|
+
return toCeloTransactionFee(await nodeApi.getFeeCurrency(tx.hash), tx);
|
|
186
184
|
}
|
|
187
185
|
//# sourceMappingURL=cip64Fees.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cip64Fees.js","sourceRoot":"","sources":["../../src/logic/cip64Fees.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cip64Fees.js","sourceRoot":"","sources":["../../src/logic/cip64Fees.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBlock.d.ts","sourceRoot":"","sources":["../../src/logic/getBlock.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,UAAU,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"getBlock.d.ts","sourceRoot":"","sources":["../../src/logic/getBlock.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,UAAU,EAAE,MAAM,WAAW,CAAA;AASpD,OAAO,KAAK,EACV,KAAK,EAKN,MAAM,2CAA2C,CAAA;AAiBlD,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAwFlF"}
|
package/lib-es/logic/getBlock.js
CHANGED
|
@@ -242,13 +242,13 @@ async function getTransactionsFromPrefetchedData(chainId, chainName, blockHeight
|
|
|
242
242
|
withReceipts.push({ tx, receipt });
|
|
243
243
|
}
|
|
244
244
|
return await Promise.all(withReceipts.map(async ({ tx, receipt }) => {
|
|
245
|
-
const
|
|
245
|
+
const fee = await readTokenFee?.({
|
|
246
246
|
hash: tx.hash,
|
|
247
247
|
from: tx.from,
|
|
248
248
|
type: receipt.type,
|
|
249
249
|
erc20Transfers: receipt.erc20Transfers,
|
|
250
250
|
});
|
|
251
|
-
const blockTx = prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger,
|
|
251
|
+
const blockTx = prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger, fee);
|
|
252
252
|
return {
|
|
253
253
|
...blockTx,
|
|
254
254
|
operations: applyChainSpecificCorrections(chainId, blockTx.operations, receipt.type, logger),
|
|
@@ -266,51 +266,77 @@ async function getTransactionsFromPrefetchedData(chainId, chainName, blockHeight
|
|
|
266
266
|
return null;
|
|
267
267
|
}
|
|
268
268
|
}
|
|
269
|
-
function prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger,
|
|
269
|
+
function prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger, fee) {
|
|
270
270
|
const failed = receipt.status === 0;
|
|
271
271
|
// Some EVM chains (e.g. Cronos) omit `gasPrice` from transaction
|
|
272
272
|
// receipts. In that case, fall back to the prefetched tx's normalized `gasPrice`
|
|
273
273
|
// (the node layer provides `0` when the raw `eth_getBlockByNumber(_, true)` payload omits it).
|
|
274
274
|
const receiptGasPrice = BigInt(receipt.gasPrice);
|
|
275
275
|
const gasPrice = receiptGasPrice > 0n ? receiptGasPrice : BigInt(tx.gasPrice);
|
|
276
|
-
const
|
|
277
|
-
const
|
|
278
|
-
|
|
279
|
-
to: tx.to,
|
|
280
|
-
value: tx.value,
|
|
281
|
-
erc20Transfers: tokenFee?.transfers ?? receipt.erc20Transfers,
|
|
282
|
-
}, logger);
|
|
276
|
+
const nativeFees = BigInt(receipt.gasUsed) * gasPrice + (receipt.l1Fee ? BigInt(receipt.l1Fee) : 0n);
|
|
277
|
+
const { erc20Transfers, feeDetails, ...feeFields } = readFeeFields(tx.hash, nativeFees, receipt.erc20Transfers, fee, logger);
|
|
278
|
+
const operations = rpcTransactionToBlockOperations({ from: tx.from, to: tx.to, value: tx.value, erc20Transfers }, logger);
|
|
283
279
|
const details = buildTransactionDetails(gasPrice, tx.gasLimit, tx.nonce, buildSmartContractDetails(tx.to, tx.input, logger, receipt.contractAddress), detectStakingOperationType(chainId, tx.to, tx.input));
|
|
284
280
|
return {
|
|
285
281
|
hash: tx.hash,
|
|
286
282
|
failed,
|
|
287
283
|
operations,
|
|
288
|
-
...
|
|
284
|
+
...feeFields,
|
|
289
285
|
feesPayer: tx.from,
|
|
290
|
-
details,
|
|
286
|
+
details: { ...details, ...feeDetails },
|
|
291
287
|
};
|
|
292
288
|
}
|
|
293
|
-
/**
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
289
|
+
/**
|
|
290
|
+
* The fee fields of a transaction, and the token transfers left for its operations, from how it
|
|
291
|
+
* paid its fee: a token fee without its fee transfers, or else the native fee.
|
|
292
|
+
*
|
|
293
|
+
* A fee currency with unknown fee logs degrades instead of failing the block, which anyone could
|
|
294
|
+
* cause with one transaction. The fee is reported as 0 in the native coin, every token transfer
|
|
295
|
+
* of the receipt stays an operation, fee transfers included, and `unsupportedFeeCurrency` in the
|
|
296
|
+
* details names the fee currency. When the fee currency emits standard Transfer events, applying
|
|
297
|
+
* the operations still gives each account's balance change; a failed transaction loses its fee,
|
|
298
|
+
* because consumers ignore its operations.
|
|
299
|
+
*/
|
|
300
|
+
function readFeeFields(hash, nativeFees, erc20Transfers, fee, logger) {
|
|
301
|
+
switch (fee?.kind) {
|
|
302
|
+
case 'token':
|
|
303
|
+
return {
|
|
304
|
+
fees: fee.tokenFee.fees,
|
|
305
|
+
feesAsset: fee.tokenFee.feesAsset,
|
|
306
|
+
erc20Transfers: fee.tokenFee.transfers,
|
|
307
|
+
feeDetails: {},
|
|
308
|
+
};
|
|
309
|
+
case 'unsupported':
|
|
310
|
+
logger('warn', 'Celo fee currency not supported, reporting no fee', {
|
|
311
|
+
hash,
|
|
312
|
+
feeCurrency: fee.feeCurrency,
|
|
313
|
+
});
|
|
314
|
+
return {
|
|
315
|
+
fees: 0n,
|
|
316
|
+
feesAsset: { type: 'native' },
|
|
317
|
+
erc20Transfers,
|
|
318
|
+
feeDetails: { unsupportedFeeCurrency: fee.feeCurrency },
|
|
319
|
+
};
|
|
320
|
+
default:
|
|
321
|
+
return { fees: nativeFees, feesAsset: { type: 'native' }, erc20Transfers, feeDetails: {} };
|
|
322
|
+
}
|
|
298
323
|
}
|
|
299
324
|
async function getTransactionFromHash(chainId, txHash, nodeApi, logger, readTokenFee) {
|
|
300
325
|
const txInfo = await nodeApi.getTransaction(txHash);
|
|
301
|
-
const
|
|
326
|
+
const fee = await readTokenFee?.(txInfo);
|
|
302
327
|
const failed = txInfo.status === 0;
|
|
303
|
-
const
|
|
304
|
-
const
|
|
328
|
+
const nativeFees = BigInt(txInfo.gasUsed) * BigInt(txInfo.gasPrice) + (txInfo.l1Fee ? BigInt(txInfo.l1Fee) : 0n);
|
|
329
|
+
const { erc20Transfers, feeDetails, ...feeFields } = readFeeFields(txHash, nativeFees, txInfo.erc20Transfers, fee, logger);
|
|
330
|
+
const rawOperations = rpcTransactionToBlockOperations({ ...txInfo, erc20Transfers }, logger);
|
|
305
331
|
const operations = applyChainSpecificCorrections(chainId, rawOperations, txInfo.type, logger);
|
|
306
332
|
const details = buildTransactionDetails(BigInt(txInfo.gasPrice), txInfo.gasLimit, txInfo.nonce, buildSmartContractDetails(txInfo.to, txInfo.input, logger, txInfo.contractAddress), detectStakingOperationType(chainId, txInfo.to, txInfo.input));
|
|
307
333
|
return {
|
|
308
334
|
hash: txHash,
|
|
309
335
|
failed,
|
|
310
336
|
operations,
|
|
311
|
-
...
|
|
337
|
+
...feeFields,
|
|
312
338
|
feesPayer: txInfo.from,
|
|
313
|
-
details,
|
|
339
|
+
details: { ...details, ...feeDetails },
|
|
314
340
|
};
|
|
315
341
|
}
|
|
316
342
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBlock.js","sourceRoot":"","sources":["../../src/logic/getBlock.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getBlock.js","sourceRoot":"","sources":["../../src/logic/getBlock.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/logic/cip64Fees.ts
CHANGED
|
@@ -192,53 +192,72 @@ export function splitTokenFee(
|
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
194
|
|
|
195
|
-
/**
|
|
196
|
-
|
|
195
|
+
/**
|
|
196
|
+
* How a Celo transaction paid its fee. A fee currency whose fee logs are not known is reported,
|
|
197
|
+
* not rejected, so that the caller decides how to degrade.
|
|
198
|
+
*/
|
|
199
|
+
export type CeloTransactionFee =
|
|
200
|
+
| { kind: 'native' }
|
|
201
|
+
| { kind: 'token'; tokenFee: TokenFee }
|
|
202
|
+
| { kind: 'unsupported'; feeCurrency: string }
|
|
203
|
+
|
|
204
|
+
/** A transaction, with the token transfers of its receipt, whose fee is to be read. */
|
|
205
|
+
type FeeTransaction = {
|
|
197
206
|
hash: string
|
|
198
207
|
from: string
|
|
199
208
|
type?: number | undefined
|
|
200
209
|
erc20Transfers: readonly ERC20Transfer[]
|
|
201
|
-
}
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
/**
|
|
213
|
+
* Reads how a transaction paid its fee.
|
|
214
|
+
*
|
|
215
|
+
* @throws UnexpectedFeeLogsError when the fee logs do not match a supported fee currency
|
|
216
|
+
*/
|
|
217
|
+
export type ReadTokenFee = (tx: FeeTransaction) => Promise<CeloTransactionFee>
|
|
218
|
+
|
|
219
|
+
function toCeloTransactionFee(
|
|
220
|
+
feeCurrency: string | null,
|
|
221
|
+
{ hash, from, erc20Transfers }: FeeTransaction
|
|
222
|
+
): CeloTransactionFee {
|
|
223
|
+
if (feeCurrency === null) return { kind: 'native' }
|
|
224
|
+
if (!CELO_FEE_CURRENCIES.has(feeCurrency.toLowerCase()))
|
|
225
|
+
return { kind: 'unsupported', feeCurrency }
|
|
226
|
+
return { kind: 'token', tokenFee: splitTokenFee(feeCurrency, from, erc20Transfers, hash) }
|
|
227
|
+
}
|
|
202
228
|
|
|
203
229
|
/**
|
|
204
|
-
* Reads the
|
|
205
|
-
*
|
|
206
|
-
*
|
|
230
|
+
* Reads the fee of the CIP-64 transactions of a Celo block. The fee currencies of the block are
|
|
231
|
+
* fetched once, at the first transaction that is or may be CIP-64: a receipt without a type does
|
|
232
|
+
* not prove the transaction pays in the native coin.
|
|
207
233
|
*
|
|
208
234
|
* @param nodeApi node of the network
|
|
209
235
|
* @param blockHeight height of the block
|
|
210
236
|
*/
|
|
211
237
|
export function createCeloTokenFeeReader(nodeApi: NodeApi, blockHeight: number): ReadTokenFee {
|
|
212
238
|
let feeCurrencies: Promise<Map<string, string | null>> | undefined
|
|
213
|
-
return async (
|
|
214
|
-
if (type !== undefined && type !== CIP64_TX_TYPE) return
|
|
239
|
+
return async (tx) => {
|
|
240
|
+
if (tx.type !== undefined && tx.type !== CIP64_TX_TYPE) return { kind: 'native' }
|
|
215
241
|
if (nodeApi.getFeeCurrencies === undefined) {
|
|
216
242
|
throw new FeeCurrencyUnavailableError(
|
|
217
243
|
'The node cannot report the fee currency of a transaction',
|
|
218
|
-
{ hash }
|
|
244
|
+
{ hash: tx.hash }
|
|
219
245
|
)
|
|
220
246
|
}
|
|
221
247
|
feeCurrencies ??= nodeApi.getFeeCurrencies(blockHeight)
|
|
222
|
-
const feeCurrency = (await feeCurrencies).get(hash.toLowerCase())
|
|
248
|
+
const feeCurrency = (await feeCurrencies).get(tx.hash.toLowerCase())
|
|
223
249
|
if (feeCurrency === undefined) {
|
|
224
|
-
throw new FeeCurrencyUnavailableError(`The node block has no transaction ${hash}`, {
|
|
225
|
-
hash,
|
|
250
|
+
throw new FeeCurrencyUnavailableError(`The node block has no transaction ${tx.hash}`, {
|
|
251
|
+
hash: tx.hash,
|
|
226
252
|
})
|
|
227
253
|
}
|
|
228
|
-
return
|
|
254
|
+
return toCeloTransactionFee(feeCurrency, tx)
|
|
229
255
|
}
|
|
230
256
|
}
|
|
231
257
|
|
|
232
|
-
/** How a Celo transaction paid its fee. */
|
|
233
|
-
export type CeloTransactionFee =
|
|
234
|
-
| { kind: 'native' }
|
|
235
|
-
| { kind: 'token'; tokenFee: TokenFee }
|
|
236
|
-
| { kind: 'unsupported'; feeCurrency: string }
|
|
237
|
-
|
|
238
258
|
/**
|
|
239
259
|
* Reads how a Celo transaction paid its fee, fetching its fee currency alone, for transactions
|
|
240
|
-
* that are not read block by block.
|
|
241
|
-
* rejected, so that the caller decides whether the fee matters to it.
|
|
260
|
+
* that are not read block by block.
|
|
242
261
|
*
|
|
243
262
|
* @param nodeApi node of the network
|
|
244
263
|
* @param tx the transaction, with the token transfers of its receipt
|
|
@@ -246,7 +265,7 @@ export type CeloTransactionFee =
|
|
|
246
265
|
*/
|
|
247
266
|
export async function readCeloTransactionFee(
|
|
248
267
|
nodeApi: NodeApi,
|
|
249
|
-
tx:
|
|
268
|
+
tx: FeeTransaction
|
|
250
269
|
): Promise<CeloTransactionFee> {
|
|
251
270
|
if (tx.type !== undefined && tx.type !== CIP64_TX_TYPE) return { kind: 'native' }
|
|
252
271
|
if (nodeApi.getFeeCurrency === undefined) {
|
|
@@ -255,12 +274,5 @@ export async function readCeloTransactionFee(
|
|
|
255
274
|
{ hash: tx.hash }
|
|
256
275
|
)
|
|
257
276
|
}
|
|
258
|
-
|
|
259
|
-
if (feeCurrency === null) return { kind: 'native' }
|
|
260
|
-
if (!CELO_FEE_CURRENCIES.has(feeCurrency.toLowerCase()))
|
|
261
|
-
return { kind: 'unsupported', feeCurrency }
|
|
262
|
-
return {
|
|
263
|
-
kind: 'token',
|
|
264
|
-
tokenFee: splitTokenFee(feeCurrency, tx.from, tx.erc20Transfers, tx.hash),
|
|
265
|
-
}
|
|
277
|
+
return toCeloTransactionFee(await nodeApi.getFeeCurrency(tx.hash), tx)
|
|
266
278
|
}
|
package/src/logic/getBlock.ts
CHANGED
|
@@ -2,9 +2,13 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import type { ChainId, EvmContext } from '../config'
|
|
5
|
-
import type {
|
|
5
|
+
import type {
|
|
6
|
+
BlockReceiptInfo,
|
|
7
|
+
ERC20Transfer,
|
|
8
|
+
PrefetchedBlockTransaction,
|
|
9
|
+
} from '../network/node/types'
|
|
6
10
|
import type { EvmStakingOperationType } from '../types/staking'
|
|
7
|
-
import type {
|
|
11
|
+
import type { CeloTransactionFee, ReadTokenFee } from './cip64Fees'
|
|
8
12
|
import type { InternalTxsByHash } from './internalTransactionsFetcher'
|
|
9
13
|
import type {
|
|
10
14
|
Block,
|
|
@@ -384,19 +388,13 @@ async function getTransactionsFromPrefetchedData(
|
|
|
384
388
|
|
|
385
389
|
return await Promise.all(
|
|
386
390
|
withReceipts.map(async ({ tx, receipt }) => {
|
|
387
|
-
const
|
|
391
|
+
const fee = await readTokenFee?.({
|
|
388
392
|
hash: tx.hash,
|
|
389
393
|
from: tx.from,
|
|
390
394
|
type: receipt.type,
|
|
391
395
|
erc20Transfers: receipt.erc20Transfers,
|
|
392
396
|
})
|
|
393
|
-
const blockTx = prefetchedTransactionToBlockTransaction(
|
|
394
|
-
chainId,
|
|
395
|
-
tx,
|
|
396
|
-
receipt,
|
|
397
|
-
logger,
|
|
398
|
-
tokenFee
|
|
399
|
-
)
|
|
397
|
+
const blockTx = prefetchedTransactionToBlockTransaction(chainId, tx, receipt, logger, fee)
|
|
400
398
|
return {
|
|
401
399
|
...blockTx,
|
|
402
400
|
operations: applyChainSpecificCorrections(
|
|
@@ -426,7 +424,7 @@ function prefetchedTransactionToBlockTransaction(
|
|
|
426
424
|
tx: PrefetchedBlockTransaction,
|
|
427
425
|
receipt: BlockReceiptInfo,
|
|
428
426
|
logger: Logger,
|
|
429
|
-
|
|
427
|
+
fee: CeloTransactionFee | undefined
|
|
430
428
|
): BlockTransaction {
|
|
431
429
|
const failed = receipt.status === 0
|
|
432
430
|
// Some EVM chains (e.g. Cronos) omit `gasPrice` from transaction
|
|
@@ -434,14 +432,17 @@ function prefetchedTransactionToBlockTransaction(
|
|
|
434
432
|
// (the node layer provides `0` when the raw `eth_getBlockByNumber(_, true)` payload omits it).
|
|
435
433
|
const receiptGasPrice = BigInt(receipt.gasPrice)
|
|
436
434
|
const gasPrice = receiptGasPrice > 0n ? receiptGasPrice : BigInt(tx.gasPrice)
|
|
437
|
-
const
|
|
435
|
+
const nativeFees =
|
|
436
|
+
BigInt(receipt.gasUsed) * gasPrice + (receipt.l1Fee ? BigInt(receipt.l1Fee) : 0n)
|
|
437
|
+
const { erc20Transfers, feeDetails, ...feeFields } = readFeeFields(
|
|
438
|
+
tx.hash,
|
|
439
|
+
nativeFees,
|
|
440
|
+
receipt.erc20Transfers,
|
|
441
|
+
fee,
|
|
442
|
+
logger
|
|
443
|
+
)
|
|
438
444
|
const operations = rpcTransactionToBlockOperations(
|
|
439
|
-
{
|
|
440
|
-
from: tx.from,
|
|
441
|
-
to: tx.to,
|
|
442
|
-
value: tx.value,
|
|
443
|
-
erc20Transfers: tokenFee?.transfers ?? receipt.erc20Transfers,
|
|
444
|
-
},
|
|
445
|
+
{ from: tx.from, to: tx.to, value: tx.value, erc20Transfers },
|
|
445
446
|
logger
|
|
446
447
|
)
|
|
447
448
|
|
|
@@ -457,20 +458,55 @@ function prefetchedTransactionToBlockTransaction(
|
|
|
457
458
|
hash: tx.hash,
|
|
458
459
|
failed,
|
|
459
460
|
operations,
|
|
460
|
-
...
|
|
461
|
+
...feeFields,
|
|
461
462
|
feesPayer: tx.from,
|
|
462
|
-
details,
|
|
463
|
+
details: { ...details, ...feeDetails },
|
|
463
464
|
}
|
|
464
465
|
}
|
|
465
466
|
|
|
466
|
-
/**
|
|
467
|
-
|
|
467
|
+
/**
|
|
468
|
+
* The fee fields of a transaction, and the token transfers left for its operations, from how it
|
|
469
|
+
* paid its fee: a token fee without its fee transfers, or else the native fee.
|
|
470
|
+
*
|
|
471
|
+
* A fee currency with unknown fee logs degrades instead of failing the block, which anyone could
|
|
472
|
+
* cause with one transaction. The fee is reported as 0 in the native coin, every token transfer
|
|
473
|
+
* of the receipt stays an operation, fee transfers included, and `unsupportedFeeCurrency` in the
|
|
474
|
+
* details names the fee currency. When the fee currency emits standard Transfer events, applying
|
|
475
|
+
* the operations still gives each account's balance change; a failed transaction loses its fee,
|
|
476
|
+
* because consumers ignore its operations.
|
|
477
|
+
*/
|
|
478
|
+
function readFeeFields(
|
|
479
|
+
hash: string,
|
|
468
480
|
nativeFees: bigint,
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
481
|
+
erc20Transfers: ERC20Transfer[],
|
|
482
|
+
fee: CeloTransactionFee | undefined,
|
|
483
|
+
logger: Logger
|
|
484
|
+
): Required<Pick<BlockTransaction, 'fees' | 'feesAsset'>> & {
|
|
485
|
+
erc20Transfers: ERC20Transfer[]
|
|
486
|
+
feeDetails: Record<string, unknown>
|
|
487
|
+
} {
|
|
488
|
+
switch (fee?.kind) {
|
|
489
|
+
case 'token':
|
|
490
|
+
return {
|
|
491
|
+
fees: fee.tokenFee.fees,
|
|
492
|
+
feesAsset: fee.tokenFee.feesAsset,
|
|
493
|
+
erc20Transfers: fee.tokenFee.transfers,
|
|
494
|
+
feeDetails: {},
|
|
495
|
+
}
|
|
496
|
+
case 'unsupported':
|
|
497
|
+
logger('warn', 'Celo fee currency not supported, reporting no fee', {
|
|
498
|
+
hash,
|
|
499
|
+
feeCurrency: fee.feeCurrency,
|
|
500
|
+
})
|
|
501
|
+
return {
|
|
502
|
+
fees: 0n,
|
|
503
|
+
feesAsset: { type: 'native' },
|
|
504
|
+
erc20Transfers,
|
|
505
|
+
feeDetails: { unsupportedFeeCurrency: fee.feeCurrency },
|
|
506
|
+
}
|
|
507
|
+
default:
|
|
508
|
+
return { fees: nativeFees, feesAsset: { type: 'native' }, erc20Transfers, feeDetails: {} }
|
|
509
|
+
}
|
|
474
510
|
}
|
|
475
511
|
|
|
476
512
|
async function getTransactionFromHash(
|
|
@@ -481,16 +517,20 @@ async function getTransactionFromHash(
|
|
|
481
517
|
readTokenFee: ReadTokenFee | undefined
|
|
482
518
|
): Promise<BlockTransaction | null> {
|
|
483
519
|
const txInfo = await nodeApi.getTransaction(txHash)
|
|
484
|
-
const
|
|
520
|
+
const fee = await readTokenFee?.(txInfo)
|
|
485
521
|
|
|
486
522
|
const failed = txInfo.status === 0
|
|
487
|
-
const
|
|
523
|
+
const nativeFees =
|
|
488
524
|
BigInt(txInfo.gasUsed) * BigInt(txInfo.gasPrice) + (txInfo.l1Fee ? BigInt(txInfo.l1Fee) : 0n)
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
525
|
+
const { erc20Transfers, feeDetails, ...feeFields } = readFeeFields(
|
|
526
|
+
txHash,
|
|
527
|
+
nativeFees,
|
|
528
|
+
txInfo.erc20Transfers,
|
|
529
|
+
fee,
|
|
492
530
|
logger
|
|
493
531
|
)
|
|
532
|
+
|
|
533
|
+
const rawOperations = rpcTransactionToBlockOperations({ ...txInfo, erc20Transfers }, logger)
|
|
494
534
|
const operations = applyChainSpecificCorrections(chainId, rawOperations, txInfo.type, logger)
|
|
495
535
|
|
|
496
536
|
const details = buildTransactionDetails(
|
|
@@ -505,9 +545,9 @@ async function getTransactionFromHash(
|
|
|
505
545
|
hash: txHash,
|
|
506
546
|
failed,
|
|
507
547
|
operations,
|
|
508
|
-
...
|
|
548
|
+
...feeFields,
|
|
509
549
|
feesPayer: txInfo.from,
|
|
510
|
-
details,
|
|
550
|
+
details: { ...details, ...feeDetails },
|
|
511
551
|
}
|
|
512
552
|
}
|
|
513
553
|
|
|
@@ -283,19 +283,25 @@ describe('createCeloTokenFeeReader', () => {
|
|
|
283
283
|
erc20Transfers: [usdtDebit, ...usdtCredits],
|
|
284
284
|
}
|
|
285
285
|
|
|
286
|
-
it('reads
|
|
286
|
+
it('reads a native fee for a transaction that is not CIP-64', async () => {
|
|
287
287
|
const nodeApi = nodeWithFeeCurrencies(new Map())
|
|
288
288
|
|
|
289
|
-
await expect(
|
|
290
|
-
|
|
291
|
-
)
|
|
289
|
+
await expect(createCeloTokenFeeReader(nodeApi, 1)({ ...cip64Tx, type: 2 })).resolves.toEqual({
|
|
290
|
+
kind: 'native',
|
|
291
|
+
})
|
|
292
292
|
expect(nodeApi.getFeeCurrencies).not.toHaveBeenCalled()
|
|
293
293
|
})
|
|
294
294
|
|
|
295
|
-
it('reads
|
|
295
|
+
it('reads a native fee for a CIP-64 transaction that pays in the native coin', async () => {
|
|
296
296
|
const read = createCeloTokenFeeReader(nodeWithFeeCurrencies(new Map([['0xabc', null]])), 1)
|
|
297
297
|
|
|
298
|
-
await expect(read(cip64Tx)).resolves.
|
|
298
|
+
await expect(read(cip64Tx)).resolves.toEqual({ kind: 'native' })
|
|
299
|
+
})
|
|
300
|
+
|
|
301
|
+
it('reports a fee currency whose fee logs are not known', async () => {
|
|
302
|
+
const read = createCeloTokenFeeReader(nodeWithFeeCurrencies(new Map([['0xabc', OTHER]])), 1)
|
|
303
|
+
|
|
304
|
+
await expect(read(cip64Tx)).resolves.toEqual({ kind: 'unsupported', feeCurrency: OTHER })
|
|
299
305
|
})
|
|
300
306
|
|
|
301
307
|
it('reads the fee currency of a transaction whose receipt has no type', async () => {
|
|
@@ -309,8 +315,13 @@ describe('createCeloTokenFeeReader', () => {
|
|
|
309
315
|
1
|
|
310
316
|
)
|
|
311
317
|
|
|
312
|
-
await expect(read({ ...cip64Tx, type: undefined })).resolves.toMatchObject({
|
|
313
|
-
|
|
318
|
+
await expect(read({ ...cip64Tx, type: undefined })).resolves.toMatchObject({
|
|
319
|
+
kind: 'token',
|
|
320
|
+
tokenFee: { fees: 3176n },
|
|
321
|
+
})
|
|
322
|
+
await expect(read({ ...cip64Tx, hash: '0xDEF', type: undefined })).resolves.toEqual({
|
|
323
|
+
kind: 'native',
|
|
324
|
+
})
|
|
314
325
|
})
|
|
315
326
|
|
|
316
327
|
it('reads the token fee, fetching the fee currencies of the block once', async () => {
|
|
@@ -319,8 +330,8 @@ describe('createCeloTokenFeeReader', () => {
|
|
|
319
330
|
|
|
320
331
|
const [first, second] = await Promise.all([read(cip64Tx), read(cip64Tx)])
|
|
321
332
|
|
|
322
|
-
expect(first
|
|
323
|
-
expect(second
|
|
333
|
+
expect(first).toMatchObject({ kind: 'token', tokenFee: { fees: 3176n } })
|
|
334
|
+
expect(second).toMatchObject({ kind: 'token', tokenFee: { fees: 3176n } })
|
|
324
335
|
expect(nodeApi.getFeeCurrencies).toHaveBeenCalledTimes(1)
|
|
325
336
|
expect(nodeApi.getFeeCurrencies).toHaveBeenCalledWith(80494727)
|
|
326
337
|
})
|
|
@@ -15,7 +15,7 @@ import type { EtherscanInternalTransaction } from '../../types'
|
|
|
15
15
|
import type { BlockOperation } from '@ledgerhq/coin-module-framework/api/index'
|
|
16
16
|
import { ethers } from 'ethers'
|
|
17
17
|
import { CHAIN_ID, evmDefaults, internalTxSourcesFromList } from '../../config'
|
|
18
|
-
import {
|
|
18
|
+
import { UnexpectedFeeLogsError, UnsupportedRpcMethodError } from '../../errors'
|
|
19
19
|
import {
|
|
20
20
|
createMockEvmConfigInfo,
|
|
21
21
|
createMockEvmContext,
|
|
@@ -2346,11 +2346,15 @@ describe('getBlock', () => {
|
|
|
2346
2346
|
feeCurrency = USDT_ADAPTER,
|
|
2347
2347
|
prefetched = true,
|
|
2348
2348
|
receiptType = 0x7b,
|
|
2349
|
+
status = 1,
|
|
2350
|
+
erc20Transfers = transfers,
|
|
2349
2351
|
}: {
|
|
2350
2352
|
chainId?: ChainId
|
|
2351
2353
|
feeCurrency?: string | null
|
|
2352
2354
|
prefetched?: boolean
|
|
2353
2355
|
receiptType?: number | null
|
|
2356
|
+
status?: number
|
|
2357
|
+
erc20Transfers?: ERC20Transfer[]
|
|
2354
2358
|
} = {}): { context: EvmContext; nodeApi: ReturnType<typeof mockNodeApi> } {
|
|
2355
2359
|
const context = createMockEvmContext(
|
|
2356
2360
|
createMockEvmConfigInfo({
|
|
@@ -2363,8 +2367,9 @@ describe('getBlock', () => {
|
|
|
2363
2367
|
hash: '0xtx1',
|
|
2364
2368
|
gasUsed: GAS_USED,
|
|
2365
2369
|
gasPrice: GAS_PRICE,
|
|
2370
|
+
status,
|
|
2366
2371
|
...(receiptType !== null ? { type: receiptType } : {}),
|
|
2367
|
-
erc20Transfers
|
|
2372
|
+
erc20Transfers,
|
|
2368
2373
|
}
|
|
2369
2374
|
const nodeApi = mockNodeApi({
|
|
2370
2375
|
getBlockByHeight: jest.fn().mockResolvedValueOnce(
|
|
@@ -2423,10 +2428,45 @@ describe('getBlock', () => {
|
|
|
2423
2428
|
expect(nodeApi.getFeeCurrencies).not.toHaveBeenCalled()
|
|
2424
2429
|
})
|
|
2425
2430
|
|
|
2426
|
-
|
|
2427
|
-
|
|
2431
|
+
// A failed transaction keeps only its fee logs: the reverted call drops its own
|
|
2432
|
+
const feeLogs = transfers.filter((transfer) => transfer !== userTransfer)
|
|
2428
2433
|
|
|
2429
|
-
|
|
2434
|
+
it.each([
|
|
2435
|
+
['prefetched with block receipts', true, 1, transfers],
|
|
2436
|
+
['fetched one by one', false, 1, transfers],
|
|
2437
|
+
['that failed', true, 0, feeLogs],
|
|
2438
|
+
])(
|
|
2439
|
+
'reports no fee and keeps the fee transfers of a transaction %s, paid in an unsupported fee currency',
|
|
2440
|
+
async (_, prefetched, status, erc20Transfers) => {
|
|
2441
|
+
const { context } = mockCeloBlock({
|
|
2442
|
+
feeCurrency: address2,
|
|
2443
|
+
prefetched,
|
|
2444
|
+
status,
|
|
2445
|
+
erc20Transfers,
|
|
2446
|
+
})
|
|
2447
|
+
|
|
2448
|
+
const [tx] = (await getBlock(context, 12345)).transactions
|
|
2449
|
+
|
|
2450
|
+
expect(tx).toMatchObject({
|
|
2451
|
+
failed: status === 0,
|
|
2452
|
+
fees: 0n,
|
|
2453
|
+
feesAsset: { type: 'native' },
|
|
2454
|
+
feesPayer: PAYER,
|
|
2455
|
+
details: expect.objectContaining({ unsupportedFeeCurrency: address2 }),
|
|
2456
|
+
})
|
|
2457
|
+
expect(tx.operations).toHaveLength(erc20Transfers.length * 2)
|
|
2458
|
+
expect(context.logger).toHaveBeenCalledWith(
|
|
2459
|
+
'warn',
|
|
2460
|
+
expect.any(String),
|
|
2461
|
+
expect.objectContaining({ hash: '0xtx1', feeCurrency: address2 })
|
|
2462
|
+
)
|
|
2463
|
+
}
|
|
2464
|
+
)
|
|
2465
|
+
|
|
2466
|
+
it('rejects a block with fee logs that do not match a supported fee currency', async () => {
|
|
2467
|
+
const { context } = mockCeloBlock({ erc20Transfers: [userTransfer] })
|
|
2468
|
+
|
|
2469
|
+
await expect(getBlock(context, 12345)).rejects.toThrow(UnexpectedFeeLogsError)
|
|
2430
2470
|
})
|
|
2431
2471
|
})
|
|
2432
2472
|
})
|