feat(pg): Support mainnets

hujw77 · Aug 8, 2023 · f5d7503 · f5d7503
1 parent 54be0a0
commit f5d7503
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 103 deletions.
diff --git a/.changeset/strange-experts-raise.md b/.changeset/strange-experts-raise.md
@@ -0,0 +1,5 @@
+---
+'@sphinx-labs/core': patch
+---
+
+Output network name during etherscan verification
diff --git a/packages/core/hardhat.config.ts b/packages/core/hardhat.config.ts
@@ -54,7 +54,7 @@ const config: HardhatUserConfig = {
     },
     arbitrum: {
       chainId: 42161,
-      url: 'https://arb1.arbitrum.io/rpc',
+      url: `https://arb-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
       accounts,
     },
     'arbitrum-goerli': {
@@ -64,19 +64,34 @@ const config: HardhatUserConfig = {
     },
     bnbt: {
       chainId: 97,
-      url: `https://young-wandering-energy.bsc-testnet.discover.quiknode.pro/${process.env.QUICKNODE_API_KEY}`,
+      url: process.env.BNB_TESTNET_URL,
+      accounts,
+    },
+    bnb: {
+      chainId: 56,
+      url: process.env.BNB_MAINNET_URL,
       accounts,
     },
     'gnosis-chiado': {
       chainId: 10200,
       url: `https://nd-706-500-091.p2pify.com/${process.env.CHAINSTACK_API_KEY}`,
       accounts,
     },
+    gnosis: {
+      chainId: 100,
+      url: process.env.GNOSIS_MAINNET_URL,
+      accounts,
+    },
     maticmum: {
       chainId: 80001,
       url: `https://polygon-mumbai.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
       accounts,
     },
+    polygon: {
+      chainId: 137,
+      url: `https://polygon-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
+      accounts,
+    },
   },
 }
 

diff --git a/packages/core/src/etherscan.ts b/packages/core/src/etherscan.ts
@@ -228,7 +228,7 @@ export const attemptVerification = async (
 
   console.log(
     `Successfully submitted source code for contract
-     ${sourceName}:${contractName} at ${contractAddress}
+     ${sourceName}:${contractName} at ${contractAddress} on ${networkName}
      for verification on the block explorer. Waiting for verification result...
     `
   )
@@ -258,13 +258,13 @@ export const attemptVerification = async (
   if (verificationStatus.isVerificationSuccess()) {
     const contractURL = buildContractUrl(urls.browserURL, contractAddress)
     console.log(
-      `Successfully verified ${contractName} on Etherscan:
+      `Successfully verified ${contractName} on ${networkName} Etherscan:
       ${contractURL}`
     )
   } else {
     // Reaching this point shouldn't be possible unless the API is behaving in a new way.
     throw new Error(
-      `The Etherscan API responded with an unexpected message.
+      `The ${networkName} Etherscan API responded with an unexpected message.
       Contract verification may have succeeded and should be checked manually.
       Message: ${verificationStatus.message}`
     )

diff --git a/packages/plugins/contracts/foundry/SphinxConstants.sol b/packages/plugins/contracts/foundry/SphinxConstants.sol
diff --git a/packages/plugins/hardhat.config.ts b/packages/plugins/hardhat.config.ts
@@ -38,31 +38,61 @@ const config: HardhatUserConfig = {
     //   url: `https://eth-goerli.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
     //   accounts,
     // },
+    // ethereum: {
+    //   chainId: 1,
+    //   url: `https://eth-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
+    //   accounts,
+    // },
     // 'optimism-goerli': {
     //   chainId: 420,
     //   url: `https://opt-goerli.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
     //   accounts,
     // },
+    // optimism: {
+    //   chainId: 10,
+    //   url: `https://opt-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
+    //   accounts,
+    // },
+    // arbitrum: {
+    //   chainId: 42161,
+    //   url: `https://arb-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
+    //   accounts,
+    // },
     // 'arbitrum-goerli': {
     //   chainId: 421613,
     //   url: `https://arb-goerli.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
     //   accounts,
     // },
     // bnbt: {
     //   chainId: 97,
-    //   url: `https://young-wandering-energy.bsc-testnet.discover.quiknode.pro/${process.env.QUICKNODE_API_KEY}`,
+    //   url: process.env.BNB_TESTNET_URL,
+    //   accounts,
+    // },
+    // bnb: {
+    //   chainId: 56,
+    //   url: process.env.BNB_MAINNET_URL,
     //   accounts,
     // },
     // 'gnosis-chiado': {
     //   chainId: 10200,
-    //   url: `https://rpc.chiadochain.net`,
+    //   url: `https://nd-706-500-091.p2pify.com/${process.env.CHAINSTACK_API_KEY}`,
+    //   accounts,
+    // },
+    // gnosis: {
+    //   chainId: 100,
+    //   url: process.env.GNOSIS_MAINNET_URL,
     //   accounts,
     // },
     // maticmum: {
     //   chainId: 80001,
     //   url: `https://polygon-mumbai.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
     //   accounts,
     // },
+    // polygon: {
+    //   chainId: 137,
+    //   url: `https://polygon-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`,
+    //   accounts,
+    // },
 
     goerli: {
       chainId: 5,
@@ -94,7 +124,6 @@ const config: HardhatUserConfig = {
       url: 'http://127.0.0.1:42001',
       accounts,
     },
-
     ethereum: {
       chainId: 1,
       url: 'http://127.0.0.1:10001',

diff --git a/packages/plugins/sphinx/Website.config.ts b/packages/plugins/sphinx/Website.config.ts
@@ -4,18 +4,18 @@ const ownerAddress = '0x9fd58Bf0F2E6125Ffb0CBFa9AE91893Dbc1D5c51'
 
 // Used for testing the website, please do not delete
 const config: UserConfigWithOptions = {
-  projectName: 'Foundry Deployment 3',
+  projectName: 'Foundry Deployment',
   options: {
-    orgId: 'clkr8uf810000gecb3w80g8cl',
+    orgId: 'clku3cgou00002gcb837z3j3j',
     owners: [ownerAddress],
     threshold: 1,
     testnets: [
-      'goerli',
       'arbitrum-goerli',
       'gnosis-chiado',
       'maticmum',
       'bnbt',
       'optimism-goerli',
+      'goerli',
     ],
     mainnets: ['ethereum', 'optimism'],
     proposers: [ownerAddress],