tokenbound deterministic deployment test green

contracts/base/Mech.sol

@@ -188,6 +188,7 @@ abstract contract Mech is IMech, Account, Receiver {
         bytes4 interfaceId
     ) public pure virtual returns (bool) {
         return
+            interfaceId == type(IMech).interfaceId ||
             interfaceId == type(IERC165).interfaceId ||
             interfaceId == type(IAccount).interfaceId ||
             interfaceId == type(IERC1271).interfaceId ||

contracts/base/TokenboundMech.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.12;
 
 import "@erc6551/reference/src/interfaces/IERC6551Account.sol";
+import "@erc6551/reference/src/lib/ERC6551AccountLib.sol";
 
 import "./Mech.sol";
-import "../libraries/MinimalProxyStore.sol";
 
 /**
  * @dev A Mech that is operated by the holder of a designated token, implements the ERC6551 standard and is deployed through the ERC6551 registry
@@ -22,11 +22,7 @@ abstract contract TokenboundMech is Mech, IERC6551Account {
         view
         returns (uint256 chainId, address tokenContract, uint256 tokenId)
     {
-        return
-            abi.decode(
-                MinimalProxyStore.getContext(address(this)),
-                (uint256, address, uint256)
-            );
+        return ERC6551AccountLib.token();
     }
 
     receive() external payable override(Receiver, IERC6551Account) {}

contracts/test/ERC6551Registry.sol

@@ -0,0 +1,4 @@
+//SPDX-License-Identifier: LGPL-3.0
+pragma solidity ^0.8.12;
+
+import "@erc6551/reference/src/ERC6551Registry.sol";

sdk/src/constants.ts

@@ -16,6 +16,67 @@ export const DEFAULT_SALT =
 export const SENTINEL_MODULES =
   "0x0000000000000000000000000000000000000001" as const
 
+export const ERC2470_SINGLETON_FACTORY_ABI = [
+  {
+    type: "function",
+    name: "deploy",
+    constant: false,
+    payable: false,
+    inputs: [
+      {
+        type: "bytes",
+        name: "_initCode",
+      },
+      {
+        type: "bytes32",
+        name: "_salt",
+      },
+    ],
+    outputs: [
+      {
+        type: "address",
+        name: "createdContract",
+      },
+    ],
+  },
+]
+
 export const ERC6551_REGISTRY_ABI = [
-  "createAccount(address implementation, uint256 chainId, address tokenContract, uint256 tokenId, uint256 salt, bytes initData) returns (address)",
+  {
+    type: "function",
+    name: "createAccount",
+    constant: false,
+    payable: false,
+    inputs: [
+      {
+        type: "address",
+        name: "implementation",
+      },
+      {
+        type: "uint256",
+        name: "chainId",
+      },
+      {
+        type: "address",
+        name: "tokenContract",
+      },
+      {
+        type: "uint256",
+        name: "tokenId",
+      },
+      {
+        type: "uint256",
+        name: "salt",
+      },
+      {
+        type: "bytes",
+        name: "initData",
+      },
+    ],
+    outputs: [
+      {
+        type: "address",
+      },
+    ],
+  },
 ]

sdk/src/deploy/deployERC1155ThresholdMech.ts

@@ -32,7 +32,7 @@ export const calculateERC1155ThresholdMechAddress = ({
   minBalances: bigint[]
   /** minimum total balance over all tokens */
   minTotalBalance: bigint
-  salt: `0x${string}`
+  salt?: `0x${string}`
 }) => {
   const context = encodeAbiParameters(
     [
@@ -77,7 +77,7 @@ export const makeERC1155ThresholdMechDeployTransaction = ({
   minBalances: bigint[]
   /** minimum total balance over all tokens */
   minTotalBalance: bigint
-  salt: `0x${string}`
+  salt?: `0x${string}`
 }) => {
   const context = encodeAbiParameters(
     [
@@ -121,7 +121,7 @@ export const deployERC1155ThresholdMech = async (
     minBalances: bigint[]
     /** minimum total balance over all tokens */
     minTotalBalance: bigint
-    salt: `0x${string}`
+    salt?: `0x${string}`
   }
 ) => {
   const { chain, account } = walletClient

sdk/src/deploy/deployERC1155TokenboundMech.ts

@@ -13,34 +13,25 @@ import {
   ERC6551_REGISTRY_ADDRESS,
 } from "../constants"
 
-import { deployMastercopy, mechProxyBytecode } from "./factory"
+import { deployMastercopy, erc6551ProxyBytecode } from "./factory"
 
-export const calculateERC1155TokenboundMechAddress = ({
-  chainId,
-  token,
-  tokenId,
-  salt = DEFAULT_SALT,
-}: {
+export const calculateERC1155TokenboundMechAddress = (context: {
   /** Address of the ERC1155 token contract */
   chainId: number
   /** Address of the ERC1155 token contract */
   token: `0x${string}`
   /** ID of the ERC1155 token */
   tokenId: bigint
-  salt: `0x${string}`
+  salt?: `0x${string}`
+  from?: `0x${string}`
 }) => {
-  const context = encodeAbiParameters(
-    [{ type: "uint256" }, { type: "address" }, { type: "uint256" }],
-    [BigInt(chainId), token, tokenId]
-  )
-
   return getCreate2Address({
-    bytecode: mechProxyBytecode(
+    bytecode: erc6551ProxyBytecode(
       calculateERC1155TokenboundMechMastercopyAddress(),
       context
     ),
-    from: ERC6551_REGISTRY_ADDRESS,
-    salt,
+    from: context.from || ERC6551_REGISTRY_ADDRESS,
+    salt: context.salt || DEFAULT_SALT,
   })
 }
 
@@ -57,17 +48,19 @@ export const makeERC1155TokenboundMechDeployTransaction = ({
   token,
   tokenId,
   salt = DEFAULT_SALT,
+  from = ERC6551_REGISTRY_ADDRESS,
 }: {
   /** ID of the chain the token lives on */
   chainId: number
   /** Address of the ERC1155 token contract */
   token: `0x${string}`
   /** ID of the ERC1155 token */
   tokenId: bigint
-  salt: string
+  salt?: string
+  from?: `0x${string}`
 }) => {
   return {
-    to: ERC6551_REGISTRY_ADDRESS,
+    to: from,
     data: encodeFunctionData({
       abi: ERC6551_REGISTRY_ABI,
       functionName: "createAccount",
@@ -77,6 +70,7 @@ export const makeERC1155TokenboundMechDeployTransaction = ({
         token,
         tokenId,
         salt,
+        "0x",
       ],
     }),
   }
@@ -89,14 +83,16 @@ export const deployERC1155TokenboundMech = async (
     token,
     tokenId,
     salt = DEFAULT_SALT,
+    from = ERC6551_REGISTRY_ADDRESS,
   }: {
     /** ID of the chain the token lives on, default to the current chain of walletClient */
     chainId?: number
     /** Address of the ERC1155 token contract */
     token: `0x${string}`
     /** ID of the ERC1155 token */
     tokenId: bigint
-    salt: `0x${string}`
+    salt?: `0x${string}`
+    from?: `0x${string}`
   }
 ) => {
   const { chain, account } = walletClient
@@ -110,6 +106,7 @@ export const deployERC1155TokenboundMech = async (
     token,
     tokenId,
     salt,
+    from,
   })
 
   return walletClient.sendTransaction({

sdk/src/deploy/deployERC721TokenboundMech.ts

@@ -13,34 +13,25 @@ import {
   ERC6551_REGISTRY_ADDRESS,
 } from "../constants"
 
-import { deployMastercopy, mechProxyBytecode } from "./factory"
+import { deployMastercopy, erc6551ProxyBytecode } from "./factory"
 
-export const calculateERC721TokenboundMechAddress = ({
-  chainId,
-  token,
-  tokenId,
-  salt = DEFAULT_SALT,
-}: {
+export const calculateERC721TokenboundMechAddress = (context: {
   /** Address of the ERC721 token contract */
   chainId: number
   /** Address of the ERC721 token contract */
   token: `0x${string}`
   /** ID of the ERC721 token */
   tokenId: bigint
-  salt: `0x${string}`
+  salt?: `0x${string}`
+  from?: `0x${string}`
 }) => {
-  const context = encodeAbiParameters(
-    [{ type: "uint256" }, { type: "address" }, { type: "uint256" }],
-    [BigInt(chainId), token, tokenId]
-  )
-
   return getCreate2Address({
-    bytecode: mechProxyBytecode(
+    bytecode: erc6551ProxyBytecode(
       calculateERC721TokenboundMechMastercopyAddress(),
       context
     ),
-    from: ERC6551_REGISTRY_ADDRESS,
-    salt,
+    from: context.from || ERC6551_REGISTRY_ADDRESS,
+    salt: context.salt || DEFAULT_SALT,
   })
 }
 
@@ -57,17 +48,19 @@ export const makeERC721TokenboundMechDeployTransaction = ({
   token,
   tokenId,
   salt = DEFAULT_SALT,
+  from = ERC6551_REGISTRY_ADDRESS,
 }: {
   /** ID of the chain the token lives on */
   chainId: number
   /** Address of the ERC721 token contract */
   token: `0x${string}`
   /** ID of the ERC721 token */
   tokenId: bigint
-  salt: string
+  salt?: string
+  from?: `0x${string}`
 }) => {
   return {
-    to: ERC6551_REGISTRY_ADDRESS,
+    to: from,
     data: encodeFunctionData({
       abi: ERC6551_REGISTRY_ABI,
       functionName: "createAccount",
@@ -77,6 +70,7 @@ export const makeERC721TokenboundMechDeployTransaction = ({
         token,
         tokenId,
         salt,
+        "0x",
       ],
     }),
   }
@@ -89,14 +83,16 @@ export const deployERC721TokenboundMech = async (
     token,
     tokenId,
     salt = DEFAULT_SALT,
+    from = ERC6551_REGISTRY_ADDRESS,
   }: {
     /** ID of the chain the token lives on, default to the current chain of walletClient */
     chainId?: number
     /** Address of the ERC721 token contract */
     token: `0x${string}`
     /** ID of the ERC721 token */
     tokenId: bigint
-    salt: `0x${string}`
+    salt?: `0x${string}`
+    from?: `0x${string}`
   }
 ) => {
   const { chain, account } = walletClient
@@ -110,6 +106,7 @@ export const deployERC721TokenboundMech = async (
     token,
     tokenId,
     salt,
+    from,
   })
 
   return walletClient.sendTransaction({

sdk/src/deploy/deployZodiacMech.ts

@@ -60,7 +60,7 @@ export const makeZodiacMechDeployTransaction = ({
 }: {
   /** Addresses of the Zodiac modules */
   modules: `0x${string}`[]
-  salt: `0x${string}`
+  salt?: `0x${string}`
 }) => {
   const initCall = encodeFunctionData({
     abi: ZodiacMech__factory.abi,