hack override all transactions

joaquim-verges · joaquim-verges · commit 56528dc6f199 · 2024-11-07T22:05:04.000+13:00
diff --git a/apps/dashboard/src/@/constants/thirdweb.server.ts b/apps/dashboard/src/@/constants/thirdweb.server.ts
@@ -4,14 +4,20 @@ import {
   IPFS_GATEWAY_URL,
 } from "@/constants/env";
 import {
+  THIRDWEB_BUNDLER_DOMAIN,
   THIRDWEB_INAPP_WALLET_DOMAIN,
   THIRDWEB_PAY_DOMAIN,
   THIRDWEB_RPC_DOMAIN,
   THIRDWEB_SOCIAL_API_DOMAIN,
   THIRDWEB_STORAGE_DOMAIN,
 } from "constants/urls";
 import { createThirdwebClient } from "thirdweb";
-import { setThirdwebDomains } from "thirdweb/utils";
+import {
+  getTransactionDecorator,
+  setThirdwebDomains,
+  setTransactionDecorator,
+} from "thirdweb/utils";
+import { getZkPaymasterData } from "thirdweb/wallets/smart";
 import { getVercelEnv } from "../../lib/vercel-utils";
 
 // returns a thirdweb client with optional JWT passed in
@@ -24,8 +30,39 @@ export function getThirdwebClient(jwt?: string) {
       pay: THIRDWEB_PAY_DOMAIN,
       storage: THIRDWEB_STORAGE_DOMAIN,
       social: THIRDWEB_SOCIAL_API_DOMAIN,
+      bundler: THIRDWEB_BUNDLER_DOMAIN,
     });
   }
