Merge pull request #496 from identity-com/chore/addOptimismSepolia

CPASS-2753 Remove all *goerli chains and polygonMumbai, add optimismSepolia support
identity-com · Jun 11, 2024 · baa0345 · baa0345
2 parents 0acb602 + 27dd594
commit baa0345
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 450 deletions.
diff --git a/ethereum/gatekeeper-cli/README.md b/ethereum/gatekeeper-cli/README.md
diff --git a/ethereum/gatekeeper-cli/src/utils/oclif/providers.test.ts b/ethereum/gatekeeper-cli/src/utils/oclif/providers.test.ts
@@ -5,7 +5,7 @@ import assert = require('assert');
 describe('Check ethers provider', function () {
   let provider: BaseProvider
   const mainnetNetworkID = 1
-  const goerliNetworkID = 5
+  const sepoliaNetworkID = 11155111;
 
   it('Try connect to mainnet ethers provider, check network ID', async () => {
     provider = getProvider('ethereum')
@@ -14,11 +14,11 @@ describe('Check ethers provider', function () {
     assert.equal(networkId, mainnetNetworkID)
   })
 
-  it('Try connect to goerli ethers provider, check network ID', async () => {
-    provider = getProvider('goerli')
+  it('Try connect to sepolia ethers provider, check network ID', async () => {
+    provider = getProvider('sepolia')
     const networkId = (await provider.getNetwork()).chainId
 
-    assert.equal(networkId, goerliNetworkID)
+    assert.equal(networkId, sepoliaNetworkID)
   })
 
   it('Try connect to localhost provider, check connection URL', () => {

diff --git a/ethereum/gatekeeper-cli/src/utils/oclif/providers.ts b/ethereum/gatekeeper-cli/src/utils/oclif/providers.ts
@@ -21,14 +21,6 @@ export const networks = {
     url: 'https://sepolia.infura.io/v3/',
     chainId: 11_155_111,
   },
-  goerli: {
-    url: 'https://goerli.infura.io/v3/',
-    chainId: 5,
-  },
-  polygonMumbai: {
-    url: 'https://polygon-mumbai.infura.io/v3/',
-    chainId: 80_001,
-  },
   polygonAmoy: {
     url: 'https://polygon-amoy.infura.io/v3/',
     chainId: 80_002,
@@ -45,9 +37,9 @@ export const networks = {
     url: 'https://aurora-mainnet.infura.io/v3/',
     chainId: 1_313_161_554,
   },
-  optimismGoerli: {
-    url: 'https://optimism-goerli.infura.io/v3/',
-    chainId: 420,
+  optimismSepolia: {
+    url: 'https://optimism-sepolia.infura.io/v3/',
+    chainId: 11155420,
   },
   optimism: {
     url: 'https://optimism-mainnet.infura.io/v3/',
@@ -61,10 +53,6 @@ export const networks = {
     url: 'https://palm-mainnet.infura.io/v3/',
     chainId: 11_297_108_109,
   },
-  arbitrumGoerli: {
-    url: 'https://arbitrum-goerli.infura.io/v3/',
-    chainId: 421_613,
-  },
   arbitrumSepolia: {
     url: 'https://sepolia-rollup.arbitrum.io/rpc',
     chainId: 421_614,

diff --git a/ethereum/smart-contract/config/networks.ts b/ethereum/smart-contract/config/networks.ts
@@ -35,16 +35,6 @@ export const networks = {
         accounts: liveAccounts,
         chainId: 11155111,
     },
-    goerli: {
-        url: process.env.GOERLI_RPC ??`https://goerli.infura.io/v3/${process.env.INFURA_API_KEY}`,
-        accounts: liveAccounts,
-        chainId: 5,
-    },
-    polygonMumbai: {
-        url: process.env.POLYGONMUMBAI_RPC ??`https://polygon-mumbai.infura.io/v3/${process.env.INFURA_API_KEY}`,
-        accounts: liveAccounts,
-        chainId: 80001,
-    },
     polygonMainnet: {
         url: process.env.POLYGON_RPC ?? `https://polygon-mainnet.infura.io/v3/${process.env.INFURA_API_KEY}`,
         accounts: liveAccounts,
@@ -65,13 +55,6 @@ export const networks = {
         accounts: liveAccounts,
         chainId: 1313161554,
     },
-    optimismGoerli: {
-        url: process.env.OPGOERLI_RPC ??`https://optimism-goerli.infura.io/v3/${process.env.INFURA_API_KEY}`,
-        accounts: liveAccounts,
-        chainId: 420,
-        // optimism goerli deployment is only reliable if a gas price is set - the gas oracles are not reliable
-        gasPrice: 1_000_000_000,
-    },
     optimismSepolia: {
         url: process.env.OPSEPOLIA_RPC ??`https://sepolia.optimism.io`,
         accounts: liveAccounts,
@@ -94,11 +77,6 @@ export const networks = {
         accounts: liveAccounts,
         chainId: 11297108109,
     },
-    arbitrumGoerli: {
-        url: process.env.ARBGOERLI_RPC ??`https://arbitrum-goerli.infura.io/v3/${process.env.INFURA_API_KEY}`,
-        accounts: liveAccounts,
-        chainId: 421613,
-    },
     arbitrumSepolia: {
         url: process.env.ARBSEPOLIA_RPC ??`https://sepolia-rollup.arbitrum.io/rpc`,
         accounts: liveAccounts,
@@ -134,11 +112,6 @@ export const networks = {
         accounts: liveAccounts,
         chainId: 0, // not documented anywhere
     },
-    starknetGoerli: {
-        url: process.env.STARKNETGOERLI_RPC ??`https://starknet-goerli.infura.io/v3/${process.env.INFURA_API_KEY}`,
-        accounts: liveAccounts,
-        chainId: 0, // not documented anywhere
-    },
     xdc: {
         url: process.env.XDC_RPC ??'https://erpc.xinfin.network',
         accounts: liveAccounts,
@@ -197,11 +170,6 @@ export const networks = {
         accounts: liveAccounts,
         chainId: 59144,
     },
-    lineaGoerli: {
-        url: process.env.LINEAGOERLI_RPC ?? `https://linea-goerli.infura.io/v3/${process.env.INFURA_API_KEY}`,
-        accounts: liveAccounts,
-        chainId: 59140,
-    },
     gnosis: {
         url: process.env.GNOSIS_RPC ?? 'https://rpc.gnosischain.com',
         accounts: liveAccounts,
@@ -228,9 +196,4 @@ export const networks = {
         accounts: liveAccounts,
         chainId: 324,
     },
-    zkSyncGoerli: {
-        url: process.env.ZKSYNCGOERLI_RPC ?? 'https://testnet.era.zksync.dev',
-        accounts: liveAccounts,
-        chainId: 280,
-    },
 };
diff --git a/ethereum/smart-contract/hardhat.config.ts b/ethereum/smart-contract/hardhat.config.ts
@@ -53,12 +53,10 @@ module.exports = {
   etherscan: {
     apiKey: {
       mainnet: process.env.ETHERSCAN_API_KEY,
-      goerli: process.env.ETHERSCAN_API_KEY,
       polygon: process.env.POLYGONSCAN_API_KEY,
       polygonZkEVM: process.env.POLYGONSCAN_API_KEY,
       polygonZkEVMTestnet: process.env.POLYGONSCAN_API_KEY,
       arbitrumOne: process.env.ARBISCAN_API_KEY,
-      arbitrumGoerli: process.env.ARBISCAN_API_KEY,
       polygonAmoy: process.env.OKLINK_AMOY_API_KEY
     },
     customChains: [

diff --git a/ethereum/smart-contract/scripts/gatekeeperBatch.sh b/ethereum/smart-contract/scripts/gatekeeperBatch.sh
@@ -17,7 +17,7 @@ action=$2  # Assign the second argument to action
 # mainnets
 networks=(mainnet polygonMainnet arbitrumMainnet xdc polygonZkEVM fantom)
 # testnets
-#networks=(sepolia goerli polygonMumbai arbitrumGoerli xdcApothem polygonZkEVMTestnet fantomTestnet)
+#networks=(sepolia xdcApothem polygonZkEVMTestnet fantomTestnet)
 gatekeepernetworks=(1 12 13 14 15 16 17 18 20 21 23 25)
 
 # Load completed tasks from batch.temp

diff --git a/solana/gatekeeper-cli/README.md b/solana/gatekeeper-cli/README.md
@@ -19,7 +19,7 @@ $ npm install -g @identity.com/solana-gatekeeper-cli
 $ gateway COMMAND
 running command...
 $ gateway (-v|--version|version)
-@identity.com/solana-gatekeeper-cli/0.0.2 darwin-arm64 node-v18.16.0
+@identity.com/solana-gatekeeper-cli/0.0.2 darwin-x64 node-v20.12.0
 $ gateway --help [COMMAND]
 USAGE
   $ gateway COMMAND
@@ -107,7 +107,7 @@ OPTIONS
 
 EXAMPLE
   $ gateway burn EzZgkwaDrgycsiyGeCVRXXRcieE1fxhGMp829qwj5TMv
-  Revoked
+  Burned
 ```
 
 ## `gateway freeze GATEWAYTOKEN`