tempo.ts 0.8.3 → 0.10.0

package/src/ox/Transaction.test.ts

@@ -65,7 +65,7 @@ describe('fromRpc', () => {
           "type": "secp256k1",
         },
         "transactionIndex": 2,
-        "type": "aa",
+        "type": "tempo",
         "value": 0n,
       }
     `)
@@ -147,7 +147,7 @@ describe('fromRpc', () => {
           "type": "secp256k1",
         },
         "transactionIndex": 2,
-        "type": "aa",
+        "type": "tempo",
         "value": 0n,
       }
     `)
@@ -254,7 +254,7 @@ describe('fromRpc', () => {
           "type": "secp256k1",
         },
         "transactionIndex": 2,
-        "type": "aa",
+        "type": "tempo",
         "value": 0n,
       }
     `)
@@ -294,7 +294,7 @@ describe('toRpc', () => {
         type: 'secp256k1',
       },
       transactionIndex: 2,
-      type: 'aa',
+      type: 'tempo',
     })
     expect(transaction).toMatchInlineSnapshot(`
       {
@@ -370,7 +370,7 @@ describe('toRpc', () => {
         type: 'secp256k1',
       },
       transactionIndex: 2,
-      type: 'aa',
+      type: 'tempo',
     })
     expect(transaction).toMatchInlineSnapshot(`
       {
@@ -465,7 +465,7 @@ describe('toRpc', () => {
         type: 'secp256k1',
       },
       transactionIndex: 2,
-      type: 'aa',
+      type: 'tempo',
     })
     expect(transaction).toMatchInlineSnapshot(`
       {

package/src/ox/Transaction.ts

@@ -1,14 +1,14 @@
 import type * as AccessList from 'ox/AccessList'
 import type * as Address from 'ox/Address'
-import type * as Authorization from 'ox/Authorization'
 import type * as Errors from 'ox/Errors'
 import * as Hex from 'ox/Hex'
 import * as Signature from 'ox/Signature'
 import * as ox_Transaction from 'ox/Transaction'
 import type { Compute, OneOf, UnionCompute } from '../internal/types.js'
+import * as AuthorizationTempo from './AuthorizationTempo.js'
 import * as KeyAuthorization from './KeyAuthorization.js'
 import * as SignatureEnvelope from './SignatureEnvelope.js'
-import type { Call } from './TransactionEnvelopeAA.js'
+import type { Call } from './TransactionEnvelopeTempo.js'
 
 /**
  * A Transaction as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/transaction.yaml).
@@ -19,7 +19,7 @@ export type Transaction<
   numberType = number,
 > = UnionCompute<
   OneOf<
-    | AA<pending, bigintType, numberType>
+    | Tempo<pending, bigintType, numberType>
     | ox_Transaction.Transaction<pending, bigintType, numberType>
   >
 >
@@ -28,28 +28,28 @@ 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<AARpc<pending> | ox_Transaction.Rpc<pending>>
+  OneOf<TempoRpc<pending> | ox_Transaction.Rpc<pending>>
 >
 
 /**
  * Native account abstraction transaction.
  */
-export type AA<
+export type Tempo<
   pending extends boolean = false,
   bigintType = bigint,
   numberType = number,
-  type extends string = 'aa',
+  type extends string = 'tempo',
 > = Compute<
   Omit<
     ox_Transaction.Base<type, pending, bigintType, numberType>,
-    // AA transactions don't have these properties.
+    // Tempo 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>
+      | AuthorizationTempo.ListSigned<bigintType, numberType>
       | undefined
     /** Array of calls to execute. */
     calls: readonly Call<bigintType>[]
@@ -92,11 +92,12 @@ export type AA<
 /**
  * Native account abstraction transaction in RPC format.
  */
-export type AARpc<pending extends boolean = false> = Compute<
+export type TempoRpc<pending extends boolean = false> = Compute<
   Omit<
-    AA<pending, Hex.Hex, Hex.Hex, ToRpcType['aa']>,
-    'calls' | 'keyAuthorization' | 'signature'
+    Tempo<pending, Hex.Hex, Hex.Hex, ToRpcType['tempo']>,
+    'authorizationList' | 'calls' | 'keyAuthorization' | 'signature'
   > & {
+    aaAuthorizationList?: AuthorizationTempo.ListRpc | undefined
     calls:
       | readonly {
           input?: Hex.Hex | undefined
@@ -112,7 +113,7 @@ export type AARpc<pending extends boolean = false> = Compute<
 /** Type to RPC Type mapping. */
 export const toRpcType = {
   ...ox_Transaction.toRpcType,
-  aa: '0x76',
+  tempo: '0x76',
 } as const
 
 /** Type to RPC Type mapping. */
@@ -123,7 +124,7 @@ export type ToRpcType = typeof toRpcType & {
 /** RPC Type to Type mapping. */
 export const fromRpcType = {
   ...ox_Transaction.fromRpcType,
-  '0x76': 'aa',
+  '0x76': 'tempo',
 } as const
 
 /** RPC Type to Type mapping. */
@@ -191,6 +192,12 @@ export function fromRpc<
 
   transaction_.type = fromRpcType[transaction.type as keyof typeof fromRpcType]
 
+  if (transaction.aaAuthorizationList) {
+    transaction_.authorizationList = AuthorizationTempo.fromRpcList(
+      transaction.aaAuthorizationList,
+    )
+    delete (transaction_ as any).aaAuthorizationList
+  }
   if (transaction.calls)
     transaction_.calls = transaction.calls.map((call) => ({
       to: call.to,
@@ -268,7 +275,7 @@ export declare namespace fromRpc {
  *     type: 'secp256k1',
  *   },
  *   transactionIndex: 2,
- *   type: 'aa',
+ *   type: 'tempo',
  * })
  * ```
  *
@@ -285,6 +292,10 @@ export function toRpc<pending extends boolean = false>(
 
   rpc.type = toRpcType[transaction.type as keyof typeof toRpcType]
 
+  if (transaction.authorizationList)
+    rpc.aaAuthorizationList = AuthorizationTempo.toRpcList(
+      transaction.authorizationList as AuthorizationTempo.ListSigned,
+    )
   if (transaction.calls)
     rpc.calls = transaction.calls.map((call) => ({
       to: call.to,