diff --git a/packages/accounts/plugindefs/multi-owner/config.ts b/packages/accounts/plugindefs/multi-owner/config.ts index e4d4b91d55..34477bce65 100644 --- a/packages/accounts/plugindefs/multi-owner/config.ts +++ b/packages/accounts/plugindefs/multi-owner/config.ts @@ -7,7 +7,7 @@ export const MultiOwnerPluginGenConfig: PluginGenConfig = { name: "MultiOwnerPlugin", abi: MultiOwnerPluginAbi, addresses: { - [sepolia.id]: "0x90d4f511c9Ca2B1694eA2A1629130B430853aBeB", + [sepolia.id]: "0xB76734F322b9f2C8F1dA934252dED3bC3C25b109", }, chain: sepolia, installConfig: { diff --git a/packages/accounts/plugindefs/token-receiver/config.ts b/packages/accounts/plugindefs/token-receiver/config.ts index 0f63fcd7fe..2cdb8c33b1 100644 --- a/packages/accounts/plugindefs/token-receiver/config.ts +++ b/packages/accounts/plugindefs/token-receiver/config.ts @@ -6,7 +6,7 @@ export const TokenReceiverPluginGenConfig: PluginGenConfig = { name: "TokenReceiverPlugin", abi: TokenReceiverPluginAbi, addresses: { - [sepolia.id]: "0x4FCDe5A446208a20A1539FC425832334bc8360Fb", + [sepolia.id]: "0x360b59D3D922fe6b015257390b35E7dBA8632A50", }, chain: sepolia, installConfig: { diff --git a/packages/accounts/src/msca/builder/wrapped-signer.ts b/packages/accounts/src/msca/builder/wrapped-signer.ts index 71a5e7a23e..978c2e6d99 100644 --- a/packages/accounts/src/msca/builder/wrapped-signer.ts +++ b/packages/accounts/src/msca/builder/wrapped-signer.ts @@ -6,7 +6,10 @@ import { isBytes, type Hash, } from "viem"; -import { MultiOwnerPlugin } from "../plugins/multi-owner/plugin.js"; +import { + MultiOwnerPlugin, + MultiOwnerPluginAbi, +} from "../plugins/multi-owner/plugin.js"; import type { SignerMethods } from "./types"; export const WrapWith712SignerMethods: SignerMethods = (acct) => { @@ -17,17 +20,21 @@ export const WrapWith712SignerMethods: SignerMethods = (acct) => { } const signWith712Wrapper = async (msg: Hash): Promise<`0x${string}`> => { - const { readEip712Domain } = MultiOwnerPlugin.accountMethods(acct); - - const [, name, version, chainId, verifyingContract, salt] = - await readEip712Domain(); + // TODO: right now this is hard coded to one Plugin address, but we should make this configurable somehow + const [, name, version, chainId, , salt] = + await acct.rpcProvider.readContract({ + abi: MultiOwnerPluginAbi, + address: MultiOwnerPlugin.meta.addresses[acct.rpcProvider.chain.id], + functionName: "eip712Domain", + account: await acct.getAddress(), + }); return owner.signTypedData({ domain: { chainId: Number(chainId), name, salt, - verifyingContract, + verifyingContract: await acct.getAddress(), version, }, types: { diff --git a/packages/accounts/src/msca/utils.ts b/packages/accounts/src/msca/utils.ts index 3e942ba7b9..89d42dae25 100644 --- a/packages/accounts/src/msca/utils.ts +++ b/packages/accounts/src/msca/utils.ts @@ -48,8 +48,8 @@ export const getDefaultMultiOwnerMSCAFactoryAddress = ( switch (chain.id) { case sepolia.id: return excludeDefaultTokenReceiverPlugin - ? "0xFD14c78640d72f73CC88238E2f7Df3273Ee84043" // MultiOwnerMSCAFactory - : "0x22322E35c1850F26DD54Ed8F59a27C1c79847A15"; + ? "0xC69731F267760466663470256A7ba28F79eDC4d6" // MultiOwnerMSCAFactory + : "0x852B3a676684031Cb77b69B50D8d7879f4c4807d"; case mainnet.id: case goerli.id: case polygon.id: diff --git a/packages/core/src/signer/utils.ts b/packages/core/src/signer/utils.ts index cf98c7f00f..20d9b09b91 100644 --- a/packages/core/src/signer/utils.ts +++ b/packages/core/src/signer/utils.ts @@ -4,8 +4,8 @@ import { parseAbiParameters, type Address, type Hash, - type PublicClient, type Hex, + type PublicClient, } from "viem"; export type SignWith6492Params = {