tempo.ts 0.0.6 → 0.1.0

package/dist/ox/TransactionEnvelopeAA.js

@@ -0,0 +1,528 @@
+import * as AccessList from 'ox/AccessList';
+import * as Address from 'ox/Address';
+import * as Errors from 'ox/Errors';
+import * as Hash from 'ox/Hash';
+import * as Hex from 'ox/Hex';
+import * as Rlp from 'ox/Rlp';
+import * as Signature from 'ox/Signature';
+import * as TransactionEnvelope from 'ox/TransactionEnvelope';
+import * as SignatureEnvelope from './SignatureEnvelope.js';
+import * as TokenId from './TokenId.js';
+export const feePayerMagic = '0x78';
+export const serializedType = '0x76';
+export const type = 'aa';
+/**
+ * Asserts a {@link ox#TransactionEnvelopeAA.TransactionEnvelopeAA} is valid.
+ *
+ * @example
+ * ```ts twoslash
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * TransactionEnvelopeAA.assert({
+ *   calls: [{ to: '0x0000000000000000000000000000000000000000', value: 0n }],
+ *   chainId: 1,
+ *   maxFeePerGas: 1000000000n,
+ * })
+ * ```
+ *
+ * @param envelope - The transaction envelope to assert.
+ */
+export function assert(envelope) {
+    const { calls, chainId, maxFeePerGas, maxPriorityFeePerGas, validBefore, validAfter, } = envelope;
+    // Calls must not be empty
+    if (!calls || calls.length === 0)
+        throw new CallsEmptyError();
+    // validBefore must be greater than validAfter if both are set
+    if (typeof validBefore === 'number' &&
+        typeof validAfter === 'number' &&
+        validBefore <= validAfter) {
+        throw new InvalidValidityWindowError({
+            validBefore: validBefore,
+            validAfter: validAfter,
+        });
+    }
+    // Validate each call
+    if (calls)
+        for (const call of calls)
+            if (call.to)
+                Address.assert(call.to, { strict: false });
+    // Validate chain ID
+    if (chainId <= 0)
+        throw new TransactionEnvelope.InvalidChainIdError({ chainId });
+    // Validate max fee per gas
+    if (maxFeePerGas && BigInt(maxFeePerGas) > 2n ** 256n - 1n)
+        throw new TransactionEnvelope.FeeCapTooHighError({
+            feeCap: maxFeePerGas,
+        });
+    if (maxPriorityFeePerGas &&
+        maxFeePerGas &&
+        maxPriorityFeePerGas > maxFeePerGas)
+        throw new TransactionEnvelope.TipAboveFeeCapError({
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+        });
+}
+/**
+ * Deserializes a {@link ox#TransactionEnvelopeAA.TransactionEnvelopeAA} from its serialized form.
+ *
+ * @example
+ * ```ts twoslash
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.deserialize('0x76f84a0182031184773594008477359400809470997970c51812dc3a010c7d01b50e0d17dc79c8880de0b6b3a764000080c0808080')
+ * // @log: {
+ * // @log:   type: 'aa',
+ * // @log:   nonce: 785n,
+ * // @log:   maxFeePerGas: 2000000000n,
+ * // @log:   gas: 1000000n,
+ * // @log:   calls: [{ to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', value: 1000000000000000000n }],
+ * // @log: }
+ * ```
+ *
+ * @param serialized - The serialized transaction.
+ * @returns Deserialized Transaction Envelope.
+ */
+export function deserialize(serialized) {
+    const transactionArray = Rlp.toHex(Hex.slice(serialized, 1));
+    const [chainId, maxPriorityFeePerGas, maxFeePerGas, gas, calls, accessList, nonceKey, nonce, validBefore, validAfter, feeToken, feePayerSignatureOrSender, signature,] = transactionArray;
+    if (!(transactionArray.length === 12 || transactionArray.length === 13))
+        throw new TransactionEnvelope.InvalidSerializedError({
+            attributes: {
+                chainId,
+                maxPriorityFeePerGas,
+                maxFeePerGas,
+                gas,
+                calls,
+                accessList,
+                nonceKey,
+                nonce,
+                validBefore,
+                validAfter,
+                feeToken,
+                feePayerSignatureOrSender,
+                ...(transactionArray.length > 12
+                    ? {
+                        signature,
+                    }
+                    : {}),
+            },
+            serialized,
+            type,
+        });
+    let transaction = {
+        chainId: Number(chainId),
+        type,
+    };
+    if (Hex.validate(gas) && gas !== '0x')
+        transaction.gas = BigInt(gas);
+    if (Hex.validate(nonce))
+        transaction.nonce = nonce === '0x' ? 0n : BigInt(nonce);
+    if (Hex.validate(maxFeePerGas) && maxFeePerGas !== '0x')
+        transaction.maxFeePerGas = BigInt(maxFeePerGas);
+    if (Hex.validate(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
+        transaction.maxPriorityFeePerGas = BigInt(maxPriorityFeePerGas);
+    if (Hex.validate(nonceKey))
+        transaction.nonceKey = nonceKey === '0x' ? 0n : BigInt(nonceKey);
+    if (Hex.validate(validBefore) && validBefore !== '0x')
+        transaction.validBefore = Number(validBefore);
+    if (Hex.validate(validAfter) && validAfter !== '0x')
+        transaction.validAfter = Number(validAfter);
+    if (Hex.validate(feeToken) && feeToken !== '0x')
+        transaction.feeToken = feeToken;
+    // Parse calls array
+    if (calls && calls !== '0x') {
+        const callsArray = calls;
+        transaction.calls = callsArray.map((callTuple) => {
+            const [to, value, data] = callTuple;
+            const call = {};
+            if (to && to !== '0x')
+                call.to = to;
+            if (value && value !== '0x')
+                call.value = BigInt(value);
+            if (data && data !== '0x')
+                call.data = data;
+            return call;
+        });
+    }
+    if (accessList?.length !== 0 && accessList !== '0x')
+        transaction.accessList = AccessList.fromTupleList(accessList);
+    if (feePayerSignatureOrSender !== '0x' &&
+        feePayerSignatureOrSender !== undefined) {
+        if (feePayerSignatureOrSender === '0x00' ||
+            Address.validate(feePayerSignatureOrSender))
+            transaction.feePayerSignature = null;
+        else
+            transaction.feePayerSignature = Signature.fromTuple(feePayerSignatureOrSender);
+    }
+    const signatureEnvelope = signature
+        ? SignatureEnvelope.deserialize(signature)
+        : undefined;
+    if (signatureEnvelope)
+        transaction = {
+            ...transaction,
+            signature: signatureEnvelope,
+        };
+    assert(transaction);
+    return transaction;
+}
+/**
+ * Converts an arbitrary transaction object into an AA Transaction Envelope.
+ *
+ * @example
+ * ```ts twoslash
+ * import { Value } from 'ox'
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.from({ // [!code focus]
+ *   chainId: 1, // [!code focus]
+ *   calls: [{ to: '0x0000000000000000000000000000000000000000', value: Value.fromEther('1') }], // [!code focus]
+ *   maxFeePerGas: Value.fromGwei('10'), // [!code focus]
+ *   maxPriorityFeePerGas: Value.fromGwei('1'), // [!code focus]
+ * }) // [!code focus]
+ * ```
+ *
+ * @example
+ * ### Attaching Signatures
+ *
+ * It is possible to attach a `signature` to the transaction envelope.
+ *
+ * ```ts twoslash
+ * // @noErrors
+ * import { Secp256k1, Value } from 'ox'
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.from({
+ *   chainId: 1,
+ *   calls: [{ to: '0x0000000000000000000000000000000000000000', value: Value.fromEther('1') }],
+ *   maxFeePerGas: Value.fromGwei('10'),
+ *   maxPriorityFeePerGas: Value.fromGwei('1'),
+ * })
+ *
+ * const signature = Secp256k1.sign({
+ *   payload: TransactionEnvelopeAA.getSignPayload(envelope),
+ *   privateKey: '0x...',
+ * })
+ *
+ * const envelope_signed = TransactionEnvelopeAA.from(envelope, { // [!code focus]
+ *   signature, // [!code focus]
+ * }) // [!code focus]
+ * // @log: {
+ * // @log:   chainId: 1,
+ * // @log:   calls: [{ to: '0x0000000000000000000000000000000000000000', value: 1000000000000000000n }],
+ * // @log:   maxFeePerGas: 10000000000n,
+ * // @log:   maxPriorityFeePerGas: 1000000000n,
+ * // @log:   type: 'aa',
+ * // @log:   r: 125...n,
+ * // @log:   s: 642...n,
+ * // @log:   yParity: 0,
+ * // @log: }
+ * ```
+ *
+ * @example
+ * ### From Serialized
+ *
+ * It is possible to instantiate an AA Transaction Envelope from a {@link ox#TransactionEnvelopeAA.Serialized} value.
+ *
+ * ```ts twoslash
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.from('0x76f84a0182031184773594008477359400809470997970c51812dc3a010c7d01b50e0d17dc79c8880de0b6b3a764000080c0808080')
+ * // @log: {
+ * // @log:   chainId: 1,
+ * // @log:   calls: [{ to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', value: 1000000000000000000n }],
+ * // @log:   maxFeePerGas: 10000000000n,
+ * // @log:   type: 'aa',
+ * // @log: }
+ * ```
+ *
+ * @param envelope - The transaction object to convert.
+ * @param options - Options.
+ * @returns An AA Transaction Envelope.
+ */
+export function from(envelope, options = {}) {
+    const { feePayerSignature, signature } = options;
+    const envelope_ = (typeof envelope === 'string' ? deserialize(envelope) : envelope);
+    assert(envelope_);
+    return {
+        ...envelope_,
+        ...(signature ? { signature: SignatureEnvelope.from(signature) } : {}),
+        ...(feePayerSignature
+            ? { feePayerSignature: Signature.from(feePayerSignature) }
+            : {}),
+        type: 'aa',
+    };
+}
+/**
+ * Serializes a {@link ox#TransactionEnvelopeAA.TransactionEnvelopeAA}.
+ *
+ * @example
+ * ```ts twoslash
+ * // @noErrors
+ * import { Value } from 'ox'
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.from({
+ *   chainId: 1,
+ *   calls: [{ to: '0x0000000000000000000000000000000000000000', value: Value.fromEther('1') }],
+ *   maxFeePerGas: Value.fromGwei('10'),
+ * })
+ *
+ * const serialized = TransactionEnvelopeAA.serialize(envelope) // [!code focus]
+ * ```
+ *
+ * @example
+ * ### Attaching Signatures
+ *
+ * It is possible to attach a `signature` to the serialized Transaction Envelope.
+ *
+ * ```ts twoslash
+ * // @noErrors
+ * import { Secp256k1, Value } from 'ox'
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.from({
+ *   chainId: 1,
+ *   calls: [{ to: '0x0000000000000000000000000000000000000000', value: Value.fromEther('1') }],
+ *   maxFeePerGas: Value.fromGwei('10'),
+ * })
+ *
+ * const signature = Secp256k1.sign({
+ *   payload: TransactionEnvelopeAA.getSignPayload(envelope),
+ *   privateKey: '0x...',
+ * })
+ *
+ * const serialized = TransactionEnvelopeAA.serialize(envelope, { // [!code focus]
+ *   signature, // [!code focus]
+ * }) // [!code focus]
+ *
+ * // ... send `serialized` transaction to JSON-RPC `eth_sendRawTransaction`
+ * ```
+ *
+ * @param envelope - The Transaction Envelope to serialize.
+ * @param options - Options.
+ * @returns The serialized Transaction Envelope.
+ */
+export function serialize(envelope, options = {}) {
+    const { accessList, calls, chainId, feeToken, gas, nonce, nonceKey, maxFeePerGas, maxPriorityFeePerGas, validBefore, validAfter, } = envelope;
+    assert(envelope);
+    const accessTupleList = AccessList.toTupleList(accessList);
+    const signature = options.signature || envelope.signature;
+    // Encode calls as RLP list of [to, value, data] tuples
+    const callsTupleList = calls.map((call) => [
+        call.to ?? '0x',
+        call.value ? Hex.fromNumber(call.value) : '0x',
+        call.data ?? '0x',
+    ]);
+    const feePayerSignatureOrSender = (() => {
+        if (options.sender)
+            return options.sender;
+        const feePayerSignature = typeof options.feePayerSignature !== 'undefined'
+            ? options.feePayerSignature
+            : envelope.feePayerSignature;
+        if (feePayerSignature === null)
+            return '0x00';
+        if (!feePayerSignature)
+            return '0x';
+        return Signature.toTuple(feePayerSignature);
+    })();
+    const serialized = [
+        Hex.fromNumber(chainId),
+        maxPriorityFeePerGas ? Hex.fromNumber(maxPriorityFeePerGas) : '0x',
+        maxFeePerGas ? Hex.fromNumber(maxFeePerGas) : '0x',
+        gas ? Hex.fromNumber(gas) : '0x',
+        callsTupleList,
+        accessTupleList,
+        nonceKey ? Hex.fromNumber(nonceKey) : '0x',
+        nonce ? Hex.fromNumber(nonce) : '0x',
+        typeof validBefore === 'number' ? Hex.fromNumber(validBefore) : '0x',
+        typeof validAfter === 'number' ? Hex.fromNumber(validAfter) : '0x',
+        typeof feeToken === 'bigint' || typeof feeToken === 'string'
+            ? TokenId.toAddress(feeToken)
+            : '0x',
+        feePayerSignatureOrSender,
+        ...(signature
+            ? [SignatureEnvelope.serialize(SignatureEnvelope.from(signature))]
+            : []),
+    ];
+    return Hex.concat(options.format === 'feePayer' ? feePayerMagic : serializedType, Rlp.fromHex(serialized));
+}
+/**
+ * Returns the payload to sign for a {@link ox#TransactionEnvelopeAA.TransactionEnvelopeAA}.
+ *
+ * @example
+ * The example below demonstrates how to compute the sign payload which can be used
+ * with ECDSA signing utilities like {@link ox#Secp256k1.(sign:function)}.
+ *
+ * ```ts twoslash
+ * // @noErrors
+ * import { Secp256k1 } from 'ox'
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.from({
+ *   chainId: 1,
+ *   calls: [{ to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', value: 1000000000000000000n }],
+ *   nonce: 0n,
+ *   maxFeePerGas: 1000000000n,
+ *   gas: 21000n,
+ * })
+ *
+ * const payload = TransactionEnvelopeAA.getSignPayload(envelope) // [!code focus]
+ * // @log: '0x...'
+ *
+ * const signature = Secp256k1.sign({ payload, privateKey: '0x...' })
+ * ```
+ *
+ * @param envelope - The transaction envelope to get the sign payload for.
+ * @returns The sign payload.
+ */
+export function getSignPayload(envelope) {
+    return hash(envelope, { presign: true });
+}
+/**
+ * Hashes a {@link ox#TransactionEnvelopeAA.TransactionEnvelopeAA}. This is the "transaction hash".
+ *
+ * @example
+ * ```ts twoslash
+ * // @noErrors
+ * import { Secp256k1 } from 'ox'
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.from({
+ *   chainId: 1,
+ *   calls: [{ to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', value: 1000000000000000000n }],
+ *   nonce: 0n,
+ *   maxFeePerGas: 1000000000n,
+ *   gas: 21000n,
+ * })
+ *
+ * const signature = Secp256k1.sign({
+ *   payload: TransactionEnvelopeAA.getSignPayload(envelope),
+ *   privateKey: '0x...'
+ * })
+ *
+ * const envelope_signed = TransactionEnvelopeAA.from(envelope, { signature })
+ *
+ * const hash = TransactionEnvelopeAA.hash(envelope_signed) // [!code focus]
+ * ```
+ *
+ * @param envelope - The AA Transaction Envelope to hash.
+ * @param options - Options.
+ * @returns The hash of the transaction envelope.
+ */
+export function hash(envelope, options = {}) {
+    const serialized = serialize({
+        ...envelope,
+        ...(options.presign
+            ? {
+                signature: undefined,
+            }
+            : {}),
+    });
+    return Hash.keccak256(serialized);
+}
+/**
+ * Returns the fee payer payload to sign for a {@link ox#TransactionEnvelopeAA.TransactionEnvelopeAA}.
+ *
+ * @example
+ * ```ts twoslash
+ * // @noErrors
+ * import { Secp256k1 } from 'ox'
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const envelope = TransactionEnvelopeAA.from({
+ *   chainId: 1,
+ *   calls: [{ to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', value: 1000000000000000000n }],
+ *   nonce: 0n,
+ *   maxFeePerGas: 1000000000n,
+ *   gas: 21000n,
+ * })
+ *
+ * const payload = TransactionEnvelopeAA.getFeePayerSignPayload(envelope, {
+ *   sender: '0xd8da6bf26964af9d7eed9e03e53415d37aa96045'
+ * }) // [!code focus]
+ * // @log: '0x...'
+ *
+ * const signature = Secp256k1.sign({ payload, privateKey: '0x...' })
+ * ```
+ *
+ * @param envelope - The transaction envelope to get the fee payer sign payload for.
+ * @param options - Options.
+ * @returns The fee payer sign payload.
+ */
+export function getFeePayerSignPayload(envelope, options) {
+    const { sender } = options;
+    const serialized = serialize({ ...envelope, signature: undefined }, {
+        sender,
+        format: 'feePayer',
+    });
+    return Hash.keccak256(serialized);
+}
+/**
+ * Validates a {@link ox#TransactionEnvelopeAA.TransactionEnvelopeAA}. Returns `true` if the envelope is valid, `false` otherwise.
+ *
+ * @example
+ * ```ts twoslash
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * const valid = TransactionEnvelopeAA.validate({
+ *   calls: [{ to: '0x0000000000000000000000000000000000000000', value: 0n }],
+ *   chainId: 1,
+ *   maxFeePerGas: 1000000000n,
+ * })
+ * // @log: true
+ * ```
+ *
+ * @param envelope - The transaction envelope to validate.
+ */
+export function validate(envelope) {
+    try {
+        assert(envelope);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Thrown when a transaction's calls list is empty.
+ *
+ * @example
+ * ```ts twoslash
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * TransactionEnvelopeAA.assert({
+ *   calls: [],
+ *   chainId: 1,
+ * })
+ * // @error: TransactionEnvelopeAA.CallsEmptyError: Calls list cannot be empty.
+ * ```
+ */
+export class CallsEmptyError extends Errors.BaseError {
+    name = 'TransactionEnvelopeAA.CallsEmptyError';
+    constructor() {
+        super('Calls list cannot be empty.');
+    }
+}
+/**
+ * Thrown when validBefore is not greater than validAfter.
+ *
+ * @example
+ * ```ts twoslash
+ * import { TransactionEnvelopeAA } from 'ox/tempo'
+ *
+ * TransactionEnvelopeAA.assert({
+ *   calls: [{ to: '0x0000000000000000000000000000000000000000' }],
+ *   chainId: 1,
+ *   validBefore: 100n,
+ *   validAfter: 200n,
+ * })
+ * // @error: TransactionEnvelopeAA.InvalidValidityWindowError: validBefore (100) must be greater than validAfter (200).
+ * ```
+ */
+export class InvalidValidityWindowError extends Errors.BaseError {
+    name = 'TransactionEnvelopeAA.InvalidValidityWindowError';
+    constructor({ validBefore, validAfter, }) {
+        super(`validBefore (${validBefore}) must be greater than validAfter (${validAfter}).`);
+    }
+}
+//# sourceMappingURL=TransactionEnvelopeAA.js.map

package/dist/ox/TransactionEnvelopeAA.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TransactionEnvelopeAA.js","sourceRoot":"","sources":["../../src/ox/TransactionEnvelopeAA.ts"],"names":[],"mappings":"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"}

package/dist/ox/TransactionRequest.d.ts

@@ -1,14 +1,16 @@
 import type * as Authorization from 'ox/Authorization';
 import type * as Errors from 'ox/Errors';
-import type * as Calls from 'ox/erc7821/Calls';
-import type * as Hex from 'ox/Hex';
+import * as Hex from 'ox/Hex';
 import * as ox_TransactionRequest from 'ox/TransactionRequest';
-import type { Compute } from "../internal/types.js";
-import * as TokenId from "./TokenId.js";
+import type { Compute } from '../internal/types.js';
+import * as TokenId from './TokenId.js';
+import type { Call } from './TransactionEnvelopeAA.js';
 /** A Transaction Request that is generic to all transaction types, as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/4aca1d7a3e5aab24c8f6437131289ad386944eaa/src/schemas/transaction.yaml#L358-L423). */
 export type TransactionRequest<bigintType = bigint, numberType = number, type extends string = string> = Compute<ox_TransactionRequest.TransactionRequest<bigintType, numberType, type> & {
-    calls?: readonly Calls.Call[] | undefined;
+    calls?: readonly Call<bigintType>[] | undefined;
     feeToken?: TokenId.TokenIdOrAddress | undefined;
+    validBefore?: numberType | undefined;
+    validAfter?: numberType | undefined;
 }>;
 /** RPC representation of a {@link ox#TransactionRequest.TransactionRequest}. */
 export type Rpc = TransactionRequest<Hex.Hex, Hex.Hex, string>;

package/dist/ox/TransactionRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionRequest.d.ts","sourceRoot":"","sources":["../../src/ox/TransactionRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACtD,OAAO,KAAK,KAAK,MAAM,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAE9C,OAAO,KAAK,KAAK,GAAG,MAAM,QAAQ,CAAA;AAClC,OAAO,KAAK,qBAAqB,MAAM,uBAAuB,CAAA;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,6BAA4B;AACnD,OAAO,KAAK,OAAO,qBAAoB;AAGvC,wPAAwP;AACxP,MAAM,MAAM,kBAAkB,CAC5B,UAAU,GAAG,MAAM,EACnB,UAAU,GAAG,MAAM,EACnB,IAAI,SAAS,MAAM,GAAG,MAAM,IAC1B,OAAO,CACT,qBAAqB,CAAC,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG;IACvE,KAAK,CAAC,EAAE,SAAS,KAAK,CAAC,IAAI,EAAE,GAAG,SAAS,CAAA;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAA;CAChD,CACF,CAAA;AAED,gFAAgF;AAChF,MAAM,MAAM,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AAE9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,kBAAkB,GAAG,GAAG,CAwBtD;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,KAAY,SAAS,GACjB,aAAa,CAAC,SAAS,CAAC,SAAS,GACjC,GAAG,CAAC,UAAU,CAAC,SAAS,GACxB,MAAM,CAAC,eAAe,CAAA;CAC3B"}
+{"version":3,"file":"TransactionRequest.d.ts","sourceRoot":"","sources":["../../src/ox/TransactionRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACtD,OAAO,KAAK,KAAK,MAAM,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAA;AAC7B,OAAO,KAAK,qBAAqB,MAAM,uBAAuB,CAAA;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAA;AAEtD,wPAAwP;AACxP,MAAM,MAAM,kBAAkB,CAC5B,UAAU,GAAG,MAAM,EACnB,UAAU,GAAG,MAAM,EACnB,IAAI,SAAS,MAAM,GAAG,MAAM,IAC1B,OAAO,CACT,qBAAqB,CAAC,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG;IACvE,KAAK,CAAC,EAAE,SAAS,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,SAAS,CAAA;IAC/C,QAAQ,CAAC,EAAE,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAA;IAC/C,WAAW,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;IACpC,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;CACpC,CACF,CAAA;AAED,gFAAgF;AAChF,MAAM,MAAM,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AAE9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,kBAAkB,GAAG,GAAG,CA+BtD;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,KAAY,SAAS,GACjB,aAAa,CAAC,SAAS,CAAC,SAAS,GACjC,GAAG,CAAC,UAAU,CAAC,SAAS,GACxB,MAAM,CAAC,eAAe,CAAA;CAC3B"}

package/dist/ox/TransactionRequest.js

@@ -1,7 +1,7 @@
-import * as Execute from 'ox/erc7821/Execute';
+import * as Hex from 'ox/Hex';
 import * as ox_TransactionRequest from 'ox/TransactionRequest';
-import * as TokenId from "./TokenId.js";
-import * as Transaction from "./Transaction.js";
+import * as TokenId from './TokenId.js';
+import * as Transaction from './Transaction.js';
 /**
  * Converts a {@link ox#TransactionRequest.TransactionRequest} to a {@link ox#TransactionRequest.Rpc}.
  *
@@ -47,20 +47,29 @@ import * as Transaction from "./Transaction.js";
  */
 export function toRpc(request) {
     const request_rpc = ox_TransactionRequest.toRpc(request);
-    request_rpc.calls = request.calls;
+    if (request.calls)
+        request_rpc.calls = request.calls.map((call) => ({
+            to: call.to ?? '0x',
+            value: call.value ? Hex.fromNumber(call.value) : '0x',
+            data: call.data ?? '0x',
+        }));
     if (typeof request.feeToken !== 'undefined')
         request_rpc.feeToken = TokenId.toAddress(request.feeToken);
-    if (request.calls && request.from) {
+    if (typeof request.validBefore !== 'undefined')
+        request_rpc.validBefore = Hex.fromNumber(request.validBefore);
+    if (typeof request.validAfter !== 'undefined')
+        request_rpc.validAfter = Hex.fromNumber(request.validAfter);
+    if (request.calls ||
+        typeof request.feeToken !== 'undefined' ||
+        typeof request.validBefore !== 'undefined' ||
+        typeof request.validAfter !== 'undefined' ||
+        request.type === 'aa') {
+        request_rpc.type = Transaction.toRpcType.aa;
+        delete request_rpc.data;
+        delete request_rpc.input;
         delete request_rpc.to;
         delete request_rpc.value;
-        delete request_rpc.data;
-        request_rpc.to = request.from;
-        request_rpc.data = Execute.encodeData(request.calls);
     }
-    if (request.calls ||
-        typeof request.feeToken !== 'undefined' ||
-        request.type === 'feeToken')
-        request_rpc.type = Transaction.toRpcType.feeToken;
     return request_rpc;
 }
 //# sourceMappingURL=TransactionRequest.js.map

package/dist/ox/TransactionRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionRequest.js","sourceRoot":"","sources":["../../src/ox/TransactionRequest.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,qBAAqB,MAAM,uBAAuB,CAAA;AAE9D,OAAO,KAAK,OAAO,qBAAoB;AACvC,OAAO,KAAK,WAAW,yBAAwB;AAiB/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,MAAM,UAAU,KAAK,CAAC,OAA2B;IAC/C,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAQ,CAAA;IAE/D,WAAW,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;IAEjC,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACzC,WAAW,CAAC,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE5D,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClC,OAAO,WAAW,CAAC,EAAE,CAAA;QACrB,OAAO,WAAW,CAAC,KAAK,CAAA;QACxB,OAAO,WAAW,CAAC,IAAI,CAAA;QACvB,WAAW,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;QAC7B,WAAW,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACtD,CAAC;IAED,IACE,OAAO,CAAC,KAAK;QACb,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACvC,OAAO,CAAC,IAAI,KAAK,UAAU;QAE3B,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAA;IAEnD,OAAO,WAAW,CAAA;AACpB,CAAC"}
+{"version":3,"file":"TransactionRequest.js","sourceRoot":"","sources":["../../src/ox/TransactionRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAA;AAC7B,OAAO,KAAK,qBAAqB,MAAM,uBAAuB,CAAA;AAE9D,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAoB/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,MAAM,UAAU,KAAK,CAAC,OAA2B;IAC/C,MAAM,WAAW,GAAG,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAQ,CAAA;IAE/D,IAAI,OAAO,CAAC,KAAK;QACf,WAAW,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC/C,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,IAAI;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;YACrD,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;SACxB,CAAC,CAAC,CAAA;IACL,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACzC,WAAW,CAAC,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC5D,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,WAAW;QAC5C,WAAW,CAAC,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAC/D,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,WAAW;QAC3C,WAAW,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAE7D,IACE,OAAO,CAAC,KAAK;QACb,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACvC,OAAO,OAAO,CAAC,WAAW,KAAK,WAAW;QAC1C,OAAO,OAAO,CAAC,UAAU,KAAK,WAAW;QACzC,OAAO,CAAC,IAAI,KAAK,IAAI,EACrB,CAAC;QACD,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC,EAAE,CAAA;QAC3C,OAAO,WAAW,CAAC,IAAI,CAAA;QACvB,OAAO,WAAW,CAAC,KAAK,CAAA;QACxB,OAAO,WAAW,CAAC,EAAE,CAAA;QACrB,OAAO,WAAW,CAAC,KAAK,CAAA;IAC1B,CAAC;IAED,OAAO,WAAW,CAAA;AACpB,CAAC"}

package/dist/ox/index.d.ts

@@ -1,5 +1,6 @@
-export * as TokenId from "./TokenId.js";
-export * as TokenRole from "./TokenRole.js";
-export * as Transaction from "./Transaction.js";
-export * as TransactionEnvelopeFeeToken from "./TransactionEnvelopeFeeToken.js";
+export * as SignatureEnvelope from './SignatureEnvelope.js';
+export * as TokenId from './TokenId.js';
+export * as TokenRole from './TokenRole.js';
+export * as Transaction from './Transaction.js';
+export * as TransactionEnvelopeAA from './TransactionEnvelopeAA.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/ox/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ox/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,qBAAoB;AACvC,OAAO,KAAK,SAAS,uBAAsB;AAC3C,OAAO,KAAK,WAAW,yBAAwB;AAC/C,OAAO,KAAK,2BAA2B,yCAAwC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ox/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}

package/dist/ox/index.js

@@ -1,5 +1,6 @@
-export * as TokenId from "./TokenId.js";
-export * as TokenRole from "./TokenRole.js";
-export * as Transaction from "./Transaction.js";
-export * as TransactionEnvelopeFeeToken from "./TransactionEnvelopeFeeToken.js";
+export * as SignatureEnvelope from './SignatureEnvelope.js';
+export * as TokenId from './TokenId.js';
+export * as TokenRole from './TokenRole.js';
+export * as Transaction from './Transaction.js';
+export * as TransactionEnvelopeAA from './TransactionEnvelopeAA.js';
 //# sourceMappingURL=index.js.map

package/dist/ox/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ox/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,qBAAoB;AACvC,OAAO,KAAK,SAAS,uBAAsB;AAC3C,OAAO,KAAK,WAAW,yBAAwB;AAC/C,OAAO,KAAK,2BAA2B,yCAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ox/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}