thirdweb 5.73.1-nightly-33c23e789e577bd6463e135cec4e25cfcfc9964a-20241205000340 → 5.75.0-nightly-ec84ed37d6db8281d3afb12bc47a20ccc5fe9713-20241207000341

package/src/transaction/actions/sign-transaction.test.ts

@@ -1,27 +1,20 @@
-import {
-  type TransactionSerializable,
-  type TransactionSerializableBase,
-  type TransactionSerializableEIP1559,
-  type TransactionSerializableEIP2930,
-  type TransactionSerializableLegacy,
-  zeroAddress,
-} from "viem";
 import { describe, expect, test } from "vitest";
 import { ANVIL_PKEY_A } from "~test/test-wallets.js";
+import { ZERO_ADDRESS } from "../../constants/addresses.js";
 import { fromGwei } from "../../utils/units.js";
 import { signTransaction } from "./sign-transaction.js";
 
 const BASE_TRANSACTION = {
   gas: 21000n,
   nonce: 785,
-} satisfies TransactionSerializableBase;
+} as const;
 
 describe("eip1559", () => {
   const BASE_EIP1559_TRANSACTION = {
     ...BASE_TRANSACTION,
     chainId: 1,
     type: "eip1559",
-  } as const satisfies TransactionSerializableEIP1559;
+  } as const;
 
   test("default", () => {
     const signature = signTransaction({
@@ -69,7 +62,7 @@ describe("eip1559", () => {
         ...BASE_EIP1559_TRANSACTION,
         accessList: [
           {
-            address: zeroAddress,
+            address: ZERO_ADDRESS,
             storageKeys: [
               "0x0000000000000000000000000000000000000000000000000000000000000001",
               "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
@@ -105,7 +98,7 @@ describe("eip2930", () => {
     ...BASE_TRANSACTION,
     chainId: 1,
     type: "eip2930",
-  } as const satisfies TransactionSerializable;
+  } as const;
 
   test("default", () => {
     const signature = signTransaction({
@@ -124,13 +117,13 @@ describe("eip2930", () => {
         gasPrice: fromGwei("2"),
         accessList: [
           {
-            address: zeroAddress,
+            address: ZERO_ADDRESS,
             storageKeys: [
               "0x0000000000000000000000000000000000000000000000000000000000000000",
             ],
           },
         ],
-      } as TransactionSerializableEIP2930,
+      },
       privateKey: ANVIL_PKEY_A,
     });
 
@@ -159,7 +152,7 @@ describe("legacy", () => {
     ...BASE_TRANSACTION,
     gasPrice: fromGwei("2"),
     type: "legacy",
-  } as const satisfies TransactionSerializableLegacy;
+  } as const;
 
   test("default", () => {
     const signature = signTransaction({

package/src/transaction/actions/sign-transaction.ts

@@ -1,11 +1,13 @@
-import type { TransactionSerializable } from "viem";
+import * as ox__Hash from "ox/Hash";
+import * as ox__Secp256k1 from "ox/Secp256k1";
 import type { Hex } from "../../utils/encoding/hex.js";
-import { keccak256 } from "../../utils/hashing/keccak256.js";
-import { sign } from "../../utils/signatures/sign.js";
-import { serializeTransaction } from "../serialize-transaction.js";
+import {
+  type SerializableTransaction,
+  serializeTransaction,
+} from "../serialize-transaction.js";
 
 export type SignTransactionOptions = {
-  transaction: TransactionSerializable;
+  transaction: SerializableTransaction;
   privateKey: Hex;
   // TODO: Add optional custom serializer here
 };
@@ -32,14 +34,10 @@ export function signTransaction({
   transaction,
   privateKey,
 }: SignTransactionOptions): Hex {
-  if (transaction.type === "eip4844") {
-    transaction = { ...transaction, sidecars: false };
-  }
-
   const serializedTransaction = serializeTransaction({ transaction });
 
-  const signature = sign({
-    hash: keccak256(serializedTransaction),
+  const signature = ox__Secp256k1.sign({
+    payload: ox__Hash.keccak256(serializedTransaction),
     privateKey: privateKey,
   });
   return serializeTransaction({

package/src/transaction/actions/to-serializable-transaction.ts

@@ -1,10 +1,10 @@
-import type { TransactionSerializable } from "viem";
 import { getGasOverridesForTransaction } from "../../gas/fee-data.js";
 import { getRpcClient } from "../../rpc/rpc.js";
 import { getAddress } from "../../utils/address.js";
 import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
 import type { PreparedTransaction } from "../prepare-transaction.js";
+import type { SerializableTransaction } from "../serialize-transaction.js";
 import { encode } from "./encode.js";
 import { estimateGas } from "./estimate-gas.js";
 
@@ -112,5 +112,5 @@ export async function toSerializableTransaction(
     accessList,
     value,
     ...feeData,
-  } satisfies TransactionSerializable;
+  } satisfies SerializableTransaction;
 }

package/src/transaction/actions/zksync/getEip721Domain.ts

@@ -1,4 +1,3 @@
-import type { TransactionSerializable } from "viem";
 import { hashBytecode } from "viem/zksync";
 import type { Address } from "../../../utils/address.js";
 import { toHex } from "../../../utils/encoding/hex.js";
@@ -6,8 +5,9 @@ import type {
   EIP712SerializedTransaction,
   EIP712TransactionOptions,
 } from "../../prepare-transaction.js";
+import type { SerializableTransaction } from "../../serialize-transaction.js";
 
-export type EIP721TransactionSerializable = TransactionSerializable & {
+export type EIP721TransactionSerializable = SerializableTransaction & {
   from: Address;
 } & EIP712TransactionOptions;
 export const gasPerPubdataDefault = 50000n;