ox 1.0.0-beta.20 → 1.0.0-beta.21

package/dist/tempo/TransactionReceipt.d.ts

@@ -10,13 +10,13 @@ import * as ox_TransactionReceipt from '../core/TransactionReceipt.js';
  *
  * @see {@link https://docs.tempo.xyz/protocol/transactions}
  */
-export type TransactionReceipt<status = ox_TransactionReceipt.Status, type = ox_TransactionReceipt.Type, bigintType = bigint, numberType = number> = Compute<ox_TransactionReceipt.TransactionReceipt<status, type, bigintType, numberType> & {
+export type TransactionReceipt<status = ox_TransactionReceipt.Status, type = Type, bigintType = bigint, numberType = number> = Compute<ox_TransactionReceipt.TransactionReceipt<status, type, bigintType, numberType> & {
     /** Address of the fee payer. */
     feePayer?: Address.Address | undefined;
     /** Address of the fee token. */
     feeToken?: Address.Address | undefined;
 }>;
-export type Rpc = TransactionReceipt<ox_TransactionReceipt.RpcStatus, ox_TransactionReceipt.RpcType, Hex.Hex, Hex.Hex>;
+export type Rpc = TransactionReceipt<ox_TransactionReceipt.RpcStatus, RpcType, Hex.Hex, Hex.Hex>;
 export type Type = 'tempo' | ox_TransactionReceipt.Type;
 export type RpcType = '0x76' | ox_TransactionReceipt.RpcType;
 export type Status = ox_TransactionReceipt.Status;
@@ -161,7 +161,7 @@ export declare namespace fromRpc {
 export declare function toRpc(receipt: toRpc.Input): Rpc;
 export declare namespace toRpc {
     /** Numberish input accepted by {@link ox#TransactionReceipt.(toRpc:function)}. */
-    type Input = TransactionReceipt<ox_TransactionReceipt.Status, ox_TransactionReceipt.Type, Hex.Hex | bigint | number, Hex.Hex | number>;
+    type Input = TransactionReceipt<ox_TransactionReceipt.Status, Type, Hex.Hex | bigint | number, Hex.Hex | number>;
     type ErrorType = ox_TransactionReceipt.toRpc.ErrorType;
 }
 //# sourceMappingURL=TransactionReceipt.d.ts.map

package/dist/tempo/TransactionReceipt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionReceipt.d.ts","sourceRoot":"","sources":["../../src/tempo/TransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,KAAK,qBAAqB,MAAM,+BAA+B,CAAA;AAEtE;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,CAC5B,MAAM,GAAG,qBAAqB,CAAC,MAAM,EACrC,IAAI,GAAG,qBAAqB,CAAC,IAAI,EACjC,UAAU,GAAG,MAAM,EACnB,UAAU,GAAG,MAAM,IACjB,OAAO,CACT,qBAAqB,CAAC,kBAAkB,CACtC,MAAM,EACN,IAAI,EACJ,UAAU,EACV,UAAU,CACX,GAAG;IACF,gCAAgC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;IACtC,gCAAgC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;CACvC,CACF,CAAA;AAED,MAAM,MAAM,GAAG,GAAG,kBAAkB,CAClC,qBAAqB,CAAC,SAAS,EAC/B,qBAAqB,CAAC,OAAO,EAC7B,GAAG,CAAC,GAAG,EACP,GAAG,CAAC,GAAG,CACR,CAAA;AAED,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG,qBAAqB,CAAC,IAAI,CAAA;AAEvD,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAA;AAE5D,MAAM,MAAM,MAAM,GAAG,qBAAqB,CAAC,MAAM,CAAA;AAEjD,MAAM,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAA;AAEvD,gCAAgC;AAChC,eAAO,MAAM,WAAW;;;;;;;CAGd,CAAA;AAEV,gCAAgC;AAChC,eAAO,MAAM,SAAS;;;;;;;CAGZ,CAAA;AAEV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,wBAAgB,OAAO,CAAC,KAAK,CAAC,OAAO,SAAS,GAAG,GAAG,IAAI,EACtD,OAAO,EAAE,OAAO,GAAG,GAAG,GAAG,IAAI,GAC5B,OAAO,SAAS,GAAG,GAAG,kBAAkB,GAAG,IAAI,CAIjD;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAY,SAAS,GAAG,qBAAqB,CAAC,OAAO,CAAC,SAAS,CAAA;CAChE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,GAAG,GAAG,CAS/C;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,kFAAkF;IAClF,KAAY,KAAK,GAAG,kBAAkB,CACpC,qBAAqB,CAAC,MAAM,EAC5B,qBAAqB,CAAC,IAAI,EAC1B,GAAG,CAAC,GAAG,GAAG,MAAM,GAAG,MAAM,EACzB,GAAG,CAAC,GAAG,GAAG,MAAM,CACjB,CAAA;IAED,KAAY,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,SAAS,CAAA;CAC9D"}
+{"version":3,"file":"TransactionReceipt.d.ts","sourceRoot":"","sources":["../../src/tempo/TransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,KAAK,qBAAqB,MAAM,+BAA+B,CAAA;AAEtE;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,CAC5B,MAAM,GAAG,qBAAqB,CAAC,MAAM,EACrC,IAAI,GAAG,IAAI,EACX,UAAU,GAAG,MAAM,EACnB,UAAU,GAAG,MAAM,IACjB,OAAO,CACT,qBAAqB,CAAC,kBAAkB,CACtC,MAAM,EACN,IAAI,EACJ,UAAU,EACV,UAAU,CACX,GAAG;IACF,gCAAgC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;IACtC,gCAAgC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;CACvC,CACF,CAAA;AAED,MAAM,MAAM,GAAG,GAAG,kBAAkB,CAClC,qBAAqB,CAAC,SAAS,EAC/B,OAAO,EACP,GAAG,CAAC,GAAG,EACP,GAAG,CAAC,GAAG,CACR,CAAA;AAED,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG,qBAAqB,CAAC,IAAI,CAAA;AAEvD,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAA;AAE5D,MAAM,MAAM,MAAM,GAAG,qBAAqB,CAAC,MAAM,CAAA;AAEjD,MAAM,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAA;AAEvD,gCAAgC;AAChC,eAAO,MAAM,WAAW;;;;;;;CAGd,CAAA;AAEV,gCAAgC;AAChC,eAAO,MAAM,SAAS;;;;;;;CAGZ,CAAA;AAEV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,wBAAgB,OAAO,CAAC,KAAK,CAAC,OAAO,SAAS,GAAG,GAAG,IAAI,EACtD,OAAO,EAAE,OAAO,GAAG,GAAG,GAAG,IAAI,GAC5B,OAAO,SAAS,GAAG,GAAG,kBAAkB,GAAG,IAAI,CASjD;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAY,SAAS,GAAG,qBAAqB,CAAC,OAAO,CAAC,SAAS,CAAA;CAChE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,GAAG,GAAG,CAU/C;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,kFAAkF;IAClF,KAAY,KAAK,GAAG,kBAAkB,CACpC,qBAAqB,CAAC,MAAM,EAC5B,IAAI,EACJ,GAAG,CAAC,GAAG,GAAG,MAAM,GAAG,MAAM,EACzB,GAAG,CAAC,GAAG,GAAG,MAAM,CACjB,CAAA;IAED,KAAY,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,SAAS,CAAA;CAC9D"}

package/dist/tempo/TransactionReceipt.js

@@ -68,7 +68,13 @@ export const toRpcType = {
  * @returns A TransactionReceipt.
  */
 export function fromRpc(receipt) {
-    return ox_TransactionReceipt.fromRpc(receipt);
+    const decoded = ox_TransactionReceipt.fromRpc(receipt);
+    if (!decoded)
+        return null;
+    return {
+        ...decoded,
+        type: fromRpcType[receipt.type] ?? receipt.type,
+    };
 }
 /**
  * Converts a TransactionReceipt to an RPC receipt.
@@ -133,6 +139,7 @@ export function toRpc(receipt) {
         ...rpc,
         feePayer: receipt.feePayer,
         feeToken: receipt.feeToken,
+        type: toRpcType[receipt.type] ?? receipt.type,
     };
 }
 //# sourceMappingURL=TransactionReceipt.js.map

package/dist/tempo/TransactionReceipt.js.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionReceipt.js","sourceRoot":"","sources":["../../src/tempo/TransactionReceipt.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,qBAAqB,MAAM,+BAA+B,CAAA;AA4CtE,gCAAgC;AAChC,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,qBAAqB,CAAC,WAAW;IACpC,MAAM,EAAE,OAAO;CACP,CAAA;AAEV,gCAAgC;AAChC,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,GAAG,qBAAqB,CAAC,SAAS;IAClC,KAAK,EAAE,MAAM;CACL,CAAA;AAEV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,MAAM,UAAU,OAAO,CACrB,OAA6B;IAE7B,OAAO,qBAAqB,CAAC,OAAO,CAClC,OAAoC,CAC5B,CAAA;AACZ,CAAC;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,MAAM,UAAU,KAAK,CAAC,OAAoB;IACxC,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,CACrC,OAAmD,CAC7C,CAAA;IACR,OAAO;QACL,GAAG,GAAG;QACN,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAA;AACH,CAAC"}
+{"version":3,"file":"TransactionReceipt.js","sourceRoot":"","sources":["../../src/tempo/TransactionReceipt.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,qBAAqB,MAAM,+BAA+B,CAAA;AA4CtE,gCAAgC;AAChC,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,qBAAqB,CAAC,WAAW;IACpC,MAAM,EAAE,OAAO;CACP,CAAA;AAEV,gCAAgC;AAChC,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,GAAG,qBAAqB,CAAC,SAAS;IAClC,KAAK,EAAE,MAAM;CACL,CAAA;AAEV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,MAAM,UAAU,OAAO,CACrB,OAA6B;IAE7B,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAC3C,OAAoC,CACrC,CAAA;IACD,IAAI,CAAC,OAAO;QAAE,OAAO,IAAa,CAAA;IAClC,OAAO;QACL,GAAG,OAAO;QACV,IAAI,EAAG,WAAmB,CAAC,OAAQ,CAAC,IAAI,CAAC,IAAI,OAAQ,CAAC,IAAI;KAClD,CAAA;AACZ,CAAC;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,MAAM,UAAU,KAAK,CAAC,OAAoB;IACxC,MAAM,GAAG,GAAG,qBAAqB,CAAC,KAAK,CACrC,OAAmD,CAC7C,CAAA;IACR,OAAO;QACL,GAAG,GAAG;QACN,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,IAAI,EAAG,SAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI;KACvD,CAAA;AACH,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "ox",
   "description": "Ethereum Standard Library",
   "type": "module",
-  "version": "1.0.0-beta.20",
+  "version": "1.0.0-beta.21",
   "main": "./dist/index.js",
   "sideEffects": false,
   "license": "MIT",

package/src/tempo/TransactionReceipt.test.ts

@@ -0,0 +1,76 @@
+import { TransactionReceipt } from 'ox/tempo'
+import { describe, expect, test } from 'vite-plus/test'
+
+const rpc = {
+  blockHash:
+    '0xc350d807505fb835650f0013632c5515592987ba169bbc6626d9fc54d91f0f0b',
+  blockNumber: '0x12f296f',
+  contractAddress: null,
+  cumulativeGasUsed: '0x82515',
+  effectiveGasPrice: '0x21c2f6c09',
+  feePayer: '0x814e5e0e31016b9a7f138c76b7e7b2bb5c1ab6a6',
+  feeToken: '0x20c0000000000000000000000000000000000001',
+  from: '0x814e5e0e31016b9a7f138c76b7e7b2bb5c1ab6a6',
+  gasUsed: '0x2abba',
+  logs: [],
+  logsBloom: `0x${'00'.repeat(256)}`,
+  status: '0x1',
+  to: '0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad',
+  transactionHash:
+    '0x353fdfc38a2f26115daadee9f5b8392ce62b84f410957967e2ed56b35338cdd0',
+  transactionIndex: '0x2',
+  type: '0x76',
+} as const satisfies TransactionReceipt.Rpc
+
+describe('fromRpc', () => {
+  test('default', () => {
+    const receipt = TransactionReceipt.fromRpc(rpc)
+    expect(receipt).toMatchInlineSnapshot(`
+      {
+        "blobGasPrice": undefined,
+        "blobGasUsed": undefined,
+        "blockHash": "0xc350d807505fb835650f0013632c5515592987ba169bbc6626d9fc54d91f0f0b",
+        "blockNumber": 19868015n,
+        "contractAddress": null,
+        "cumulativeGasUsed": 533781n,
+        "effectiveGasPrice": 9062804489n,
+        "feePayer": "0x814e5e0e31016b9a7f138c76b7e7b2bb5c1ab6a6",
+        "feeToken": "0x20c0000000000000000000000000000000000001",
+        "from": "0x814e5e0e31016b9a7f138c76b7e7b2bb5c1ab6a6",
+        "gasUsed": 175034n,
+        "logs": [],
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "status": "success",
+        "to": "0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad",
+        "transactionHash": "0x353fdfc38a2f26115daadee9f5b8392ce62b84f410957967e2ed56b35338cdd0",
+        "transactionIndex": 2,
+        "type": "tempo",
+      }
+    `)
+  })
+
+  test('behavior: non-tempo type passes through the generic mapping', () => {
+    const receipt = TransactionReceipt.fromRpc({ ...rpc, type: '0x2' })
+    expect(receipt.type).toBe('eip1559')
+  })
+
+  test('behavior: null', () => {
+    expect(TransactionReceipt.fromRpc(null)).toBeNull()
+  })
+})
+
+describe('toRpc', () => {
+  test('default', () => {
+    const receipt = TransactionReceipt.fromRpc(rpc)
+    const encoded = TransactionReceipt.toRpc(receipt)
+    expect(encoded.type).toBe('0x76')
+    expect(encoded.feePayer).toBe(rpc.feePayer)
+    expect(encoded.feeToken).toBe(rpc.feeToken)
+    expect(TransactionReceipt.fromRpc(encoded)).toEqual(receipt)
+  })
+
+  test('behavior: non-tempo type passes through the generic mapping', () => {
+    const receipt = TransactionReceipt.fromRpc({ ...rpc, type: '0x2' })
+    expect(TransactionReceipt.toRpc(receipt).type).toBe('0x2')
+  })
+})

package/src/tempo/TransactionReceipt.ts

@@ -13,7 +13,7 @@ import * as ox_TransactionReceipt from '../core/TransactionReceipt.js'
  */
 export type TransactionReceipt<
   status = ox_TransactionReceipt.Status,
-  type = ox_TransactionReceipt.Type,
+  type = Type,
   bigintType = bigint,
   numberType = number,
 > = Compute<
@@ -32,7 +32,7 @@ export type TransactionReceipt<
 
 export type Rpc = TransactionReceipt<
   ox_TransactionReceipt.RpcStatus,
-  ox_TransactionReceipt.RpcType,
+  RpcType,
   Hex.Hex,
   Hex.Hex
 >
@@ -118,9 +118,14 @@ export const toRpcType = {
 export function fromRpc<const receipt extends Rpc | null>(
   receipt: receipt | Rpc | null,
 ): receipt extends Rpc ? TransactionReceipt : null {
-  return ox_TransactionReceipt.fromRpc(
+  const decoded = ox_TransactionReceipt.fromRpc(
     receipt as ox_TransactionReceipt.Rpc,
-  ) as never
+  )
+  if (!decoded) return null as never
+  return {
+    ...decoded,
+    type: (fromRpcType as any)[receipt!.type] ?? receipt!.type,
+  } as never
 }
 
 export declare namespace fromRpc {
@@ -192,6 +197,7 @@ export function toRpc(receipt: toRpc.Input): Rpc {
     ...rpc,
     feePayer: receipt.feePayer,
     feeToken: receipt.feeToken,
+    type: (toRpcType as any)[receipt.type] ?? receipt.type,
   }
 }
 
@@ -199,7 +205,7 @@ export declare namespace toRpc {
   /** Numberish input accepted by {@link ox#TransactionReceipt.(toRpc:function)}. */
   export type Input = TransactionReceipt<
     ox_TransactionReceipt.Status,
-    ox_TransactionReceipt.Type,
+    Type,
     Hex.Hex | bigint | number,
     Hex.Hex | number
   >

package/src/tempo/e2e.test.ts

@@ -158,7 +158,7 @@ test('behavior: default (secp256k1)', async () => {
       "contractAddress": null,
       "status": "success",
       "to": "0x0000000000000000000000000000000000000000",
-      "type": "0x76",
+      "type": "tempo",
     }
   `)
 })
@@ -365,7 +365,7 @@ test('behavior: default (p256)', async () => {
       "contractAddress": null,
       "status": "success",
       "to": "0x0000000000000000000000000000000000000000",
-      "type": "0x76",
+      "type": "tempo",
     }
   `)
 })
@@ -504,7 +504,7 @@ test('behavior: default (p256 - webcrypto)', async () => {
       "contractAddress": null,
       "status": "success",
       "to": "0x0000000000000000000000000000000000000000",
-      "type": "0x76",
+      "type": "tempo",
     }
   `)
 })
@@ -650,7 +650,7 @@ test('behavior: default (webauthn)', async () => {
       "contractAddress": null,
       "status": "success",
       "to": "0x0000000000000000000000000000000000000000",
-      "type": "0x76",
+      "type": "tempo",
     }
   `)
 })
@@ -759,7 +759,7 @@ test('behavior: feePayerSignature (user → feePayer)', async () => {
         "contractAddress": null,
         "status": "success",
         "to": "0x0000000000000000000000000000000000000000",
-        "type": "0x76",
+        "type": "tempo",
       }
     `)
   }
@@ -1029,7 +1029,7 @@ describe('behavior: keyAuthorization', () => {
         "contractAddress": null,
         "status": "success",
         "to": "0x0000000000000000000000000000000000000000",
-        "type": "0x76",
+        "type": "tempo",
       }
     `)
 
@@ -1243,7 +1243,7 @@ describe('behavior: keyAuthorization', () => {
         "contractAddress": null,
         "status": "success",
         "to": "0x0000000000000000000000000000000000000000",
-        "type": "0x76",
+        "type": "tempo",
       }
     `)
 

package/src/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '1.0.0-beta.20'
+export const version = '1.0.0-beta.21'