tempo.ts 0.0.6 → 0.1.0

package/src/ox/Transaction.ts

@@ -7,7 +7,9 @@ import * as Secp256k1 from 'ox/Secp256k1'
 import * as Signature from 'ox/Signature'
 import * as ox_Transaction from 'ox/Transaction'
 import type { Compute, OneOf, UnionCompute } from '../internal/types.js'
-import * as TransactionEnvelopeFeeToken from './TransactionEnvelopeFeeToken.js'
+import * as SignatureEnvelope from './SignatureEnvelope.js'
+import type { Call } from './TransactionEnvelopeAA.js'
+import * as TransactionEnvelopeAA from './TransactionEnvelopeAA.js'
 
 /**
  * A Transaction as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/transaction.yaml).
@@ -18,7 +20,7 @@ export type Transaction<
   numberType = number,
 > = UnionCompute<
   OneOf<
-    | FeeToken<pending, bigintType, numberType>
+    | AA<pending, bigintType, numberType>
     | ox_Transaction.Transaction<pending, bigintType, numberType>
   >
 >
@@ -27,25 +29,31 @@ export type Transaction<
  * An RPC Transaction as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/transaction.yaml).
  */
 export type Rpc<pending extends boolean = false> = UnionCompute<
-  OneOf<FeeTokenRpc<pending> | ox_Transaction.Rpc<pending>>
+  OneOf<AARpc<pending> | ox_Transaction.Rpc<pending>>
 >
 
 /**
- * Fee token transaction.
+ * Native account abstraction transaction.
  */
-export type FeeToken<
+export type AA<
   pending extends boolean = false,
   bigintType = bigint,
   numberType = number,
-  type extends string = 'feeToken',
+  type extends string = 'aa',
 > = Compute<
-  ox_Transaction.Base<type, pending, bigintType, numberType> & {
+  Omit<
+    ox_Transaction.Base<type, pending, bigintType, numberType>,
+    // AA transactions don't have these properties.
+    'input' | 'to' | 'value' | 'v' | 'r' | 's' | 'yParity'
+  > & {
     /** EIP-2930 Access List. */
     accessList: AccessList.AccessList
     /** EIP-7702 Authorization list for the transaction. */
-    authorizationList: Authorization.ListSigned<bigintType, numberType>
-    /** Fee token preference. */
-    feeToken: Address.Address
+    authorizationList?:
+      | Authorization.ListSigned<bigintType, numberType>
+      | undefined
+    /** Array of calls to execute. */
+    calls: readonly Call<bigintType>[]
     /** Fee payer address. */
     feePayer?: Address.Address | undefined
     /** Fee payer signature. */
@@ -61,26 +69,48 @@ export type FeeToken<
           v?: numberType | undefined
         }
       | undefined
+    /** Fee token preference. */
+    feeToken: Address.Address
     /** Effective gas price paid by the sender in wei. */
     gasPrice?: bigintType | undefined
     /** Total fee per gas in wei (gasPrice/baseFeePerGas + maxPriorityFeePerGas). */
     maxFeePerGas: bigintType
     /** Max priority fee per gas (in wei). */
     maxPriorityFeePerGas: bigintType
+    /** Nonce key for 2D nonce system (192 bits). */
+    nonceKey?: bigintType | undefined
+    /** Sender signature. */
+    signature: SignatureEnvelope.SignatureEnvelope<bigintType, numberType>
+    /** Transaction can only be included in a block before this timestamp. */
+    validBefore?: numberType | undefined
+    /** Transaction can only be included in a block after this timestamp. */
+    validAfter?: numberType | undefined
   }
 >
 
 /**
- * Fee token transaction in RPC format.
+ * Native account abstraction transaction in RPC format.
  */
