Chore: Update Game7Testnet config

G7DAO · Sep 3, 2024 · b5e8bcb · b5e8bcb
1 parent 634cb1f
commit b5e8bcb
Show file tree

Hide file tree

Showing 11 changed files with 4,797 additions and 3,496 deletions.
diff --git a/README.md b/README.md
@@ -36,8 +36,7 @@ pnpm install
     "deploy:mantle:sepolia": "pnpm compile && hardhat --config mantle.config.ts deploy --network mantleSepolia",
     "deploy:polygon:mainnet": "pnpm compile && hardhat --config polygon.config.ts deploy --network polygon",
     "deploy:polygon:mumbai": "pnpm compile && hardhat --config polygon.config.ts deploy --network polygonMumbai",
-    "deploy:g7:arb:sepolia": "pnpm compile && hardhat --config g7.config.ts deploy --network game7OrbitArbSepolia",
-    "deploy:g7:base:sepolia": "pnpm compile && hardhat --config g7.config.ts deploy --network game7OrbitBaseSepolia",
+    "deploy:g7:testnet": "pnpm compile && hardhat --config g7.config.ts deploy --network game7Testnet",
     "test:foundry": "forge test -vvv",
     "test": "REPORT_GAS=true hardhat --config hardhat.config.ts test test/hardhatTests/*.ts --network hardhat",
     "test:ci": "hardhat --config hardhat.config.ts test test/hardhatTests/*.ts  --network hardhat",

diff --git a/constants/constructor-args.ts b/constants/constructor-args.ts
@@ -234,12 +234,12 @@ export const BridgePolygonV1Args = {
     MAINNET: {
         developerAdmin: 'DEPLOYER_WALLET',
         chainIdFrom: ChainId.Polygon,
-        chainIdTo: ChainId.Game7OrbitArbSepolia, // TODO * chain to mainnet
+        chainIdTo: ChainId.Game7Testnet, // TODO * chain to mainnet
     },
     TESTNET: {
         developerAdmin: 'DEPLOYER_WALLET',
         chainIdFrom: ChainId.PolygonMumbai,
-        chainIdTo: ChainId.Game7OrbitArbSepolia,
+        chainIdTo: ChainId.Game7Testnet,
     },
 };
 

diff --git a/constants/deployments/deployments-g7-sepolia-base.ts b/constants/deployments/deployments-g7-sepolia-base.ts
diff --git a/...deployments/deployments-g7-sepolia-arb.ts → ...nts/deployments/deployments-g7-testnet.ts b/...deployments/deployments-g7-sepolia-arb.ts → ...nts/deployments/deployments-g7-testnet.ts
@@ -21,7 +21,7 @@ import { TENANT } from '@constants/tenant';
 import { DeploymentContract } from '../../types/deployment-type';
 import { NETWORK_TYPE, NetworkName } from '../network';
 
