ox 0.14.47 → 0.14.49
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 +31 -0
- package/_cjs/core/Frame.js +15 -13
- package/_cjs/core/Frame.js.map +1 -1
- package/_cjs/core/FrameReceipt.js +10 -8
- package/_cjs/core/FrameReceipt.js.map +1 -1
- package/_cjs/core/FrameSignature.js +33 -18
- package/_cjs/core/FrameSignature.js.map +1 -1
- package/_cjs/core/TxEnvelopeEip8141.js +4 -4
- package/_cjs/core/TxEnvelopeEip8141.js.map +1 -1
- package/_cjs/version.js +1 -1
- package/_esm/core/Frame.js +25 -23
- package/_esm/core/Frame.js.map +1 -1
- package/_esm/core/FrameReceipt.js +15 -11
- package/_esm/core/FrameReceipt.js.map +1 -1
- package/_esm/core/FrameSignature.js +36 -20
- package/_esm/core/FrameSignature.js.map +1 -1
- package/_esm/core/TxEnvelopeEip8141.js +8 -8
- package/_esm/core/TxEnvelopeEip8141.js.map +1 -1
- package/_esm/index.js +5 -5
- package/_esm/version.js +1 -1
- package/_types/core/Frame.d.ts +20 -20
- package/_types/core/Frame.d.ts.map +1 -1
- package/_types/core/FrameReceipt.d.ts +17 -11
- package/_types/core/FrameReceipt.d.ts.map +1 -1
- package/_types/core/FrameSignature.d.ts +14 -13
- package/_types/core/FrameSignature.d.ts.map +1 -1
- package/_types/core/TxEnvelopeEip8141.d.ts +4 -4
- package/_types/index.d.ts +5 -5
- package/_types/version.d.ts +1 -1
- package/core/Frame.ts +38 -33
- package/core/FrameReceipt.ts +21 -13
- package/core/FrameSignature.ts +56 -36
- package/core/TxEnvelopeEip8141.ts +8 -8
- package/index.ts +5 -5
- package/package.json +1 -1
- package/version.ts +1 -1
|
@@ -2,15 +2,15 @@ import * as Hex from './Hex.js';
|
|
|
2
2
|
import * as Quantity from './internal/quantity.js';
|
|
3
3
|
/** RPC status to status mapping. */
|
|
4
4
|
export const fromRpcStatus = {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
'0x0': 'reverted',
|
|
6
|
+
'0x1': 'success',
|
|
7
|
+
'0x2': 'skipped',
|
|
8
8
|
};
|
|
9
9
|
/** Status to RPC status mapping. */
|
|
10
10
|
export const toRpcStatus = {
|
|
11
|
-
reverted:
|
|
12
|
-
skipped:
|
|
13
|
-
success:
|
|
11
|
+
reverted: '0x0',
|
|
12
|
+
skipped: '0x2',
|
|
13
|
+
success: '0x1',
|
|
14
14
|
};
|
|
15
15
|
/**
|
|
16
16
|
* Converts an RPC frame receipt to a {@link ox#FrameReceipt.FrameReceipt}.
|
|
@@ -23,9 +23,10 @@ export const toRpcStatus = {
|
|
|
23
23
|
*
|
|
24
24
|
* const receipt = FrameReceipt.fromRpc({
|
|
25
25
|
* executionGasUsed: '0x5208',
|
|
26
|
+
* gasUsed: '0x5208',
|
|
26
27
|
* logs: [],
|
|
27
28
|
* stateGasUsed: '0x0',
|
|
28
|
-
* status:
|
|
29
|
+
* status: '0x1'
|
|
29
30
|
* })
|
|
30
31
|
* ```
|
|
31
32
|
*
|
|
@@ -34,7 +35,8 @@ export const toRpcStatus = {
|
|
|
34
35
|
*/
|
|
35
36
|
export function fromRpc(receipt) {
|
|
36
37
|
return {
|
|
37
|
-
|
|
38
|
+
executionGasUsed: Hex.toBigInt(receipt.executionGasUsed),
|
|
39
|
+
gasUsed: Hex.toBigInt(receipt.gasUsed),
|
|
38
40
|
logs: receipt.logs,
|
|
39
41
|
stateGasUsed: Hex.toBigInt(receipt.stateGasUsed),
|
|
40
42
|
status: fromRpcStatus[receipt.status],
|
|
@@ -51,19 +53,21 @@ export function fromRpc(receipt) {
|
|
|
51
53
|
*
|
|
52
54
|
* const receipt = FrameReceipt.fromRpc({
|
|
53
55
|
* executionGasUsed: '0x5208',
|
|
56
|
+
* gasUsed: '0x5208',
|
|
54
57
|
* logs: [],
|
|
55
58
|
* stateGasUsed: '0x0',
|
|
56
|
-
* status:
|
|
59
|
+
* status: '0x1'
|
|
57
60
|
* })
|
|
58
61
|
* const rpc = FrameReceipt.toRpc(receipt)
|
|
59
62
|
* ```
|
|
60
63
|
*
|
|
61
64
|
* @param receipt - The frame receipt. Gas accepts hex, bigint, or number values.
|
|
62
|
-
* @returns The RPC frame receipt with hex gas and a
|
|
65
|
+
* @returns The RPC frame receipt with hex gas and a hex status.
|
|
63
66
|
*/
|
|
64
67
|
export function toRpc(receipt) {
|
|
65
68
|
return {
|
|
66
|
-
executionGasUsed: Quantity.fromNumberish(receipt.
|
|
69
|
+
executionGasUsed: Quantity.fromNumberish(receipt.executionGasUsed),
|
|
70
|
+
gasUsed: Quantity.fromNumberish(receipt.gasUsed),
|
|
67
71
|
logs: receipt.logs,
|
|
68
72
|
stateGasUsed: Quantity.fromNumberish(receipt.stateGasUsed),
|
|
69
73
|
status: toRpcStatus[receipt.status],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FrameReceipt.js","sourceRoot":"","sources":["../../core/FrameReceipt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"FrameReceipt.js","sourceRoot":"","sources":["../../core/FrameReceipt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAqClD,oCAAoC;AACpC,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,KAAK,EAAE,UAAU;IACjB,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;CACR,CAAA;AAEV,oCAAoC;AACpC,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,QAAQ,EAAE,KAAK;IACf,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,KAAK;CACN,CAAA;AAEV;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,OAAO,CAAC,OAAY;IAClC,OAAO;QACL,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC;QACxD,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QACtC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;QAChD,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;KACtC,CAAA;AACH,CAAC;AAMD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,KAAK,CAAC,OAAoB;IACxC,OAAO;QACL,gBAAgB,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAClE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC;QAChD,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;QAC1D,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;KACpC,CAAA;AACH,CAAC"}
|
|
@@ -89,16 +89,20 @@ export function assert(entry, options = {}) {
|
|
|
89
89
|
throw new InvalidError('Signature is required.');
|
|
90
90
|
return;
|
|
91
91
|
}
|
|
92
|
-
if (typeof entry.signature
|
|
93
|
-
|
|
92
|
+
if (typeof entry.signature === 'string')
|
|
93
|
+
Hex.assert(entry.signature, { strict: true });
|
|
94
|
+
const signature = typeof entry.signature === 'string'
|
|
95
|
+
? Signature.fromHex(entry.signature)
|
|
96
|
+
: entry.signature;
|
|
97
|
+
if (typeof signature.r !== 'bigint' || typeof signature.s !== 'bigint')
|
|
94
98
|
throw new InvalidError('Signature scalars must be bigint.');
|
|
95
|
-
if ((scheme === 1 ||
|
|
96
|
-
|
|
97
|
-
|
|
99
|
+
if ((scheme === 1 || signature.yParity !== undefined) &&
|
|
100
|
+
signature.yParity !== 0 &&
|
|
101
|
+
signature.yParity !== 1)
|
|
98
102
|
throw new InvalidError('Signature parity must be 0 or 1.');
|
|
99
|
-
Signature.assert(
|
|
100
|
-
const r =
|
|
101
|
-
const s =
|
|
103
|
+
Signature.assert(signature, { recovered: scheme === 1 });
|
|
104
|
+
const r = signature.r;
|
|
105
|
+
const s = signature.s;
|
|
102
106
|
const order = scheme === 1 ? secp256k1N : p256N;
|
|
103
107
|
if (r === 0n ||
|
|
104
108
|
r >= order ||
|
|
@@ -110,7 +114,8 @@ export function assert(entry, options = {}) {
|
|
|
110
114
|
/**
|
|
111
115
|
* Coerces a value into a {@link ox#FrameSignature.FrameSignature}.
|
|
112
116
|
*
|
|
113
|
-
* Accepts arbitrary signature bytes or a
|
|
117
|
+
* Accepts arbitrary signature bytes or a signature entry. Protocol signatures accept
|
|
118
|
+
* structured objects or `Signature.toHex` bytes. P-256 entries still require a public key. Omitted
|
|
114
119
|
* `scheme` and `payload` default to `'arbitrary'` and `'0x'`, respectively.
|
|
115
120
|
* An empty payload selects the canonical transaction signing hash; an explicit
|
|
116
121
|
* payload must be a nonzero 32-byte digest.
|
|
@@ -203,7 +208,7 @@ export function from(entry) {
|
|
|
203
208
|
*
|
|
204
209
|
* const entry = FrameSignature.fromRpc({
|
|
205
210
|
* msg: '0x',
|
|
206
|
-
* scheme:
|
|
211
|
+
* scheme: '0x0',
|
|
207
212
|
* signature: '0xdeadbeef'
|
|
208
213
|
* })
|
|
209
214
|
* ```
|
|
@@ -213,10 +218,12 @@ export function from(entry) {
|
|
|
213
218
|
*/
|
|
214
219
|
export function fromRpc(entry) {
|
|
215
220
|
return fromTuple([
|
|
216
|
-
entry.scheme ===
|
|
221
|
+
entry.scheme === '0x0'
|
|
222
|
+
? '0x'
|
|
223
|
+
: Hex.fromNumber(Hex.toNumber(entry.scheme), { size: 1 }),
|
|
217
224
|
entry.signer ?? '0x',
|
|
218
|
-
entry.msg,
|
|
219
|
-
entry.signature,
|
|
225
|
+
entry.msg ?? '0x',
|
|
226
|
+
entry.signature ?? '0x',
|
|
220
227
|
]);
|
|
221
228
|
}
|
|
222
229
|
/**
|
|
@@ -239,8 +246,10 @@ export function toRpc(entry) {
|
|
|
239
246
|
const [scheme, signer, msg, signature] = toTuple(entry);
|
|
240
247
|
return {
|
|
241
248
|
msg,
|
|
242
|
-
scheme: (scheme === '0x'
|
|
243
|
-
|
|
249
|
+
scheme: (scheme === '0x'
|
|
250
|
+
? '0x0'
|
|
251
|
+
: Hex.fromNumber(Hex.toNumber(scheme))),
|
|
252
|
+
...(signature === '0x' && scheme !== '0x' ? {} : { signature }),
|
|
244
253
|
...(signer === '0x' ? {} : { signer }),
|
|
245
254
|
};
|
|
246
255
|
}
|
|
@@ -352,15 +361,22 @@ export function toTuple(entry) {
|
|
|
352
361
|
case 'arbitrary':
|
|
353
362
|
return entry.signature;
|
|
354
363
|
case 1:
|
|
355
|
-
case 'secp256k1':
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
364
|
+
case 'secp256k1': {
|
|
365
|
+
if (entry.signature === undefined)
|
|
366
|
+
return '0x';
|
|
367
|
+
const signature = typeof entry.signature === 'string'
|
|
368
|
+
? Signature.fromHex(entry.signature)
|
|
369
|
+
: entry.signature;
|
|
370
|
+
return Hex.concat(Hex.fromNumber(signature.yParity, { size: 1 }), Hex.fromNumber(signature.r, { size: 32 }), Hex.fromNumber(signature.s, { size: 32 }));
|
|
371
|
+
}
|
|
359
372
|
case 2:
|
|
360
373
|
case 'p256': {
|
|
361
374
|
if (entry.signature === undefined)
|
|
362
375
|
return '0x';
|
|
363
|
-
const { publicKey
|
|
376
|
+
const { publicKey } = entry;
|
|
377
|
+
const signature = typeof entry.signature === 'string'
|
|
378
|
+
? Signature.fromHex(entry.signature)
|
|
379
|
+
: entry.signature;
|
|
364
380
|
const s = signature.s;
|
|
365
381
|
return Hex.concat(Hex.fromNumber(signature.r, { size: 32 }), Hex.fromNumber(s > p256N / 2n ? p256N - s : s, { size: 32 }), Hex.fromNumber(publicKey.x, { size: 32 }), Hex.fromNumber(publicKey.y, { size: 32 }));
|
|
366
382
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FrameSignature.js","sourceRoot":"","sources":["../../core/FrameSignature.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FrameSignature.js","sourceRoot":"","sources":["../../core/FrameSignature.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export const type = 'eip8141';
|
|
|
26
26
|
*
|
|
27
27
|
* TxEnvelopeEip8141.assert({
|
|
28
28
|
* chainId: 1,
|
|
29
|
-
* frames: [{
|
|
29
|
+
* frames: [{ executionGas: 50_000n, mode: 'verify' }],
|
|
30
30
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
31
31
|
* })
|
|
32
32
|
* ```
|
|
@@ -62,7 +62,7 @@ export function assert(envelope) {
|
|
|
62
62
|
}
|
|
63
63
|
if (blobVersionedHashes.length === 0 && maxFeePerBlobGas !== 0n)
|
|
64
64
|
throw new InvalidError('maxFeePerBlobGas must be zero without blobs.');
|
|
65
|
-
let
|
|
65
|
+
let executionGas = 0n;
|
|
66
66
|
let stateGas = 0n;
|
|
67
67
|
let previousBatch = false;
|
|
68
68
|
let expiry = false;
|
|
@@ -101,7 +101,7 @@ export function assert(envelope) {
|
|
|
101
101
|
throw new InvalidError('Invalid or duplicate expiry verifier frame.');
|
|
102
102
|
expiry = true;
|
|
103
103
|
}
|
|
104
|
-
|
|
104
|
+
executionGas += frame.executionGas ?? 0n;
|
|
105
105
|
stateGas += frame.stateGas ?? 0n;
|
|
106
106
|
count(frame.data ?? '0x');
|
|
107
107
|
if ((frame.value ?? 0n) > 0n &&
|
|
@@ -116,9 +116,9 @@ export function assert(envelope) {
|
|
|
116
116
|
count(payload);
|
|
117
117
|
count(signature);
|
|
118
118
|
}
|
|
119
|
-
if (
|
|
119
|
+
if (executionGas + stateGas >= 2n ** 64n)
|
|
120
120
|
throw new InvalidError('Combined frame gas must be less than 2^64.');
|
|
121
|
-
if (intrinsic + tokens * 4n +
|
|
121
|
+
if (intrinsic + tokens * 4n + executionGas > 16777216n ||
|
|
122
122
|
intrinsic + size * 64n > 16777216n)
|
|
123
123
|
throw new InvalidError('Transaction execution gas exceeds 16777216.');
|
|
124
124
|
}
|
|
@@ -215,8 +215,8 @@ export function deserialize(serialized) {
|
|
|
215
215
|
* chainId: 1,
|
|
216
216
|
* frames: [
|
|
217
217
|
* {
|
|
218
|
+
* executionGas: 50_000n,
|
|
218
219
|
* flags: 'approveExecutionAndPayment',
|
|
219
|
-
* gas: 50_000n,
|
|
220
220
|
* mode: 'verify'
|
|
221
221
|
* }
|
|
222
222
|
* ],
|
|
@@ -327,8 +327,8 @@ export function toRpc(envelope) {
|
|
|
327
327
|
* chainId: 1,
|
|
328
328
|
* frames: [
|
|
329
329
|
* {
|
|
330
|
+
* executionGas: 50_000n,
|
|
330
331
|
* flags: 'approveExecutionAndPayment',
|
|
331
|
-
* gas: 50_000n,
|
|
332
332
|
* mode: 'verify'
|
|
333
333
|
* }
|
|
334
334
|
* ],
|
|
@@ -390,7 +390,7 @@ export function hash(envelope, options = {}) {
|
|
|
390
390
|
*
|
|
391
391
|
* const envelope = TxEnvelopeEip8141.from({
|
|
392
392
|
* chainId: 1,
|
|
393
|
-
* frames: [{
|
|
393
|
+
* frames: [{ executionGas: 50_000n, mode: 'sender' }],
|
|
394
394
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
395
395
|
* })
|
|
396
396
|
* const serialized = TxEnvelopeEip8141.serialize(envelope)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxEnvelopeEip8141.js","sourceRoot":"","sources":["../../core/TxEnvelopeEip8141.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TxEnvelopeEip8141.js","sourceRoot":"","sources":["../../core/TxEnvelopeEip8141.ts"],"names":[],"mappings":"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"}
|
package/_esm/index.js
CHANGED
|
@@ -1531,13 +1531,13 @@ export * as Filter from './core/Filter.js';
|
|
|
1531
1531
|
* import { Frame } from 'ox'
|
|
1532
1532
|
*
|
|
1533
1533
|
* const frame = Frame.from({
|
|
1534
|
+
* executionGas: 50_000n,
|
|
1534
1535
|
* flags: 'approveExecutionAndPayment',
|
|
1535
|
-
* gas: 50_000n,
|
|
1536
1536
|
* mode: 'verify'
|
|
1537
1537
|
* })
|
|
1538
1538
|
* ```
|
|
1539
1539
|
*
|
|
1540
|
-
* @category
|
|
1540
|
+
* @category Frames (EIP-8141)
|
|
1541
1541
|
*/
|
|
1542
1542
|
export * as Frame from './core/Frame.js';
|
|
1543
1543
|
/**
|
|
@@ -1545,7 +1545,7 @@ export * as Frame from './core/Frame.js';
|
|
|
1545
1545
|
*
|
|
1546
1546
|
* Frame receipts include execution gas, state gas, logs, and execution status.
|
|
1547
1547
|
*
|
|
1548
|
-
* @category
|
|
1548
|
+
* @category Frames (EIP-8141)
|
|
1549
1549
|
*/
|
|
1550
1550
|
export * as FrameReceipt from './core/FrameReceipt.js';
|
|
1551
1551
|
/**
|
|
@@ -1567,7 +1567,7 @@ export * as FrameReceipt from './core/FrameReceipt.js';
|
|
|
1567
1567
|
* // @log: { payload: '0x', scheme: 'arbitrary', signature: '0xaabb' }
|
|
1568
1568
|
* ```
|
|
1569
1569
|
*
|
|
1570
|
-
* @category
|
|
1570
|
+
* @category Frames (EIP-8141)
|
|
1571
1571
|
*/
|
|
1572
1572
|
export * as FrameSignature from './core/FrameSignature.js';
|
|
1573
1573
|
/**
|
|
@@ -3296,7 +3296,7 @@ export * as TxEnvelopeEip7702 from './core/TxEnvelopeEip7702.js';
|
|
|
3296
3296
|
*
|
|
3297
3297
|
* const envelope = TxEnvelopeEip8141.from({
|
|
3298
3298
|
* chainId: 1,
|
|
3299
|
-
* frames: [{
|
|
3299
|
+
* frames: [{ executionGas: 50_000n, mode: 'sender' }],
|
|
3300
3300
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
3301
3301
|
* })
|
|
3302
3302
|
* ```
|
package/_esm/version.js
CHANGED
package/_types/core/Frame.d.ts
CHANGED
|
@@ -9,16 +9,16 @@ export type Frame<bigintType = bigint> = {
|
|
|
9
9
|
* @default '0x'
|
|
10
10
|
*/
|
|
11
11
|
data?: Hex.Hex | undefined;
|
|
12
|
+
/**
|
|
13
|
+
* Execution gas budget.
|
|
14
|
+
* @default 0n
|
|
15
|
+
*/
|
|
16
|
+
executionGas?: bigintType | undefined;
|
|
12
17
|
/**
|
|
13
18
|
* Approval scope and atomic batching bits.
|
|
14
19
|
* @default 0
|
|
15
20
|
*/
|
|
16
21
|
flags?: Flags | undefined;
|
|
17
|
-
/**
|
|
18
|
-
* Execution gas budget.
|
|
19
|
-
* @default 0n
|
|
20
|
-
*/
|
|
21
|
-
gas?: bigintType | undefined;
|
|
22
22
|
/**
|
|
23
23
|
* Execution context: default, verify, or sender.
|
|
24
24
|
* @default 0
|
|
@@ -42,13 +42,13 @@ export type Rpc = {
|
|
|
42
42
|
/** Frame calldata. */
|
|
43
43
|
data: Hex.Hex;
|
|
44
44
|
/** Execution gas budget. */
|
|
45
|
-
|
|
45
|
+
executionGas: Hex.Hex;
|
|
46
46
|
/** Approval scope and batching bits. */
|
|
47
|
-
flags:
|
|
47
|
+
flags: Hex.Hex;
|
|
48
48
|
/** Execution mode. */
|
|
49
|
-
mode:
|
|
49
|
+
mode: Hex.Hex;
|
|
50
50
|
/** State gas budget. */
|
|
51
|
-
|
|
51
|
+
stateGas: Hex.Hex;
|
|
52
52
|
/** Target address; absent for the transaction sender. */
|
|
53
53
|
target?: Address.Address | null | undefined;
|
|
54
54
|
/** Value transferred in wei. */
|
|
@@ -96,8 +96,8 @@ export type Tuple = readonly [
|
|
|
96
96
|
* import { Frame } from 'ox'
|
|
97
97
|
*
|
|
98
98
|
* Frame.assert({
|
|
99
|
+
* executionGas: 50_000n,
|
|
99
100
|
* flags: 'approveExecutionAndPayment',
|
|
100
|
-
* gas: 50_000n,
|
|
101
101
|
* mode: 'verify'
|
|
102
102
|
* })
|
|
103
103
|
* ```
|
|
@@ -124,8 +124,8 @@ export declare namespace assert {
|
|
|
124
124
|
* import { Frame } from 'ox'
|
|
125
125
|
*
|
|
126
126
|
* const frame = Frame.from({
|
|
127
|
+
* executionGas: 50_000n,
|
|
127
128
|
* flags: 'approveExecutionAndPayment',
|
|
128
|
-
* gas: 50_000n,
|
|
129
129
|
* mode: 'verify'
|
|
130
130
|
* })
|
|
131
131
|
* ```
|
|
@@ -148,10 +148,10 @@ export declare namespace from {
|
|
|
148
148
|
*
|
|
149
149
|
* const frame = Frame.fromRpc({
|
|
150
150
|
* data: '0x',
|
|
151
|
-
*
|
|
152
|
-
* flags:
|
|
153
|
-
* mode:
|
|
154
|
-
*
|
|
151
|
+
* executionGas: '0xc350',
|
|
152
|
+
* flags: '0x3',
|
|
153
|
+
* mode: '0x1',
|
|
154
|
+
* stateGas: '0x0',
|
|
155
155
|
* value: '0x0'
|
|
156
156
|
* })
|
|
157
157
|
* ```
|
|
@@ -161,7 +161,7 @@ export declare namespace from {
|
|
|
161
161
|
*/
|
|
162
162
|
export declare function fromRpc(frame: Rpc): Frame;
|
|
163
163
|
export declare namespace fromRpc {
|
|
164
|
-
type ErrorType = from.ErrorType | Hex.toBigInt.ErrorType;
|
|
164
|
+
type ErrorType = from.ErrorType | Hex.toBigInt.ErrorType | Hex.toNumber.ErrorType;
|
|
165
165
|
}
|
|
166
166
|
/**
|
|
167
167
|
* Converts a frame to its JSON-RPC representation.
|
|
@@ -172,7 +172,7 @@ export declare namespace fromRpc {
|
|
|
172
172
|
* ```ts twoslash
|
|
173
173
|
* import { Frame } from 'ox'
|
|
174
174
|
*
|
|
175
|
-
* const frame = Frame.from({
|
|
175
|
+
* const frame = Frame.from({ executionGas: 50_000n, mode: 'verify' })
|
|
176
176
|
* const rpc = Frame.toRpc(frame)
|
|
177
177
|
* ```
|
|
178
178
|
*
|
|
@@ -208,8 +208,8 @@ export declare namespace toRpc {
|
|
|
208
208
|
* ])
|
|
209
209
|
* // @log: {
|
|
210
210
|
* // @log: data: '0x',
|
|
211
|
+
* // @log: executionGas: 50000n,
|
|
211
212
|
* // @log: flags: 3,
|
|
212
|
-
* // @log: gas: 50000n,
|
|
213
213
|
* // @log: mode: 1,
|
|
214
214
|
* // @log: stateGas: 0n,
|
|
215
215
|
* // @log: value: 0n
|
|
@@ -239,8 +239,8 @@ export declare namespace fromTuple {
|
|
|
239
239
|
* import { Frame } from 'ox'
|
|
240
240
|
*
|
|
241
241
|
* const tuple = Frame.toTuple({
|
|
242
|
+
* executionGas: 50_000n,
|
|
242
243
|
* flags: 'approveExecutionAndPayment',
|
|
243
|
-
* gas: 50_000n,
|
|
244
244
|
* mode: 'verify'
|
|
245
245
|
* })
|
|
246
246
|
* // @log: ['0x01', '0x03', '0x', ['0xc350', '0x'], '0x', '0x']
|
|
@@ -268,8 +268,8 @@ export declare namespace toTuple {
|
|
|
268
268
|
* import { Frame } from 'ox'
|
|
269
269
|
*
|
|
270
270
|
* const valid = Frame.validate({
|
|
271
|
+
* executionGas: 50_000n,
|
|
271
272
|
* flags: 'approveExecutionAndPayment',
|
|
272
|
-
* gas: 50_000n,
|
|
273
273
|
* mode: 'verify'
|
|
274
274
|
* })
|
|
275
275
|
* // @log: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Frame.d.ts","sourceRoot":"","sources":["../../core/Frame.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAG/B,8BAA8B;AAC9B,MAAM,MAAM,KAAK,CAAC,UAAU,GAAG,MAAM,IAAI;IACvC;;;OAGG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,SAAS,CAAA;IAC1B;;;OAGG;IACH,
|
|
1
|
+
{"version":3,"file":"Frame.d.ts","sourceRoot":"","sources":["../../core/Frame.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@ import type * as Log from './Log.js';
|
|
|
4
4
|
/** Receipt for one frame. Frame logs contain only address, data, and topics. */
|
|
5
5
|
export type FrameReceipt<bigintType = bigint> = {
|
|
6
6
|
/** Execution gas used before transaction-level refunds. */
|
|
7
|
+
executionGasUsed: bigintType;
|
|
8
|
+
/** Total execution and state gas used. */
|
|
7
9
|
gasUsed: bigintType;
|
|
8
10
|
/** Logs emitted by this frame. */
|
|
9
11
|
logs: readonly Pick<Log.Log, 'address' | 'data' | 'topics'>[];
|
|
@@ -14,6 +16,8 @@ export type FrameReceipt<bigintType = bigint> = {
|
|
|
14
16
|
};
|
|
15
17
|
/** JSON-RPC receipt for one frame. */
|
|
16
18
|
export type Rpc = {
|
|
19
|
+
/** Total execution and state gas used. */
|
|
20
|
+
gasUsed: Hex.Hex;
|
|
17
21
|
/** Execution gas used. */
|
|
18
22
|
executionGasUsed: Hex.Hex;
|
|
19
23
|
/** Logs emitted by this frame. */
|
|
@@ -25,19 +29,19 @@ export type Rpc = {
|
|
|
25
29
|
};
|
|
26
30
|
/** Frame execution status. */
|
|
27
31
|
export type Status = 'reverted' | 'skipped' | 'success';
|
|
28
|
-
/**
|
|
29
|
-
export type RpcStatus =
|
|
32
|
+
/** Hex JSON-RPC frame execution status. */
|
|
33
|
+
export type RpcStatus = '0x0' | '0x1' | '0x2';
|
|
30
34
|
/** RPC status to status mapping. */
|
|
31
35
|
export declare const fromRpcStatus: {
|
|
32
|
-
readonly
|
|
33
|
-
readonly
|
|
34
|
-
readonly
|
|
36
|
+
readonly '0x0': "reverted";
|
|
37
|
+
readonly '0x1': "success";
|
|
38
|
+
readonly '0x2': "skipped";
|
|
35
39
|
};
|
|
36
40
|
/** Status to RPC status mapping. */
|
|
37
41
|
export declare const toRpcStatus: {
|
|
38
|
-
readonly reverted:
|
|
39
|
-
readonly skipped:
|
|
40
|
-
readonly success:
|
|
42
|
+
readonly reverted: "0x0";
|
|
43
|
+
readonly skipped: "0x2";
|
|
44
|
+
readonly success: "0x1";
|
|
41
45
|
};
|
|
42
46
|
/**
|
|
43
47
|
* Converts an RPC frame receipt to a {@link ox#FrameReceipt.FrameReceipt}.
|
|
@@ -50,9 +54,10 @@ export declare const toRpcStatus: {
|
|
|
50
54
|
*
|
|
51
55
|
* const receipt = FrameReceipt.fromRpc({
|
|
52
56
|
* executionGasUsed: '0x5208',
|
|
57
|
+
* gasUsed: '0x5208',
|
|
53
58
|
* logs: [],
|
|
54
59
|
* stateGasUsed: '0x0',
|
|
55
|
-
* status:
|
|
60
|
+
* status: '0x1'
|
|
56
61
|
* })
|
|
57
62
|
* ```
|
|
58
63
|
*
|
|
@@ -74,15 +79,16 @@ export declare namespace fromRpc {
|
|
|
74
79
|
*
|
|
75
80
|
* const receipt = FrameReceipt.fromRpc({
|
|
76
81
|
* executionGasUsed: '0x5208',
|
|
82
|
+
* gasUsed: '0x5208',
|
|
77
83
|
* logs: [],
|
|
78
84
|
* stateGasUsed: '0x0',
|
|
79
|
-
* status:
|
|
85
|
+
* status: '0x1'
|
|
80
86
|
* })
|
|
81
87
|
* const rpc = FrameReceipt.toRpc(receipt)
|
|
82
88
|
* ```
|
|
83
89
|
*
|
|
84
90
|
* @param receipt - The frame receipt. Gas accepts hex, bigint, or number values.
|
|
85
|
-
* @returns The RPC frame receipt with hex gas and a
|
|
91
|
+
* @returns The RPC frame receipt with hex gas and a hex status.
|
|
86
92
|
*/
|
|
87
93
|
export declare function toRpc(receipt: toRpc.Input): Rpc;
|
|
88
94
|
export declare namespace toRpc {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FrameReceipt.d.ts","sourceRoot":"","sources":["../../core/FrameReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAA;AAEpC,gFAAgF;AAChF,MAAM,MAAM,YAAY,CAAC,UAAU,GAAG,MAAM,IAAI;IAC9C,2DAA2D;IAC3D,OAAO,EAAE,UAAU,CAAA;IACnB,kCAAkC;IAClC,IAAI,EAAE,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAA;IAC7D,mDAAmD;IACnD,YAAY,EAAE,UAAU,CAAA;IACxB,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,sCAAsC;AACtC,MAAM,MAAM,GAAG,GAAG;IAChB,0BAA0B;IAC1B,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAA;IACzB,kCAAkC;IAClC,IAAI,EAAE,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAA;IAC7D,4BAA4B;IAC5B,YAAY,EAAE,GAAG,CAAC,GAAG,CAAA;IACrB,qEAAqE;IACrE,MAAM,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,8BAA8B;AAC9B,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAA;AAEvD
|
|
1
|
+
{"version":3,"file":"FrameReceipt.d.ts","sourceRoot":"","sources":["../../core/FrameReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAA;AAEpC,gFAAgF;AAChF,MAAM,MAAM,YAAY,CAAC,UAAU,GAAG,MAAM,IAAI;IAC9C,2DAA2D;IAC3D,gBAAgB,EAAE,UAAU,CAAA;IAC5B,0CAA0C;IAC1C,OAAO,EAAE,UAAU,CAAA;IACnB,kCAAkC;IAClC,IAAI,EAAE,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAA;IAC7D,mDAAmD;IACnD,YAAY,EAAE,UAAU,CAAA;IACxB,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,sCAAsC;AACtC,MAAM,MAAM,GAAG,GAAG;IAChB,0CAA0C;IAC1C,OAAO,EAAE,GAAG,CAAC,GAAG,CAAA;IAChB,0BAA0B;IAC1B,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAA;IACzB,kCAAkC;IAClC,IAAI,EAAE,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAA;IAC7D,4BAA4B;IAC5B,YAAY,EAAE,GAAG,CAAC,GAAG,CAAA;IACrB,qEAAqE;IACrE,MAAM,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,8BAA8B;AAC9B,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAA;AAEvD,2CAA2C;AAC3C,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAA;AAE7C,oCAAoC;AACpC,eAAO,MAAM,aAAa;;;;CAIhB,CAAA;AAEV,oCAAoC;AACpC,eAAO,MAAM,WAAW;;;;CAId,CAAA;AAEV;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,YAAY,CAQlD;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAK,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,eAAe,CAAA;CACjE;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,GAAG,GAAG,CAQ/C;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,KAAK,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;IAEpD,KAAK,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,GAAG,MAAM,CAAC,eAAe,CAAA;CACnE"}
|