deep-stack/wallet-connect-web-examples
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: smart account creation on session requests (#442)

Browse Source
This commit is contained in:
tomiir 2024-02-02 03:55:16 -06:00 committed by GitHub
parent 9439c9af54
commit 544b840ede
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 61 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
advanced/wallets/react-wallet-v2/src/components/SmartAccountCard.tsx
View File

@ -100,7 +100,6 @@ export default function SmartAccountCard({
>
{activeChainId === chainId ? `✅` : `🔄`}
</Button>
{smartAccountAddress ? (
<>
<Text h5 css={{ marginTop: 20 }}>
@ -109,15 +108,17 @@ export default function SmartAccountCard({
<Text small css={{ marginTop: 5 }}>
{smartAccountAddress}
</Text>
<Button
size="md"
css={{ marginTop: 20, width: '100%' }}
onClick={sendTestTransaction}
disabled={!isActiveChain || loading}
>
{loading ? <Loading size="sm" /> : 'Send Test TX'}
</Button>
</>
) : null}
{isDeployed && smartAccountAddress ? (
<Button
size="md"
css={{ marginTop: 20, width: '100%' }}
onClick={sendTestTransaction}
disabled={!isActiveChain || loading}
>
{loading ? <Loading size="sm" /> : 'Send Test TX'}
</Button>
) : (
<>
<Button

6
advanced/wallets/react-wallet-v2/src/hooks/useSmartAccount.ts
View File

@ -58,9 +58,9 @@ export default function useSmartAccount(signerPrivateKey: Hex, chain: Chain) {
}, [signerPrivateKey, smartAccountSponsorshipEnabled, chain])
useEffect(() => {
client?.checkIfSmartAccountDeployed()
.then((deployed: boolean) => {
setIsDeployed(deployed)
client?.init()
.then(() => {
setIsDeployed(client?.isDeployed)
setAddress(client?.address)
})
}, [client, chain])

17
advanced/wallets/react-wallet-v2/src/lib/SmartAccountLib.ts
View File

@ -162,8 +162,13 @@ export class SmartAccountLib {
}
// -- Public ------------------------------------------------------------------
public getAccount = async () =>
privateKeyToSafeSmartAccount(this.publicClient, {
public async init() {
await this.checkIfSmartAccountDeployed()
this.address = (await this.getAccount()).address
}
public getAccount = async () => {
const account = await privateKeyToSafeSmartAccount(this.publicClient, {
privateKey: this.#signerPrivateKey,
safeVersion: '1.4.1', // simple version
entryPoint: ENTRYPOINT_ADDRESSES[this.chain.name], // global entrypoint
@ -178,6 +183,10 @@ export class SmartAccountLib {
}
]
})
this.address = account.address
return account;
}
static isSmartAccount = async (address: Address, chain: Chain) => {
const client = createPublicClient({
@ -263,9 +272,7 @@ export class SmartAccountLib {
this.isDeployed = Boolean(bytecode)
console.log(`Smart Account Deployed: ${this.isDeployed}`)
if (this.isDeployed) {
this.address = smartAccountClient.account.address
}
return this.isDeployed;
}

25
advanced/wallets/react-wallet-v2/src/utils/EIP155RequestHandlerUtil.ts
View File

@ -12,33 +12,34 @@ import { SignClientTypes } from '@walletconnect/types'
import { getSdkError } from '@walletconnect/utils'
import { providers } from 'ethers'
import { Hex } from 'viem'
import { allowedChains } from './SmartAccountUtils'
import { Chain, allowedChains } from './SmartAccountUtils'
type RequestEventArgs = Omit<SignClientTypes.EventArguments['session_request'], 'verifyContext'>
const getWallet = async (params: any) => {
const requestParams: Array<any> = params?.request?.params || []
console.log('get wallet params', params)
const chainId = params?.chainId?.split(':')[1]
console.log('chain id', chainId)
const eoaWallet = eip155Wallets[getWalletAddressFromParams(eip155Addresses, params)]
if (eoaWallet) {
return eoaWallet
}
const deployedSmartAccounts = await Promise.all(Object.values(eip155Wallets).map(async (wallet) => {
const smartAccountEnabledChain = allowedChains.find((chain) => chain.id.toString() === chainId) as Chain
console.log('smart account enabled chain', smartAccountEnabledChain)
const smartAccounts = await Promise.all(Object.values(eip155Wallets).map(async (wallet) => {
const smartAccount = new SmartAccountLib({
privateKey: wallet.getPrivateKey() as Hex,
chain: allowedChains[0], // TODO: FIX FOR MULTI NETWORK
chain: smartAccountEnabledChain,
sponsored: true, // TODO: Sponsor for now but should be dynamic according to SettingsStore
})
const isDeployed = await smartAccount.checkIfSmartAccountDeployed()
if (isDeployed) {
return smartAccount
}
return null
await smartAccount.init()
return smartAccount
}));
const validSmartAccounts = deployedSmartAccounts.filter(Boolean) as Array<SmartAccountLib>
const smartAccountAddress = getWalletAddressFromParams(validSmartAccounts.map(acc => acc.address!), params)
return validSmartAccounts.find((smartAccount) => smartAccount?.address === smartAccountAddress) as SmartAccountLib
const smartAccountAddress = getWalletAddressFromParams(smartAccounts.map(acc => acc.address!), params)
return smartAccounts.find((smartAccount) => smartAccount?.address === smartAccountAddress) as SmartAccountLib
}

36
advanced/wallets/react-wallet-v2/src/views/SessionProposalModal.tsx
View File

@ -36,7 +36,7 @@ import { Hex } from 'viem'
import ChainSmartAddressMini from '@/components/ChainSmartAddressMini'
import { useSnapshot } from 'valtio'
import SettingsStore from '@/store/SettingsStore'
import { allowedChains } from '@/utils/SmartAccountUtils'
import { Chain, allowedChains } from '@/utils/SmartAccountUtils'
const StyledText = styled(Text, {
fontWeight: 400
@ -236,18 +236,28 @@ export default function SessionProposalModal() {
})
// TODO: improve for multi network
console.log('Checking if SA is deployed', eip155Wallets[eip155Addresses[0]])
const chainId = namespaces['eip155'].chains?.[0]
const smartAccountClient = new SmartAccountLib({
privateKey: eip155Wallets[eip155Addresses[0]].getPrivateKey() as Hex,
chain: allowedChains.find(chain => chain.id.toString() === chainId)!,
sponsored: smartAccountSponsorshipEnabled,
})
const isDeployed = await smartAccountClient.checkIfSmartAccountDeployed()
console.log('isDeployed', isDeployed)
if (isDeployed) {
namespaces.eip155.accounts = [...namespaces.eip155.accounts, `eip155:5:${smartAccountClient.address}`]
console.log('namespaces', namespaces['eip155'])
const namespaceChains = namespaces['eip155'].chains?.map((c: string) => c.split(':')[1])
const smartAccountEnabledChains: Chain[] = allowedChains.filter(chain => namespaceChains?.includes(chain.id.toString()))
// We find a request for a chain that is enabled for smart account
if (smartAccountEnabledChains.length) {
const signerAddress = namespaces['eip155'].accounts[0].split(':')[2]
const wallet = eip155Wallets[signerAddress]
const chain = smartAccountEnabledChains[0]
if (wallet) {
const smartAccountClient = new SmartAccountLib({
privateKey: wallet.getPrivateKey() as Hex,
chain,
sponsored: smartAccountSponsorshipEnabled,
})
await smartAccountClient.init()
const isDeployed = await smartAccountClient.checkIfSmartAccountDeployed()
console.log('isDeployed', isDeployed, smartAccountClient.address)
if (isDeployed) {
namespaces.eip155.accounts = [...namespaces.eip155.accounts, `eip155:${chain.id}:${smartAccountClient.address}`]
}
}
}
console.log('approving namespaces:', namespaces)