-const chain = NetworkName.Game7OrbitArbSepolia;
+const chain = NetworkName.Game7Testnet;
 const networkType = NETWORK_TYPE.TESTNET;
 
 export const G7_SEPOLIA_ARB_CONTRACTS: DeploymentContract[] = [

diff --git a/constants/network.ts b/constants/network.ts
@@ -24,8 +24,7 @@ export enum ChainId {
     OPSepolia = 11155420,
     Base = 8453,
     BaseSepolia = 84532,
-    Game7OrbitArbSepolia = 7007007,
-    Game7Testnet = 95002,
+    Game7Testnet = 13746,
 }
 
 export enum NetworkName {
@@ -44,7 +43,6 @@ export enum NetworkName {
     OPSepolia = 'OPSepolia',
     Base = 'base',
     BaseSepolia = 'baseSepolia',
-    Game7OrbitArbSepolia = 'game7OrbitArbSepolia',
     Game7Testnet = 'game7Testnet',
 }
 
@@ -65,7 +63,6 @@ export enum NetworkConfigFile {
     OPSepolia = 'op.config.ts',
     Base = 'base.config.ts',
     BaseSepolia = 'base.config.ts',
-    Game7OrbitArbSepolia = 'g7.config.ts',
     Game7Testnet = 'g7.config.ts',
 }
 
@@ -85,8 +82,6 @@ export enum Currency {
     OPSepolia = 'ETH',
     Base = 'ETH',
     BaseSepolia = 'ETH',
-    Game7Sepolia = 'ETH',
-    Game7OrbitArbSepolia = 'Iron',
     Game7Testnet = 'G7',
 }
 
@@ -107,8 +102,7 @@ export enum NetworkExplorer {
     Base = 'https://basescan.org',
     BaseSepolia = 'https://base-sepolia.blockscout.com',
     //  this will change to: testnet.explorer.game7.io
-    Game7OrbitArbSepolia = 'https://explorerl2new-game7-arb-anytrust-wcj9hysn7y.t.conduit.xyz',
-    Game7Testnet = 'https://explorer-game7-testnet-2g3y2k9azw.t.conduit.xyz/',
+    Game7Testnet = 'https://explorer-game7-testnet-0ilneybprf.t.conduit.xyz',
 }
 
 export function getTransactionUrl(txHash: string, network: NetworkName): string {
@@ -135,6 +129,5 @@ export const rpcUrls = {
     [ChainId.Base]: 'https://mainnet.base.org',
     [ChainId.BaseSepolia]: 'https://sepolia.base.org',
     //  this will change to: rpc.sepolia.game7.io
-    [ChainId.Game7OrbitArbSepolia]: 'https://rpc-game7-arb-anytrust-wcj9hysn7y.t.conduit.xyz',
-    [ChainId.Game7Testnet]: 'https://rpc-game7-testnet-2g3y2k9azw.t.conduit.xyz/',
+    [ChainId.Game7Testnet]: 'https://rpc-game7-testnet-0ilneybprf.t.conduit.xyz',
 };
diff --git a/...loyments/deployments-game7-arb-sepolia.ts → ...-deployments/deployments-game7-testnet.ts b/...loyments/deployments-game7-arb-sepolia.ts → ...-deployments/deployments-game7-testnet.ts
@@ -5,7 +5,7 @@ import { TENANT } from '@constants/tenant';
 import { DeploymentContract } from '../../types/deployment-type';
 import { NETWORK_TYPE, NetworkName } from '../network';
 
-const chain = NetworkName.Game7OrbitArbSepolia;
+const chain = NetworkName.Game7Testnet;
 const networkType = NETWORK_TYPE.TESTNET;
 
 export const GAME7_ARB_SEPOLIA_CONTRACTS: DeploymentContract[] = [

diff --git a/...loyments/deployments-game7-arb-sepolia.ts → ...-deployments/deployments-game7-testnet.ts b/...loyments/deployments-game7-arb-sepolia.ts → ...-deployments/deployments-game7-testnet.ts
@@ -14,10 +14,10 @@ import {
     DirectListingExtensionArgs,
     EnglishAuctionsExtensionArgs,
     MarketplaceArgs,
-    OffersExtensionArgs
-} from "@constants/constructor-args";
+    OffersExtensionArgs,
+} from '@constants/constructor-args';
 
-const chain = NetworkName.Game7OrbitArbSepolia;
+const chain = NetworkName.Game7Testnet;
 const networkType = NETWORK_TYPE.TESTNET;
 
 export const GAME7_ARB_SEPOLIA_CONTRACTS: DeploymentProxyContract[] = [

diff --git a/deploy/deploy.ts b/deploy/deploy.ts
@@ -67,7 +67,7 @@ export default async function (
 
     if (contract.verify) {
         log('Waiting for contract to be confirmed...');
-        if (hre.network.name === NetworkName.Game7OrbitArbSepolia || hre.network.name === NetworkName.Game7Testnet) {
+        if (hre.network.name === NetworkName.Game7Testnet) {
             // This L3 provided network requires only 1 confirmation
             await achievoContract.deploymentTransaction()?.wait(1); // wait for 1 confirmation
         } else {

diff --git a/g7.config.ts b/g7.config.ts
@@ -12,11 +12,6 @@ log(`Using Game7 L3 config`);
 
 defaultConfig.networks = {
     ...defaultConfig.networks,
-    [NetworkName.Game7OrbitArbSepolia]: {
-        url: rpcUrls[ChainId.Game7OrbitArbSepolia],
-        accounts: [PRIVATE_KEY],
-        chainId: ChainId.Game7OrbitArbSepolia,
-    },
     [NetworkName.Game7Testnet]: {
         url: rpcUrls[ChainId.Game7Testnet],
         accounts: [PRIVATE_KEY],
@@ -27,14 +22,6 @@ defaultConfig.networks = {
 defaultConfig.etherscan = {
     apiKey: ETHSCAN_API_KEY,
     customChains: [
-        {
-            network: NetworkName.Game7OrbitArbSepolia,
-            chainId: ChainId.Game7OrbitArbSepolia,
-            urls: {
-                apiURL: `${NetworkExplorer.Game7OrbitArbSepolia}/api`,
-                browserURL: NetworkExplorer.Game7OrbitArbSepolia,
-            },
-        },
         {
             network: NetworkName.Game7Testnet,
             chainId: ChainId.Game7Testnet,

diff --git a/package.json b/package.json
@@ -21,8 +21,7 @@
         "deploy:mantle:sepolia": "pnpm compile && hardhat --config mantle.config.ts deploy --network mantleSepolia",
         "deploy:polygon:mainnet": "pnpm compile && hardhat --config polygon.config.ts deploy --network polygon",
         "deploy:polygon:mumbai": "pnpm compile && hardhat --config polygon.config.ts deploy --network polygonMumbai",
-        "deploy:g7:arb:sepolia": "pnpm compile && hardhat --config g7.config.ts deploy --network game7OrbitArbSepolia",
-        "deploy:g7:base:sepolia": "pnpm compile && hardhat --config g7.config.ts deploy --network game7OrbitBaseSepolia",
+        "deploy:g7:testnet": "pnpm compile && hardhat --config g7.config.ts deploy --network game7Testnet",
         "test:foundry": "forge test -vvv",
         "test": "REPORT_GAS=true hardhat --config hardhat.config.ts test test/hardhatTests/*.ts --network hardhat",
         "test:ci": "hardhat --config hardhat.config.ts test test/hardhatTests/*.ts  --network hardhat",