@ledgerhq/coin-evm 17.0.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 +12 -0
- package/lib/logic/cip64Fees.d.ts +40 -9
- package/lib/logic/cip64Fees.d.ts.map +1 -1
- package/lib/logic/cip64Fees.js +86 -34
- 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/logic/listOperations.d.ts.map +1 -1
- package/lib/logic/listOperations.js +21 -3
- package/lib/logic/listOperations.js.map +1 -1
- package/lib/logic/tokenFeeOperations.d.ts +61 -0
- package/lib/logic/tokenFeeOperations.d.ts.map +1 -0
- package/lib/logic/tokenFeeOperations.js +128 -0
- package/lib/logic/tokenFeeOperations.js.map +1 -0
- package/lib/network/node/rpc.common.d.ts.map +1 -1
- package/lib/network/node/rpc.common.js +18 -0
- package/lib/network/node/rpc.common.js.map +1 -1
- package/lib/network/node/types.d.ts +2 -0
- package/lib/network/node/types.d.ts.map +1 -1
- package/lib/network/node/types.js.map +1 -1
- package/lib/network/node/withNodeSources.d.ts.map +1 -1
- package/lib/network/node/withNodeSources.js +2 -0
- package/lib/network/node/withNodeSources.js.map +1 -1
- package/lib-es/logic/cip64Fees.d.ts +40 -9
- package/lib-es/logic/cip64Fees.d.ts.map +1 -1
- package/lib-es/logic/cip64Fees.js +85 -34
- 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/lib-es/logic/listOperations.d.ts.map +1 -1
- package/lib-es/logic/listOperations.js +21 -3
- package/lib-es/logic/listOperations.js.map +1 -1
- package/lib-es/logic/tokenFeeOperations.d.ts +61 -0
- package/lib-es/logic/tokenFeeOperations.d.ts.map +1 -0
- package/lib-es/logic/tokenFeeOperations.js +122 -0
- package/lib-es/logic/tokenFeeOperations.js.map +1 -0
- package/lib-es/network/node/rpc.common.d.ts.map +1 -1
- package/lib-es/network/node/rpc.common.js +18 -0
- package/lib-es/network/node/rpc.common.js.map +1 -1
- package/lib-es/network/node/types.d.ts +2 -0
- package/lib-es/network/node/types.d.ts.map +1 -1
- package/lib-es/network/node/types.js.map +1 -1
- package/lib-es/network/node/withNodeSources.d.ts.map +1 -1
- package/lib-es/network/node/withNodeSources.js +2 -0
- package/lib-es/network/node/withNodeSources.js.map +1 -1
- package/package.json +1 -1
- package/src/api/tests/index.celo.integ.test.ts +143 -0
- package/src/logic/cip64Fees.ts +123 -38
- package/src/logic/getBlock.ts +74 -34
- package/src/logic/listOperations.ts +32 -2
- package/src/logic/tests/cip64Fees.test.ts +149 -14
- package/src/logic/tests/getBlock.test.ts +45 -5
- package/src/logic/tests/listOperations.test.ts +469 -1
- package/src/logic/tokenFeeOperations.ts +169 -0
- package/src/network/node/rpc.common.ts +19 -0
- package/src/network/node/types.ts +2 -0
- package/src/network/node/withNodeSources.ts +3 -0
- package/src/network/tests/node/rpc.test.ts +36 -0
- package/src/network/tests/node/withNodeSources.test.ts +17 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
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
|
+
|
|
9
|
+
## 17.1.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- [#1334](https://github.com/LedgerHQ/coin-modules/pull/1334) [`cd7fe46`](https://github.com/LedgerHQ/coin-modules/commit/cd7fe468bfe84b805cdf498bdca3e06983e45888) Thanks [@lysyi3m](https://github.com/lysyi3m)! - feat(coin-evm): `listOperations` reports the fee of a Celo transaction paid in a fee currency in that token, with its payer, and removes the fee transfers from the operations. A fee currency with unknown fee logs fails the page only when the account paid the fee. `getBlock` and `listOperations` read Celo fees in 19 fee currencies instead of 4, including Mento fees from before the Mento token upgrade.
|
|
14
|
+
|
|
3
15
|
## 17.0.0
|
|
4
16
|
|
|
5
17
|
### Major Changes
|
package/lib/logic/cip64Fees.d.ts
CHANGED
|
@@ -2,17 +2,18 @@ import type { ERC20Transfer, NodeApi } from '../network/node/types';
|
|
|
2
2
|
import type { AssetInfo } from '@ledgerhq/coin-module-framework/api/index';
|
|
3
3
|
/** EIP-2718 type of a Celo CIP-64 transaction, which can pay its fee in a token. */
|
|
4
4
|
export declare const CIP64_TX_TYPE = 123;
|
|
5
|
-
/** The fee of a token-paid transaction,
|
|
5
|
+
/** The fee of a token-paid transaction, the transfers that move it, and the other transfers. */
|
|
6
6
|
export type TokenFee = {
|
|
7
7
|
fees: bigint;
|
|
8
8
|
feesAsset: AssetInfo;
|
|
9
|
+
feeTransfers: ERC20Transfer[];
|
|
9
10
|
transfers: ERC20Transfer[];
|
|
10
11
|
};
|
|
11
12
|
/**
|
|
12
13
|
* Splits the token transfers of a CIP-64 transaction into its fee and its own transfers.
|
|
13
14
|
*
|
|
14
15
|
* The fee logs are found by position: the first transfer is the debit and the last
|
|
15
|
-
* {@link CREDIT_COUNT} are the credits,
|
|
16
|
+
* {@link CREDIT_COUNT} are the credits, checked against the patterns of the fee currency.
|
|
16
17
|
* Matching on position, not on recipients, keeps a transfer of the transaction to the fee
|
|
17
18
|
* recipients. The fee is what the payer sent minus what it got back, in the token's own units:
|
|
18
19
|
* a value converted from the adapter's 18 decimals would not be the amount debited.
|
|
@@ -20,24 +21,54 @@ export type TokenFee = {
|
|
|
20
21
|
* @param feeCurrency `feeCurrency` of the transaction
|
|
21
22
|
* @param payer sender of the transaction
|
|
22
23
|
* @param transfers the token transfers of the receipt, in log order
|
|
24
|
+
* @param hash hash of the transaction, for the error context
|
|
23
25
|
* @throws UnsupportedFeeCurrencyError when the fee currency is not supported
|
|
24
26
|
* @throws UnexpectedFeeLogsError when the fee logs do not match the fee currency
|
|
25
27
|
*/
|
|
26
|
-
export declare function splitTokenFee(feeCurrency: string, payer: string, transfers: readonly ERC20Transfer[]): TokenFee;
|
|
27
|
-
/**
|
|
28
|
-
|
|
28
|
+
export declare function splitTokenFee(feeCurrency: string, payer: string, transfers: readonly ERC20Transfer[], hash?: string): TokenFee;
|
|
29
|
+
/**
|
|
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.
|
|
32
|
+
*/
|
|
33
|
+
export type CeloTransactionFee = {
|
|
34
|
+
kind: 'native';
|
|
35
|
+
} | {
|
|
36
|
+
kind: 'token';
|
|
37
|
+
tokenFee: TokenFee;
|
|
38
|
+
} | {
|
|
39
|
+
kind: 'unsupported';
|
|
40
|
+
feeCurrency: string;
|
|
41
|
+
};
|
|
42
|
+
/** A transaction, with the token transfers of its receipt, whose fee is to be read. */
|
|
43
|
+
type FeeTransaction = {
|
|
29
44
|
hash: string;
|
|
30
45
|
from: string;
|
|
31
46
|
type?: number | undefined;
|
|
32
47
|
erc20Transfers: readonly ERC20Transfer[];
|
|
33
|
-
}
|
|
48
|
+
};
|
|
34
49
|
/**
|
|
35
|
-
* Reads
|
|
36
|
-
*
|
|
37
|
-
*
|
|
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.
|
|
38
59
|
*
|
|
39
60
|
* @param nodeApi node of the network
|
|
40
61
|
* @param blockHeight height of the block
|
|
41
62
|
*/
|
|
42
63
|
export declare function createCeloTokenFeeReader(nodeApi: NodeApi, blockHeight: number): ReadTokenFee;
|
|
64
|
+
/**
|
|
65
|
+
* Reads how a Celo transaction paid its fee, fetching its fee currency alone, for transactions
|
|
66
|
+
* that are not read block by block.
|
|
67
|
+
*
|
|
68
|
+
* @param nodeApi node of the network
|
|
69
|
+
* @param tx the transaction, with the token transfers of its receipt
|
|
70
|
+
* @throws UnexpectedFeeLogsError when the fee logs do not match a supported fee currency
|
|
71
|
+
*/
|
|
72
|
+
export declare function readCeloTransactionFee(nodeApi: NodeApi, tx: FeeTransaction): Promise<CeloTransactionFee>;
|
|
73
|
+
export {};
|
|
43
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;
|
|
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
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.CIP64_TX_TYPE = void 0;
|
|
6
6
|
exports.splitTokenFee = splitTokenFee;
|
|
7
7
|
exports.createCeloTokenFeeReader = createCeloTokenFeeReader;
|
|
8
|
+
exports.readCeloTransactionFee = readCeloTransactionFee;
|
|
8
9
|
const errors_1 = require("../errors");
|
|
9
10
|
/** EIP-2718 type of a Celo CIP-64 transaction, which can pay its fee in a token. */
|
|
10
11
|
exports.CIP64_TX_TYPE = 0x7b;
|
|
@@ -12,31 +13,62 @@ const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
|
|
|
12
13
|
/** Credits of every supported fee currency: refund, tip and base fee, each emitted also when 0. */
|
|
13
14
|
const CREDIT_COUNT = 3;
|
|
14
15
|
/**
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
16
|
+
* Mento stable tokens have moved fees both ways: cUSD used `burnRemint` until an upgrade between
|
|
17
|
+
* blocks 50M and 75M, and `burnMint` since. The two shapes cannot be mistaken for each other, and
|
|
18
|
+
* the fee is the payer's net movement in either, so every Mento token accepts both.
|
|
19
|
+
*/
|
|
20
|
+
const MENTO_PATTERNS = ['burnMint', 'burnRemint'];
|
|
21
|
+
const mentoToken = (token) => [
|
|
22
|
+
token,
|
|
23
|
+
{ token, patterns: MENTO_PATTERNS },
|
|
24
|
+
];
|
|
25
|
+
/**
|
|
26
|
+
* Fee currencies whose fee logs are known, by lower-case fee currency address, with the
|
|
27
|
+
* lower-case token they move. The patterns were checked on mainnet receipts, the oldest on Celo
|
|
28
|
+
* L1. A Mento token without receipts shares the proxy implementation of one with receipts, and
|
|
29
|
+
* WETH's verified source burns the debit and mints each credit. Any other fee currency is
|
|
30
|
+
* reported as unsupported rather than guessed.
|
|
18
31
|
*/
|
|
19
32
|
const CELO_FEE_CURRENCIES = new Map([
|
|
20
33
|
// USD₮ through its adapter
|
|
21
34
|
[
|
|
22
35
|
'0x0e2a3e05bc9a16f5292a6170456a710cb89c6f72',
|
|
23
|
-
{ token: '0x48065fbbe25f71c9282ddf5e1cd6d6a887483d5e',
|
|
36
|
+
{ token: '0x48065fbbe25f71c9282ddf5e1cd6d6a887483d5e', patterns: ['holder'] },
|
|
24
37
|
],
|
|
25
38
|
// USDC through its adapter
|
|
26
39
|
[
|
|
27
40
|
'0x2f25deb3848c207fc8e0c34035b3ba7fc157602b',
|
|
28
|
-
{ token: '0xceba9300f2b948710d2653dd7b07f33a8b32118c',
|
|
41
|
+
{ token: '0xceba9300f2b948710d2653dd7b07f33a8b32118c', patterns: ['burnRemint'] },
|
|
29
42
|
],
|
|
30
|
-
//
|
|
43
|
+
// USAT through its adapter
|
|
31
44
|
[
|
|
32
|
-
'
|
|
33
|
-
{ token: '
|
|
45
|
+
'0x0357ee22278c922e1d36cfe6b899269b161880c4',
|
|
46
|
+
{ token: '0xd2ab3c9a02dbbab236bfec45d1d755df4267f771', patterns: ['holder'] },
|
|
34
47
|
],
|
|
35
|
-
//
|
|
48
|
+
// WETH, not upgradeable
|
|
36
49
|
[
|
|
37
|
-
'
|
|
38
|
-
{ token: '
|
|
50
|
+
'0xd221812de1bd094f35587ee8e174b07b6167d9af',
|
|
51
|
+
{ token: '0xd221812de1bd094f35587ee8e174b07b6167d9af', patterns: ['burnMint'] },
|
|
39
52
|
],
|
|
53
|
+
// Mento USDm (cUSD), EURm (cEUR), GBPm, CHFm, JPYm, KESm, COPm, NGNm, GHSm, PHPm, ZARm, AUDm,
|
|
54
|
+
// XOFm, BRLm, CADm
|
|
55
|
+
...[
|
|
56
|
+
'0x765de816845861e75a25fca122bb6898b8b1282a',
|
|
57
|
+
'0xd8763cba276a3738e6de85b4b3bf5fded6d6ca73',
|
|
58
|
+
'0xccf663b1ff11028f0b19058d0f7b674004a40746',
|
|
59
|
+
'0xb55a79f398e759e43c95b979163f30ec87ee131d',
|
|
60
|
+
'0xc45ecf20f3cd864b32d9794d6f76814ae8892e20',
|
|
61
|
+
'0x456a3d042c0dbd3db53d5489e98dfb038553b0d0',
|
|
62
|
+
'0x8a567e2ae79ca692bd748ab832081c45de4041ea',
|
|
63
|
+
'0xe2702bd97ee33c88c8f6f92da3b733608aa76f71',
|
|
64
|
+
'0xfaea5f3404bba20d3cc2f8c4b0a888f55a3c7313',
|
|
65
|
+
'0x105d4a9306d2e55a71d2eb95b81553ae1dc20d7b',
|
|
66
|
+
'0x4c35853a3b4e647fd266f4de678dcc8fec410bf6',
|
|
67
|
+
'0x7175504c455076f15c04a2f90a8e352281f492f9',
|
|
68
|
+
'0x73f93dcc49cb8a239e2032663e9475dd5ef29a08',
|
|
69
|
+
'0xe8537a3d056da446677b9e9d6c5db704eaab4787',
|
|
70
|
+
'0xff4ab19391af240c311c54200a492233052b6325',
|
|
71
|
+
].map(mentoToken),
|
|
40
72
|
]);
|
|
41
73
|
const same = (a, b) => a.toLowerCase() === b.toLowerCase();
|
|
42
74
|
function matchesPattern(pattern, payer, debit, credits) {
|
|
@@ -62,7 +94,7 @@ function matchesPattern(pattern, payer, debit, credits) {
|
|
|
62
94
|
* Splits the token transfers of a CIP-64 transaction into its fee and its own transfers.
|
|
63
95
|
*
|
|
64
96
|
* The fee logs are found by position: the first transfer is the debit and the last
|
|
65
|
-
* {@link CREDIT_COUNT} are the credits,
|
|
97
|
+
* {@link CREDIT_COUNT} are the credits, checked against the patterns of the fee currency.
|
|
66
98
|
* Matching on position, not on recipients, keeps a transfer of the transaction to the fee
|
|
67
99
|
* recipients. The fee is what the payer sent minus what it got back, in the token's own units:
|
|
68
100
|
* a value converted from the adapter's 18 decimals would not be the amount debited.
|
|
@@ -70,15 +102,15 @@ function matchesPattern(pattern, payer, debit, credits) {
|
|
|
70
102
|
* @param feeCurrency `feeCurrency` of the transaction
|
|
71
103
|
* @param payer sender of the transaction
|
|
72
104
|
* @param transfers the token transfers of the receipt, in log order
|
|
105
|
+
* @param hash hash of the transaction, for the error context
|
|
73
106
|
* @throws UnsupportedFeeCurrencyError when the fee currency is not supported
|
|
74
107
|
* @throws UnexpectedFeeLogsError when the fee logs do not match the fee currency
|
|
75
108
|
*/
|
|
76
|
-
function splitTokenFee(feeCurrency, payer, transfers) {
|
|
109
|
+
function splitTokenFee(feeCurrency, payer, transfers, hash) {
|
|
110
|
+
const context = { feeCurrency, payer, ...(hash !== undefined && { hash }) };
|
|
77
111
|
const currency = CELO_FEE_CURRENCIES.get(feeCurrency.toLowerCase());
|
|
78
112
|
if (currency === undefined) {
|
|
79
|
-
throw new errors_1.UnsupportedFeeCurrencyError(`Unsupported Celo fee currency ${feeCurrency}`,
|
|
80
|
-
feeCurrency,
|
|
81
|
-
});
|
|
113
|
+
throw new errors_1.UnsupportedFeeCurrencyError(`Unsupported Celo fee currency ${feeCurrency}`, context);
|
|
82
114
|
}
|
|
83
115
|
const creditStart = transfers.length - CREDIT_COUNT;
|
|
84
116
|
const [debit] = transfers;
|
|
@@ -86,10 +118,8 @@ function splitTokenFee(feeCurrency, payer, transfers) {
|
|
|
86
118
|
if (debit === undefined ||
|
|
87
119
|
creditStart < 1 ||
|
|
88
120
|
![debit, ...credits].every((transfer) => same(transfer.asset.assetReference, currency.token)) ||
|
|
89
|
-
!
|
|
90
|
-
throw new errors_1.UnexpectedFeeLogsError(`Unexpected fee logs for Celo fee currency ${feeCurrency}`,
|
|
91
|
-
feeCurrency,
|
|
92
|
-
});
|
|
121
|
+
!currency.patterns.some((pattern) => matchesPattern(pattern, payer, debit, credits))) {
|
|
122
|
+
throw new errors_1.UnexpectedFeeLogsError(`Unexpected fee logs for Celo fee currency ${feeCurrency}`, context);
|
|
93
123
|
}
|
|
94
124
|
let fees = 0n;
|
|
95
125
|
for (const transfer of [debit, ...credits]) {
|
|
@@ -100,40 +130,62 @@ function splitTokenFee(feeCurrency, payer, transfers) {
|
|
|
100
130
|
fees -= value;
|
|
101
131
|
}
|
|
102
132
|
if (fees < 0n) {
|
|
103
|
-
throw new errors_1.UnexpectedFeeLogsError(`Negative fee for Celo fee currency ${feeCurrency}`,
|
|
104
|
-
feeCurrency,
|
|
105
|
-
});
|
|
133
|
+
throw new errors_1.UnexpectedFeeLogsError(`Negative fee for Celo fee currency ${feeCurrency}`, context);
|
|
106
134
|
}
|
|
107
135
|
return {
|
|
108
136
|
fees,
|
|
109
137
|
feesAsset: { type: 'erc20', assetReference: debit.asset.assetReference },
|
|
138
|
+
feeTransfers: [debit, ...credits],
|
|
110
139
|
transfers: transfers.slice(1, creditStart),
|
|
111
140
|
};
|
|
112
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
|
+
}
|
|
113
149
|
/**
|
|
114
|
-
* Reads the
|
|
115
|
-
*
|
|
116
|
-
*
|
|
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.
|
|
117
153
|
*
|
|
118
154
|
* @param nodeApi node of the network
|
|
119
155
|
* @param blockHeight height of the block
|
|
120
156
|
*/
|
|
121
157
|
function createCeloTokenFeeReader(nodeApi, blockHeight) {
|
|
122
158
|
let feeCurrencies;
|
|
123
|
-
return async (
|
|
124
|
-
if (type !== undefined && type !== exports.CIP64_TX_TYPE)
|
|
125
|
-
return
|
|
159
|
+
return async (tx) => {
|
|
160
|
+
if (tx.type !== undefined && tx.type !== exports.CIP64_TX_TYPE)
|
|
161
|
+
return { kind: 'native' };
|
|
126
162
|
if (nodeApi.getFeeCurrencies === undefined) {
|
|
127
|
-
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 });
|
|
128
164
|
}
|
|
129
165
|
feeCurrencies ??= nodeApi.getFeeCurrencies(blockHeight);
|
|
130
|
-
const feeCurrency = (await feeCurrencies).get(hash.toLowerCase());
|
|
166
|
+
const feeCurrency = (await feeCurrencies).get(tx.hash.toLowerCase());
|
|
131
167
|
if (feeCurrency === undefined) {
|
|
132
|
-
throw new errors_1.FeeCurrencyUnavailableError(`The node block has no transaction ${hash}`, {
|
|
133
|
-
hash,
|
|
168
|
+
throw new errors_1.FeeCurrencyUnavailableError(`The node block has no transaction ${tx.hash}`, {
|
|
169
|
+
hash: tx.hash,
|
|
134
170
|
});
|
|
135
171
|
}
|
|
136
|
-
return
|
|
172
|
+
return toCeloTransactionFee(feeCurrency, tx);
|
|
137
173
|
};
|
|
138
174
|
}
|
|
175
|
+
/**
|
|
176
|
+
* Reads how a Celo transaction paid its fee, fetching its fee currency alone, for transactions
|
|
177
|
+
* that are not read block by block.
|
|
178
|
+
*
|
|
179
|
+
* @param nodeApi node of the network
|
|
180
|
+
* @param tx the transaction, with the token transfers of its receipt
|
|
181
|
+
* @throws UnexpectedFeeLogsError when the fee logs do not match a supported fee currency
|
|
182
|
+
*/
|
|
183
|
+
async function readCeloTransactionFee(nodeApi, tx) {
|
|
184
|
+
if (tx.type !== undefined && tx.type !== exports.CIP64_TX_TYPE)
|
|
185
|
+
return { kind: 'native' };
|
|
186
|
+
if (nodeApi.getFeeCurrency === undefined) {
|
|
187
|
+
throw new errors_1.FeeCurrencyUnavailableError('The node cannot report the fee currency of a transaction', { hash: tx.hash });
|
|
188
|
+
}
|
|
189
|
+
return toCeloTransactionFee(await nodeApi.getFeeCurrency(tx.hash), tx);
|
|
190
|
+
}
|
|
139
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;;;
|
|
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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOperations.d.ts","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"listOperations.d.ts","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE3C,OAAO,KAAK,EACV,IAAI,EACJ,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACtB,MAAM,2CAA2C,CAAA;AAyClD,wBAAsB,cAAc,CAClC,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,CA8R5C"}
|
|
@@ -4,8 +4,10 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.listOperations = listOperations;
|
|
6
6
|
const errors_1 = require("@ledgerhq/coin-module-framework/errors");
|
|
7
|
+
const config_1 = require("../config");
|
|
7
8
|
const explorer_1 = require("../network/explorer");
|
|
8
9
|
const feeCollectorOperations_1 = require("./feeCollectorOperations");
|
|
10
|
+
const tokenFeeOperations_1 = require("./tokenFeeOperations");
|
|
9
11
|
// the sort parameter has a double meaning:
|
|
10
12
|
// - legacy (for the bridge): it's used to sort the operations in the result list. Explorer always queried in "desc" order.
|
|
11
13
|
// - new: it's used to sort AND query the explorer with the correct order.
|
|
@@ -44,10 +46,23 @@ async function listOperations(context, address, options) {
|
|
|
44
46
|
const config = await context.config();
|
|
45
47
|
const explorerApi = (0, explorer_1.getExplorerApi)(config);
|
|
46
48
|
const explorerOrder = options.limit === undefined ? 'desc' : (options.order ?? 'desc');
|
|
47
|
-
const { lastCoinOperations, lastTokenOperations, lastNftOperations, lastInternalOperations, nextPagingToken, } = await explorerApi.getOperations(config, context.logger, address, options.minHeight, undefined, options.cursor, options.limit, explorerOrder);
|
|
49
|
+
const { lastCoinOperations, lastTokenOperations: explorerTokenOperations, lastNftOperations, lastInternalOperations, nextPagingToken, } = await explorerApi.getOperations(config, context.logger, address, options.minHeight, undefined, options.cursor, options.limit, explorerOrder);
|
|
50
|
+
const addressLower = address.toLowerCase();
|
|
51
|
+
// A Celo CIP-64 transaction can pay its fee in a token. The fee transfers are removed before the
|
|
52
|
+
// parent suppression below, so that the native operation stays as the fee carrier.
|
|
53
|
+
const tokenFees = config.chainId === config_1.CHAIN_ID.CELO
|
|
54
|
+
? await (0, tokenFeeOperations_1.readCeloTokenFees)(config, context.logger, address, [
|
|
55
|
+
...lastCoinOperations,
|
|
56
|
+
...explorerTokenOperations,
|
|
57
|
+
...lastNftOperations,
|
|
58
|
+
...lastInternalOperations,
|
|
59
|
+
].map((op) => op.tx.hash), new Set(lastCoinOperations
|
|
60
|
+
.filter((op) => op.senders.some((sender) => sender.toLowerCase() === addressLower))
|
|
61
|
+
.map((op) => op.tx.hash.toLowerCase())))
|
|
62
|
+
: new Map();
|
|
63
|
+
const lastTokenOperations = (0, tokenFeeOperations_1.removeFeeTransfers)(explorerTokenOperations, tokenFees);
|
|
48
64
|
const tokenOrNftHashes = new Set([...lastTokenOperations, ...lastNftOperations].map((op) => op.tx.hash));
|
|
49
65
|
const tokenNftOrInternalHashes = new Set([...lastTokenOperations, ...lastNftOperations, ...lastInternalOperations].map((op) => op.tx.hash));
|
|
50
|
-
const addressLower = address.toLowerCase();
|
|
51
66
|
const isAddressInOp = (op) => op.senders.some((s) => s.toLowerCase() === addressLower) ||
|
|
52
67
|
op.recipients.some((r) => r.toLowerCase() === addressLower);
|
|
53
68
|
const tokenOpHashesWhereAddressInvolved = new Set([...lastTokenOperations, ...lastNftOperations].filter(isAddressInOp).map((op) => op.tx.hash));
|
|
@@ -92,6 +107,7 @@ async function listOperations(context, address, options) {
|
|
|
92
107
|
...op.tx,
|
|
93
108
|
block: { ...op.tx.block, hash: op.tx.block.hash || parent.tx.block.hash },
|
|
94
109
|
fees: parent.tx.fees,
|
|
110
|
+
...(parent.tx.feesAsset ? { feesAsset: parent.tx.feesAsset } : {}),
|
|
95
111
|
failed: parent.tx.failed,
|
|
96
112
|
...(parent.tx.feesPayer ? { feesPayer: parent.tx.feesPayer } : {}),
|
|
97
113
|
},
|
|
@@ -135,6 +151,7 @@ async function listOperations(context, address, options) {
|
|
|
135
151
|
...op.tx,
|
|
136
152
|
block: { ...op.tx.block, hash: parent.tx.block.hash },
|
|
137
153
|
fees: parent.tx.fees,
|
|
154
|
+
...(parent.tx.feesAsset ? { feesAsset: parent.tx.feesAsset } : {}),
|
|
138
155
|
...(parent.tx.feesPayer ? { feesPayer: parent.tx.feesPayer } : {}),
|
|
139
156
|
},
|
|
140
157
|
};
|
|
@@ -213,7 +230,8 @@ async function listOperations(context, address, options) {
|
|
|
213
230
|
.concat(tokenExpanded)
|
|
214
231
|
.concat(internalOperations)
|
|
215
232
|
.filter(hasValidType)
|
|
216
|
-
.filter(isAddressInvolved)
|
|
233
|
+
.filter(isAddressInvolved)
|
|
234
|
+
.map((op) => (0, tokenFeeOperations_1.withTokenFee)(op, tokenFees));
|
|
217
235
|
const feeEvidence = [...lastTokenOperations, ...lastNftOperations, ...lastInternalOperations];
|
|
218
236
|
const operations = (0, feeCollectorOperations_1.attributeFeeCollectorPayments)(accountOperations, address, config.feeCollectorContracts ?? [], config.feeCollectorTokens ?? [], feeEvidence, await (0, feeCollectorOperations_1.findTransactionsPaidByOthers)(config, context.logger, address, accountOperations, feeEvidence));
|
|
219
237
|
operations.sort((a, b) => options.order === 'asc'
|