+
+  if (!getTransactionDecorator()) {
+    setTransactionDecorator(async ({ account, transaction }) => {
+      // special override for sophon testnet (zk chain)
+      // sophon only allows transactions through their paymaster
+      // so always use eip712 txs with paymaster
+      if (transaction.chain.id === 531050104) {
+        const pmData = await getZkPaymasterData({
+          options: {
+            client: transaction.client,
+            chain: transaction.chain,
+          },
+          transaction,
+        });
+        return {
+          account,
+          transaction: {
+            ...transaction,
+            eip712: {
+              ...transaction.eip712,
+              paymaster: pmData.paymaster,
+              paymasterInput: pmData.paymasterInput,
+            },
+          },
+        };
+      }
+      return { account, transaction };
+    });
+  }
+
   return createThirdwebClient({
     secretKey: jwt ? jwt : DASHBOARD_THIRDWEB_SECRET_KEY,
     clientId: DASHBOARD_THIRDWEB_CLIENT_ID,
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/components/connect-wallet/index.tsx b/apps/dashboard/src/@3rdweb-sdk/react/components/connect-wallet/index.tsx
@@ -13,7 +13,7 @@ import Image from "next/image";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useCallback, useMemo, useState } from "react";
-import type { Chain } from "thirdweb";
+import { type Chain } from "thirdweb";
 import {
   AutoConnect,
   ConnectButton,
diff --git a/apps/dashboard/src/components/buttons/MismatchButton.tsx b/apps/dashboard/src/components/buttons/MismatchButton.tsx
@@ -59,6 +59,7 @@ import { useV5DashboardChain } from "../../lib/v5-adapter";
 const GAS_FREE_CHAINS = [
   75513, // Geek verse testnet
   75512, // Geek verse mainnet
+  531050104, // sophon testnet
 ];
 
 function useNetworkMismatchAdapter(desiredChainId: number) {
diff --git a/apps/dashboard/src/constants/urls.ts b/apps/dashboard/src/constants/urls.ts
@@ -24,3 +24,6 @@ export const THIRDWEB_STORAGE_DOMAIN =
 
 export const THIRDWEB_SOCIAL_API_DOMAIN =
   process.env.NEXT_PUBLIC_SOCIAL_URL || "social.thirdweb-dev.com";
+
+export const THIRDWEB_BUNDLER_DOMAIN =
+  process.env.NEXT_PUBLIC_BUNDLER_URL || "bundler.thirdweb-dev.com";
diff --git a/packages/thirdweb/src/contract/deployment/zksync/zkDeployContract.ts b/packages/thirdweb/src/contract/deployment/zksync/zkDeployContract.ts
@@ -37,8 +37,6 @@ export async function zkDeployContract(
     ),
   });
 
-  console.log("deploying", options.deploymentType);
-
   const receipt = await sendAndConfirmTransaction({
     account: options.account,
     transaction: prepareTransaction({
@@ -49,23 +47,17 @@ export async function zkDeployContract(
       eip712: {
         factoryDeps: [options.bytecode],
         // TODO (zksync): allow passing in a paymaster
-        paymaster: "0x950e3Bb8C6bab20b56a70550EC037E22032A413e",
-        paymasterInput:
-          "0x8c5a344500000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",
       },
     }),
   });
 
-  console.log("receipt", receipt);
-
   const events = parseEventLogs({
     logs: receipt.logs,
     events: [contractDeployedEvent()],
   });
 
   const contractAddress = events[0]?.args.contractAddress;
 
-  console.log("deployed contractAddress", contractAddress);
   if (!contractAddress) {
     throw new Error("Contract creation failed");
   }
diff --git a/packages/thirdweb/src/contract/deployment/zksync/zkDeployCreate2Factory.ts b/packages/thirdweb/src/contract/deployment/zksync/zkDeployCreate2Factory.ts
@@ -34,18 +34,17 @@ export async function zkDeployCreate2Factory(
     client: options.client,
     privateKey: PUBLISHED_PRIVATE_KEY,
   });
-  console.log("create2Signer", create2Signer);
+
   const valueToSend = toWei("0.01");
   const balance = await getWalletBalance({
     address: create2Signer.address,
     chain: options.chain,
     client: options.client,
   });
-  console.log("balance", balance);
 
   if (balance.value < valueToSend) {
     await sendAndConfirmTransaction({
-      account: create2Signer,
+      account: options.account,
       transaction: prepareTransaction({
         chain: options.chain,
         client: options.client,
diff --git a/packages/thirdweb/src/contract/deployment/zksync/zkDeployProxy.ts b/packages/thirdweb/src/contract/deployment/zksync/zkDeployProxy.ts
@@ -38,7 +38,6 @@ export async function zkDeployProxy(
       `Implementation contract at ${implementationAddress} is not deployed`,
     );
   }
-  console.log("deploying tw proxy");
   // deploy tw proxy of the implementation
   const proxyAddress = await zkDeployContractDeterministic({
     client: options.client,
diff --git a/packages/thirdweb/src/exports/utils.ts b/packages/thirdweb/src/exports/utils.ts
@@ -147,6 +147,11 @@ export { encodePacked } from "viem";
 // Useful helpers
 export { setThirdwebDomains } from "../utils/domains.js";
 export { resolvePromisedValue } from "../utils/promise/resolve-promised-value.js";
+export {
+  setTransactionDecorator,
+  getTransactionDecorator,
+  clearTransactionDecorator,
+} from "../utils/accounts.js";
 
 // ------------------------------------------------
 // json
diff --git a/packages/thirdweb/src/exports/wallets/smart.ts b/packages/thirdweb/src/exports/wallets/smart.ts
@@ -21,6 +21,7 @@ export {
 } from "../../wallets/smart/lib/calls.js";
 
 export { getPaymasterAndData } from "../../wallets/smart/lib/paymaster.js";
+export { getZkPaymasterData } from "../../wallets/smart/lib/bundler.js";
 
 export type {
   SmartWalletConnectionOptions,
diff --git a/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.ts b/packages/thirdweb/src/extensions/prebuilts/get-required-transactions.ts
@@ -51,39 +51,43 @@ export async function getRequiredTransactions(
       | DeployTransactionResult[]
       | null
     )[] = await Promise.all([
-      getDeployedCreate2Factory({
-        chain,
-        client,
-      }).then((c) =>
-        c || isZkSync
-          ? null
-          : ({ type: "infra", contractId: "Create2Factory" } as const),
-      ),
-      getDeployedInfraContract({
-        chain,
-        client,
-        contractId: "Forwarder",
-      }).then((c) =>
-        c || isZkSync
-          ? null
-          : ({ type: "infra", contractId: "Forwarder" } as const),
-      ),
-      getDeployedInfraContract({
-        chain,
-        client,
-        contractId: "TWCloneFactory",
-        constructorParams: {
-          _trustedForwarder: await computePublishedContractAddress({
+      isZkSync
+        ? null
+        : getDeployedCreate2Factory({
+            chain,
+            client,
+          }).then((c) =>
+            c
+              ? null
+              : ({ type: "infra", contractId: "Create2Factory" } as const),
+          ),
+      isZkSync
+        ? null
+        : getDeployedInfraContract({
             chain,
             client,
             contractId: "Forwarder",
-          }),
-        },
-      }).then((c) =>
-        c || isZkSync
-          ? null
-          : ({ type: "infra", contractId: "TWCloneFactory" } as const),
-      ),
+          }).then((c) =>
+            c ? null : ({ type: "infra", contractId: "Forwarder" } as const),
+          ),
+      isZkSync
+        ? null
+        : getDeployedInfraContract({
+            chain,
+            client,
+            contractId: "TWCloneFactory",
+            constructorParams: {
+              _trustedForwarder: await computePublishedContractAddress({
+                chain,
+                client,
+                contractId: "Forwarder",
+              }),
+            },
+          }).then((c) =>
+            c
+              ? null
+              : ({ type: "infra", contractId: "TWCloneFactory" } as const),
+          ),
       // TODO (deploy): add WETH contract check for implementations that need it (check implementation constructor params)
       getTransactionsForImplementation({
         chain,
diff --git a/packages/thirdweb/src/transaction/actions/send-transaction.ts b/packages/thirdweb/src/transaction/actions/send-transaction.ts
@@ -1,3 +1,4 @@
+import { getTransactionDecorator } from "../../utils/accounts.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
 import type { PreparedTransaction } from "../prepare-transaction.js";
 import { addTransactionToStore } from "../transaction-store.js";
@@ -138,14 +139,22 @@ export interface SendTransactionOptions {
 export async function sendTransaction(
   options: SendTransactionOptions,
 ): Promise<WaitForReceiptOptions> {
-  const { account, transaction, gasless } = options;
+  let { account, transaction, gasless } = options;
+
+  const decorator = getTransactionDecorator();
+  if (decorator) {
+    const { account: decoratedAccount, transaction: decoratedTransaction } =
+      await decorator({ account, transaction });
+    account = decoratedAccount;
+    transaction = decoratedTransaction;
+  }
 
   if (account.onTransactionRequested) {
     await account.onTransactionRequested(transaction);
   }
 
   // if zksync transaction params are set, send with eip712
-  if (options.transaction.eip712) {
+  if (transaction.eip712) {
     const { sendEip712Transaction } = await import(
       "./zksync/send-eip712-transaction.js"
     );
diff --git a/packages/thirdweb/src/utils/accounts.ts b/packages/thirdweb/src/utils/accounts.ts
@@ -0,0 +1,26 @@
+import type { PreparedTransaction } from "../transaction/prepare-transaction.js";
+import type { Account } from "../wallets/interfaces/wallet.js";
+
+let transactionDecorator:
+  | ((args: {
+      account: Account;
+      transaction: PreparedTransaction;
+    }) => Promise<{ account: Account; transaction: PreparedTransaction }>)
+  | null = null;
+
+export function setTransactionDecorator(
+  decoratorFunction: (args: {
+    account: Account;
+    transaction: PreparedTransaction;
+  }) => Promise<{ account: Account; transaction: PreparedTransaction }>,
+) {
+  transactionDecorator = decoratorFunction;
+}
+
+export function clearTransactionDecorator() {
+  transactionDecorator = null;
+}
+
+export function getTransactionDecorator() {
+  return transactionDecorator;
+}
diff --git a/packages/thirdweb/src/utils/any-evm/zksync/constants.ts b/packages/thirdweb/src/utils/any-evm/zksync/constants.ts
@@ -3,8 +3,7 @@ export const ZKSYNC_SINGLETON_FACTORY =
 export const CONTRACT_DEPLOYER_ADDRESS =
   "0x0000000000000000000000000000000000008006" as const;
 export const KNOWN_CODES_STORAGE = "0x0000000000000000000000000000000000008004";
-export const PUBLISHED_PRIVATE_KEY =
-  "0xfa550fb8205119c91cf8f380d15b70a0b2945221a286398ffc0c85680697ed9c";
+export const PUBLISHED_PRIVATE_KEY = "";
 
 export const singletonFactoryAbi = [
   "function deploy(bytes32,bytes32,bytes) external payable",
diff --git a/packages/thirdweb/src/utils/fetch.ts b/packages/thirdweb/src/utils/fetch.ts
@@ -47,7 +47,12 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
 
       // if we have an auth token set, use that (thirdweb.com/dashboard sets this for the user)
       // pay urls should never send the auth token, because we always want the "developer" to be the one making the request, not the "end user"
-      if (authToken && !isPayUrl(url) && !isInAppWalletUrl(url)) {
+      if (
+        authToken &&
+        !isPayUrl(url) &&
+        !isInAppWalletUrl(url) &&
+        !isBundlerUrl(url)
+      ) {
         headers.set("authorization", `Bearer ${authToken}`);
       } else if (secretKey) {
         headers.set("x-secret-key", secretKey);
@@ -153,6 +158,18 @@ function isInAppWalletUrl(url: string): boolean {
   }
 }
 
+function isBundlerUrl(url: string): boolean {
+  try {
+    const { hostname } = new URL(url);
+    return (
+      hostname.endsWith("bundler.thirdweb.com") ||
+      hostname.endsWith("bundler.thirdweb-dev.com")
+    );
+  } catch {
+    return false;
+  }
+}
+
 const SDK_NAME = "unified-sdk";
 
 let previousPlatform: [string, string][] | undefined;
diff --git a/packages/thirdweb/src/wallets/interfaces/wallet.ts b/packages/thirdweb/src/wallets/interfaces/wallet.ts
@@ -7,7 +7,10 @@ import type {
   TypedDataDefinition,
 } from "viem";
 import type { Chain } from "../../chains/types.js";
-import type { PreparedTransaction } from "../../transaction/prepare-transaction.js";
+import type {
+  EIP712TransactionOptions,
+  PreparedTransaction,
+} from "../../transaction/prepare-transaction.js";
 import type { SendTransactionResult } from "../../transaction/types.js";
 import type { WalletEmitter } from "../wallet-emitter.js";
 import type {
@@ -19,6 +22,7 @@ import type {
 
 export type SendTransactionOption = TransactionSerializable & {
   chainId: number;
+  eip712?: EIP712TransactionOptions;
 };
 
 type SendRawTransactionOptions = {
diff --git a/packages/thirdweb/src/wallets/smart/index.ts b/packages/thirdweb/src/wallets/smart/index.ts
@@ -501,14 +501,15 @@ function createZkSyncAccount(args: {
         value: transaction.value ?? 0n,
         chain: getCachedChain(transaction.chainId),
         client: connectionOptions.client,
+        eip712: transaction.eip712,
       };
 
       let serializableTransaction = await populateEip712Transaction({
         account,
         transaction: prepTx,
       });
 
-      if (args.sponsorGas) {
+      if (args.sponsorGas && !serializableTransaction.paymaster) {
         // get paymaster input
         const pmData = await getZkPaymasterData({
           options: {
@@ -525,6 +526,8 @@ function createZkSyncAccount(args: {
         };
       }
 
+      console.log("serializableTransaction", serializableTransaction);
+
       // sign
       const signedTransaction = await signEip712Transaction({
         account,
diff --git a/packages/thirdweb/src/wallets/smart/smart-wallet-dev.test.ts b/packages/thirdweb/src/wallets/smart/smart-wallet-dev.test.ts
@@ -28,7 +28,7 @@ const contract = getContract({
   chain,
   address: "0x6A7a26c9a595E6893C255C9dF0b593e77518e0c3",
 });
-describe.runIf(process.env.TW_SECRET_KEY).sequential(
+describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
   "SmartWallet policy tests",
   {
     retry: 0,
diff --git a/packages/thirdweb/test/src/test-clients.ts b/packages/thirdweb/test/src/test-clients.ts

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ export async function zkDeployProxy(`
`38`	`38`	`Implementation contract at ${implementationAddress} is not deployed`,
`39`	`39`	`);`
`40`	`40`	`}`
`41`		`- console.log("deploying tw proxy");`
`42`	`41`	`// deploy tw proxy of the implementation`
`43`	`42`	`const proxyAddress = await zkDeployContractDeterministic({`
`44`	`43`	`client: options.client,`