-export type FeeTokenRpc<pending extends boolean = false> = Compute<
-  FeeToken<pending, Hex.Hex, Hex.Hex, ToRpcType['feeToken']>
+export type AARpc<pending extends boolean = false> = Compute<
+  Omit<
+    AA<pending, Hex.Hex, Hex.Hex, ToRpcType['aa']>,
+    'calls' | 'signature'
+  > & {
+    calls:
+      | readonly {
+          input?: Hex.Hex | undefined
+          to?: Hex.Hex | undefined
+          value?: Hex.Hex | undefined
+        }[]
+      | undefined
+    signature: SignatureEnvelope.SignatureEnvelopeRpc
+  }
 >
 
 /** Type to RPC Type mapping. */
 export const toRpcType = {
   ...ox_Transaction.toRpcType,
-  feeToken: '0x77',
+  aa: '0x76',
 } as const
 
 /** Type to RPC Type mapping. */
@@ -91,7 +121,7 @@ export type ToRpcType = typeof toRpcType & {
 /** RPC Type to Type mapping. */
 export const fromRpcType = {
   ...ox_Transaction.fromRpcType,
-  '0x77': 'feeToken',
+  '0x76': 'aa',
 } as const
 
 /** RPC Type to Type mapping. */
@@ -113,22 +143,31 @@ export type FromRpcType = typeof fromRpcType & {
  *   blockHash:
  *     '0xc350d807505fb835650f0013632c5515592987ba169bbc6626d9fc54d91f0f0b',
  *   blockNumber: '0x12f296f',
+ *   calls: [
+ *     {
+ *       input: '0xdeadbeef',
+ *       to: '0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad',
+ *       value: '0x9b6e64a8ec60000',
+ *     },
+ *   ],
  *   feeToken: '0x20c0000000000000000000000000000000000000',
  *   transactionIndex: '0x2',
  *   from: '0x814e5e0e31016b9a7f138c76b7e7b2bb5c1ab6a6',
- *   to: '0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad',
  *   value: '0x9b6e64a8ec60000',
  *   gas: '0x43f5d',
  *   maxFeePerGas: '0x2ca6ae494',
  *   maxPriorityFeePerGas: '0x41cc3c0',
  *   input:
  *     '0x3593564c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000006643504700000000000000000000000000000000000000000000000000000000000000040b080604000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000009b6e64a8ec600000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000009b6e64a8ec60000000000000000000000000000000000000000000000000000019124bb5ae978c000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000c56c7a0eaa804f854b536a5f3d5f49d2ec4b12b80000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c56c7a0eaa804f854b536a5f3d5f49d2ec4b12b8000000000000000000000000000000fee13a103a10d593b9ae06b3e05f2e7e1c00000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c56c7a0eaa804f854b536a5f3d5f49d2ec4b12b800000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000190240001b9872b',
- *   r: '0x635dc2033e60185bb36709c29c75d64ea51dfbd91c32ef4be198e4ceb169fb4d',
- *   s: '0x50c2667ac4c771072746acfdcf1f1483336dcca8bd2df47cd83175dbe60f0540',
- *   yParity: '0x0',
+ *   signature: {
+ *     r: '0x635dc2033e60185bb36709c29c75d64ea51dfbd91c32ef4be198e4ceb169fb4d',
+ *     s: '0x50c2667ac4c771072746acfdcf1f1483336dcca8bd2df47cd83175dbe60f0540',
+ *     type: 'secp256k1',
+ *     yParity: '0x0',
+ *   },
  *   chainId: '0x1',
  *   accessList: [],
- *   type: '0x77',
+ *   type: '0x76',
  * })
  * ```
  *
@@ -149,6 +188,21 @@ export function fromRpc<
   ) as Transaction<pending>
 
   transaction_.type = fromRpcType[transaction.type as keyof typeof fromRpcType]
+
+  if (transaction.calls)
+    transaction_.calls = transaction.calls.map((call) => ({
+      to: call.to,
+      value: call.value ? BigInt(call.value) : undefined,
+      data: call.input,
+    }))
+  if (transaction.feeToken) transaction_.feeToken = transaction.feeToken
+  if (transaction.nonceKey) transaction_.nonceKey = BigInt(transaction.nonceKey)
+  if (transaction.signature)
+    transaction_.signature = SignatureEnvelope.fromRpc(transaction.signature)
+  if (transaction.validAfter)
+    transaction_.validAfter = Number(transaction.validAfter)
+  if (transaction.validBefore)
+    transaction_.validBefore = Number(transaction.validBefore)
   if (transaction.feePayerSignature) {
     transaction_.feePayerSignature = Signature.fromRpc(
       transaction.feePayerSignature,
@@ -159,14 +213,13 @@ export function fromRpc<
 
     // TODO: remove once `feePayer` returned on `eth_getTxBy*`.
     transaction_.feePayer = Secp256k1.recoverAddress({
-      payload: TransactionEnvelopeFeeToken.getFeePayerSignPayload(
+      payload: TransactionEnvelopeAA.getFeePayerSignPayload(
         transaction_ as never,
         { sender: transaction.from },
       ),
       signature: transaction_.feePayerSignature,
     })
   }
-  if (transaction.feeToken) transaction_.feeToken = transaction.feeToken
 
   return transaction_ as never
 }
@@ -191,6 +244,13 @@ export declare namespace fromRpc {
  *   blockHash:
  *     '0xc350d807505fb835650f0013632c5515592987ba169bbc6626d9fc54d91f0f0b',
  *   blockNumber: 19868015n,
+ *   calls: [
+ *     {
+ *       data: '0xdeadbeef',
+ *       to: '0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad',
+ *       value: 700000000000000000n,
+ *     },
+ *   ],
  *   chainId: 1,
  *   feeToken: '0x20c0000000000000000000000000000000000000',
  *   from: '0x814e5e0e31016b9a7f138c76b7e7b2bb5c1ab6a6',
@@ -201,14 +261,16 @@ export declare namespace fromRpc {
  *   maxFeePerGas: 11985937556n,
  *   maxPriorityFeePerGas: 68993984n,
  *   nonce: 855n,
- *   r: 44944627813007772897391531230081695102703289123332187696115181104739239197517n,
- *   s: 36528503505192438307355164441104001310566505351980369085208178712678799181120n,
- *   to: '0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad',
+ *   signature: {
+ *     signature: {
+ *       r: 44944627813007772897391531230081695102703289123332187696115181104739239197517n,
+ *       s: 36528503505192438307355164441104001310566505351980369085208178712678799181120n,
+ *       yParity: 0,
+ *     },
+ *     type: 'secp256k1',
+ *   },
  *   transactionIndex: 2,
- *   type: 'feeToken',
- *   v: 27,
- *   value: 700000000000000000n,
- *   yParity: 0,
+ *   type: 'aa',
  * })
  * ```
  *
@@ -224,6 +286,13 @@ export function toRpc<pending extends boolean = false>(
   ) as Rpc<pending>
 
   rpc.type = toRpcType[transaction.type as keyof typeof toRpcType]
+
+  if (transaction.calls)
+    rpc.calls = transaction.calls.map((call) => ({
+      to: call.to,
+      value: call.value ? Hex.fromNumber(call.value) : undefined,
+      data: call.data,
+    }))
   if (transaction.feeToken) rpc.feeToken = transaction.feeToken
   if (transaction.feePayerSignature) {
     rpc.feePayerSignature = Signature.toRpc(
@@ -234,6 +303,12 @@ export function toRpc<pending extends boolean = false>(
     )
     rpc.feePayer = transaction.feePayer
   }
+  if (transaction.signature)
+    rpc.signature = SignatureEnvelope.toRpc(transaction.signature)
+  if (typeof transaction.validAfter === 'number')
+    rpc.validAfter = Hex.fromNumber(transaction.validAfter)
+  if (typeof transaction.validBefore === 'number')
+    rpc.validBefore = Hex.fromNumber(transaction.validBefore)
 
   return rpc as Rpc<pending>
 }