fix(sdk): ox cjs imports

gregfromstl · gregfromstl · commit c9a7120b036c · 2025-01-06T14:12:04.000-10:00
diff --git a/packages/thirdweb/src/utils/abi/decodeError.ts b/packages/thirdweb/src/utils/abi/decodeError.ts
@@ -1,4 +1,5 @@
-import { type Abi, AbiError } from "ox";
+import * as ox__Abi from "ox/Abi";
+import * as ox__AbiError from "ox/AbiError";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import type { Hex } from "../encoding/hex.js";
@@ -17,7 +18,7 @@ import type { Hex } from "../encoding/hex.js";
  *
  * @utils
  */
-export async function decodeError<abi extends Abi.Abi>(options: {
+export async function decodeError<abi extends ox__Abi.Abi>(options: {
   contract: ThirdwebContract<abi>;
   data: Hex;
 }) {
@@ -31,6 +32,6 @@ export async function decodeError<abi extends Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiError = AbiError.fromAbi(abi, data) as AbiError.AbiError;
-  return AbiError.decode(abiError, data);
+  const abiError = ox__AbiError.fromAbi(abi, data) as ox__AbiError.AbiError;
+  return ox__AbiError.decode(abiError, data);
 }
diff --git a/packages/thirdweb/src/utils/abi/decodeFunctionData.ts b/packages/thirdweb/src/utils/abi/decodeFunctionData.ts
@@ -1,4 +1,6 @@
-import { type Abi, AbiFunction, type Hex } from "ox";
+import type * as ox__Abi from "ox/Abi";
+import * as ox__AbiFunction from "ox/AbiFunction";
+import type * as ox__Hex from "ox/Hex";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 
@@ -16,9 +18,9 @@ import type { ThirdwebContract } from "../../contract/contract.js";
  *
  * @utils
  */
-export async function decodeFunctionData<abi extends Abi.Abi>(options: {
+export async function decodeFunctionData<abi extends ox__Abi.Abi>(options: {
   contract: ThirdwebContract<abi>;
-  data: Hex.Hex;
+  data: ox__Hex.Hex;
 }) {
   const { contract, data } = options;
   let abi = contract?.abi;
@@ -30,6 +32,6 @@ export async function decodeFunctionData<abi extends Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiFunction = AbiFunction.fromAbi(abi, data);
-  return AbiFunction.decodeData(abiFunction, data);
+  const abiFunction = ox__AbiFunction.fromAbi(abi, data);
+  return ox__AbiFunction.decodeData(abiFunction, data);
 }
diff --git a/packages/thirdweb/src/utils/abi/decodeFunctionResult.ts b/packages/thirdweb/src/utils/abi/decodeFunctionResult.ts
@@ -1,4 +1,6 @@
-import { type Abi, AbiFunction, type Hex } from "ox";
+import type * as ox__Abi from "ox/Abi";
+import * as ox__AbiFunction from "ox/AbiFunction";
+import type * as ox__Hex from "ox/Hex";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 
@@ -16,9 +18,9 @@ import type { ThirdwebContract } from "../../contract/contract.js";
  *
  * @utils
  */
-export async function decodeFunctionResult<abi extends Abi.Abi>(options: {
+export async function decodeFunctionResult<abi extends ox__Abi.Abi>(options: {
   contract: ThirdwebContract<abi>;
-  data: Hex.Hex;
+  data: ox__Hex.Hex;
 }) {
   const { contract, ...rest } = options;
   let abi = contract?.abi;
@@ -30,6 +32,6 @@ export async function decodeFunctionResult<abi extends Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiFunction = AbiFunction.fromAbi(abi, rest.data);
-  return AbiFunction.decodeResult(abiFunction, rest.data);
+  const abiFunction = ox__AbiFunction.fromAbi(abi, rest.data);
+  return ox__AbiFunction.decodeResult(abiFunction, rest.data);
 }
diff --git a/packages/thirdweb/src/utils/hashing/hashMessage.ts b/packages/thirdweb/src/utils/hashing/hashMessage.ts
@@ -1,4 +1,4 @@
-import { Bytes as ox__Bytes } from "ox";
+import * as ox__Bytes from "ox/Bytes";
 import type { Hex } from "../encoding/hex.js";
 import { stringToBytes, toBytes } from "../encoding/to-bytes.js";
 import type { SignableMessage } from "../types.js";
diff --git a/packages/thirdweb/src/wallets/smart/presets/7579.ts b/packages/thirdweb/src/wallets/smart/presets/7579.ts
@@ -1,4 +1,5 @@
-import { AbiParameters, Hex } from "ox";
+import * as ox__AbiParameters from "ox/AbiParameters";
+import * as ox__Hex from "ox/Hex";
 import { serializeErc6492Signature } from "../../../auth/serialize-erc6492-signature.js";
 import { verifyHash } from "../../../auth/verify-hash.js";
 import { ZERO_ADDRESS } from "../../../constants/addresses.js";
@@ -56,9 +57,9 @@ export type ERC7579Config = SmartWalletOptions & {
 export function erc7579(options: ERC7579Config): SmartWalletOptions {
   const saltHex =
     options.overrides?.accountSalt &&
-    Hex.validate(options.overrides.accountSalt)
+      ox__Hex.validate(options.overrides.accountSalt)
       ? options.overrides.accountSalt
-      : Hex.fromString(options.overrides?.accountSalt ?? "");
+      : ox__Hex.fromString(options.overrides?.accountSalt ?? "");
   const defaultValidator = getAddress(options.validatorAddress);
   const modularAccountOptions: SmartWalletOptions = {
     ...options,
@@ -75,7 +76,7 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
               {
                 moduleTypeId: 1n, // validator type id
                 module: defaultValidator,
-                initData: Hex.fromString(""),
+                initData: ox__Hex.fromString(""),
               },
             ];
             return {
@@ -99,8 +100,8 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
           contract: accountContract,
           async asyncParams() {
             return {
-              mode: Hex.padRight("0x00", 32), // single execution
-              executionCalldata: AbiParameters.encodePacked(
+              mode: ox__Hex.padRight("0x00", 32), // single execution
+              executionCalldata: ox__AbiParameters.encodePacked(
                 ["address", "uint256", "bytes"],
                 [
                   transaction.to || ZERO_ADDRESS,
@@ -117,8 +118,8 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
           contract: accountContract,
           async asyncParams() {
             return {
-              mode: Hex.padRight("0x01", 32), // batch execution
-              executionCalldata: AbiParameters.encode(
+              mode: ox__Hex.padRight("0x01", 32), // batch execution
+              executionCalldata: ox__AbiParameters.encode(
                 [
                   {
                     type: "tuple[]",
@@ -152,10 +153,10 @@ export function erc7579(options: ERC7579Config): SmartWalletOptions {
           sender: accountContract.address,
         });
         // TODO (msa) - could be different if validator for the deployed account is different
-        const withValidator = Hex.from(
-          `${defaultValidator}${Hex.fromNumber(entryPointNonce).slice(42)}`,
+        const withValidator = ox__Hex.from(
+          `${defaultValidator}${ox__Hex.fromNumber(entryPointNonce).slice(42)}`,
         );
-        return Hex.toBigInt(withValidator);
+        return ox__Hex.toBigInt(withValidator);
       },
       async signMessage(options) {
         const { accountContract, factoryContract, adminAccount, message } =
@@ -201,7 +202,7 @@ async function generateSignature(options: {
   accountContract: ThirdwebContract;
   factoryContract: ThirdwebContract;
   adminAccount: Account;
-  originalMsgHash: Hex.Hex;
+  originalMsgHash: ox__Hex.Hex;
   defaultValidator: string;
   createAccount: (
     factoryContract: ThirdwebContract,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Bytes as ox__Bytes } from "ox";`
	`1`	`+import * as ox__Bytes from "ox/Bytes";`
`2`	`2`	`import type { Hex } from "../encoding/hex.js";`
`3`	`3`	`import { stringToBytes, toBytes } from "../encoding/to-bytes.js";`
`4`	`4`	`import type { SignableMessage } from "../types.js";`