@agentaos/chains 1.1.1 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ethereum/ethereum.chain.d.ts +8 -0
- package/dist/ethereum/ethereum.chain.d.ts.map +1 -1
- package/dist/ethereum/ethereum.chain.js +67 -10
- package/dist/ethereum/ethereum.chain.js.map +1 -1
- package/package.json +3 -4
- package/dist/ethereum/ethereum.decoder.test.d.ts +0 -2
- package/dist/ethereum/ethereum.decoder.test.d.ts.map +0 -1
- package/dist/ethereum/ethereum.decoder.test.js +0 -32
- package/dist/ethereum/ethereum.decoder.test.js.map +0 -1
- package/dist/ethereum/ethereum.nonce.test.d.ts +0 -2
- package/dist/ethereum/ethereum.nonce.test.d.ts.map +0 -1
- package/dist/ethereum/ethereum.nonce.test.js +0 -99
- package/dist/ethereum/ethereum.nonce.test.js.map +0 -1
|
@@ -19,6 +19,14 @@ export declare class EthereumChain implements IChain {
|
|
|
19
19
|
to?: string;
|
|
20
20
|
value?: bigint;
|
|
21
21
|
data?: Uint8Array;
|
|
22
|
+
authorizationList?: readonly {
|
|
23
|
+
address: string;
|
|
24
|
+
chainId: number;
|
|
25
|
+
nonce: number;
|
|
26
|
+
r: string;
|
|
27
|
+
s: string;
|
|
28
|
+
yParity: number;
|
|
29
|
+
}[];
|
|
22
30
|
}): Promise<bigint>;
|
|
23
31
|
getGasPrice(): Promise<bigint>;
|
|
24
32
|
estimateFeesPerGas(): Promise<FeeEstimate>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.chain.d.ts","sourceRoot":"","sources":["../../src/ethereum/ethereum.chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAa7F,qBAAa,aAAc,YAAW,MAAM;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;gBAE1B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAQnD,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"ethereum.chain.d.ts","sourceRoot":"","sources":["../../src/ethereum/ethereum.chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAa7F,qBAAa,aAAc,YAAW,MAAM;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;gBAE1B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAQnD,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC;IA4DxE,0BAA0B,CACzB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE;QAAE,CAAC,EAAE,UAAU,CAAC;QAAC,CAAC,EAAE,UAAU,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,CAAA;KAAE,GACrD,UAAU;IA6Eb,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,aAAa;IAe3C,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAOzD,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAM5C,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAM1C,WAAW,CAAC,OAAO,EAAE;QAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,UAAU,CAAC;QAClB,iBAAiB,CAAC,EAAE,SAAS;YAC5B,OAAO,EAAE,MAAM,CAAC;YAChB,OAAO,EAAE,MAAM,CAAC;YAChB,KAAK,EAAE,MAAM,CAAC;YACd,CAAC,EAAE,MAAM,CAAC;YACV,CAAC,EAAE,MAAM,CAAC;YACV,OAAO,EAAE,MAAM,CAAC;SAChB,EAAE,CAAC;KACJ,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBb,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9B,kBAAkB,IAAI,OAAO,CAAC,WAAW,CAAC;IAQ1C,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAQlF"}
|
|
@@ -17,8 +17,32 @@ export class EthereumChain {
|
|
|
17
17
|
}
|
|
18
18
|
const to = request.to;
|
|
19
19
|
const data = request.data ? toHex(request.data) : undefined;
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
let serialized;
|
|
21
|
+
if (request.authorizationList && request.authorizationList.length > 0) {
|
|
22
|
+
// Type 4 (EIP-7702) transaction
|
|
23
|
+
serialized = serializeTransaction({
|
|
24
|
+
type: 'eip7702',
|
|
25
|
+
to,
|
|
26
|
+
value: request.value,
|
|
27
|
+
data,
|
|
28
|
+
chainId: request.chainId,
|
|
29
|
+
gas: request.gasLimit,
|
|
30
|
+
maxFeePerGas: request.maxFeePerGas,
|
|
31
|
+
maxPriorityFeePerGas: request.maxPriorityFeePerGas,
|
|
32
|
+
nonce: request.nonce,
|
|
33
|
+
authorizationList: request.authorizationList.map((auth) => ({
|
|
34
|
+
address: auth.address,
|
|
35
|
+
chainId: auth.chainId,
|
|
36
|
+
nonce: auth.nonce,
|
|
37
|
+
r: auth.r,
|
|
38
|
+
s: auth.s,
|
|
39
|
+
yParity: auth.yParity,
|
|
40
|
+
})),
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
else if (request.maxFeePerGas) {
|
|
44
|
+
// Type 2 (EIP-1559) transaction
|
|
45
|
+
serialized = serializeTransaction({
|
|
22
46
|
type: 'eip1559',
|
|
23
47
|
to,
|
|
24
48
|
value: request.value,
|
|
@@ -28,8 +52,11 @@ export class EthereumChain {
|
|
|
28
52
|
maxFeePerGas: request.maxFeePerGas,
|
|
29
53
|
maxPriorityFeePerGas: request.maxPriorityFeePerGas,
|
|
30
54
|
nonce: request.nonce,
|
|
31
|
-
})
|
|
32
|
-
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
// Type 0 (legacy) transaction
|
|
59
|
+
serialized = serializeTransaction({
|
|
33
60
|
type: 'legacy',
|
|
34
61
|
to,
|
|
35
62
|
value: request.value,
|
|
@@ -39,6 +66,7 @@ export class EthereumChain {
|
|
|
39
66
|
gasPrice: request.gasPrice,
|
|
40
67
|
nonce: request.nonce,
|
|
41
68
|
});
|
|
69
|
+
}
|
|
42
70
|
return hexToBytes(serialized);
|
|
43
71
|
}
|
|
44
72
|
serializeSignedTransaction(unsignedTx, signature) {
|
|
@@ -50,8 +78,23 @@ export class EthereumChain {
|
|
|
50
78
|
const to = tx.to;
|
|
51
79
|
const data = tx.data;
|
|
52
80
|
const sig = { r: rHex, s: sHex, v: BigInt(v), yParity };
|
|
53
|
-
|
|
54
|
-
|
|
81
|
+
let serialized;
|
|
82
|
+
if (tx.type === 'eip7702') {
|
|
83
|
+
serialized = serializeTransaction({
|
|
84
|
+
type: 'eip7702',
|
|
85
|
+
to,
|
|
86
|
+
value: tx.value,
|
|
87
|
+
data,
|
|
88
|
+
chainId: tx.chainId,
|
|
89
|
+
gas: tx.gas,
|
|
90
|
+
maxFeePerGas: tx.maxFeePerGas,
|
|
91
|
+
maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
|
|
92
|
+
nonce: tx.nonce,
|
|
93
|
+
authorizationList: tx.authorizationList,
|
|
94
|
+
}, sig);
|
|
95
|
+
}
|
|
96
|
+
else if (tx.type === 'eip1559') {
|
|
97
|
+
serialized = serializeTransaction({
|
|
55
98
|
type: 'eip1559',
|
|
56
99
|
to,
|
|
57
100
|
value: tx.value,
|
|
@@ -61,8 +104,10 @@ export class EthereumChain {
|
|
|
61
104
|
maxFeePerGas: tx.maxFeePerGas,
|
|
62
105
|
maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
|
|
63
106
|
nonce: tx.nonce,
|
|
64
|
-
}, sig)
|
|
65
|
-
|
|
107
|
+
}, sig);
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
serialized = serializeTransaction({
|
|
66
111
|
type: 'legacy',
|
|
67
112
|
to,
|
|
68
113
|
value: tx.value,
|
|
@@ -72,6 +117,7 @@ export class EthereumChain {
|
|
|
72
117
|
gasPrice: tx.gasPrice,
|
|
73
118
|
nonce: tx.nonce,
|
|
74
119
|
}, sig);
|
|
120
|
+
}
|
|
75
121
|
return hexToBytes(serialized);
|
|
76
122
|
}
|
|
77
123
|
decodeTransaction(raw) {
|
|
@@ -104,12 +150,23 @@ export class EthereumChain {
|
|
|
104
150
|
}
|
|
105
151
|
async estimateGas(request) {
|
|
106
152
|
const data = request.data ? toHex(request.data) : undefined;
|
|
107
|
-
|
|
153
|
+
const params = {
|
|
108
154
|
account: request.from,
|
|
109
155
|
to: request.to,
|
|
110
156
|
value: request.value,
|
|
111
157
|
data,
|
|
112
|
-
}
|
|
158
|
+
};
|
|
159
|
+
if (request.authorizationList && request.authorizationList.length > 0) {
|
|
160
|
+
params.authorizationList = request.authorizationList.map((auth) => ({
|
|
161
|
+
address: auth.address,
|
|
162
|
+
chainId: auth.chainId,
|
|
163
|
+
nonce: auth.nonce,
|
|
164
|
+
r: auth.r,
|
|
165
|
+
s: auth.s,
|
|
166
|
+
yParity: auth.yParity,
|
|
167
|
+
}));
|
|
168
|
+
}
|
|
169
|
+
return this.client.estimateGas(params);
|
|
113
170
|
}
|
|
114
171
|
async getGasPrice() {
|
|
115
172
|
return this.client.getGasPrice();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.chain.js","sourceRoot":"","sources":["../../src/ethereum/ethereum.chain.ts"],"names":[],"mappings":"AACA,OAAO,EACN,IAAI,EAEJ,kBAAkB,EAClB,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,oBAAoB,EACpB,KAAK,GACL,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,OAAO,aAAa;IAChB,OAAO,CAAS;IAChB,IAAI,CAAS;IACL,MAAM,CAAe;IAEtC,YAAY,OAAe,EAAE,IAAY,EAAE,MAAc;QACxD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAC;YAChC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC3C,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAA2B;QACjD,IAAI,OAAO,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,MAAM,EAAE,GAAG,OAAO,CAAC,EAA+B,CAAC;QACnD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE5D,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"ethereum.chain.js","sourceRoot":"","sources":["../../src/ethereum/ethereum.chain.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentaos/chains",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"description": "Ethereum chain adapter for AgentaOS threshold wallet",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"author": "AgentaOS <hello@agentaos.ai>",
|
|
@@ -39,11 +39,10 @@
|
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"viem": "^2.21.0",
|
|
42
|
-
"@agentaos/core": "
|
|
42
|
+
"@agentaos/core": "2.0.0"
|
|
43
43
|
},
|
|
44
|
-
"devDependencies": {},
|
|
45
44
|
"scripts": {
|
|
46
|
-
"build": "tsc",
|
|
45
|
+
"build": "tsc -p tsconfig.build.json",
|
|
47
46
|
"lint": "biome check src/",
|
|
48
47
|
"test": "vitest run",
|
|
49
48
|
"typecheck": "tsc --noEmit",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.decoder.test.d.ts","sourceRoot":"","sources":["../../src/ethereum/ethereum.decoder.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it } from 'vitest';
|
|
2
|
-
import { decodeCalldata } from './ethereum.decoder.js';
|
|
3
|
-
describe('decodeCalldata', () => {
|
|
4
|
-
it('returns undefined for data shorter than 4 bytes', () => {
|
|
5
|
-
expect(decodeCalldata(new Uint8Array([0x01, 0x02]))).toBeUndefined();
|
|
6
|
-
expect(decodeCalldata(new Uint8Array([]))).toBeUndefined();
|
|
7
|
-
});
|
|
8
|
-
it('decodes known ERC20 transfer selector', () => {
|
|
9
|
-
// 0xa9059cbb = transfer(address,uint256)
|
|
10
|
-
const data = new Uint8Array([0xa9, 0x05, 0x9c, 0xbb, 0x00, 0x00]);
|
|
11
|
-
const result = decodeCalldata(data);
|
|
12
|
-
expect(result).toBeDefined();
|
|
13
|
-
expect(result?.selector).toBe('0xa9059cbb');
|
|
14
|
-
expect(result?.name).toBe('transfer(address,uint256)');
|
|
15
|
-
});
|
|
16
|
-
it('decodes known approve selector', () => {
|
|
17
|
-
// 0x095ea7b3 = approve(address,uint256)
|
|
18
|
-
const data = new Uint8Array([0x09, 0x5e, 0xa7, 0xb3]);
|
|
19
|
-
const result = decodeCalldata(data);
|
|
20
|
-
expect(result).toBeDefined();
|
|
21
|
-
expect(result?.selector).toBe('0x095ea7b3');
|
|
22
|
-
expect(result?.name).toBe('approve(address,uint256)');
|
|
23
|
-
});
|
|
24
|
-
it('returns unknown for unrecognized selector', () => {
|
|
25
|
-
const data = new Uint8Array([0xde, 0xad, 0xbe, 0xef]);
|
|
26
|
-
const result = decodeCalldata(data);
|
|
27
|
-
expect(result).toBeDefined();
|
|
28
|
-
expect(result?.selector).toBe('0xdeadbeef');
|
|
29
|
-
expect(result?.name).toBe('unknown(0xdeadbeef)');
|
|
30
|
-
});
|
|
31
|
-
});
|
|
32
|
-
//# sourceMappingURL=ethereum.decoder.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.decoder.test.js","sourceRoot":"","sources":["../../src/ethereum/ethereum.decoder.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,cAAc,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACrE,MAAM,CAAC,cAAc,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAChD,yCAAyC;QACzC,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACzC,wCAAwC;QACxC,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.nonce.test.d.ts","sourceRoot":"","sources":["../../src/ethereum/ethereum.nonce.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,99 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it } from 'vitest';
|
|
2
|
-
import { EthereumNonceManager } from './ethereum.nonce.js';
|
|
3
|
-
describe('EthereumNonceManager', () => {
|
|
4
|
-
const address = '0x1234567890abcdef1234567890abcdef12345678';
|
|
5
|
-
it('fetches initial nonce from chain', async () => {
|
|
6
|
-
const manager = new EthereumNonceManager(async () => 5);
|
|
7
|
-
const nonce = await manager.getNext(address);
|
|
8
|
-
expect(nonce).toBe(5);
|
|
9
|
-
});
|
|
10
|
-
it('increments nonce on subsequent calls', async () => {
|
|
11
|
-
const manager = new EthereumNonceManager(async () => 0);
|
|
12
|
-
const n1 = await manager.getNext(address);
|
|
13
|
-
const n2 = await manager.getNext(address);
|
|
14
|
-
const n3 = await manager.getNext(address);
|
|
15
|
-
expect(n1).toBe(0);
|
|
16
|
-
expect(n2).toBe(1);
|
|
17
|
-
expect(n3).toBe(2);
|
|
18
|
-
});
|
|
19
|
-
it('normalizes address to lowercase', async () => {
|
|
20
|
-
const manager = new EthereumNonceManager(async () => 10);
|
|
21
|
-
const upper = '0xABCDEF1234567890ABCDEF1234567890ABCDEF12';
|
|
22
|
-
const n1 = await manager.getNext(upper);
|
|
23
|
-
const n2 = await manager.getNext(upper.toLowerCase());
|
|
24
|
-
expect(n1).toBe(10);
|
|
25
|
-
expect(n2).toBe(11);
|
|
26
|
-
});
|
|
27
|
-
it('re-fetches from chain after release', async () => {
|
|
28
|
-
// Chain says nonce 0 (nothing mined yet)
|
|
29
|
-
const manager = new EthereumNonceManager(async () => 0);
|
|
30
|
-
const n1 = await manager.getNext(address);
|
|
31
|
-
expect(n1).toBe(0);
|
|
32
|
-
// Release nonce 0 (tx failed) — clears cache, re-fetch from chain
|
|
33
|
-
await manager.release(address, 0);
|
|
34
|
-
// Chain still says 0 → re-issue 0
|
|
35
|
-
const n2 = await manager.getNext(address);
|
|
36
|
-
expect(n2).toBe(0);
|
|
37
|
-
});
|
|
38
|
-
it('skips in-flight nonces after release and re-fetch', async () => {
|
|
39
|
-
// Chain says 0. Issue 0, 1, 2 → reserved={0,1,2}
|
|
40
|
-
const manager = new EthereumNonceManager(async () => 0);
|
|
41
|
-
const n0 = await manager.getNext(address);
|
|
42
|
-
const n1 = await manager.getNext(address);
|
|
43
|
-
const n2 = await manager.getNext(address);
|
|
44
|
-
expect(n0).toBe(0);
|
|
45
|
-
expect(n1).toBe(1);
|
|
46
|
-
expect(n2).toBe(2);
|
|
47
|
-
// Release nonce 1 (tx failed) → reserved={0,2}, cache cleared
|
|
48
|
-
await manager.release(address, 1);
|
|
49
|
-
// Re-fetch from chain (still 0), skip 0 (reserved), land on 1
|
|
50
|
-
const reused = await manager.getNext(address);
|
|
51
|
-
expect(reused).toBe(1);
|
|
52
|
-
// Now reserved={0,1,2}, counter=2, skip 2 (reserved) → 3
|
|
53
|
-
const next = await manager.getNext(address);
|
|
54
|
-
expect(next).toBe(3);
|
|
55
|
-
});
|
|
56
|
-
it('handles multiple releases — fills gaps from chain', async () => {
|
|
57
|
-
// Chain says 0. Issue 0,1,2,3 → reserved={0,1,2,3}
|
|
58
|
-
const manager = new EthereumNonceManager(async () => 0);
|
|
59
|
-
await manager.getNext(address); // 0
|
|
60
|
-
await manager.getNext(address); // 1
|
|
61
|
-
await manager.getNext(address); // 2
|
|
62
|
-
await manager.getNext(address); // 3
|
|
63
|
-
// Release 2 then 0 → reserved={1,3}
|
|
64
|
-
await manager.release(address, 2);
|
|
65
|
-
await manager.release(address, 0);
|
|
66
|
-
// Re-fetch from chain (0), not reserved → issue 0
|
|
67
|
-
expect(await manager.getNext(address)).toBe(0);
|
|
68
|
-
// counter=1, skip 1 (reserved), try 2 → issue 2
|
|
69
|
-
expect(await manager.getNext(address)).toBe(2);
|
|
70
|
-
// counter=3, skip 3 (reserved), try 4 → issue 4
|
|
71
|
-
expect(await manager.getNext(address)).toBe(4);
|
|
72
|
-
});
|
|
73
|
-
it('re-fetches updated chain nonce after txs mine', async () => {
|
|
74
|
-
// Simulate: chain nonce advances as txs mine
|
|
75
|
-
let chainNonce = 0;
|
|
76
|
-
const manager = new EthereumNonceManager(async () => chainNonce);
|
|
77
|
-
// Issue 0, 1, 2
|
|
78
|
-
expect(await manager.getNext(address)).toBe(0);
|
|
79
|
-
expect(await manager.getNext(address)).toBe(1);
|
|
80
|
-
expect(await manager.getNext(address)).toBe(2);
|
|
81
|
-
// Tx 0 and 1 mine → chain advances to 2
|
|
82
|
-
chainNonce = 2;
|
|
83
|
-
// Release nonce 2 (tx failed) → cache cleared
|
|
84
|
-
await manager.release(address, 2);
|
|
85
|
-
// Re-fetch from chain (now 2), not reserved → issue 2
|
|
86
|
-
expect(await manager.getNext(address)).toBe(2);
|
|
87
|
-
});
|
|
88
|
-
it('handles concurrent nonce allocation without conflicts', async () => {
|
|
89
|
-
const manager = new EthereumNonceManager(async () => 0);
|
|
90
|
-
const nonces = await Promise.all([
|
|
91
|
-
manager.getNext(address),
|
|
92
|
-
manager.getNext(address),
|
|
93
|
-
manager.getNext(address),
|
|
94
|
-
]);
|
|
95
|
-
const unique = new Set(nonces);
|
|
96
|
-
expect(unique.size).toBe(3);
|
|
97
|
-
});
|
|
98
|
-
});
|
|
99
|
-
//# sourceMappingURL=ethereum.nonce.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.nonce.test.js","sourceRoot":"","sources":["../../src/ethereum/ethereum.nonce.test.ts"],"names":[],"mappings":"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"}
|