[TSv4] Avoid unnecessary fetching for error formatting (thirdweb-dev#3239)

Co-authored-by: Joaquim Verges <[email protected]>

Author: 0xFirekeeper

.changeset/strange-dryers-yawn.md

@@ -0,0 +1,6 @@
+---
+"@thirdweb-dev/unity-js-bridge": patch
+"@thirdweb-dev/sdk": patch
+---
+
+[TSv4] Avoid unnecessary fetching for error formatting

legacy_packages/sdk/src/evm/core/classes/internal/contract-wrapper.ts

@@ -18,21 +18,20 @@ import { computeEOAForwarderAddress } from "../../../common/any-evm-utils/comput
 import { computeForwarderAddress } from "../../../common/any-evm-utils/computeForwarderAddress";
 import { TransactionError, parseRevertReason } from "../../../common/error";
 import { extractFunctionsFromAbi } from "../../../common/feature-detection/extractFunctionsFromAbi";
-import { fetchSourceFilesFromMetadata } from "../../../common/fetchSourceFilesFromMetadata";
 import {
   BiconomyForwarderAbi,
   ChainAwareForwardRequest,
   ForwardRequest,
   getAndIncrementNonce,
 } from "../../../common/forwarder";
 import { getDefaultGasOverrides } from "../../../common/gas-price";
-import { fetchContractMetadataFromAddress } from "../../../common/metadata-resolver";
+import { fetchContractMetadataFromAddress, getContractMetadataFromCache } from "../../../common/metadata-resolver";
 import { signEIP2612Permit } from "../../../common/permit";
 import { signTypedDataInternal } from "../../../common/sign";
 import { CONTRACT_ADDRESSES } from "../../../constants/addresses/CONTRACT_ADDRESSES";
 import { getContractAddressByChainId } from "../../../constants/addresses/getContractAddressByChainId";
 import { EventType } from "../../../constants/events";
-import { AbiSchema, ContractSource } from "../../../schema/contracts/custom";
+import { AbiSchema } from "../../../schema/contracts/custom";
 import { SDKOptions } from "../../../schema/sdk-options";
 import { Address } from "../../../schema/shared/Address";
 import { CallOverrideSchema } from "../../../schema/shared/CallOverrideSchema";
@@ -433,8 +432,8 @@ export class ContractWrapper<
             ...args,
             ...(callOverrides.value ? [{ value: callOverrides.value }] : []),
           );
-        } catch (err: any) {
-          throw await this.formatError(err, fn, args, callOverrides);
+        } catch (staticErr: any) {
+          throw await this.formatError(staticErr, fn, args, callOverrides);
         }
       }
     }
@@ -495,24 +494,18 @@ export class ContractWrapper<
     // Parse the revert reason from the error
     const reason = parseRevertReason(error);
 
-    // Get contract sources for stack trace
-    let sources: ContractSource[] | undefined = undefined;
+    // Get contract metadata for contract name if cached
     let contractName: string | undefined = undefined;
     try {
-      const metadata = await fetchContractMetadataFromAddress(
+      const chainId = (await provider.getNetwork()).chainId;
+      const metadata = getContractMetadataFromCache(
         this.address,
-        this.getProvider(),
-        this.storage,
-        this.options,
+        chainId,
       );
 
-      if (metadata.name) {
+      if (metadata?.name) {
         contractName = metadata.name;
       }
-
-      if (metadata.metadata.sources) {
-        sources = await fetchSourceFilesFromMetadata(metadata, this.storage);
-      }
     } catch (err) {
       // no-op
     }
@@ -529,7 +522,6 @@ export class ContractWrapper<
         value,
         hash,
         contractName,
-        sources,
       },
       error,
     );

legacy_packages/sdk/src/evm/core/classes/transactions.ts

@@ -663,7 +663,7 @@ export class Transaction<
     // Parse the revert reason from the error
     const reason = parseRevertReason(error);
 
-    // Get contract sources for stack trace
+    // Get contract metadata for contract name if cached
     let contractName: string | undefined = undefined;
     try {
       const chainId = (await provider.getNetwork()).chainId;

legacy_packages/unity-js-bridge/src/thirdweb-bridge.ts

@@ -27,6 +27,7 @@ import { EthersWallet } from "@thirdweb-dev/wallets/evm/wallets/ethers";
 import { InjectedWallet } from "@thirdweb-dev/wallets/evm/wallets/injected";
 import { LocalWallet } from "@thirdweb-dev/wallets/evm/wallets/local-wallet";
 import { MetaMaskWallet } from "@thirdweb-dev/wallets/evm/wallets/metamask";
+import { RabbyWallet } from "@thirdweb-dev/wallets/evm/wallets/rabby";
 import { SmartWallet } from "@thirdweb-dev/wallets/evm/wallets/smart-wallet";
 import { WalletConnect } from "@thirdweb-dev/wallets/evm/wallets/wallet-connect";
 import {
@@ -68,6 +69,7 @@ const bigNumberReplacer = (_key: string, value: any) => {
 const SUPPORTED_WALLET_IDS = [
   "injected",
   "metamask",
+  "rabby",
   "walletConnect",
   "coinbase",
   "localWallet",
@@ -171,7 +173,7 @@ class ThirdwebBridge implements TWBridge {
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
       (globalThis as any).X_SDK_PLATFORM = "unity";
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
-      (globalThis as any).X_SDK_VERSION = "4.15.1";
+      (globalThis as any).X_SDK_VERSION = "4.15.2";
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
       (globalThis as any).X_SDK_OS = browser?.os ?? "unknown";
     }
@@ -237,6 +239,14 @@ class ThirdwebBridge implements TWBridge {
             clientId: sdkOptions.clientId,
           });
           break;
+        case "rabby":
+          walletInstance = new RabbyWallet({
+            projectId: sdkOptions.wallet?.walletConnectProjectId,
+            dappMetadata,
+            chains: supportedChains,
+            clientId: sdkOptions.clientId,
+          });
+          break;
         case "walletConnect":
           walletInstance = new WalletConnect({
             projectId: sdkOptions.wallet?.walletConnectProjectId,