feat: add support for ERC3009, ERC2612, and Permit2 token transfers

contracts/accounts.js

@@ -141,6 +141,12 @@ const ACCOUNT_24 = {
     "0x40fec058aab032f7d099a0a476868cb77e47633172634e96f02267249f64bce1"
 };
 
+const ACCOUNT_25 = {
+  address: "0x6937E19EcA5b87De580Fa26B11ca0E91E1ca0614",
+  privateKey:
+    "0x6b340639bc944c250c290bbcaf8d1cd3ee2c1d6e98b35af8716b88cf81350cc9"
+};
+
 const ACCOUNTS = [
   ACCOUNT_1,
   ACCOUNT_2,
@@ -165,7 +171,8 @@ const ACCOUNTS = [
   ACCOUNT_21,
   ACCOUNT_22,
   ACCOUNT_23,
-  ACCOUNT_24
+  ACCOUNT_24,
+  ACCOUNT_25
 ];
 
 module.exports = {
@@ -193,5 +200,6 @@ module.exports = {
   ACCOUNT_21,
   ACCOUNT_22,
   ACCOUNT_23,
-  ACCOUNT_24
+  ACCOUNT_24,
+  ACCOUNT_25
 };

contracts/hardhat.config.js

@@ -254,7 +254,10 @@ module.exports = {
       "Seaport",
       "OpenSeaWrapper",
       "OpenSeaWrapperFactory",
-      "DRFeeMutualizer"
+      "DRFeeMutualizer",
+      "MockERC2612Token",
+      "MockERC3009Token",
+      "MockPermit2"
     ],
     except: ["MockDRFeeMutualizer"]
   }

contracts/scripts/deploy-other-tokens.js

@@ -0,0 +1,49 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { Contract } = require("ethers");
+const hre = require("hardhat");
+const ethers = hre.ethers;
+const PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
+
+async function deployWeth() {
+  const WETH9 = await ethers.getContractFactory("WETH9");
+  const weth = await WETH9.deploy();
+  await weth.waitForDeployment();
+  return weth;
+}
+
+async function deployERC3009Token() {
+  const MockERC3009Token = await ethers.getContractFactory("MockERC3009Token");
+  const mockERC3009Token = await MockERC3009Token.deploy(
+    "ERC3009Token",
+    "ERC3009"
+  );
+  await mockERC3009Token.waitForDeployment();
+  return mockERC3009Token;
+}
+
+async function deployERC2612Token() {
+  const MockERC2612Token = await ethers.getContractFactory("MockERC2612Token");
+  const mockERC2612Token = await MockERC2612Token.deploy(
+    "ERC2612Token",
+    "ERC2612"
+  );
+  await mockERC2612Token.waitForDeployment();
+  return mockERC2612Token;
+}
+
+async function deployPermit2() {
+  const MockPermit2 = await ethers.getContractFactory("MockPermit2");
+  const mockPermit2 = await MockPermit2.deploy();
+  await mockPermit2.waitForDeployment();
+  // Inject MockPermit2 at the canonical Permit2 address. The Permit2
+  // sub-context relies on this code being present at PERMIT2_ADDRESS so
+  // `TokenTransferAuthorizationLib._consumePermit2` calls land on it.
+  const code = await ethers.provider.getCode(await mockPermit2.getAddress());
+  await hre.network.provider.send("hardhat_setCode", [PERMIT2_ADDRESS, code]);
+  return new Contract(PERMIT2_ADDRESS, MockPermit2.interface, ethers.provider);
+}
+
+exports.deployERC3009Token = deployERC3009Token;
+exports.deployERC2612Token = deployERC2612Token;
+exports.deployPermit2 = deployPermit2;
+exports.deployWeth = deployWeth;

contracts/scripts/deploy.js

@@ -25,7 +25,12 @@ const { deploySeaport } = require("./deploy-seaport");
 const { ZeroAddress } = require("ethers");
 const { deployWrappers } = require("./deploy-wrappers.js");
 const { deployDRFeeMutualizer } = require("./deploy-dRFeeMutualizer.js");
-const { deployWeth } = require("./deploy-weth.js");
+const {
+  deployWeth,
+  deployERC2612Token,
+  deployERC3009Token,
+  deployPermit2
+} = require("./deploy-other-tokens.js");
 
 async function main() {
   const { addresses } = await deployAndMintMockNFTAuthTokens();
@@ -42,15 +47,18 @@ async function main() {
   await deploySuite("localhost", undefined);
   const mockTokens = ["Foreign20", "Foreign721", "Foreign1155"];
   const deployedTokens = await deployMockTokens([...mockTokens]);
-  let foreign20Token;
+  const erc20sForDisputeResolver = new Map();
   for (const [index, mockToken] of Object.entries(mockTokens)) {
     console.log(
       `✅ Mock token ${mockToken} has been deployed at ${await deployedTokens[
         index
       ].getAddress()}`
     );
     if (mockToken === "Foreign20") {
-      foreign20Token = await deployedTokens[index].getAddress();
+      erc20sForDisputeResolver.set(
+        mockToken,
+        await deployedTokens[index].getAddress()
+      );
     }
   }
   const file = await fs.readFile(
@@ -64,10 +72,65 @@ async function main() {
   const priceDiscoveryClient = deployedContracts.find(
     (c) => c.name === "BosonPriceDiscoveryClient"
   )?.address;
+
+  // Deploy Seaport contract
+  const mockSeaport = await deploySeaport();
+  const seaportAddress = await mockSeaport.getAddress();
+  console.log(`✅ Seaport Contract has been deployed at ${seaportAddress}`);
+  // Deploy wrappers contracts
+  const { openSeaWrapperFactory } = await deployWrappers(
+    protocolDiamond,
+    priceDiscoveryClient,
+    seaportAddress
+  );
+  console.log(
+    `✅ OpenSeaWrapperFactory Contract has been deployed at ${await openSeaWrapperFactory.getAddress()}`
+  );
+
+  // Deploy WETH contract
+  const weth = await deployWeth();
+  const wethAddress = await weth.getAddress();
+  console.log(`✅ WETH Contract has been deployed at ${wethAddress}`);
+  process.env.WETH_ADDRESS = wethAddress;
+  // Deploy DRFeeMutualizer
+  const dRFeeMutualizer = await deployDRFeeMutualizer(
+    protocolDiamond,
+    process.env.FORWARDER_ADDRESS,
+    wethAddress
+  );
+  const dRFeeMutualizerAddress = await dRFeeMutualizer.getAddress();
+  console.log(
+    `✅ DRFeeMutualizer Contract has been deployed at ${dRFeeMutualizerAddress}`
+  );
+
+  // Deploy MockERC3009Token contract
+  const mockERC3009Token = await deployERC3009Token();
+  const mockERC3009TokenAddress = await mockERC3009Token.getAddress();
+  console.log(
+    `✅ MockERC3009Token Contract has been deployed at ${mockERC3009TokenAddress}`
+  );
+  erc20sForDisputeResolver.set("MockERC3009Token", mockERC3009TokenAddress);
+
+  // Deploy MockERC2612Token contract
+  const mockERC2612Token = await deployERC2612Token();
+  const mockERC2612TokenAddress = await mockERC2612Token.getAddress();
+  console.log(
+    `✅ MockERC2612Token Contract has been deployed at ${mockERC2612TokenAddress}`
+  );
+  erc20sForDisputeResolver.set("MockERC2612Token", mockERC2612TokenAddress);
+
+  // Deploy MockPermit2 contract
+  const mockPermit2 = await deployPermit2();
+  const mockPermit2Address = await mockPermit2.getAddress();
+  console.log(
+    `✅ MockPermit2 Contract has been deployed at ${mockPermit2Address}`
+  );
+  erc20sForDisputeResolver.set("MockPermit2", mockPermit2Address);
+
+  // Create default dispute resolver
   const accounts = await ethers.getSigners();
   const disputeResolverSigner = accounts[1];
   const disputeResolver = disputeResolverSigner.address;
-  // Create default dispute resolver
   const accountHandler = await ethers.getContractAt(
     "IBosonAccountHandler",
     protocolDiamond
@@ -92,11 +155,13 @@ async function main() {
           tokenName: "Native",
           feeAmount: "0"
         },
-        {
-          tokenAddress: foreign20Token,
-          tokenName: "Foreign20",
-          feeAmount: "0"
-        }
+        ...Array.from(erc20sForDisputeResolver.entries()).map(
+          ([tokenName, tokenAddress]) => ({
+            tokenAddress,
+            tokenName,
+            feeAmount: "0"
+          })
+        )
       ],
       []
     );
@@ -108,34 +173,7 @@ async function main() {
   console.log(
     `✅ Dispute resolver created. ID: ${disputeResolverId} Wallet: ${disputeResolver}`
   );
-  // Deploy Seaport contract
-  const mockSeaport = await deploySeaport();
-  const seaportAddress = await mockSeaport.getAddress();
-  console.log(`✅ Seaport Contract has been deployed at ${seaportAddress}`);
-  // Deploy wrappers contracts
-  const { openSeaWrapperFactory } = await deployWrappers(
-    protocolDiamond,
-    priceDiscoveryClient,
-    seaportAddress
-  );
-  console.log(
-    `✅ OpenSeaWrapperFactory Contract has been deployed at ${await openSeaWrapperFactory.getAddress()}`
-  );
-  // Deploy WETH contract
-  const weth = await deployWeth();
-  const wethAddress = await weth.getAddress();
-  console.log(`✅ WETH Contract has been deployed at ${wethAddress}`);
-  process.env.WETH_ADDRESS = wethAddress;
-  // Deploy DRFeeMutualizer
-  const dRFeeMutualizer = await deployDRFeeMutualizer(
-    protocolDiamond,
-    process.env.FORWARDER_ADDRESS,
-    wethAddress
-  );
-  const dRFeeMutualizerAddress = await dRFeeMutualizer.getAddress();
-  console.log(
-    `✅ DRFeeMutualizer Contract has been deployed at ${dRFeeMutualizerAddress}`
-  );
+
   // Set specific configuration values (needed for tests)
   const deployer = accounts[0];
   const configHandler = await ethers.getContractAt(

e2e/docker-compose.yml

@@ -38,7 +38,7 @@ services:
       - host.docker.internal:host-gateway
 
   boson-protocol-node:
-    image: boson-protocol-node:858661679cc8ba2be97eedf3cbc3acd0f5c1903e_2
+    image: boson-protocol-node:858661679cc8ba2be97eedf3cbc3acd0f5c1903e_4
     build:
       context: ../.
       dockerfile: ./contracts/Dockerfile