From 44d3d3631f5d34fb6db8cc7a42fbd4c8078f1766 Mon Sep 17 00:00:00 2001
From: Kamlesh Mugdiya <kamleshmugdiya@bitgo.com>
Date: Fri, 23 Aug 2024 09:05:46 +0530
Subject: [PATCH] feat(base): deploy v2 contracts on base chain Ticket:
 COIN-1108

---
 hardhat.config.ts | 10 ++--------
 package.json      |  4 ++--
 scripts/deploy.ts |  4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index c45ae81..fb4c4d2 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -126,17 +126,11 @@ const config: HardhatUserConfig = {
     },
     tbaseeth: {
       url: 'https://sepolia.base.org',
-      accounts: [
-        `${PRIVATE_KEY_FOR_V1_WALLET_CONTRACT_DEPLOYMENT}`,
-        `${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT_BACKUP}`
-      ]
+      accounts: [`${TESTNET_PRIVATE_KEY_FOR_CONTRACT_DEPLOYMENT}`]
     },
     baseeth: {
       url: 'https://mainnet.base.org/',
-      accounts: [
-        `${PRIVATE_KEY_FOR_V1_WALLET_CONTRACT_DEPLOYMENT}`,
-        `${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT_BACKUP}`
-      ]
+      accounts: [`${MAINNET_PRIVATE_KEY_FOR_CONTRACT_DEPLOYMENT}`]
     },
     tbera: {
       url: `https://bartio.rpc.berachain.com/`,
diff --git a/package.json b/package.json
index b0d6257..53fac50 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
     "test": "test"
   },
   "scripts": {
-    "deploy-prod": "hardhat run scripts/deployV1FactoryContracts.ts --network",
-    "deploy-test": "hardhat run scripts/deployV1FactoryContracts.ts --network",
+    "deploy-prod": "hardhat run scripts/deploy.ts --network",
+    "deploy-test": "hardhat run scripts/deploy.ts --network",
     "test": "hardhat test",
     "coverage": "hardhat coverage",
     "solhint": "./node_modules/.bin/solhint --fix 'contracts/**/*.sol'",
diff --git a/scripts/deploy.ts b/scripts/deploy.ts
index d310843..7b1eb27 100644
--- a/scripts/deploy.ts
+++ b/scripts/deploy.ts
@@ -86,8 +86,8 @@ async function main() {
     // base
     case 8453:
       walletImplementationContractName = 'WalletSimple';
-      forwarderContractName = 'ForwarderV4';
-      forwarderFactoryContractName = 'ForwarderFactoryV4';
+      forwarderContractName = 'Forwarder';
+      forwarderFactoryContractName = 'ForwarderFactory';
       contractPath = `contracts/${walletImplementationContractName}.sol:${walletImplementationContractName}`;
       break;
     case 80084: