ox 1.8.1 → 1.8.4
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 +53 -0
- package/dist/core/Frame.d.ts +23 -20
- package/dist/core/Frame.d.ts.map +1 -1
- package/dist/core/Frame.js +28 -23
- package/dist/core/Frame.js.map +1 -1
- package/dist/core/FrameReceipt.d.ts +23 -14
- package/dist/core/FrameReceipt.d.ts.map +1 -1
- package/dist/core/FrameReceipt.js +15 -11
- package/dist/core/FrameReceipt.js.map +1 -1
- package/dist/core/FrameRequest.d.ts +50 -0
- package/dist/core/FrameRequest.d.ts.map +1 -0
- package/dist/core/FrameRequest.js +59 -0
- package/dist/core/FrameRequest.js.map +1 -0
- package/dist/core/FrameSignature.d.ts +17 -16
- package/dist/core/FrameSignature.d.ts.map +1 -1
- package/dist/core/FrameSignature.js +38 -21
- package/dist/core/FrameSignature.js.map +1 -1
- package/dist/core/Siwe.d.ts.map +1 -1
- package/dist/core/Siwe.js +3 -3
- package/dist/core/Siwe.js.map +1 -1
- package/dist/core/Transaction.d.ts +7 -4
- package/dist/core/Transaction.d.ts.map +1 -1
- package/dist/core/Transaction.js +8 -0
- package/dist/core/Transaction.js.map +1 -1
- package/dist/core/TransactionRequest.d.ts +8 -5
- package/dist/core/TransactionRequest.d.ts.map +1 -1
- package/dist/core/TransactionRequest.js +11 -3
- package/dist/core/TransactionRequest.js.map +1 -1
- package/dist/core/TxEnvelope.d.ts +4 -2
- package/dist/core/TxEnvelope.d.ts.map +1 -1
- package/dist/core/TxEnvelope.js +11 -2
- package/dist/core/TxEnvelope.js.map +1 -1
- package/dist/core/TxEnvelopeEip8141.d.ts +22 -11
- package/dist/core/TxEnvelopeEip8141.d.ts.map +1 -1
- package/dist/core/TxEnvelopeEip8141.js +45 -16
- package/dist/core/TxEnvelopeEip8141.js.map +1 -1
- package/dist/core/internal/frameNonce.d.ts +10 -0
- package/dist/core/internal/frameNonce.d.ts.map +1 -0
- package/dist/core/internal/frameNonce.js +45 -0
- package/dist/core/internal/frameNonce.js.map +1 -0
- package/dist/core/internal/rpcSchemas/eth.d.ts +16 -4
- package/dist/core/internal/rpcSchemas/eth.d.ts.map +1 -1
- package/dist/index.d.ts +21 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +21 -5
- package/dist/index.js.map +1 -1
- package/dist/zod/Block.d.ts +52 -37
- package/dist/zod/Block.d.ts.map +1 -1
- package/dist/zod/Frame.d.ts +14 -14
- package/dist/zod/Frame.js +5 -5
- package/dist/zod/Frame.js.map +1 -1
- package/dist/zod/FrameReceipt.d.ts +42 -2
- package/dist/zod/FrameReceipt.d.ts.map +1 -1
- package/dist/zod/FrameReceipt.js +11 -1
- package/dist/zod/FrameReceipt.js.map +1 -1
- package/dist/zod/FrameRequest.d.ts +40 -0
- package/dist/zod/FrameRequest.d.ts.map +1 -0
- package/dist/zod/FrameRequest.js +37 -0
- package/dist/zod/FrameRequest.js.map +1 -0
- package/dist/zod/FrameSignature.d.ts +21 -13
- package/dist/zod/FrameSignature.d.ts.map +1 -1
- package/dist/zod/FrameSignature.js +10 -7
- package/dist/zod/FrameSignature.js.map +1 -1
- package/dist/zod/RpcSchema.d.ts +470 -265
- package/dist/zod/RpcSchema.d.ts.map +1 -1
- package/dist/zod/Transaction.d.ts +104 -74
- package/dist/zod/Transaction.d.ts.map +1 -1
- package/dist/zod/Transaction.js +22 -15
- package/dist/zod/Transaction.js.map +1 -1
- package/dist/zod/TransactionEnvelope.d.ts +60 -34
- package/dist/zod/TransactionEnvelope.d.ts.map +1 -1
- package/dist/zod/TransactionReceipt.d.ts +42 -2
- package/dist/zod/TransactionReceipt.d.ts.map +1 -1
- package/dist/zod/TransactionRequest.d.ts +31 -21
- package/dist/zod/TransactionRequest.d.ts.map +1 -1
- package/dist/zod/TransactionRequest.js +10 -4
- package/dist/zod/TransactionRequest.js.map +1 -1
- package/dist/zod/TxEnvelopeEip8141.d.ts +44 -25
- package/dist/zod/TxEnvelopeEip8141.d.ts.map +1 -1
- package/dist/zod/TxEnvelopeEip8141.js +2 -0
- package/dist/zod/TxEnvelopeEip8141.js.map +1 -1
- package/dist/zod/internal/Frame.d.ts +8 -0
- package/dist/zod/internal/Frame.d.ts.map +1 -1
- package/dist/zod/internal/Frame.js +29 -0
- package/dist/zod/internal/Frame.js.map +1 -1
- package/dist/zod/internal/rpcSchemas/Eth.d.ts +472 -267
- package/dist/zod/internal/rpcSchemas/Eth.d.ts.map +1 -1
- package/dist/zod/internal/rpcSchemas/Eth.js +9 -0
- package/dist/zod/internal/rpcSchemas/Eth.js.map +1 -1
- package/dist/zod/internal/rpcSchemas/Wallet.d.ts +51 -21
- package/dist/zod/internal/rpcSchemas/Wallet.d.ts.map +1 -1
- package/dist/zod/tempo/RpcSchemaTempo.d.ts +68 -48
- package/dist/zod/tempo/RpcSchemaTempo.d.ts.map +1 -1
- package/dist/zod/tempo/Transaction.d.ts +52 -37
- package/dist/zod/tempo/Transaction.d.ts.map +1 -1
- package/dist/zod/z.d.ts +1 -0
- package/dist/zod/z.d.ts.map +1 -1
- package/dist/zod/z.js +1 -0
- package/dist/zod/z.js.map +1 -1
- package/package.json +11 -1
- package/src/core/Frame.ts +41 -33
- package/src/core/FrameReceipt.ts +30 -16
- package/src/core/FrameRequest.ts +78 -0
- package/src/core/FrameSignature.ts +64 -34
- package/src/core/Siwe.ts +21 -13
- package/src/core/Transaction.ts +52 -24
- package/src/core/TransactionRequest.ts +21 -7
- package/src/core/TxEnvelope.ts +16 -3
- package/src/core/TxEnvelopeEip8141.ts +69 -21
- package/src/core/_test/AbiConstructor.test.ts +2 -0
- package/src/core/_test/Frame.test-d.ts +16 -7
- package/src/core/_test/Frame.test.ts +52 -24
- package/src/core/_test/FrameReceipt.test.ts +15 -9
- package/src/core/_test/FrameRequest.test-d.ts +16 -0
- package/src/core/_test/FrameRequest.test.ts +41 -0
- package/src/core/_test/FrameRpc.test.ts +131 -0
- package/src/core/_test/FrameSignature.test-d.ts +20 -0
- package/src/core/_test/FrameSignature.test.ts +132 -11
- package/src/core/_test/RpcSchema.test-d.ts +45 -0
- package/src/core/_test/Siwe.test.ts +147 -0
- package/src/core/_test/TransactionEnvelope.test-d.ts +27 -0
- package/src/core/_test/TransactionEnvelope.test.ts +27 -1
- package/src/core/_test/TransactionReceipt.test.ts +32 -6
- package/src/core/_test/TransactionRequest.test-d.ts +10 -1
- package/src/core/_test/TransactionRequest.test.ts +31 -2
- package/src/core/_test/TxEnvelopeEip8141.test-d.ts +29 -2
- package/src/core/_test/TxEnvelopeEip8141.test.ts +548 -55
- package/src/core/_test/index.test.ts +1 -0
- package/src/core/internal/frameNonce.ts +61 -0
- package/src/core/internal/rpcSchemas/eth.ts +13 -4
- package/src/index.ts +22 -5
- package/src/version.ts +1 -1
- package/src/zod/Frame.ts +5 -5
- package/src/zod/FrameReceipt.ts +11 -1
- package/src/zod/FrameRequest.ts +46 -0
- package/src/zod/FrameSignature.ts +10 -7
- package/src/zod/Transaction.ts +46 -27
- package/src/zod/TransactionRequest.ts +33 -18
- package/src/zod/TxEnvelopeEip8141.ts +2 -0
- package/src/zod/_test/Frame.test.ts +13 -11
- package/src/zod/_test/FrameReceipt.test.ts +11 -4
- package/src/zod/_test/FrameRequest.test-d.ts +15 -0
- package/src/zod/_test/FrameRequest.test.ts +44 -0
- package/src/zod/_test/FrameSignature.test.ts +73 -9
- package/src/zod/_test/RpcSchema.test.ts +106 -0
- package/src/zod/_test/TransactionRequest.test.ts +61 -0
- package/src/zod/_test/TxEnvelopeEip8141.nonce.test.ts +174 -0
- package/src/zod/_test/TxEnvelopeEip8141.test-d.ts +29 -0
- package/src/zod/_test/TxEnvelopeEip8141.test.ts +3 -3
- package/src/zod/internal/Frame.ts +45 -0
- package/src/zod/internal/rpcSchemas/Eth.ts +20 -0
- package/src/zod/z.ts +1 -0
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import * as Frame from './Frame.js';
|
|
2
|
+
/**
|
|
3
|
+
* Converts an RPC frame request, preserving omitted gas limits for node estimation.
|
|
4
|
+
*
|
|
5
|
+
* @example
|
|
6
|
+
* ```ts twoslash
|
|
7
|
+
* import { FrameRequest } from 'ox'
|
|
8
|
+
*
|
|
9
|
+
* const frame = FrameRequest.fromRpc({
|
|
10
|
+
* mode: '0x2',
|
|
11
|
+
* stateGas: '0x0'
|
|
12
|
+
* })
|
|
13
|
+
* ```
|
|
14
|
+
*
|
|
15
|
+
* @param frame - The RPC frame request.
|
|
16
|
+
* @returns The decoded request with omitted gas limits preserved.
|
|
17
|
+
*/
|
|
18
|
+
export function fromRpc(frame) {
|
|
19
|
+
const { executionGas, stateGas, ...rest } = Frame.fromRpc({
|
|
20
|
+
...frame,
|
|
21
|
+
data: frame.data ?? '0x',
|
|
22
|
+
executionGas: frame.executionGas ?? '0x0',
|
|
23
|
+
flags: frame.flags ?? '0x0',
|
|
24
|
+
stateGas: frame.stateGas ?? '0x0',
|
|
25
|
+
value: frame.value ?? '0x0',
|
|
26
|
+
});
|
|
27
|
+
return {
|
|
28
|
+
...rest,
|
|
29
|
+
...(frame.executionGas === undefined ? {} : { executionGas }),
|
|
30
|
+
...(frame.stateGas === undefined ? {} : { stateGas }),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Converts a frame request to RPC fields without filling omitted gas limits.
|
|
35
|
+
*
|
|
36
|
+
* Explicit zero limits remain zero. Omitted mode, flags, value, and data use frame defaults.
|
|
37
|
+
*
|
|
38
|
+
* @example
|
|
39
|
+
* ```ts twoslash
|
|
40
|
+
* import { FrameRequest } from 'ox'
|
|
41
|
+
*
|
|
42
|
+
* const frame = FrameRequest.toRpc({
|
|
43
|
+
* mode: 'sender',
|
|
44
|
+
* stateGas: 0n
|
|
45
|
+
* })
|
|
46
|
+
* ```
|
|
47
|
+
*
|
|
48
|
+
* @param frame - The frame request. Gas and value accept hex, bigint, or number values.
|
|
49
|
+
* @returns The RPC request with omitted gas limits preserved.
|
|
50
|
+
*/
|
|
51
|
+
export function toRpc(frame) {
|
|
52
|
+
const { executionGas, stateGas, ...rest } = Frame.toRpc(frame);
|
|
53
|
+
return {
|
|
54
|
+
...rest,
|
|
55
|
+
...(frame.executionGas === undefined ? {} : { executionGas }),
|
|
56
|
+
...(frame.stateGas === undefined ? {} : { stateGas }),
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=FrameRequest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FrameRequest.js","sourceRoot":"","sources":["../../src/core/FrameRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAWnC;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,OAAO,CAAC,KAAU;IAChC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;QACxD,GAAG,KAAK;QACR,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,IAAI;QACxB,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,KAAK;QACzC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,KAAK;QAC3B,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;QACjC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,KAAK;KAC5B,CAAC,CAAA;IACF,OAAO;QACL,GAAG,IAAI;QACP,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC;QAC7D,GAAG,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;KACtD,CAAA;AACH,CAAC;AAMD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,KAAK,CAAC,KAAkB;IACtC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC9D,OAAO;QACL,GAAG,IAAI;QACP,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC;QAC7D,GAAG,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;KACtD,CAAA;AACH,CAAC"}
|
|
@@ -23,18 +23,18 @@ export type Arbitrary = {
|
|
|
23
23
|
/** Arbitrary signatures have no signer metadata. */
|
|
24
24
|
signer?: undefined;
|
|
25
25
|
};
|
|
26
|
-
/** A
|
|
26
|
+
/** A secp256k1 signature entry. */
|
|
27
27
|
export type Secp256k1 = {
|
|
28
28
|
/** Explicit nonzero digest. Omit or use empty bytes for the transaction signing hash. */
|
|
29
29
|
payload?: Hex.Hex | undefined;
|
|
30
30
|
/** secp256k1 verification scheme. */
|
|
31
31
|
scheme: 1 | 'secp256k1';
|
|
32
|
-
/** Recovered signature. Omit for an unsigned entry. */
|
|
33
|
-
signature?: Signature.Signature | undefined;
|
|
32
|
+
/** Recovered signature or `Signature.toHex` bytes. Omit or use `0x` for an unsigned entry. */
|
|
33
|
+
signature?: Hex.Hex | Signature.Signature | undefined;
|
|
34
34
|
/** Signer address. Omit to use the transaction sender. */
|
|
35
35
|
signer?: Address.Address | undefined;
|
|
36
36
|
};
|
|
37
|
-
/** A
|
|
37
|
+
/** A P-256 signature entry. */
|
|
38
38
|
export type P256 = {
|
|
39
39
|
/** Explicit nonzero digest. Omit or use empty bytes for the transaction signing hash. */
|
|
40
40
|
payload?: Hex.Hex | undefined;
|
|
@@ -45,26 +45,26 @@ export type P256 = {
|
|
|
45
45
|
} & ({
|
|
46
46
|
/** Uncompressed P-256 public key. */
|
|
47
47
|
publicKey: PublicKey.PublicKey;
|
|
48
|
-
/** P-256 signature. */
|
|
49
|
-
signature: Signature.Signature<false>;
|
|
48
|
+
/** P-256 signature or `Signature.toHex` bytes. */
|
|
49
|
+
signature: Hex.Hex | Signature.Signature<false>;
|
|
50
50
|
} | {
|
|
51
51
|
/** Public key, if already known. Empty wire signatures do not retain it. */
|
|
52
52
|
publicKey?: PublicKey.PublicKey | undefined;
|
|
53
|
-
/** Omit for an unsigned entry. */
|
|
54
|
-
signature?: undefined;
|
|
53
|
+
/** Omit or use `0x` for an unsigned entry. */
|
|
54
|
+
signature?: '0x' | undefined;
|
|
55
55
|
});
|
|
56
56
|
/** An EIP-8141 signature entry. Empty payload selects the transaction signing hash. */
|
|
57
57
|
export type FrameSignature = Arbitrary | Secp256k1 | P256;
|
|
58
58
|
/** JSON-RPC representation of a frame signature. */
|
|
59
59
|
export type Rpc = {
|
|
60
60
|
/** Explicit digest, or empty bytes for the transaction signing hash. */
|
|
61
|
-
msg
|
|
61
|
+
msg?: Hex.Hex | undefined;
|
|
62
62
|
/** Signature verification scheme. */
|
|
63
|
-
scheme:
|
|
63
|
+
scheme: '0x0' | '0x1' | '0x2';
|
|
64
64
|
/** Encoded signature bytes. */
|
|
65
|
-
signature
|
|
65
|
+
signature?: Hex.Hex | undefined;
|
|
66
66
|
/** Signer address; absent for the transaction sender. */
|
|
67
|
-
signer?: Address.Address |
|
|
67
|
+
signer?: Address.Address | '0x' | undefined;
|
|
68
68
|
};
|
|
69
69
|
/** RLP-ready signature entry. The payload occupies the specification's `msg` field. */
|
|
70
70
|
export type Tuple = readonly [
|
|
@@ -126,12 +126,13 @@ export declare namespace assert {
|
|
|
126
126
|
*/
|
|
127
127
|
signed?: boolean | undefined;
|
|
128
128
|
};
|
|
129
|
-
type ErrorType = InvalidError | Address.assert.ErrorType | Hex.assert.ErrorType | Hex.toBigInt.ErrorType | PublicKey.assert.ErrorType | Signature.assert.ErrorType | Errors.GlobalErrorType;
|
|
129
|
+
type ErrorType = InvalidError | Address.assert.ErrorType | Hex.assert.ErrorType | Hex.toBigInt.ErrorType | PublicKey.assert.ErrorType | Signature.assert.ErrorType | Signature.fromHex.ErrorType | Errors.GlobalErrorType;
|
|
130
130
|
}
|
|
131
131
|
/**
|
|
132
132
|
* Coerces a value into a {@link ox#FrameSignature.FrameSignature}.
|
|
133
133
|
*
|
|
134
|
-
* Accepts arbitrary signature bytes or a
|
|
134
|
+
* Accepts arbitrary signature bytes or a signature entry. Protocol signatures accept
|
|
135
|
+
* structured objects or `Signature.toHex` bytes. P-256 entries still require a public key. Omitted
|
|
135
136
|
* `scheme` and `payload` default to `'arbitrary'` and `'0x'`, respectively.
|
|
136
137
|
* An empty payload selects the canonical transaction signing hash; an explicit
|
|
137
138
|
* payload must be a nonzero 32-byte digest.
|
|
@@ -230,7 +231,7 @@ export declare namespace from {
|
|
|
230
231
|
*
|
|
231
232
|
* const entry = FrameSignature.fromRpc({
|
|
232
233
|
* msg: '0x',
|
|
233
|
-
* scheme:
|
|
234
|
+
* scheme: '0x0',
|
|
234
235
|
* signature: '0xdeadbeef'
|
|
235
236
|
* })
|
|
236
237
|
* ```
|
|
@@ -240,7 +241,7 @@ export declare namespace from {
|
|
|
240
241
|
*/
|
|
241
242
|
export declare function fromRpc(entry: Rpc): FrameSignature;
|
|
242
243
|
export declare namespace fromRpc {
|
|
243
|
-
type ErrorType = fromTuple.ErrorType | Hex.fromNumber.ErrorType;
|
|
244
|
+
type ErrorType = fromTuple.ErrorType | Hex.fromNumber.ErrorType | Hex.toNumber.ErrorType;
|
|
244
245
|
}
|
|
245
246
|
/**
|
|
246
247
|
* Converts a structured frame signature to its RPC representation.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FrameSignature.d.ts","sourceRoot":"","sources":["../../src/core/FrameSignature.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAClE,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C,+CAA+C;AAC/C,eAAO,MAAM,OAAO;;;;CAAmD,CAAA;AAEvE,2DAA2D;AAC3D,MAAM,MAAM,MAAM,GACd,MAAM,OAAO,OAAO,GACpB,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,OAAO,OAAO,CAAC,CAAA;AAE1C,wCAAwC;AACxC,MAAM,MAAM,SAAS,GAAG;IACtB,yFAAyF;IACzF,OAAO,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,SAAS,CAAA;IAC7B,4CAA4C;IAC5C,MAAM,EAAE,CAAC,GAAG,WAAW,CAAA;IACvB,4BAA4B;IAC5B,SAAS,EAAE,GAAG,CAAC,GAAG,CAAA;IAClB,oDAAoD;IACpD,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB,CAAA;AAED,
|
|
1
|
+
{"version":3,"file":"FrameSignature.d.ts","sourceRoot":"","sources":["../../src/core/FrameSignature.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,23 +80,30 @@ export function assert(entry, options = {}) {
|
|
|
80
80
|
throw new InvalidError('Public key coordinates must fit in 32 bytes.');
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
|
-
if (entry.signature !== undefined &&
|
|
83
|
+
if (entry.signature !== undefined &&
|
|
84
|
+
entry.signature !== '0x' &&
|
|
85
|
+
entry.publicKey === undefined)
|
|
84
86
|
throw new InvalidError('P-256 signatures require a public key.');
|
|
85
87
|
}
|
|
86
|
-
if (entry.signature === undefined) {
|
|
88
|
+
if (entry.signature === undefined || entry.signature === '0x') {
|
|
87
89
|
if (options.signed)
|
|
88
90
|
throw new InvalidError('Signature is required.');
|
|
89
91
|
return;
|
|
90
92
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
entry.signature
|
|
95
|
-
entry.signature
|
|
93
|
+
if (typeof entry.signature === 'string')
|
|
94
|
+
Hex.assert(entry.signature, { strict: true });
|
|
95
|
+
const signature = typeof entry.signature === 'string'
|
|
96
|
+
? Signature.fromHex(entry.signature)
|
|
97
|
+
: entry.signature;
|
|
98
|
+
Hex.assert(signature.r, { strict: true });
|
|
99
|
+
Hex.assert(signature.s, { strict: true });
|
|
100
|
+
if ((scheme === 1 || signature.yParity !== undefined) &&
|
|
101
|
+
signature.yParity !== 0 &&
|
|
102
|
+
signature.yParity !== 1)
|
|
96
103
|
throw new InvalidError('Signature parity must be 0 or 1.');
|
|
97
|
-
Signature.assert(
|
|
98
|
-
const r = Hex.toBigInt(
|
|
99
|
-
const s = Hex.toBigInt(
|
|
104
|
+
Signature.assert(signature, { recovered: scheme === 1 });
|
|
105
|
+
const r = Hex.toBigInt(signature.r);
|
|
106
|
+
const s = Hex.toBigInt(signature.s);
|
|
100
107
|
const order = scheme === 1 ? secp256k1N : p256N;
|
|
101
108
|
if (r === 0n ||
|
|
102
109
|
r >= order ||
|
|
@@ -108,7 +115,8 @@ export function assert(entry, options = {}) {
|
|
|
108
115
|
/**
|
|
109
116
|
* Coerces a value into a {@link ox#FrameSignature.FrameSignature}.
|
|
110
117
|
*
|
|
111
|
-
* Accepts arbitrary signature bytes or a
|
|
118
|
+
* Accepts arbitrary signature bytes or a signature entry. Protocol signatures accept
|
|
119
|
+
* structured objects or `Signature.toHex` bytes. P-256 entries still require a public key. Omitted
|
|
112
120
|
* `scheme` and `payload` default to `'arbitrary'` and `'0x'`, respectively.
|
|
113
121
|
* An empty payload selects the canonical transaction signing hash; an explicit
|
|
114
122
|
* payload must be a nonzero 32-byte digest.
|
|
@@ -201,7 +209,7 @@ export function from(entry) {
|
|
|
201
209
|
*
|
|
202
210
|
* const entry = FrameSignature.fromRpc({
|
|
203
211
|
* msg: '0x',
|
|
204
|
-
* scheme:
|
|
212
|
+
* scheme: '0x0',
|
|
205
213
|
* signature: '0xdeadbeef'
|
|
206
214
|
* })
|
|
207
215
|
* ```
|
|
@@ -211,10 +219,12 @@ export function from(entry) {
|
|
|
211
219
|
*/
|
|
212
220
|
export function fromRpc(entry) {
|
|
213
221
|
return fromTuple([
|
|
214
|
-
entry.scheme ===
|
|
222
|
+
entry.scheme === '0x0'
|
|
223
|
+
? '0x'
|
|
224
|
+
: Hex.fromNumber(Hex.toNumber(entry.scheme), { size: 1 }),
|
|
215
225
|
entry.signer ?? '0x',
|
|
216
|
-
entry.msg,
|
|
217
|
-
entry.signature,
|
|
226
|
+
entry.msg ?? '0x',
|
|
227
|
+
entry.signature ?? '0x',
|
|
218
228
|
]);
|
|
219
229
|
}
|
|
220
230
|
/**
|
|
@@ -237,8 +247,10 @@ export function toRpc(entry) {
|
|
|
237
247
|
const [scheme, signer, msg, signature] = toTuple(entry);
|
|
238
248
|
return {
|
|
239
249
|
msg,
|
|
240
|
-
scheme: (scheme === '0x'
|
|
241
|
-
|
|
250
|
+
scheme: (scheme === '0x'
|
|
251
|
+
? '0x0'
|
|
252
|
+
: Hex.fromNumber(Hex.toNumber(scheme))),
|
|
253
|
+
...(signature === '0x' && scheme !== '0x' ? {} : { signature }),
|
|
242
254
|
...(signer === '0x' ? {} : { signer }),
|
|
243
255
|
};
|
|
244
256
|
}
|
|
@@ -347,14 +359,19 @@ export function toTuple(entry) {
|
|
|
347
359
|
return entry.signature;
|
|
348
360
|
case 1:
|
|
349
361
|
case 'secp256k1':
|
|
350
|
-
return entry.signature === undefined
|
|
362
|
+
return entry.signature === undefined || entry.signature === '0x'
|
|
351
363
|
? '0x'
|
|
352
|
-
: Hex.fromBytes(Signature.toRecoveredBytes(entry.signature
|
|
364
|
+
: Hex.fromBytes(Signature.toRecoveredBytes(typeof entry.signature === 'string'
|
|
365
|
+
? Signature.fromHex(entry.signature)
|
|
366
|
+
: entry.signature));
|
|
353
367
|
case 2:
|
|
354
368
|
case 'p256': {
|
|
355
|
-
if (entry.signature === undefined)
|
|
369
|
+
if (entry.signature === undefined || entry.signature === '0x')
|
|
356
370
|
return '0x';
|
|
357
|
-
const
|
|
371
|
+
const publicKey = entry.publicKey;
|
|
372
|
+
const signature = typeof entry.signature === 'string'
|
|
373
|
+
? Signature.fromHex(entry.signature)
|
|
374
|
+
: entry.signature;
|
|
358
375
|
const s = Hex.toBigInt(signature.s);
|
|
359
376
|
return Hex.concat(Hex.fromNumber(Hex.toBigInt(signature.r), { size: 32 }), Hex.fromNumber(s > p256N / 2n ? p256N - s : s, { size: 32 }), Hex.fromNumber(Hex.toBigInt(publicKey.x), { size: 32 }), Hex.fromNumber(Hex.toBigInt(publicKey.y), { size: 32 }));
|
|
360
377
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FrameSignature.js","sourceRoot":"","sources":["../../src/core/FrameSignature.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAExD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C,+CAA+C;AAC/C,MAAM,CAAC,MAAM,OAAO,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAW,CAAA;AA6EvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,MAAM,UAAU,MAAM,CACpB,KAAqB,EACrB,UAA0B,EAAE;IAE5B,MAAM,MAAM,GACV,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;IACzE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC;QACvD,MAAM,IAAI,YAAY,CAAC,+BAA+B,CAAC,CAAA;IACzD,IAAI,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS;QAC5C,MAAM,IAAI,YAAY,CAAC,+CAA+C,CAAC,CAAA;IACzE,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS;QAC5B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;IACjD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,CAAA;IACrC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IACrC,IACE,OAAO,KAAK,IAAI;QAChB,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAEvD,MAAM,IAAI,YAAY,CAAC,oDAAoD,CAAC,CAAA;IAC9E,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,CAAC,CAAC;QACP,KAAK,WAAW;YACd,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;YAC7C,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC;gBAClC,MAAM,IAAI,YAAY,CAAC,qCAAqC,CAAC,CAAA;YAC/D,OAAM;IACV,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAClD,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAClC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;YACxD,KAAK,MAAM,UAAU,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;gBACxC,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,EAAE;oBAC/C,MAAM,IAAI,YAAY,CAAC,8CAA8C,CAAC,CAAA;YAC1E,CAAC;QACH,CAAC;QACD,
|
|
1
|
+
{"version":3,"file":"FrameSignature.js","sourceRoot":"","sources":["../../src/core/FrameSignature.ts"],"names":[],"mappings":"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"}
|
package/dist/core/Siwe.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Siwe.d.ts","sourceRoot":"","sources":["../../src/core/Siwe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEvD,eAAO,MAAM,WAAW,QACwD,CAAA;AAEhF,eAAO,MAAM,OAAO,QAC8J,CAAA;AAElL,eAAO,MAAM,cAAc,QAA8B,CAAA;AAEzD,eAAO,MAAM,UAAU,QAAsB,CAAA;AAE7C,eAAO,MAAM,WAAW,QAAgC,CAAA;AAGxD,eAAO,MAAM,WAAW,QACoL,CAAA;AAG5M,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"Siwe.d.ts","sourceRoot":"","sources":["../../src/core/Siwe.ts"],"names":[],"mappings":"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"}
|
package/dist/core/Siwe.js
CHANGED
|
@@ -9,7 +9,7 @@ export const schemeRegex = /^([a-zA-Z][a-zA-Z0-9+-.]*)$/;
|
|
|
9
9
|
// https://regexr.com/80gdj
|
|
10
10
|
export const prefixRegex = /^(?:(?<scheme>[a-zA-Z][a-zA-Z0-9+-.]*):\/\/)?(?<domain>[a-zA-Z0-9+-.]*(?::[0-9]{1,5})?) (?:wants you to sign in with your Ethereum account:\n)(?<address>0x[a-fA-F0-9]{40})\n\n(?:(?<statement>.*)\n\n)?/;
|
|
11
11
|
// https://regexr.com/80gf9
|
|
12
|
-
export const suffixRegex = /(?:URI: (?<uri>.+))\n(?:Version: (?<version>.+))\n(?:Chain ID: (?<chainId>\d+))\n(?:Nonce: (?<nonce>[a-zA-Z0-9]+))\n(?:Issued At: (?<issuedAt>.+))(?:\nExpiration Time: (?<expirationTime>.+))?(?:\nNot Before: (?<notBefore>.+))?(?:\nRequest ID: (?<requestId
|
|
12
|
+
export const suffixRegex = /(?:URI: (?<uri>.+))\n(?:Version: (?<version>.+))\n(?:Chain ID: (?<chainId>\d+))\n(?:Nonce: (?<nonce>[a-zA-Z0-9]+))\n(?:Issued At: (?<issuedAt>.+))(?:\nExpiration Time: (?<expirationTime>.+))?(?:\nNot Before: (?<notBefore>.+))?(?:\nRequest ID: (?<requestId>.*))?(?:\nResources:(?<resources>(?:\n- .+)*))?/;
|
|
13
13
|
const siweDateTimeRegex = /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])[Tt]([01]\d|2[0-3]):[0-5]\d:[0-5]\d(?:\.\d+)?(?:[Zz]|[+-](?:[01]\d|2[0-3]):[0-5]\d)$/;
|
|
14
14
|
function parseSiweDateTime(value) {
|
|
15
15
|
const match = value.match(siweDateTimeRegex);
|
|
@@ -316,8 +316,8 @@ function splitUri(value) {
|
|
|
316
316
|
export function parseMessage(message) {
|
|
317
317
|
const { scheme, statement, ...prefix } = (message.match(prefixRegex)
|
|
318
318
|
?.groups ?? {});
|
|
319
|
-
const { chainId, expirationTime, issuedAt, notBefore, requestId, ...suffix } = (message.match(suffixRegex)?.groups ?? {});
|
|
320
|
-
const resources =
|
|
319
|
+
const { chainId, expirationTime, issuedAt, notBefore, requestId, resources: resources_, ...suffix } = (message.match(suffixRegex)?.groups ?? {});
|
|
320
|
+
const resources = resources_?.split('\n- ').slice(1);
|
|
321
321
|
return {
|
|
322
322
|
...prefix,
|
|
323
323
|
...suffix,
|
package/dist/core/Siwe.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Siwe.js","sourceRoot":"","sources":["../../src/core/Siwe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAG/B,MAAM,CAAC,MAAM,WAAW,GACtB,8EAA8E,CAAA;AAEhF,MAAM,CAAC,MAAM,OAAO,GAClB,gLAAgL,CAAA;AAElL,MAAM,CAAC,MAAM,cAAc,GAAG,2BAA2B,CAAA;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,mBAAmB,CAAA;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,6BAA6B,CAAA;AAExD,2BAA2B;AAC3B,MAAM,CAAC,MAAM,WAAW,GACtB,0MAA0M,CAAA;AAE5M,2BAA2B;AAC3B,MAAM,CAAC,MAAM,WAAW,GACtB,
|
|
1
|
+
{"version":3,"file":"Siwe.js","sourceRoot":"","sources":["../../src/core/Siwe.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,8 @@ import type * as Errors from './Errors.js';
|
|
|
5
5
|
import * as Frame from './Frame.js';
|
|
6
6
|
import * as FrameSignature from './FrameSignature.js';
|
|
7
7
|
import * as Hex from './Hex.js';
|
|
8
|
-
import
|
|
8
|
+
import * as FrameNonce from './internal/frameNonce.js';
|
|
9
|
+
import type { Compute, ExactPartial, OneOf, UnionCompute } from './internal/types.js';
|
|
9
10
|
import * as Signature from './Signature.js';
|
|
10
11
|
/**
|
|
11
12
|
* A Transaction as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/transaction.yaml).
|
|
@@ -111,7 +112,7 @@ export type Eip7702<pending extends boolean = false, bigintType = bigint, number
|
|
|
111
112
|
/** An RPC [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) Transaction as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/transaction.yaml). */
|
|
112
113
|
export type Eip7702Rpc<pending extends boolean = false> = Compute<Eip7702<pending, Hex.Hex, Hex.Hex, ToRpcType['eip7702']>>;
|
|
113
114
|
/** An EIP-8141 frame transaction. */
|
|
114
|
-
export type Eip8141<pending extends boolean = false, bigintType = bigint, numberType = number, type extends string = 'eip8141'> = Compute<Omit<Base<type, pending, bigintType, numberType>, 'chainId' | 'r' | 's' | 'v' | 'yParity'> & {
|
|
115
|
+
export type Eip8141<pending extends boolean = false, bigintType = bigint, numberType = number, type extends string = 'eip8141'> = Compute<Omit<Base<type, pending, bigintType, numberType>, 'chainId' | 'gas' | 'input' | 'to' | 'value' | 'r' | 's' | 'v' | 'yParity'> & ExactPartial<Pick<Base<type, pending, bigintType, numberType>, 'gas' | 'input' | 'to' | 'value'>> & {
|
|
115
116
|
/** Versioned blob hashes. */
|
|
116
117
|
blobVersionedHashes: readonly Hex.Hex[];
|
|
117
118
|
/** Chain ID, retaining bigint precision when needed. */
|
|
@@ -126,6 +127,8 @@ export type Eip8141<pending extends boolean = false, bigintType = bigint, number
|
|
|
126
127
|
maxFeePerGas: bigintType;
|
|
127
128
|
/** Maximum priority fee per gas. */
|
|
128
129
|
maxPriorityFeePerGas: bigintType;
|
|
130
|
+
/** EIP-8250 domains sharing the transaction's `nonce` sequence. */
|
|
131
|
+
nonceKeys?: readonly bigintType[] | undefined;
|
|
129
132
|
/** Frame signature entries. */
|
|
130
133
|
signatures: readonly ([bigintType] extends [Hex.Hex] ? FrameSignature.Rpc : FrameSignature.FrameSignature)[];
|
|
131
134
|
}>;
|
|
@@ -208,7 +211,7 @@ export declare namespace fromRpc {
|
|
|
208
211
|
type Options<pending extends boolean = false> = {
|
|
209
212
|
pending?: pending | boolean | undefined;
|
|
210
213
|
};
|
|
211
|
-
type ErrorType = Signature.extract.ErrorType | Frame.fromRpc.ErrorType | FrameSignature.fromRpc.ErrorType | Errors.GlobalErrorType;
|
|
214
|
+
type ErrorType = Signature.extract.ErrorType | FrameNonce.InvalidError | Frame.fromRpc.ErrorType | FrameSignature.fromRpc.ErrorType | Errors.GlobalErrorType;
|
|
212
215
|
}
|
|
213
216
|
/**
|
|
214
217
|
* Converts an {@link ox#Transaction.Transaction} to an {@link ox#Transaction.Rpc}.
|
|
@@ -252,6 +255,6 @@ export declare namespace toRpc {
|
|
|
252
255
|
type Options<pending extends boolean = false> = {
|
|
253
256
|
pending?: pending | boolean | undefined;
|
|
254
257
|
};
|
|
255
|
-
type ErrorType = Signature.extract.ErrorType | Frame.toRpc.ErrorType | FrameSignature.toRpc.ErrorType | Errors.GlobalErrorType;
|
|
258
|
+
type ErrorType = Signature.extract.ErrorType | FrameNonce.InvalidError | Frame.toRpc.ErrorType | FrameSignature.toRpc.ErrorType | Errors.GlobalErrorType;
|
|
256
259
|
}
|
|
257
260
|
//# sourceMappingURL=Transaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../src/core/Transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAClD,OAAO,KAAK,KAAK,OAAO,MAAM,cAAc,CAAA;AAC5C,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../src/core/Transaction.ts"],"names":[],"mappings":"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"}
|
package/dist/core/Transaction.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as Authorization from './Authorization.js';
|
|
2
2
|
import * as Frame from './Frame.js';
|
|
3
3
|
import * as FrameSignature from './FrameSignature.js';
|
|
4
|
+
import * as FrameNonce from './internal/frameNonce.js';
|
|
4
5
|
import * as Quantity from './internal/quantity.js';
|
|
5
6
|
import * as Signature from './Signature.js';
|
|
6
7
|
/** Type to RPC Type mapping. */
|
|
@@ -88,6 +89,11 @@ export function fromRpc(transaction, _options = {}) {
|
|
|
88
89
|
? chainId
|
|
89
90
|
: Number(chainId);
|
|
90
91
|
}
|
|
92
|
+
if (transaction.type === '0x6' && transaction.nonceKeys !== undefined) {
|
|
93
|
+
if (transaction.nonce === undefined)
|
|
94
|
+
throw new FrameNonce.InvalidError('A keyed transaction result requires nonce.');
|
|
95
|
+
transaction_.nonceKeys = FrameNonce.fromRpc(transaction.nonceKeys, transaction.nonce);
|
|
96
|
+
}
|
|
91
97
|
if (transaction.type === '0x6' && transaction.frames) {
|
|
92
98
|
transaction_.frames = transaction.frames.map(Frame.fromRpc);
|
|
93
99
|
transaction_.signatures = (transaction.signatures ?? []).map(FrameSignature.fromRpc);
|
|
@@ -172,6 +178,8 @@ export function toRpc(transaction, _options) {
|
|
|
172
178
|
: Quantity.fromNumberish(transaction.transactionIndex);
|
|
173
179
|
rpc.type = toRpcType[transaction.type] ?? transaction.type;
|
|
174
180
|
rpc.value = Quantity.fromNumberish(transaction.value ?? 0n);
|
|
181
|
+
if (transaction.type === 'eip8141' && transaction.nonceKeys !== undefined)
|
|
182
|
+
rpc.nonceKeys = FrameNonce.toRpc(transaction.nonceKeys, transaction.nonce);
|
|
175
183
|
if (transaction.type === 'eip8141' && transaction.frames) {
|
|
176
184
|
rpc.frames = transaction.frames.map(Frame.toRpc);
|
|
177
185
|
rpc.signatures = transaction.signatures.map(FrameSignature.toRpc);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../src/core/Transaction.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../src/core/Transaction.ts"],"names":[],"mappings":"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"}
|