ox 0.14.47 → 0.14.48
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/_cjs/core/Frame.js +9 -7
- package/_cjs/core/Frame.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 +15 -13
- package/_esm/core/Frame.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 +11 -11
- package/_types/core/Frame.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 +20 -18
- package/core/TxEnvelopeEip8141.ts +8 -8
- package/index.ts +5 -5
- package/package.json +1 -1
- package/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# ox
|
|
2
2
|
|
|
3
|
+
## 0.14.48
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`42381cf`](https://github.com/wevm/ox/commit/42381cfee704c87c406796317266e122fe202115) Thanks [@jxom](https://github.com/jxom)! - Renamed `Frame.gas` to `Frame.executionGas`.
|
|
8
|
+
|
|
9
|
+
```ts
|
|
10
|
+
import { Frame } from "ox";
|
|
11
|
+
|
|
12
|
+
Frame.from({ executionGas: 50_000n, stateGas: 1_000n });
|
|
13
|
+
```
|
|
14
|
+
|
|
3
15
|
## 0.14.47
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
package/_cjs/core/Frame.js
CHANGED
|
@@ -22,7 +22,7 @@ exports.flags = {
|
|
|
22
22
|
none: 0,
|
|
23
23
|
};
|
|
24
24
|
function assert(frame) {
|
|
25
|
-
const { data = '0x', flags: flagsValue = 0,
|
|
25
|
+
const { data = '0x', executionGas = 0n, flags: flagsValue = 0, mode: modeValue = 0, stateGas = 0n, value = 0n, } = frame;
|
|
26
26
|
const mode = typeof modeValue === 'string' ? exports.modes[modeValue] : modeValue;
|
|
27
27
|
if (!Number.isInteger(mode) || mode < 0 || mode > 2)
|
|
28
28
|
throw new InvalidError('mode must be a supported name or 0, 1, or 2.');
|
|
@@ -38,12 +38,12 @@ function assert(frame) {
|
|
|
38
38
|
if (frame.to !== undefined)
|
|
39
39
|
Address.assert(frame.to, { strict: false });
|
|
40
40
|
for (const [field, limit] of [
|
|
41
|
-
['
|
|
41
|
+
['executionGas', executionGas],
|
|
42
42
|
['stateGas', stateGas],
|
|
43
43
|
])
|
|
44
44
|
if (typeof limit !== 'bigint' || limit < 0n || limit >= 2n ** 64n)
|
|
45
45
|
throw new InvalidError(`${field} must be an unsigned 64-bit integer.`);
|
|
46
|
-
if (
|
|
46
|
+
if (executionGas + stateGas >= 2n ** 64n)
|
|
47
47
|
throw new InvalidError('Combined frame gas must be less than 2^64.');
|
|
48
48
|
if (typeof value !== 'bigint' || value < 0n || value >= 2n ** 256n)
|
|
49
49
|
throw new InvalidError('value must be an unsigned 256-bit integer.');
|
|
@@ -60,8 +60,8 @@ function from(frame) {
|
|
|
60
60
|
function fromRpc(frame) {
|
|
61
61
|
return from({
|
|
62
62
|
data: frame.data,
|
|
63
|
+
executionGas: Hex.toBigInt(frame.executionGasLimit),
|
|
63
64
|
flags: frame.flags,
|
|
64
|
-
gas: Hex.toBigInt(frame.executionGasLimit),
|
|
65
65
|
mode: frame.mode,
|
|
66
66
|
stateGas: Hex.toBigInt(frame.stateGasLimit),
|
|
67
67
|
...(frame.target == null ? {} : { to: frame.target }),
|
|
@@ -72,7 +72,7 @@ function toRpc(frame) {
|
|
|
72
72
|
const { flags: flags_ = 0, mode = 0 } = frame;
|
|
73
73
|
return {
|
|
74
74
|
data: frame.data ?? '0x',
|
|
75
|
-
executionGasLimit: Quantity.fromNumberish(frame.
|
|
75
|
+
executionGasLimit: Quantity.fromNumberish(frame.executionGas ?? 0n),
|
|
76
76
|
flags: typeof flags_ === 'string' ? exports.flags[flags_] : flags_,
|
|
77
77
|
mode: typeof mode === 'string' ? exports.modes[mode] : mode,
|
|
78
78
|
stateGasLimit: Quantity.fromNumberish(frame.stateGas ?? 0n),
|
|
@@ -98,8 +98,8 @@ function fromTuple(tuple) {
|
|
|
98
98
|
const frame = {
|
|
99
99
|
...(target === '0x' ? {} : { to: target }),
|
|
100
100
|
data,
|
|
101
|
+
executionGas: execution === '0x' ? 0n : Hex.toBigInt(execution),
|
|
101
102
|
flags: flags === '0x' ? 0 : Hex.toNumber(flags),
|
|
102
|
-
gas: execution === '0x' ? 0n : Hex.toBigInt(execution),
|
|
103
103
|
mode: mode === '0x' ? 0 : Hex.toNumber(mode),
|
|
104
104
|
stateGas: state === '0x' ? 0n : Hex.toBigInt(state),
|
|
105
105
|
value: value === '0x' ? 0n : Hex.toBigInt(value),
|
|
@@ -116,7 +116,9 @@ function toTuple(frame) {
|
|
|
116
116
|
flags_ ? Hex.fromBytes(Bytes.fromNumber(flags_)) : '0x',
|
|
117
117
|
frame.to ?? '0x',
|
|
118
118
|
[
|
|
119
|
-
frame.
|
|
119
|
+
frame.executionGas
|
|
120
|
+
? Hex.fromBytes(Bytes.fromNumber(frame.executionGas))
|
|
121
|
+
: '0x',
|
|
120
122
|
frame.stateGas ? Hex.fromBytes(Bytes.fromNumber(frame.stateGas)) : '0x',
|
|
121
123
|
],
|
|
122
124
|
frame.value ? Hex.fromBytes(Bytes.fromNumber(frame.value)) : '0x',
|
package/_cjs/core/Frame.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Frame.js","sourceRoot":"","sources":["../../core/Frame.ts"],"names":[],"mappings":";;;AA+GA,wBAyCC;AAmCD,oBAGC;AA4BD,0BAUC;AAsBD,sBAWC;AA0CD,8BAgCC;AAmCD,
|
|
1
|
+
{"version":3,"file":"Frame.js","sourceRoot":"","sources":["../../core/Frame.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ function assert(envelope) {
|
|
|
51
51
|
}
|
|
52
52
|
if (blobVersionedHashes.length === 0 && maxFeePerBlobGas !== 0n)
|
|
53
53
|
throw new InvalidError('maxFeePerBlobGas must be zero without blobs.');
|
|
54
|
-
let
|
|
54
|
+
let executionGas = 0n;
|
|
55
55
|
let stateGas = 0n;
|
|
56
56
|
let previousBatch = false;
|
|
57
57
|
let expiry = false;
|
|
@@ -90,7 +90,7 @@ function assert(envelope) {
|
|
|
90
90
|
throw new InvalidError('Invalid or duplicate expiry verifier frame.');
|
|
91
91
|
expiry = true;
|
|
92
92
|
}
|
|
93
|
-
|
|
93
|
+
executionGas += frame.executionGas ?? 0n;
|
|
94
94
|
stateGas += frame.stateGas ?? 0n;
|
|
95
95
|
count(frame.data ?? '0x');
|
|
96
96
|
if ((frame.value ?? 0n) > 0n &&
|
|
@@ -105,9 +105,9 @@ function assert(envelope) {
|
|
|
105
105
|
count(payload);
|
|
106
106
|
count(signature);
|
|
107
107
|
}
|
|
108
|
-
if (
|
|
108
|
+
if (executionGas + stateGas >= 2n ** 64n)
|
|
109
109
|
throw new InvalidError('Combined frame gas must be less than 2^64.');
|
|
110
|
-
if (intrinsic + tokens * 4n +
|
|
110
|
+
if (intrinsic + tokens * 4n + executionGas > 16777216n ||
|
|
111
111
|
intrinsic + size * 64n > 16777216n)
|
|
112
112
|
throw new InvalidError('Transaction execution gas exceeds 16777216.');
|
|
113
113
|
}
|
|
@@ -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/_cjs/version.js
CHANGED
package/_esm/core/Frame.js
CHANGED
|
@@ -28,8 +28,8 @@ export const flags = {
|
|
|
28
28
|
* import { Frame } from 'ox'
|
|
29
29
|
*
|
|
30
30
|
* Frame.assert({
|
|
31
|
+
* executionGas: 50_000n,
|
|
31
32
|
* flags: 'approveExecutionAndPayment',
|
|
32
|
-
* gas: 50_000n,
|
|
33
33
|
* mode: 'verify'
|
|
34
34
|
* })
|
|
35
35
|
* ```
|
|
@@ -37,7 +37,7 @@ export const flags = {
|
|
|
37
37
|
* @param frame - The frame to assert.
|
|
38
38
|
*/
|
|
39
39
|
export function assert(frame) {
|
|
40
|
-
const { data = '0x', flags: flagsValue = 0,
|
|
40
|
+
const { data = '0x', executionGas = 0n, flags: flagsValue = 0, mode: modeValue = 0, stateGas = 0n, value = 0n, } = frame;
|
|
41
41
|
const mode = typeof modeValue === 'string' ? modes[modeValue] : modeValue;
|
|
42
42
|
if (!Number.isInteger(mode) || mode < 0 || mode > 2)
|
|
43
43
|
throw new InvalidError('mode must be a supported name or 0, 1, or 2.');
|
|
@@ -53,12 +53,12 @@ export function assert(frame) {
|
|
|
53
53
|
if (frame.to !== undefined)
|
|
54
54
|
Address.assert(frame.to, { strict: false });
|
|
55
55
|
for (const [field, limit] of [
|
|
56
|
-
['
|
|
56
|
+
['executionGas', executionGas],
|
|
57
57
|
['stateGas', stateGas],
|
|
58
58
|
])
|
|
59
59
|
if (typeof limit !== 'bigint' || limit < 0n || limit >= 2n ** 64n)
|
|
60
60
|
throw new InvalidError(`${field} must be an unsigned 64-bit integer.`);
|
|
61
|
-
if (
|
|
61
|
+
if (executionGas + stateGas >= 2n ** 64n)
|
|
62
62
|
throw new InvalidError('Combined frame gas must be less than 2^64.');
|
|
63
63
|
if (typeof value !== 'bigint' || value < 0n || value >= 2n ** 256n)
|
|
64
64
|
throw new InvalidError('value must be an unsigned 256-bit integer.');
|
|
@@ -84,8 +84,8 @@ export function assert(frame) {
|
|
|
84
84
|
* import { Frame } from 'ox'
|
|
85
85
|
*
|
|
86
86
|
* const frame = Frame.from({
|
|
87
|
+
* executionGas: 50_000n,
|
|
87
88
|
* flags: 'approveExecutionAndPayment',
|
|
88
|
-
* gas: 50_000n,
|
|
89
89
|
* mode: 'verify'
|
|
90
90
|
* })
|
|
91
91
|
* ```
|
|
@@ -122,8 +122,8 @@ export function from(frame) {
|
|
|
122
122
|
export function fromRpc(frame) {
|
|
123
123
|
return from({
|
|
124
124
|
data: frame.data,
|
|
125
|
+
executionGas: Hex.toBigInt(frame.executionGasLimit),
|
|
125
126
|
flags: frame.flags,
|
|
126
|
-
gas: Hex.toBigInt(frame.executionGasLimit),
|
|
127
127
|
mode: frame.mode,
|
|
128
128
|
stateGas: Hex.toBigInt(frame.stateGasLimit),
|
|
129
129
|
...(frame.target == null ? {} : { to: frame.target }),
|
|
@@ -139,7 +139,7 @@ export function fromRpc(frame) {
|
|
|
139
139
|
* ```ts twoslash
|
|
140
140
|
* import { Frame } from 'ox'
|
|
141
141
|
*
|
|
142
|
-
* const frame = Frame.from({
|
|
142
|
+
* const frame = Frame.from({ executionGas: 50_000n, mode: 'verify' })
|
|
143
143
|
* const rpc = Frame.toRpc(frame)
|
|
144
144
|
* ```
|
|
145
145
|
*
|
|
@@ -150,7 +150,7 @@ export function toRpc(frame) {
|
|
|
150
150
|
const { flags: flags_ = 0, mode = 0 } = frame;
|
|
151
151
|
return {
|
|
152
152
|
data: frame.data ?? '0x',
|
|
153
|
-
executionGasLimit: Quantity.fromNumberish(frame.
|
|
153
|
+
executionGasLimit: Quantity.fromNumberish(frame.executionGas ?? 0n),
|
|
154
154
|
flags: typeof flags_ === 'string' ? flags[flags_] : flags_,
|
|
155
155
|
mode: typeof mode === 'string' ? modes[mode] : mode,
|
|
156
156
|
stateGasLimit: Quantity.fromNumberish(frame.stateGas ?? 0n),
|
|
@@ -182,8 +182,8 @@ export function toRpc(frame) {
|
|
|
182
182
|
* ])
|
|
183
183
|
* // @log: {
|
|
184
184
|
* // @log: data: '0x',
|
|
185
|
+
* // @log: executionGas: 50000n,
|
|
185
186
|
* // @log: flags: 3,
|
|
186
|
-
* // @log: gas: 50000n,
|
|
187
187
|
* // @log: mode: 1,
|
|
188
188
|
* // @log: stateGas: 0n,
|
|
189
189
|
* // @log: value: 0n
|
|
@@ -211,8 +211,8 @@ export function fromTuple(tuple) {
|
|
|
211
211
|
const frame = {
|
|
212
212
|
...(target === '0x' ? {} : { to: target }),
|
|
213
213
|
data,
|
|
214
|
+
executionGas: execution === '0x' ? 0n : Hex.toBigInt(execution),
|
|
214
215
|
flags: flags === '0x' ? 0 : Hex.toNumber(flags),
|
|
215
|
-
gas: execution === '0x' ? 0n : Hex.toBigInt(execution),
|
|
216
216
|
mode: mode === '0x' ? 0 : Hex.toNumber(mode),
|
|
217
217
|
stateGas: state === '0x' ? 0n : Hex.toBigInt(state),
|
|
218
218
|
value: value === '0x' ? 0n : Hex.toBigInt(value),
|
|
@@ -236,8 +236,8 @@ export function fromTuple(tuple) {
|
|
|
236
236
|
* import { Frame } from 'ox'
|
|
237
237
|
*
|
|
238
238
|
* const tuple = Frame.toTuple({
|
|
239
|
+
* executionGas: 50_000n,
|
|
239
240
|
* flags: 'approveExecutionAndPayment',
|
|
240
|
-
* gas: 50_000n,
|
|
241
241
|
* mode: 'verify'
|
|
242
242
|
* })
|
|
243
243
|
* // @log: ['0x01', '0x03', '0x', ['0xc350', '0x'], '0x', '0x']
|
|
@@ -255,7 +255,9 @@ export function toTuple(frame) {
|
|
|
255
255
|
flags_ ? Hex.fromBytes(Bytes.fromNumber(flags_)) : '0x',
|
|
256
256
|
frame.to ?? '0x',
|
|
257
257
|
[
|
|
258
|
-
frame.
|
|
258
|
+
frame.executionGas
|
|
259
|
+
? Hex.fromBytes(Bytes.fromNumber(frame.executionGas))
|
|
260
|
+
: '0x',
|
|
259
261
|
frame.stateGas ? Hex.fromBytes(Bytes.fromNumber(frame.stateGas)) : '0x',
|
|
260
262
|
],
|
|
261
263
|
frame.value ? Hex.fromBytes(Bytes.fromNumber(frame.value)) : '0x',
|
|
@@ -277,8 +279,8 @@ export function toTuple(frame) {
|
|
|
277
279
|
* import { Frame } from 'ox'
|
|
278
280
|
*
|
|
279
281
|
* const valid = Frame.validate({
|
|
282
|
+
* executionGas: 50_000n,
|
|
280
283
|
* flags: 'approveExecutionAndPayment',
|
|
281
|
-
* gas: 50_000n,
|
|
282
284
|
* mode: 'verify'
|
|
283
285
|
* })
|
|
284
286
|
* // @log: true
|
package/_esm/core/Frame.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Frame.js","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;AAC/B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAwDlD,6BAA6B;AAC7B,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAW,CAAA;AAKlE,0CAA0C;AAC1C,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,gBAAgB,EAAE,CAAC;IACnB,0BAA0B,EAAE,CAAC;IAC7B,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,CAAC;IACd,IAAI,EAAE,CAAC;CACC,CAAA;AAeV;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,MAAM,CAAC,KAAY;IACjC,MAAM,EACJ,IAAI,GAAG,IAAI,EACX,KAAK,EAAE,UAAU,GAAG,CAAC,EACrB,
|
|
1
|
+
{"version":3,"file":"Frame.js","sourceRoot":"","sources":["../../core/Frame.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
|
|
@@ -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
|
* ```
|
|
@@ -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":"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,YAAY,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;IACrC;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,SAAS,CAAA;IACzB;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;IACvB;;;OAGG;IACH,QAAQ,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;IACjC,6DAA6D;IAC7D,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;IAChC;;;OAGG;IACH,KAAK,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;CAC/B,CAAA;AAED,0CAA0C;AAC1C,MAAM,MAAM,GAAG,GAAG;IAChB,sBAAsB;IACtB,IAAI,EAAE,GAAG,CAAC,GAAG,CAAA;IACb,4BAA4B;IAC5B,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAA;IAC1B,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAA;IACb,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,wBAAwB;IACxB,aAAa,EAAE,GAAG,CAAC,GAAG,CAAA;IACtB,yDAAyD;IACzD,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;IAC3C,gCAAgC;IAChC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAA;CACf,CAAA;AAED,6BAA6B;AAC7B,eAAO,MAAM,KAAK;;;;CAAgD,CAAA;AAElE,+CAA+C;AAC/C,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,MAAM,OAAO,KAAK,CAAA;AAE9C,0CAA0C;AAC1C,eAAO,MAAM,KAAK;;;;;;CAMR,CAAA;AAEV,iEAAiE;AACjE,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,MAAM,OAAO,KAAK,CAAA;AAE/C,iFAAiF;AACjF,MAAM,MAAM,KAAK,GAAG,SAAS;IAC3B,IAAI,EAAE,GAAG,CAAC,GAAG;IACb,KAAK,EAAE,GAAG,CAAC,GAAG;IACd,MAAM,EAAE,GAAG,CAAC,GAAG;IACf,MAAM,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC;IACrD,KAAK,EAAE,GAAG,CAAC,GAAG;IACd,IAAI,EAAE,GAAG,CAAC,GAAG;CACd,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAyCzC;AAED,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC;IAC9B,KAAK,SAAS,GACV,YAAY,GACZ,OAAO,CAAC,MAAM,CAAC,SAAS,GACxB,GAAG,CAAC,MAAM,CAAC,SAAS,GACpB,MAAM,CAAC,eAAe,CAAA;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAG3E;AAED,MAAM,CAAC,OAAO,WAAW,IAAI,CAAC;IAC5B,KAAK,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;CAClC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,CAUzC;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAK,SAAS,GAAG,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAA;CACzD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,GAAG,CAW7C;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,KAAK,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;IAC7C,KAAK,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,GAAG,MAAM,CAAC,eAAe,CAAA;CACnE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAgC7C;AAED,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAK,SAAS,GACV,MAAM,CAAC,SAAS,GAChB,GAAG,CAAC,QAAQ,CAAC,SAAS,GACtB,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAA;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAmB3C;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAK,SAAS,GACV,MAAM,CAAC,SAAS,GAChB,KAAK,CAAC,UAAU,CAAC,SAAS,GAC1B,GAAG,CAAC,SAAS,CAAC,SAAS,CAAA;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAO9C;AAED,MAAM,CAAC,OAAO,WAAW,QAAQ,CAAC;IAChC,KAAK,SAAS,GAAG,MAAM,CAAC,eAAe,CAAA;CACxC;AAED,6DAA6D;AAC7D,qBAAa,YAAa,SAAQ,MAAM,CAAC,SAAS;IAChD,SAAkB,IAAI,wBAAuB;gBAEjC,OAAO,EAAE,MAAM;CAG5B"}
|
|
@@ -82,7 +82,7 @@ export type Type = typeof type;
|
|
|
82
82
|
*
|
|
83
83
|
* TxEnvelopeEip8141.assert({
|
|
84
84
|
* chainId: 1,
|
|
85
|
-
* frames: [{
|
|
85
|
+
* frames: [{ executionGas: 50_000n, mode: 'verify' }],
|
|
86
86
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
87
87
|
* })
|
|
88
88
|
* ```
|
|
@@ -132,8 +132,8 @@ export declare namespace deserialize {
|
|
|
132
132
|
* chainId: 1,
|
|
133
133
|
* frames: [
|
|
134
134
|
* {
|
|
135
|
+
* executionGas: 50_000n,
|
|
135
136
|
* flags: 'approveExecutionAndPayment',
|
|
136
|
-
* gas: 50_000n,
|
|
137
137
|
* mode: 'verify'
|
|
138
138
|
* }
|
|
139
139
|
* ],
|
|
@@ -235,8 +235,8 @@ export declare namespace toRpc {
|
|
|
235
235
|
* chainId: 1,
|
|
236
236
|
* frames: [
|
|
237
237
|
* {
|
|
238
|
+
* executionGas: 50_000n,
|
|
238
239
|
* flags: 'approveExecutionAndPayment',
|
|
239
|
-
* gas: 50_000n,
|
|
240
240
|
* mode: 'verify'
|
|
241
241
|
* }
|
|
242
242
|
* ],
|
|
@@ -300,7 +300,7 @@ export declare namespace hash {
|
|
|
300
300
|
*
|
|
301
301
|
* const envelope = TxEnvelopeEip8141.from({
|
|
302
302
|
* chainId: 1,
|
|
303
|
-
* frames: [{
|
|
303
|
+
* frames: [{ executionGas: 50_000n, mode: 'sender' }],
|
|
304
304
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
305
305
|
* })
|
|
306
306
|
* const serialized = TxEnvelopeEip8141.serialize(envelope)
|
package/_types/index.d.ts
CHANGED
|
@@ -1533,13 +1533,13 @@ export * as Filter from './core/Filter.js';
|
|
|
1533
1533
|
* import { Frame } from 'ox'
|
|
1534
1534
|
*
|
|
1535
1535
|
* const frame = Frame.from({
|
|
1536
|
+
* executionGas: 50_000n,
|
|
1536
1537
|
* flags: 'approveExecutionAndPayment',
|
|
1537
|
-
* gas: 50_000n,
|
|
1538
1538
|
* mode: 'verify'
|
|
1539
1539
|
* })
|
|
1540
1540
|
* ```
|
|
1541
1541
|
*
|
|
1542
|
-
* @category
|
|
1542
|
+
* @category Frames (EIP-8141)
|
|
1543
1543
|
*/
|
|
1544
1544
|
export * as Frame from './core/Frame.js';
|
|
1545
1545
|
/**
|
|
@@ -1547,7 +1547,7 @@ export * as Frame from './core/Frame.js';
|
|
|
1547
1547
|
*
|
|
1548
1548
|
* Frame receipts include execution gas, state gas, logs, and execution status.
|
|
1549
1549
|
*
|
|
1550
|
-
* @category
|
|
1550
|
+
* @category Frames (EIP-8141)
|
|
1551
1551
|
*/
|
|
1552
1552
|
export * as FrameReceipt from './core/FrameReceipt.js';
|
|
1553
1553
|
/**
|
|
@@ -1569,7 +1569,7 @@ export * as FrameReceipt from './core/FrameReceipt.js';
|
|
|
1569
1569
|
* // @log: { payload: '0x', scheme: 'arbitrary', signature: '0xaabb' }
|
|
1570
1570
|
* ```
|
|
1571
1571
|
*
|
|
1572
|
-
* @category
|
|
1572
|
+
* @category Frames (EIP-8141)
|
|
1573
1573
|
*/
|
|
1574
1574
|
export * as FrameSignature from './core/FrameSignature.js';
|
|
1575
1575
|
/**
|
|
@@ -3299,7 +3299,7 @@ export * as TxEnvelopeEip7702 from './core/TxEnvelopeEip7702.js';
|
|
|
3299
3299
|
*
|
|
3300
3300
|
* const envelope = TxEnvelopeEip8141.from({
|
|
3301
3301
|
* chainId: 1,
|
|
3302
|
-
* frames: [{
|
|
3302
|
+
* frames: [{ executionGas: 50_000n, mode: 'sender' }],
|
|
3303
3303
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
3304
3304
|
* })
|
|
3305
3305
|
* ```
|
package/_types/version.d.ts
CHANGED
package/core/Frame.ts
CHANGED
|
@@ -11,16 +11,16 @@ export type Frame<bigintType = bigint> = {
|
|
|
11
11
|
* @default '0x'
|
|
12
12
|
*/
|
|
13
13
|
data?: Hex.Hex | undefined
|
|
14
|
+
/**
|
|
15
|
+
* Execution gas budget.
|
|
16
|
+
* @default 0n
|
|
17
|
+
*/
|
|
18
|
+
executionGas?: bigintType | undefined
|
|
14
19
|
/**
|
|
15
20
|
* Approval scope and atomic batching bits.
|
|
16
21
|
* @default 0
|
|
17
22
|
*/
|
|
18
23
|
flags?: Flags | undefined
|
|
19
|
-
/**
|
|
20
|
-
* Execution gas budget.
|
|
21
|
-
* @default 0n
|
|
22
|
-
*/
|
|
23
|
-
gas?: bigintType | undefined
|
|
24
24
|
/**
|
|
25
25
|
* Execution context: default, verify, or sender.
|
|
26
26
|
* @default 0
|
|
@@ -101,8 +101,8 @@ export type Tuple = readonly [
|
|
|
101
101
|
* import { Frame } from 'ox'
|
|
102
102
|
*
|
|
103
103
|
* Frame.assert({
|
|
104
|
+
* executionGas: 50_000n,
|
|
104
105
|
* flags: 'approveExecutionAndPayment',
|
|
105
|
-
* gas: 50_000n,
|
|
106
106
|
* mode: 'verify'
|
|
107
107
|
* })
|
|
108
108
|
* ```
|
|
@@ -112,8 +112,8 @@ export type Tuple = readonly [
|
|
|
112
112
|
export function assert(frame: Frame): void {
|
|
113
113
|
const {
|
|
114
114
|
data = '0x',
|
|
115
|
+
executionGas = 0n,
|
|
115
116
|
flags: flagsValue = 0,
|
|
116
|
-
gas = 0n,
|
|
117
117
|
mode: modeValue = 0,
|
|
118
118
|
stateGas = 0n,
|
|
119
119
|
value = 0n,
|
|
@@ -136,12 +136,12 @@ export function assert(frame: Frame): void {
|
|
|
136
136
|
}
|
|
137
137
|
if (frame.to !== undefined) Address.assert(frame.to, { strict: false })
|
|
138
138
|
for (const [field, limit] of [
|
|
139
|
-
['
|
|
139
|
+
['executionGas', executionGas],
|
|
140
140
|
['stateGas', stateGas],
|
|
141
141
|
] as const)
|
|
142
142
|
if (typeof limit !== 'bigint' || limit < 0n || limit >= 2n ** 64n)
|
|
143
143
|
throw new InvalidError(`${field} must be an unsigned 64-bit integer.`)
|
|
144
|
-
if (
|
|
144
|
+
if (executionGas + stateGas >= 2n ** 64n)
|
|
145
145
|
throw new InvalidError('Combined frame gas must be less than 2^64.')
|
|
146
146
|
if (typeof value !== 'bigint' || value < 0n || value >= 2n ** 256n)
|
|
147
147
|
throw new InvalidError('value must be an unsigned 256-bit integer.')
|
|
@@ -176,8 +176,8 @@ export declare namespace assert {
|
|
|
176
176
|
* import { Frame } from 'ox'
|
|
177
177
|
*
|
|
178
178
|
* const frame = Frame.from({
|
|
179
|
+
* executionGas: 50_000n,
|
|
179
180
|
* flags: 'approveExecutionAndPayment',
|
|
180
|
-
* gas: 50_000n,
|
|
181
181
|
* mode: 'verify'
|
|
182
182
|
* })
|
|
183
183
|
* ```
|
|
@@ -219,8 +219,8 @@ export declare namespace from {
|
|
|
219
219
|
export function fromRpc(frame: Rpc): Frame {
|
|
220
220
|
return from({
|
|
221
221
|
data: frame.data,
|
|
222
|
+
executionGas: Hex.toBigInt(frame.executionGasLimit),
|
|
222
223
|
flags: frame.flags,
|
|
223
|
-
gas: Hex.toBigInt(frame.executionGasLimit),
|
|
224
224
|
mode: frame.mode,
|
|
225
225
|
stateGas: Hex.toBigInt(frame.stateGasLimit),
|
|
226
226
|
...(frame.target == null ? {} : { to: frame.target }),
|
|
@@ -241,7 +241,7 @@ export declare namespace fromRpc {
|
|
|
241
241
|
* ```ts twoslash
|
|
242
242
|
* import { Frame } from 'ox'
|
|
243
243
|
*
|
|
244
|
-
* const frame = Frame.from({
|
|
244
|
+
* const frame = Frame.from({ executionGas: 50_000n, mode: 'verify' })
|
|
245
245
|
* const rpc = Frame.toRpc(frame)
|
|
246
246
|
* ```
|
|
247
247
|
*
|
|
@@ -252,7 +252,7 @@ export function toRpc(frame: toRpc.Input): Rpc {
|
|
|
252
252
|
const { flags: flags_ = 0, mode = 0 } = frame
|
|
253
253
|
return {
|
|
254
254
|
data: frame.data ?? '0x',
|
|
255
|
-
executionGasLimit: Quantity.fromNumberish(frame.
|
|
255
|
+
executionGasLimit: Quantity.fromNumberish(frame.executionGas ?? 0n),
|
|
256
256
|
flags: typeof flags_ === 'string' ? flags[flags_] : flags_,
|
|
257
257
|
mode: typeof mode === 'string' ? modes[mode] : mode,
|
|
258
258
|
stateGasLimit: Quantity.fromNumberish(frame.stateGas ?? 0n),
|
|
@@ -290,8 +290,8 @@ export declare namespace toRpc {
|
|
|
290
290
|
* ])
|
|
291
291
|
* // @log: {
|
|
292
292
|
* // @log: data: '0x',
|
|
293
|
+
* // @log: executionGas: 50000n,
|
|
293
294
|
* // @log: flags: 3,
|
|
294
|
-
* // @log: gas: 50000n,
|
|
295
295
|
* // @log: mode: 1,
|
|
296
296
|
* // @log: stateGas: 0n,
|
|
297
297
|
* // @log: value: 0n
|
|
@@ -325,8 +325,8 @@ export function fromTuple(tuple: Tuple): Frame {
|
|
|
325
325
|
const frame = {
|
|
326
326
|
...(target === '0x' ? {} : { to: target }),
|
|
327
327
|
data,
|
|
328
|
+
executionGas: execution === '0x' ? 0n : Hex.toBigInt(execution),
|
|
328
329
|
flags: flags === '0x' ? 0 : Hex.toNumber(flags),
|
|
329
|
-
gas: execution === '0x' ? 0n : Hex.toBigInt(execution),
|
|
330
330
|
mode: mode === '0x' ? 0 : Hex.toNumber(mode),
|
|
331
331
|
stateGas: state === '0x' ? 0n : Hex.toBigInt(state),
|
|
332
332
|
value: value === '0x' ? 0n : Hex.toBigInt(value),
|
|
@@ -358,8 +358,8 @@ export declare namespace fromTuple {
|
|
|
358
358
|
* import { Frame } from 'ox'
|
|
359
359
|
*
|
|
360
360
|
* const tuple = Frame.toTuple({
|
|
361
|
+
* executionGas: 50_000n,
|
|
361
362
|
* flags: 'approveExecutionAndPayment',
|
|
362
|
-
* gas: 50_000n,
|
|
363
363
|
* mode: 'verify'
|
|
364
364
|
* })
|
|
365
365
|
* // @log: ['0x01', '0x03', '0x', ['0xc350', '0x'], '0x', '0x']
|
|
@@ -379,7 +379,9 @@ export function toTuple(frame: Frame): Tuple {
|
|
|
379
379
|
flags_ ? Hex.fromBytes(Bytes.fromNumber(flags_)) : '0x',
|
|
380
380
|
frame.to ?? '0x',
|
|
381
381
|
[
|
|
382
|
-
frame.
|
|
382
|
+
frame.executionGas
|
|
383
|
+
? Hex.fromBytes(Bytes.fromNumber(frame.executionGas))
|
|
384
|
+
: '0x',
|
|
383
385
|
frame.stateGas ? Hex.fromBytes(Bytes.fromNumber(frame.stateGas)) : '0x',
|
|
384
386
|
],
|
|
385
387
|
frame.value ? Hex.fromBytes(Bytes.fromNumber(frame.value)) : '0x',
|
|
@@ -409,8 +411,8 @@ export declare namespace toTuple {
|
|
|
409
411
|
* import { Frame } from 'ox'
|
|
410
412
|
*
|
|
411
413
|
* const valid = Frame.validate({
|
|
414
|
+
* executionGas: 50_000n,
|
|
412
415
|
* flags: 'approveExecutionAndPayment',
|
|
413
|
-
* gas: 50_000n,
|
|
414
416
|
* mode: 'verify'
|
|
415
417
|
* })
|
|
416
418
|
* // @log: true
|
|
@@ -95,7 +95,7 @@ export type Type = typeof type
|
|
|
95
95
|
*
|
|
96
96
|
* TxEnvelopeEip8141.assert({
|
|
97
97
|
* chainId: 1,
|
|
98
|
-
* frames: [{
|
|
98
|
+
* frames: [{ executionGas: 50_000n, mode: 'verify' }],
|
|
99
99
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
100
100
|
* })
|
|
101
101
|
* ```
|
|
@@ -151,7 +151,7 @@ export function assert(envelope: PartialBy<TxEnvelopeEip8141, 'type'>): void {
|
|
|
151
151
|
}
|
|
152
152
|
if (blobVersionedHashes.length === 0 && maxFeePerBlobGas !== 0n)
|
|
153
153
|
throw new InvalidError('maxFeePerBlobGas must be zero without blobs.')
|
|
154
|
-
let
|
|
154
|
+
let executionGas = 0n
|
|
155
155
|
let stateGas = 0n
|
|
156
156
|
let previousBatch = false
|
|
157
157
|
let expiry = false
|
|
@@ -198,7 +198,7 @@ export function assert(envelope: PartialBy<TxEnvelopeEip8141, 'type'>): void {
|
|
|
198
198
|
throw new InvalidError('Invalid or duplicate expiry verifier frame.')
|
|
199
199
|
expiry = true
|
|
200
200
|
}
|
|
201
|
-
|
|
201
|
+
executionGas += frame.executionGas ?? 0n
|
|
202
202
|
stateGas += frame.stateGas ?? 0n
|
|
203
203
|
count(frame.data ?? '0x')
|
|
204
204
|
if (
|
|
@@ -215,10 +215,10 @@ export function assert(envelope: PartialBy<TxEnvelopeEip8141, 'type'>): void {
|
|
|
215
215
|
count(payload)
|
|
216
216
|
count(signature)
|
|
217
217
|
}
|
|
218
|
-
if (
|
|
218
|
+
if (executionGas + stateGas >= 2n ** 64n)
|
|
219
219
|
throw new InvalidError('Combined frame gas must be less than 2^64.')
|
|
220
220
|
if (
|
|
221
|
-
intrinsic + tokens * 4n +
|
|
221
|
+
intrinsic + tokens * 4n + executionGas > 16_777_216n ||
|
|
222
222
|
intrinsic + size * 64n > 16_777_216n
|
|
223
223
|
)
|
|
224
224
|
throw new InvalidError('Transaction execution gas exceeds 16777216.')
|
|
@@ -342,8 +342,8 @@ export declare namespace deserialize {
|
|
|
342
342
|
* chainId: 1,
|
|
343
343
|
* frames: [
|
|
344
344
|
* {
|
|
345
|
+
* executionGas: 50_000n,
|
|
345
346
|
* flags: 'approveExecutionAndPayment',
|
|
346
|
-
* gas: 50_000n,
|
|
347
347
|
* mode: 'verify'
|
|
348
348
|
* }
|
|
349
349
|
* ],
|
|
@@ -508,8 +508,8 @@ export declare namespace toRpc {
|
|
|
508
508
|
* chainId: 1,
|
|
509
509
|
* frames: [
|
|
510
510
|
* {
|
|
511
|
+
* executionGas: 50_000n,
|
|
511
512
|
* flags: 'approveExecutionAndPayment',
|
|
512
|
-
* gas: 50_000n,
|
|
513
513
|
* mode: 'verify'
|
|
514
514
|
* }
|
|
515
515
|
* ],
|
|
@@ -594,7 +594,7 @@ export declare namespace hash {
|
|
|
594
594
|
*
|
|
595
595
|
* const envelope = TxEnvelopeEip8141.from({
|
|
596
596
|
* chainId: 1,
|
|
597
|
-
* frames: [{
|
|
597
|
+
* frames: [{ executionGas: 50_000n, mode: 'sender' }],
|
|
598
598
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
599
599
|
* })
|
|
600
600
|
* const serialized = TxEnvelopeEip8141.serialize(envelope)
|
package/index.ts
CHANGED
|
@@ -1562,13 +1562,13 @@ export * as Filter from './core/Filter.js'
|
|
|
1562
1562
|
* import { Frame } from 'ox'
|
|
1563
1563
|
*
|
|
1564
1564
|
* const frame = Frame.from({
|
|
1565
|
+
* executionGas: 50_000n,
|
|
1565
1566
|
* flags: 'approveExecutionAndPayment',
|
|
1566
|
-
* gas: 50_000n,
|
|
1567
1567
|
* mode: 'verify'
|
|
1568
1568
|
* })
|
|
1569
1569
|
* ```
|
|
1570
1570
|
*
|
|
1571
|
-
* @category
|
|
1571
|
+
* @category Frames (EIP-8141)
|
|
1572
1572
|
*/
|
|
1573
1573
|
export * as Frame from './core/Frame.js'
|
|
1574
1574
|
/**
|
|
@@ -1576,7 +1576,7 @@ export * as Frame from './core/Frame.js'
|
|
|
1576
1576
|
*
|
|
1577
1577
|
* Frame receipts include execution gas, state gas, logs, and execution status.
|
|
1578
1578
|
*
|
|
1579
|
-
* @category
|
|
1579
|
+
* @category Frames (EIP-8141)
|
|
1580
1580
|
*/
|
|
1581
1581
|
export * as FrameReceipt from './core/FrameReceipt.js'
|
|
1582
1582
|
/**
|
|
@@ -1598,7 +1598,7 @@ export * as FrameReceipt from './core/FrameReceipt.js'
|
|
|
1598
1598
|
* // @log: { payload: '0x', scheme: 'arbitrary', signature: '0xaabb' }
|
|
1599
1599
|
* ```
|
|
1600
1600
|
*
|
|
1601
|
-
* @category
|
|
1601
|
+
* @category Frames (EIP-8141)
|
|
1602
1602
|
*/
|
|
1603
1603
|
export * as FrameSignature from './core/FrameSignature.js'
|
|
1604
1604
|
/**
|
|
@@ -3335,7 +3335,7 @@ export * as TxEnvelopeEip7702 from './core/TxEnvelopeEip7702.js'
|
|
|
3335
3335
|
*
|
|
3336
3336
|
* const envelope = TxEnvelopeEip8141.from({
|
|
3337
3337
|
* chainId: 1,
|
|
3338
|
-
* frames: [{
|
|
3338
|
+
* frames: [{ executionGas: 50_000n, mode: 'sender' }],
|
|
3339
3339
|
* sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
|
|
3340
3340
|
* })
|
|
3341
3341
|
* ```
|
package/package.json
CHANGED
package/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/** @internal */
|
|
2
|
-
export const version = '0.14.
|
|
2
|
+
export const version = '0.14.48'
|