[SDK] Add ERC6551 Interface #1324
working code & fix factoryAddress required
- Loading branch information
commit cf5bb9382a548c196826b23ebafba812de6bcf0e
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,54 @@ | ||
| import { TokenBoundSmartWalletConfig, TokenBoundSmartWalletConfigInput } from "./types"; | ||
| import { ethers } from "ethers"; | ||
| import { SmartWalletConnector } from "../smart-wallet"; | ||
| import { | ||
| AccountContractInfo, | ||
| FactoryContractInfo, | ||
| } from "../smart-wallet/types"; | ||
| import { ERC6551_REGISTRY } from "../smart-wallet/lib/constants"; | ||
| import { SmartWalletConfig } from "../smart-wallet/types"; | ||
|
|
||
| export class TokenBoundSmartWalletConnector extends SmartWalletConnector { | ||
| protected config: TokenBoundSmartWalletConfig; | ||
|
|
||
| constructor(input: TokenBoundSmartWalletConfigInput) { | ||
| input.factoryAddress = input.factoryAddress || ERC6551_REGISTRY; | ||
| super(input as TokenBoundSmartWalletConfig); | ||
| this.config = input as TokenBoundSmartWalletConfig; | ||
| } | ||
|
|
||
| protected defaultAccountInfo(): AccountContractInfo { | ||
| return { | ||
| execute: async (account, target, value, data) => { | ||
| return account.prepare("executeCall", [target, value, data]); | ||
| }, | ||
| getNonce: async (account) => { | ||
| return account.call("nonce", []); | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| protected defaultFactoryInfo(): FactoryContractInfo { | ||
| return { | ||
| createAccount: async (factory, owner) => { | ||
| return factory.prepare("createAccount", [ | ||
| this.config.accountImplementation, | ||
| this.chainId, | ||
| this.config.tokenContract, | ||
| this.config.tokenId, | ||
| this.config.salt, | ||
| ethers.utils.toUtf8Bytes(""), | ||
| ]); | ||
| }, | ||
| getAccountAddress: async (factory, owner) => { | ||
| return await factory.call("account", [ | ||
| this.config.accountImplementation, | ||
| this.chainId, | ||
| this.config.tokenContract, | ||
| this.config.tokenId, | ||
| this.config.salt, | ||
| ]); | ||
| }, | ||
| }; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,30 @@ | ||
| import type { BigNumberish } from "ethers"; | ||
| import { WalletConnectReceiverConfig } from "../../../core/types/walletConnect"; | ||
| import type { ChainOrRpcUrl } from "@thirdweb-dev/sdk"; | ||
| import { ContractInfoInput } from "../smart-wallet/types"; | ||
| import { PaymasterAPI } from "@account-abstraction/sdk"; | ||
| import { SmartWalletConfig } from "../smart-wallet/types"; | ||
|
|
||
| export type TokenBoundSmartWalletConfigInput = { | ||
| chain: ChainOrRpcUrl; | ||
| factoryAddress?: string; | ||
| clientId?: string; | ||
| secretKey?: string; | ||
| gasless: boolean; | ||
| bundlerUrl?: string; | ||
| paymasterUrl?: string; | ||
| paymasterAPI?: PaymasterAPI; | ||
| entryPointAddress?: string; | ||
| tokenContract: string; | ||
| tokenId: BigNumberish; | ||
| accountImplementation: string; // TODO provide default implementation published by us | ||
| salt?: BigNumberish; | ||
| } & ContractInfoInput & | ||
| WalletConnectReceiverConfig; | ||
|
|
||
| export type TokenBoundSmartWalletConfig = { | ||
| tokenContract: string; | ||
| tokenId: BigNumberish; | ||
| accountImplementation: string; // TODO provide default implementation published by us | ||
| salt?: BigNumberish; | ||
| } & SmartWalletConfig; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,44 @@ | ||
| import { SmartWallet } from "./smart-wallet"; | ||
| import type { TokenBoundSmartWalletConnector as TokenBoundSmartWalletConnectorType } from "../connectors/token-bound-smart-wallet"; | ||
| import { walletIds } from "../constants/walletIds"; | ||
| import type { TokenBoundSmartWalletConfigInput, TokenBoundSmartWalletConfig } from "../connectors/token-bound-smart-wallet/types"; | ||
| import { WalletOptions } from "./base"; | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| export class TokenBoundSmartWallet extends SmartWallet { | ||
| connector?: TokenBoundSmartWalletConnectorType; | ||
|
|
||
| static meta = { | ||
| name: "Token Bound Smart Wallet", | ||
| iconURL: | ||
| "ipfs://QmeAJVqn17aDNQhjEU3kcWVZCFBrfta8LzaDGkS8Egdiyk/token-bound-smart-wallet.svg", | ||
| }; | ||
|
|
||
| static id = walletIds.tokenBoundSmartWallet; | ||
| public get walletName() { | ||
| return "Token Bound Smart Wallet"; | ||
| } | ||
|
|
||
| constructor(options: WalletOptions<TokenBoundSmartWalletConfigInput>) { | ||
| super(options as TokenBoundSmartWalletConfig); | ||
| } | ||
|
|
||
| async getConnector(): Promise<TokenBoundSmartWalletConnectorType> { | ||
| if (!this.connector) { | ||
| if (this.enableConnectApp) { | ||
| await this.wcWallet.init(); | ||
| this.setupWalletConnectEventsListeners(); | ||
| } | ||
|
|
||
| const { TokenBoundSmartWalletConnector } = await import( | ||
| "../connectors/token-bound-smart-wallet" | ||
| ); | ||
| this.connector = new TokenBoundSmartWalletConnector( | ||
| this.options as TokenBoundSmartWalletConfig, | ||
| ); | ||
| } | ||
| return this.connector; | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dumb question but in the parent SmartWallet class, the calls here are:
executeandgetNonce, just making sure these are different on purposeThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah in the official registry, the function signatures are different - they are of this format
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you double check that these can be configured back if they so choose
@joaquim-verges could you check this please - my assumption was to use the erc-6551 registry function signatures by default rather than the ones we have - is this the route we are choosing to go? SHould we have a
customoption or something which uses the thirdweb defaults? I just wanted to keep things simple but I'm not sure