Merge pull request #91 from propeller-heads/router/dc/ENG-4251-verify…

…-on-etherscan feat: Verify contracts on etherscan
propeller-heads · Feb 27, 2025 · 6a1e78a · 6a1e78a
2 parents 87e7394 + fedc504
commit 6a1e78a
Show file tree

Hide file tree

Showing 33 changed files with 81 additions and 233 deletions.
diff --git a/config/executor_addresses.json b/config/executor_addresses.json
@@ -1,9 +1,9 @@
 {
   "ethereum": {
-    "uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",
-    "uniswap_v3": "0xF744EBfaA580cF3fFc25aD046E92BD8B770a0700",
-    "uniswap_v4": "0x90BE4620436354c9DfA58614B3Bdd5a80FBfAF31",
-    "vm:balancer_v2": "0xffe5B139b396c9A3d5d9ab89AAE78bF3070CbD64"
+    "uniswap_v2": "0xf6c5be66FFf9DC69962d73da0A617a827c382329",
+    "uniswap_v3": "0xdD8559c917393FC8DD2b4dD289c52Ff445fDE1B0",
+    "uniswap_v4": "0x042C0ebBEAb9d9987c2f64Ee05f2B3aeB86eAf70",
+    "vm:balancer_v2": "0x00BE8EfAE40219Ff76287b0F9b9e497942f5BC91"
   },
   "tenderly_ethereum": {
     "uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",

diff --git a/foundry/hardhat.config.js b/foundry/hardhat.config.js
@@ -1,5 +1,6 @@
 /** @type import('hardhat/config').HardhatUserConfig */
 require("@tenderly/hardhat-tenderly");
+require("@nomicfoundation/hardhat-verify");
 require("@nomiclabs/hardhat-ethers");
 require("@nomicfoundation/hardhat-foundry");
 
@@ -40,6 +41,10 @@ module.exports = {
     tenderly: {
         project: "project",
         username: "tvinagre",
-        privateVerification: true,
+        privateVerification: false,
     },
+
+    etherscan: {
+        apiKey: process.env.ETHERSCAN_API_KEY,
+    }
 };
diff --git a/foundry/interfaces/ICallback.sol b/foundry/interfaces/ICallback.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.26;
 
 interface ICallback {

diff --git a/foundry/interfaces/IExecutor.sol b/foundry/interfaces/IExecutor.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

diff --git a/foundry/lib/IWETH.sol b/foundry/lib/IWETH.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.26;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/foundry/lib/LibSwap.sol b/foundry/lib/LibSwap.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.26;
 
 library LibSwap {

diff --git a/foundry/lib/Payments.sol b/foundry/lib/Payments.sol
diff --git a/foundry/lib/PaymentsImmutables.sol b/foundry/lib/PaymentsImmutables.sol
diff --git a/foundry/lib/Permit2Payments.sol b/foundry/lib/Permit2Payments.sol
diff --git a/foundry/lib/bytes/LibPrefixLengthEncodedByteArray.sol b/foundry/lib/bytes/LibPrefixLengthEncodedByteArray.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.26;
 
 /**

diff --git a/foundry/package-lock.json b/foundry/package-lock.json
diff --git a/foundry/package.json b/foundry/package.json
@@ -1,6 +1,7 @@
 {
   "name": "hardhat-project",
   "devDependencies": {
+    "@nomicfoundation/hardhat-verify": "^2.0.13",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@tenderly/hardhat-tenderly": "^2.5.2",
     "dotenv": "^16.4.7",

diff --git a/foundry/scripts/README.md b/foundry/scripts/README.md
@@ -5,7 +5,7 @@
 
 ## Deploy on a Tenderly fork
 
-1. Make a new [fork](https://dashboard.tenderly.co/) in tenderly dashboard for the 
+1. Make a new [fork](https://dashboard.tenderly.co/) in tenderly dashboard for the
    chain that you wish to deploy on.
 2. Set the following environment variables:
 
@@ -25,6 +25,7 @@ export PRIVATE_KEY=<private-key>
 export RPC_URL=<chain-rpc-url>
 export DEPLOY_WALLET=<wallet-address>
 export PRIVATE_KEY=<private-key>
+export ETHERSCAN_API_KEY=<etherscan-api-key>
 ```
 
 Make sure to run `unset HISTFILE` in your terminal before setting the private key. This will prevent the private key

diff --git a/foundry/scripts/deploy-executors.js b/foundry/scripts/deploy-executors.js
@@ -5,9 +5,9 @@ const hre = require("hardhat");
 // Comment out the executors you don't want to deploy
 const executors_to_deploy = [
     {exchange: "UniswapV2Executor", args: []},
-    // {exchange: "UniswapV3Executor", args: ["0x1F98431c8aD98523631AE4a59f267346ea31F984"]},
-    // {exchange: "UniswapV4Executor", args: ["0x000000000004444c5dc75cB358380D2e3dE08A90"]},
-    // {exchange: "BalancerV2Executor", args: []},
+    {exchange: "UniswapV3Executor", args: ["0x1F98431c8aD98523631AE4a59f267346ea31F984"]},
+    {exchange: "UniswapV4Executor", args: ["0x000000000004444c5dc75cB358380D2e3dE08A90"]},
+    {exchange: "BalancerV2Executor", args: []},
 ]
 
 async function main() {
@@ -25,6 +25,7 @@ async function main() {
         await deployedExecutor.deployed();
         console.log(`${exchange} deployed to: ${deployedExecutor.address}`);
 
+        // Verify on Tenderly
         try {
             await hre.tenderly.verify({
                 name: exchange,
@@ -34,6 +35,19 @@ async function main() {
         } catch (error) {
             console.error("Error during contract verification:", error);
         }
+
+        console.log("Waiting for 1 minute before verifying the contract...");
+        await new Promise(resolve => setTimeout(resolve, 60000));
+        // Verify on Etherscan
+        try {
+            await hre.run("verify:verify", {
+                address: deployedExecutor.address,
+                constructorArguments: args,
+            });
+            console.log(`${exchange} verified successfully on Etherscan!`);
+        } catch (error) {
+            console.error(`Error during Etherscan verification:`, error);
+        }
     }
 }
 

diff --git a/foundry/scripts/deploy-router.js b/foundry/scripts/deploy-router.js
@@ -6,11 +6,11 @@ async function main() {
     const network = hre.network.name;
     let permit2;
     let weth;
-    if (network === "mainnet" || network === "tenderly_mainnet") {
+    if (network === "ethereum" || network === "tenderly_ethereum") {
         permit2 = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
         weth = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2";
     } else if (network === "base" || network === "tenderly_base") {
-        // permit2 address is the same as on mainnet
+        // permit2 address is the same as on ethereum
         permit2 = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
         weth = "0x4200000000000000000000000000000000000006";
     } else {
@@ -31,6 +31,7 @@ async function main() {
     await router.deployed();
     console.log(`TychoRouter deployed to: ${router.address}`);
 
+    // Verify on Tenderly
     try {
         console.log("Verifying contract on Tenderly...");
         await hre.tenderly.verify({
@@ -41,6 +42,21 @@ async function main() {
     } catch (error) {
         console.error("Error during contract verification:", error);
     }
+
+    console.log("Waiting for 1 minute before verifying the contract...");
+    await new Promise(resolve => setTimeout(resolve, 60000));
+
+    // Verify on Etherscan
+    try {
+        await hre.run("verify:verify", {
+            address: router.address,
+            constructorArguments: [permit2, weth],
+        });
+        console.log(`TychoRouter verified successfully on Etherscan!`);
+    } catch (error) {
+        console.error(`Error during Etherscan verification:`, error);
+    }
+
 }
 
 main()

diff --git a/foundry/src/Dispatcher.sol b/foundry/src/Dispatcher.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.26;
 
 import "@interfaces/IExecutor.sol";

diff --git a/foundry/src/TychoRouter.sol b/foundry/src/TychoRouter.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.26;
 
 import "../lib/IWETH.sol";