Gasless flow Permit2Proxy (v1.0.0) [Permit2Proxy v1.0.0]

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "lib/solady"]
 	path = lib/solady
 	url = https://github.com/Vectorized/solady
+[submodule "lib/Permit2"]
+	path = lib/Permit2
+	url = https://github.com/Uniswap/Permit2

config/permit2.json

@@ -0,0 +1,4 @@
+{
+  "mainnet": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+  "arbitrum": "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+}

deployments/_deployments_log_file.json

@@ -21793,16 +21793,6 @@
             "VERIFIED": "true"
           }
         ],
-        "1.0.1": [
-          {
-            "ADDRESS": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61",
-            "OPTIMIZER_RUNS": "1000000",
-            "TIMESTAMP": "2024-08-14 18:28:47",
-            "CONSTRUCTOR_ARGS": "0x0000000000000000000000006ce9bf8cdab780416ad1fd87b318a077d2f50eac",
-            "SALT": "",
-            "VERIFIED": "true"
-          }
-        ],
         "1.0.1": [
           {
             "ADDRESS": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61",
@@ -22407,5 +22397,21 @@
         ]
       }
     }
+  },
+  "Permit2Proxy": {
+    "arbitrum": {
+      "staging": {
+        "1.0.0": [
+          {
+            "ADDRESS": "0x442BBFD6a4641B2b710DFfa4754081eC7502a3F7",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-08-26 18:34:52",
+            "CONSTRUCTOR_ARGS": "0x00000000000000000000000011f1022ca6adef6400e5677528a80d49a069c00c000000000000000000000000000000000022d473030f116ddee9f6b43ac78ba3",
+            "SALT": "09072024",
+            "VERIFIED": "true"
+          }
+        ]
+      }
+    }
   }
-}
+}

deployments/arbitrum.staging.json

@@ -44,5 +44,6 @@
   "CircleBridgeFacet": "0xa73a8BC8d36472269138c3233e24D0Ee0c344bd8",
   "HopFacetOptimized": "0xf82135385765f1324257ffF74489F16382EBBb8A",
   "LiFuelFeeCollector": "0x94EA56D8049e93E0308B9c7d1418Baf6A7C68280",
-  "TokenWrapper": "0xF63b27AE2Dc887b88f82E2Cc597d07fBB2E78E70"
+  "TokenWrapper": "0xF63b27AE2Dc887b88f82E2Cc597d07fBB2E78E70",
+  "Permit2Proxy": "0x442BBFD6a4641B2b710DFfa4754081eC7502a3F7"
 }

remappings.txt

@@ -9,7 +9,7 @@ celer-network/=lib/sgn-v2-contracts/
 create3-factory/=lib/create3-factory/src/
 solmate/=lib/solmate/src/
 solady/=lib/solady/src/
-
+permit2/=lib/Permit2/src/
 ds-test/=lib/ds-test/src/
 forge-std/=lib/forge-std/src/
 

script/demoScripts/demoPermit2Proxy.ts

