Merge remote-tracking branch 'template/develop' into update-with-temp…

…late-repo
aragon · May 10, 2024 · 88ee6a2 · 88ee6a2
2 parents 47e427f + 1a61f1d
commit 88ee6a2
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 72 deletions.
diff --git a/.env.example b/.env.example
@@ -1,7 +1,7 @@
 # GENERAL
 
 ## The network used for testing purposes
-NETWORK_NAME="sepolia" #  ["mainnet", "sepolia", "polygon", "mumbai","baseMainnet", "baseGoerli", "baseSepolia", "arbitrum", "arbitrumSepolia"]
+NETWORK_NAME="sepolia" #  ["mainnet", "sepolia", "polygon", "baseMainnet", "arbitrum"]
 
 # CONTRACTS
 
@@ -29,4 +29,4 @@ GRAPH_KEY="zzzzzzzzzzzz"
 ## Subgraph
 SUBGRAPH_NAME="osx"
 SUBGRAPH_VERSION="v1.0.0"
-SUBGRAPH_NETWORK_NAME="mainnet" #  ["mainnet", "goerli", "sepolia", "polygon", "polygonMumbai", "base", "baseSepolia", "arbitrum", "arbitrumSepolia"]
+SUBGRAPH_NETWORK_NAME="mainnet" #  ["mainnet", "sepolia", "polygon", "base", "arbitrum"]
diff --git a/USAGE_GUIDE.md b/USAGE_GUIDE.md
@@ -144,7 +144,7 @@ GRAPH_KEY="zzzzzzzzzzzz"
 ## Subgraph
 SUBGRAPH_NAME="osx"
 SUBGRAPH_VERSION="v1.0.0"
-SUBGRAPH_NETWORK_NAME="mainnet" #  ["mainnet", "goerli", "sepolia", "polygon", "polygonMumbai", "base", "baseSepolia", "arbitrum", "arbitrumSepolia"]
+SUBGRAPH_NETWORK_NAME="mainnet" #  ["mainnet", "sepolia", "polygon", "base", "arbitrum"]
 ```
 
 - `GRAPH_KEY`: This key will be used for deploying the subgraph.

diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
@@ -116,14 +116,10 @@ const config: HardhatUserConfig = {
   etherscan: {
     apiKey: {
       mainnet: process.env.ETHERSCAN_API_KEY || '',
-      goerli: process.env.ETHERSCAN_API_KEY || '',
       sepolia: process.env.ETHERSCAN_API_KEY || '',
       polygon: process.env.POLYGONSCAN_API_KEY || '',
-      polygonMumbai: process.env.POLYGONSCAN_API_KEY || '',
       base: process.env.BASESCAN_API_KEY || '',
-      baseGoerli: process.env.BASESCAN_API_KEY || '',
       arbitrumOne: process.env.ARBISCAN_API_KEY || '',
-      arbitrumGoerli: process.env.ARBISCAN_API_KEY || '',
     },
     customChains: [
       {
@@ -142,14 +138,6 @@ const config: HardhatUserConfig = {
           browserURL: 'https://basescan.org',
         },
       },
-      {
-        network: 'baseGoerli',
-        chainId: 84531,
-        urls: {
-          apiURL: 'https://api-goerli.basescan.org/api',
-          browserURL: 'https://goerli.basescan.org',
-        },
-      },
     ],
   },
 

diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -1,6 +1,4 @@
 {
-  "name": "@aragon/osx-plugin-template-contracts",
-  "version": "1.0.0",
   "license": "AGPL-3.0-or-later",
   "scripts": {
     "build": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",

diff --git a/packages/contracts/test/20_integration-testing/21_deployment.ts b/packages/contracts/test/20_integration-testing/21_deployment.ts
@@ -67,11 +67,6 @@ describe(`Deployment on network '${productionNetworkName}'`, function () {
     it('registers the setup', async () => {
       const {pluginRepo} = await loadFixture(fixture);
 
-      await pluginRepo['getVersion((uint8,uint16))']({
-        release: VERSION.release,
-        build: VERSION.build,
-      });
-
       const results = await pluginRepo['getVersion((uint8,uint16))']({
         release: VERSION.release,
         build: VERSION.build,

diff --git a/packages/subgraph/manifest/data/arbitrumSepolia.json b/packages/subgraph/manifest/data/arbitrumSepolia.json
diff --git a/packages/subgraph/manifest/data/baseSepolia.json b/packages/subgraph/manifest/data/baseSepolia.json
diff --git a/packages/subgraph/manifest/data/mumbai.json b/packages/subgraph/manifest/data/mumbai.json
diff --git a/packages/subgraph/scripts/deploy-subgraph.sh b/packages/subgraph/scripts/deploy-subgraph.sh
@@ -22,8 +22,9 @@ echo ''
 echo '> Building subgraph'
 ./scripts/build-subgraph.sh
 
-if [ "$SUBGRAPH_NETWORK_NAME" == 'localhost' ]; then
-    SUBGRAPH_NETWORK_NAME='goerli'
+if [ "$SUBGRAPH_NETWORK_NAME" == 'localhost' ]
+then
+  SUBGRAPH_NETWORK_NAME='sepolia'
 fi
 
 # Prepare subgraph name