Merge branch 'main' into ciara/tba

packages/sdk/src/evm/core/classes/account.ts

@@ -42,152 +42,7 @@ export class Account<TContract extends IAccountCore>
   }
 
   getAddress(): string {
-    return this.contractWrapper.readContract.address;
-  }
-
-  /*********************************
-   * HELPER FUNCTIONS
-   ********************************/
-
-  private hasDuplicateSigners(snapshot: PermissionSnapshotOutput): boolean {
-    const checkedSigner: Record<string, boolean> = {};
-
-    const signers = snapshot.map((item) => item.signer);
-
-    for (const signer of signers) {
-      if (!checkedSigner[signer]) {
-        checkedSigner[signer] = true;
-      } else {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Format the access restrictions for a given role
-   *
-   * @param restrictions - The access restrictions for a given role
-   * @returns formatted role restrictions
-   *
-   */
-  private parseSignerPermissionsStruct(
-    permissions: IAccountPermissions.SignerPermissionsStruct,
-  ): SignerPermissions {
-    return {
-      startDate: new Date(
-        parseInt(permissions.startTimestamp.toString()) * 1000,
-      ),
-      expirationDate: new Date(
-        parseInt(permissions.endTimestamp.toString()) * 1000,
-      ),
-      nativeTokenLimitPerTransaction: BigNumber.from(
-        permissions.nativeTokenLimitPerTransaction,
-      ),
-      approvedCallTargets: permissions.approvedTargets,
-    };
-  }
-
-  private async sendSignerPermissionRequest(
-    signerAddress: string,
-    permissions: SignerPermissionsOutput,
-  ): Promise<Transaction> {
-    const { payload, signature } = await this.generatePayload(
-      signerAddress,
-      permissions,
-    );
-
-    const { success } =
-      await this.contractWrapper.readContract.verifySignerPermissionRequest(
-        payload,
-        signature,
-      );
-    if (!success) {
-      throw new Error(`Invalid signature.`);
-    }
-
-    return Transaction.fromContractWrapper({
-      contractWrapper: this.contractWrapper,
-      method: "setPermissionsForSigner",
-      args: [payload, signature],
-    });
-  }
-
-  private async buildSignerPermissionRequest(
-    signerAddress: string,
-    permissions: SignerPermissionsOutput,
-  ): Promise<string> {
-    const { payload, signature } = await this.generatePayload(
-      signerAddress,
-      permissions,
-    );
-
-    const isValidSigner =
-      await this.contractWrapper.readContract.verifySignerPermissionRequest(
-        payload,
-        signature,
-      );
-    if (!isValidSigner) {
-      throw new Error(`Invalid signature.`);
-    }
-
-    return this.contractWrapper.writeContract.interface.encodeFunctionData(
-      "setPermissionsForSigner",
-      [payload, signature],
-    );
-  }
-
-  /**
-   * Generate and sign a payload to grant or revoke a signer's access to the account.
-   *
-   * @param signer - The address of the signer
-   * @param roleAction - The address of the signer
-   * @returns The generated payload and signature produced on signing that payload.
-   *
-   */
-  private async generatePayload(
-    signerAddress: string,
-    permissions: SignerPermissionsOutput,
-  ): Promise<SignedSignerPermissionsPayload> {
-    // Get payload struct.
-    const payload: IAccountPermissions.SignerPermissionRequestStruct = {
-      signer: signerAddress,
-      approvedTargets: permissions.approvedCallTargets,
-      nativeTokenLimitPerTransaction: utils.parseEther(
-        permissions.nativeTokenLimitPerTransaction,
-      ),
-      permissionStartTimestamp: permissions.startDate,
-      permissionEndTimestamp: permissions.expirationDate,
-      reqValidityStartTimestamp: 0,
-      // Req validity ends 10 years from now.
-      reqValidityEndTimestamp: BigNumber.from(
-        Math.floor(
-          new Date(Date.now() + 1000 * 60 * 60 * 24 * 365 * 10).getTime() /
-          1000,
-        ),
-      ),
-      uid: resolveOrGenerateId(undefined),
-    };
-
-    // Generate signature
-    const chainId = await this.contractWrapper.getChainID();
-    const connectedSigner = this.contractWrapper.getSigner();
-    invariant(connectedSigner, "No signer available");
-
-    const signature = await this.contractWrapper.signTypedData(
-      connectedSigner,
-      {
-        name: "Account",
-        version: "1",
-        chainId,
-        verifyingContract: this.getAddress(),
-      },
-      { SignerPermissionRequest },
-      payload,
-    );
-
-    return { payload, signature };
+    return this.contractWrapper.address;
   }
 
   /*********************************

packages/wallets/package.json

@@ -323,6 +323,13 @@
       },
       "default": "./evm/wallets/token-bound-smart-wallet/dist/thirdweb-dev-wallets-evm-wallets-token-bound-smart-wallet.cjs.js"
     },
+    "./evm/connectors/embedded-wallet": {
+      "module": {
+        "browser": "./evm/connectors/embedded-wallet/dist/thirdweb-dev-wallets-evm-connectors-embedded-wallet.browser.esm.js",
+        "default": "./evm/connectors/embedded-wallet/dist/thirdweb-dev-wallets-evm-connectors-embedded-wallet.esm.js"
+      },
+      "default": "./evm/connectors/embedded-wallet/dist/thirdweb-dev-wallets-evm-connectors-embedded-wallet.cjs.js"
+    },
     "./evm/connectors/wallet-connect-v1": {
       "module": {
         "browser": "./evm/connectors/wallet-connect-v1/dist/thirdweb-dev-wallets-evm-connectors-wallet-connect-v1.browser.esm.js",
@@ -337,6 +344,13 @@
       },
       "default": "./evm/connectors/token-bound-smart-wallet/dist/thirdweb-dev-wallets-evm-connectors-token-bound-smart-wallet.cjs.js"
     },
+    "./evm/connectors/embedded-wallet/implementations": {
+      "module": {
+        "browser": "./evm/connectors/embedded-wallet/implementations/dist/thirdweb-dev-wallets-evm-connectors-embedded-wallet-implementations.browser.esm.js",
+        "default": "./evm/connectors/embedded-wallet/implementations/dist/thirdweb-dev-wallets-evm-connectors-embedded-wallet-implementations.esm.js"
+      },
+      "default": "./evm/connectors/embedded-wallet/implementations/dist/thirdweb-dev-wallets-evm-connectors-embedded-wallet-implementations.cjs.js"
+    },
     "./package.json": "./package.json"
   },
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/wallets",

packages/wallets/src/evm/index.ts

@@ -43,13 +43,8 @@ export * from "./wallets/smart-wallet";
 export * from "./wallets/trust";
 export * from "./wallets/wallet-connect";
 export * from "./wallets/wallet-connect-v1";
-export * from "./wallets/safe";
-export * from "./wallets/magic";
-export * from "./wallets/smart-wallet";
-export * from "./wallets/token-bound-smart-wallet";
-export * from "./wallets/ethers";
-export * from "./wallets/private-key";
 export * from "./wallets/zerion";
+export * from "./wallets/token-bound-smart-wallet";
 
 export type { Chain } from "@thirdweb-dev/chains";
 

packages/wallets/src/evm/wallets/smart-wallet.ts

@@ -31,7 +31,8 @@ export type { PaymasterAPI } from "@account-abstraction/sdk";
 
 export class SmartWallet
   extends AbstractClientWallet<SmartWalletConfig, SmartWalletConnectionArgs>
-  implements IWalletConnectReceiver {
+  implements IWalletConnectReceiver
+{
   connector?: SmartWalletConnectorType;
 
   public enableConnectApp: boolean = false;
@@ -49,17 +50,26 @@ export class SmartWallet
   }
 
   constructor(options: WalletOptions<SmartWalletConfig>) {
-    super(options.walletId || SmartWallet.id, {
+    if (options.clientId && typeof options.chain === "object") {
+      try {
+        options.chain = {
+          ...options.chain,
+          rpc: getValidChainRPCs(options.chain, options.clientId),
+        };
+      } catch {}
+    }
+
+    super(SmartWallet.id, {
       ...options,
     });
 
     this.enableConnectApp = options?.enableConnectApp || false;
     this.wcWallet = this.enableConnectApp
       ? new WalletConnectV2Handler({
-        walletConnectWalletMetadata: options?.walletConnectWalletMetadata,
-        walletConenctV2ProjectId: options?.walletConenctV2ProjectId,
-        walletConnectV2RelayUrl: options?.walletConnectV2RelayUrl,
-      })
+          walletConnectWalletMetadata: options?.walletConnectWalletMetadata,
+          walletConnectV2ProjectId: options?.walletConnectV2ProjectId,
+          walletConnectV2RelayUrl: options?.walletConnectV2RelayUrl,
+        })
       : new NoOpWalletConnectHandler();
   }