diff --git a/.env.example b/.env.example index 2ffc6856..6bdb3c76 100644 --- 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/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts index d1e9092a..da103f21 100644 --- a/packages/contracts/hardhat.config.ts +++ b/packages/contracts/hardhat.config.ts @@ -115,14 +115,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: [ { @@ -141,14 +137,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 index 1a6af088..547597be 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,4 @@ { - "name": "@aragon/admin-plugin-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 index cc8c6472..cfa1da4d 100644 --- 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 deleted file mode 100644 index c1f13274..00000000 --- a/packages/subgraph/manifest/data/arbitrumSepolia.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest", - "network": "arbitrum-sepolia", - "PluginRepo": { - "address": "0x152c9E28995E418870b85cbbc0AEE4e53020edb2" - }, - "dataSources": { - "PluginSetupProcessors": [ - { - "name": "PluginSetupProcessor", - "address": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f", - "startBlock": 2827173 - } - ] - } -} diff --git a/packages/subgraph/manifest/data/baseSepolia.json b/packages/subgraph/manifest/data/baseSepolia.json deleted file mode 100644 index b99f6c59..00000000 --- a/packages/subgraph/manifest/data/baseSepolia.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest", - "network": "base-sepolia", - "PluginRepo": { - "address": "0x152c9E28995E418870b85cbbc0AEE4e53020edb2" - }, - "dataSources": { - "PluginSetupProcessors": [ - { - "name": "PluginSetupProcessor", - "address": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f", - "startBlock": 3654401 - } - ] - } -} diff --git a/packages/subgraph/manifest/data/mumbai.json b/packages/subgraph/manifest/data/mumbai.json deleted file mode 100644 index 2a3b4be2..00000000 --- a/packages/subgraph/manifest/data/mumbai.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest", - "network": "mumbai", - "PluginRepo": { - "address": "0x0DF9b15550fF39149e491dDD154b28f587e0cD16" - }, - "dataSources": { - "PluginSetupProcessors": [ - { - "name": "PluginSetupProcessor", - "address": "0x9227b311C5cecB416707F1C8B7Ca1b52649AabEc", - "startBlock": 33514164 - } - ] - } -} diff --git a/packages/subgraph/scripts/deploy-subgraph.sh b/packages/subgraph/scripts/deploy-subgraph.sh index 3f7a9db3..961758bd 100755 --- a/packages/subgraph/scripts/deploy-subgraph.sh +++ b/packages/subgraph/scripts/deploy-subgraph.sh @@ -26,7 +26,7 @@ echo '> Building subgraph' if [ "$SUBGRAPH_NETWORK_NAME" == 'localhost' ] then - SUBGRAPH_NETWORK_NAME='goerli' + SUBGRAPH_NETWORK_NAME='sepolia' fi # Prepare subgraph name