@@ -0,0 +1,120 @@
+import {
+  http,
+  createPublicClient,
+  parseAbi,
+  Hex,
+  parseUnits,
+  serializeSignature,
+  createWalletClient,
+} from 'viem'
+import { privateKeyToAccount, sign } from 'viem/accounts'
+import { arbitrum } from 'viem/chains'
+import { defineCommand, runMain } from 'citty'
+
+const DIAMOND_ADDRESS = '0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE'
+const USDT_ADDRESS = '0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9'
+const PERMIT2_PROXY_ADDRESS = '0x442BBFD6a4641B2b710DFfa4754081eC7502a3F7'
+const PERMIT2_ADDRESS = '0x000000000022D473030F116dDEE9F6B43aC78BA3'
+const PRIVATE_KEY = `0x${process.env.PRIVATE_KEY}`
+
+const main = defineCommand({
+  meta: {
+    name: 'demo-permit2',
+    description: 'Demonstrate a Permit2 tx',
+  },
+  args: {
+    signerKey: {
+      type: 'string',
+      description: 'Private key of signer',
+      required: true,
+    },
+    executorKey: {
+      type: 'string',
+      description: 'Private key of the executor',
+      required: true,
+    },
+  },
+  async run({ args }) {
+    const SIGNER_PRIVATE_KEY = `0x${args.signerKey}` as Hex
+    const EXECUTOR_PRIVATE_KEY = `0x${args.executorKey}` as Hex
+
+    // Setup the required ABIs
+    const permit2Abi = parseAbi([
+      'function nonceBitmap(address owner, uint256 index) external view returns (uint256 nonce)',
+    ])
+    const permit2ProxyAbi = parseAbi([
+      'function getPermit2MsgHash(address,bytes,address,uint256,uint256,uint256) external view returns (bytes32)',
+      'function callDiamondWithPermit2SignatureSingle(address,bytes,address,((address,uint256),uint256,uint256),bytes) external',
+    ])
+
+    // Setup a READ-ONLY client
+    const client = createPublicClient({
+      chain: arbitrum,
+      transport: http(),
+    })
+
+    // Setup a signer account
+    const account = privateKeyToAccount(SIGNER_PRIVATE_KEY)
+
+    // Get calldata to bridge USDT from LIFI API
+    const url =
+      'https://li.quest/v1/quote?fromChain=ARB&toChain=POL&fromToken=0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9&toToken=0xc2132D05D31c914a87C6611C10748AEb04B58e8F&fromAddress=0xb9c0dE368BECE5e76B52545a8E377a4C118f597B&toAddress=0xb9c0dE368BECE5e76B52545a8E377a4C118f597B&fromAmount=5000000'
+    const options = { method: 'GET', headers: { accept: 'application/json' } }
+    const lifiResp = await fetch(url, options)
+    const calldata = (await lifiResp.json()).transactionRequest.data
+
+    // Get the nonce from the PERMIT2 contract
+    const nonce = await client.readContract({
+      address: PERMIT2_ADDRESS,
+      abi: permit2Abi,
+      functionName: 'nonceBitmap',
+      args: [account.address, 0n],
+    })
+
+    // Get lastest block
+    const block = await client.getBlock()
+
+    // Consturct a valid message hash to sign using Permit2Proxy's utility func
+    const msgHash = await client.readContract({
+      address: PERMIT2_PROXY_ADDRESS,
+      abi: permit2ProxyAbi,
+      functionName: 'getPermit2MsgHash',
+      args: [
+        DIAMOND_ADDRESS,
+        calldata,
+        USDT_ADDRESS,
+        parseUnits('5', 6),
+        nonce,
+        block.timestamp + 1200n,
+      ],
+    })
+    console.log(msgHash)
+
+    // Sign the message hash
+    const rsvSig = await sign({ hash: msgHash, privateKey: SIGNER_PRIVATE_KEY })
+    const signature = serializeSignature(rsvSig)
+    console.log(signature)
+
+    // Setup the parameters for the executor to call
+    const tokenPermissions = [USDT_ADDRESS, parseUnits('5', 6)]
+    const permit = [tokenPermissions, nonce, block.timestamp + 1200n]
+
+    // Instantiate the executor account and a WRITE enabled client
+    const executorAccount = privateKeyToAccount(EXECUTOR_PRIVATE_KEY)
+    const walletClient = createWalletClient({
+      account: executorAccount,
+      chain: arbitrum,
+      transport: http(),
+    })
+
+    // Execute using the Permit2 Proxy
+    const tx = await walletClient.writeContract({
+      address: PERMIT2_PROXY_ADDRESS,
+      abi: permit2ProxyAbi,
+      functionName: 'callDiamondWithPermit2SignatureSingle',
+      args: [DIAMOND_ADDRESS, calldata, account.address, permit, signature],
+    })
+  },
+})
+
+runMain(main)

script/deploy/facets/DeployPermit2Proxy.s.sol

@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.17;
+
+import { DeployScriptBase } from "./utils/DeployScriptBase.sol";
+import { Permit2Proxy } from "lifi/Periphery/Permit2Proxy.sol";
+import { stdJson } from "forge-std/Script.sol";
+
+contract DeployScript is DeployScriptBase {
+    using stdJson for string;
+
+    constructor() DeployScriptBase("Permit2Proxy") {}
+
+    function run()
+        public
+        returns (Permit2Proxy deployed, bytes memory constructorArgs)
+    {
+        constructorArgs = getConstructorArgs();
+
+        deployed = Permit2Proxy(deploy(type(Permit2Proxy).creationCode));
+    }
+
+    function getConstructorArgs() internal override returns (bytes memory) {
+        // get path of global config file
+        string memory globalConfigPath = string.concat(
+            root,
+            "/config/global.json"
+        );
+
+        // read file into json variable
+        string memory globalConfigJson = vm.readFile(globalConfigPath);
+
+        // extract refundWallet address
+        address deployWalletAddress = globalConfigJson.readAddress(
+            ".deployerWallet"
+        );
+
+        // get path of permit2 config file
+        string memory permit2ProxyConfig = string.concat(
+            root,
+            "/config/permit2.json"
+        );
+
+        // read file into json variable
+        string memory permit2ProxyConfigJSON = vm.readFile(permit2ProxyConfig);
+
+        // extract wrapped token address for the given network
+        address permit2Address = permit2ProxyConfigJSON.readAddress(
+            string.concat(".", network)
+        );
+
+        return abi.encode(deployWalletAddress, permit2Address);
+    }
+}