Feature/fix scripts (#331)

* fix scripts

Author: alexcos20

.github/workflows/tests.yml

@@ -64,7 +64,7 @@ jobs:
       
       - name: create and deploy subgraph
         run: |
-          npm run quickstart:development
+          npm run quickstart:barge
           sleep 20
         env:
           ADDRESS_FILE: /home/runner/.ocean/ocean-contracts/artifacts/address.json

README.md

@@ -18,8 +18,8 @@
 
 - [🏄 Get Started](#-get-started)
 - [⛵ Example Queries](#-example-queries)
-- [🏊 Development](#-development)
 - [🏊 Development on barge](#-development-on-barge)
+- [🏊 Deploying graphs for live networks](#-Deploying-graphs-for-live-networks)
 - [🔍 Testing](#-testing)
 - [✨ Code Style](#-code-style)
 - [🛳 Releases](#️-releases)
@@ -30,11 +30,10 @@
 
 This subgraph is deployed under `/subgraphs/name/oceanprotocol/ocean-subgraph/` namespace for all networks the Ocean Protocol contracts are deployed to:
 
-- [subgraph.mainnet.oceanprotocol.com](https://subgraph.mainnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
-- [subgraph.ropsten.oceanprotocol.com](https://subgraph.ropsten.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
-- [subgraph.rinkeby.oceanprotocol.com](https://subgraph.rinkeby.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
-- [subgraph.polygon.oceanprotocol.com](https://subgraph.polygon.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
-- [subgraph.bsc.oceanprotocol.com](https://subgraph.bsc.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
+- [subgraphv4.ropsten.oceanprotocol.com](https://subgraphv4.ropsten.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
+- [subgraphv4.rinkeby.oceanprotocol.com](https://subgraphv4.rinkeby.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
+- [subgraphv4.mumbai.oceanprotocol.com](https://subgraphv4.mumbai.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
+- [subgraphv4.moonbase.oceanprotocol.com](https://subgraphv4.moonbase.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph/graphql)
 
 ## ⛵ Example Queries
 
@@ -85,35 +84,6 @@ This subgraph is deployed under `/subgraphs/name/oceanprotocol/ocean-subgraph/`
 
 > Note: all ETH addresses like `$userAddress` in above example need to be passed in lowercase.
 
-## 🏊 Development
-
-First, clone the repo and install dependencies:
-
-```bash
-git clone https://github.com/oceanprotocol/ocean-subgraph/
-cd ocean-subgraph
-npm i
-```
-
-Developing and testing any change requires them to be deployed against a locally running graph-node and some other components running in Docker. Make sure you have Docker and Docker Compose installed on your machine, then prepare the Docker setup:
-
-```bash
-cd docker
-./setup.sh
-```
-
-Then add your Infura key as environment variable with a `.env` file, and start everything up with Docker Compose:
-
-```bash
-# create .env and modify
-cp .env.example .env
-
-docker-compose --env-file .env up
-```
-
-The default network for development is set to Rinkeby. If you want to switch to another network you have to modify the `docker/docker-compose.yml` file within `environment.ethereum`.
-
-You now have a local graph-node running and can start deploying your changes to it. To do so, follow the [Deployment instructions](#️-deployment).
 
 
 ## 🏊 Development on Barge
@@ -137,37 +107,48 @@ cd ocean-subgraph
 npm i
 ```
 
-3. If you use barge, then let the components know where to pickup the smart contract addresses. For production networks, skip this step
+3. Let the components know where to pickup the smart contract addresses. 
 ```
 export ADDRESS_FILE="${HOME}/.ocean/ocean-contracts/artifacts/address.json"
 ```
 
 4. Generate the subgraphs
 ```bash
-node ./scripts/generatenetworkssubgraphs.js
+node ./scripts/generatenetworkssubgraphs.js barge
 npm run codegen
 ```
 
-To generate subgraph for just one network, add the network name as parameter
-```bash
-node ./scripts/generatenetworkssubgraphs.js rinkeby
-```
-
 5. To deploy a subgraph use:
 
-npm run create:local-[network]
-npm run deploy:local-[network]
+npm run create:local-barge
+npm run deploy:local-barge
 
 ```bash
-npm run create:local-development
-npm run deploy:local-development
+npm run create:local
+npm run deploy:local
 ```
 
-- Alternatively, if you want to get the sub-graph quickly running on barge, you can run `npm run quickstart:barge` which combines steps 3-5 above.
+- Alternatively, if you want to get the sub-graph quickly running on barge, you can run `npm run quickstart:barge` which combines steps 4-5 above.
 
 You now have a local graph-node running on http://127.0.0.1:9000/subgraphs/name/oceanprotocol/ocean-subgraph/graphql
 
 
+## 🏊 Deploying graphs for live networks
+
+
+1. Clone the repo and install dependencies:
+
+```bash
+git clone https://github.com/oceanprotocol/ocean-subgraph/
+cd ocean-subgraph
+npm i
+```
+
+2. Generate & deploy on rinkeby
+```bash
+npm run quickstart:rinkeby
+```
+
 
 ## 🔍 Testing
 

docker-entrypoint.sh

@@ -11,7 +11,7 @@ then
     sleep 2
   done
   export ADDRESS_FILE="/ocean-contracts/artifacts/address.json"
-  /usr/src/app/
+  cd /usr/src/app/
   npm run quickstart:barge
 fi
 tail -f /dev/null

package.json

@@ -3,42 +3,20 @@
   "version": "1.2.0",
   "scripts": {
     "start": "",
-    "quickstart:development": "node ./scripts/generatenetworkssubgraphs.js development && npm run codegen && npm run create:local-development && npm run deploy:local-development",
+    "quickstart:development": "node ./scripts/generatenetworkssubgraphs.js development && npm run codegen && npm run create:local && npm run deploy:local",
     "quickstart:barge": "node ./scripts/generatenetworkssubgraphs.js development && npm run codegen && npm run create:local-barge && npm run deploy:local-barge",
-    "create": "graph create oceanprotocol/ocean-subgraph --node https://api.thegraph.com/deploy/",
+    "quickstart:rinkeby": "node ./scripts/generatenetworkssubgraphs.js rinkeby && npm run codegen && npm run create:local && npm run deploy:local",
+    "quickstart:ropsten": "node ./scripts/generatenetworkssubgraphs.js ropsten && npm run codegen && npm run create:local && npm run deploy:local",
+    "quickstart:mumbai": "node ./scripts/generatenetworkssubgraphs.js mumbai && npm run codegen && npm run create:local && npm run deploy:local",
+    "quickstart:moonbase": "node ./scripts/generatenetworkssubgraphs.js moonbase && npm run codegen && npm run create:local && npm run deploy:local",
+    "create:thegraph": "graph create oceanprotocol/ocean-subgraph --node https://api.thegraph.com/deploy/",
     "create:local": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-development": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:9020",
     "create:local-barge": "graph create oceanprotocol/ocean-subgraph --node http://172.15.0.15:8020",
-    "create:local-rinkeby": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-ropsten": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-polygon": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-moonbeamalpha": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-gaiaxtestnet": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-catenaxtestnet": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-mumbai": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-bsc": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-celoalfajores": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-energyweb": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
-    "create:local-moonriver": "graph create oceanprotocol/ocean-subgraph --node http://127.0.0.1:8020",
     "codegen": "graph codegen --output-dir src/@types",
     "build": "graph build",
-    "xx": "graph deploy --help",
-    "deploy": "graph deploy oceanprotocol/ocean-subgraph -l $npm_package_version --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
-    "deploy:beta": "graph deploy oceanprotocol/ocean-subgraph-beta -l $npm_package_version --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
+    "deploy:thegraph": "graph deploy oceanprotocol/ocean-subgraph -l $npm_package_version --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/",
     "deploy:local": "graph deploy oceanprotocol/ocean-subgraph subgraph.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-development": "graph deploy oceanprotocol/ocean-subgraph subgraph.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:9020",
     "deploy:local-barge": "graph deploy oceanprotocol/ocean-subgraph subgraph.yaml -l $npm_package_version --debug --ipfs http://172.15.0.16:5001 --node http://172.15.0.15:8020",
-    "deploy:local-rinkeby": "graph deploy oceanprotocol/ocean-subgraph subgraph.rinkeby.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-ropsten": "graph deploy oceanprotocol/ocean-subgraph subgraph.ropsten.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-polygon": "graph deploy oceanprotocol/ocean-subgraph subgraph.polygon.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-moonbeamalpha": "graph deploy oceanprotocol/ocean-subgraph subgraph.moonbeamalpha.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-gaiaxtestnet": "graph deploy oceanprotocol/ocean-subgraph subgraph.gaiaxtestnet.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-catenaxtestnet": "graph deploy oceanprotocol/ocean-subgraph subgraph.catenaxtestnet.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-mumbai": "graph deploy oceanprotocol/ocean-subgraph subgraph.mumbai.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-bsc": "graph deploy oceanprotocol/ocean-subgraph subgraph.bsc.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-celoalfajores": "graph deploy oceanprotocol/ocean-subgraph subgraph.celoalfajores.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-energyweb": "graph deploy oceanprotocol/ocean-subgraph subgraph.energyweb.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
-    "deploy:local-moonriver": "graph deploy oceanprotocol/ocean-subgraph subgraph.moonriver.yaml -l $npm_package_version --debug --ipfs http://127.0.0.1:5001 --node http://127.0.0.1:8020",
     "test": "npm run codegen && npm run lint && npm run type-check",
     "test-integration": "TS_NODE_PROJECT='test/integration/tsconfig.json' mocha --config=test/integration/.mocharc.json --node-env=test --exit 'test/integration/**/*.test.ts'",
     "lint": "eslint --ignore-path .gitignore --ext .js --ext .ts --ext .tsx .",

scripts/generatenetworkssubgraphs.js

@@ -4,18 +4,22 @@ var addresses = require('@oceanprotocol/contracts/addresses/address.json')
 
 async function replaceContractAddresses() {
   // load addresses file first
+  if (!process.argv[2]) {
+    console.error('Missing network..')
+    return
+  }
   if (process.env.ADDRESS_FILE) {
     console.log('Using custom ADDRESS_FILE instead of ocean-contracts npm dep')
     addresses = JSON.parse(fs.readFileSync(process.env.ADDRESS_FILE, 'utf8'))
   }
-  console.log(process.argv)
+
   for (const network in addresses) {
-    if (process.argv[2] && process.argv[2] != network) {
+    if (process.argv[2] != network) {
       console.log('Skipping ' + network)
       continue
     }
-    console.log('Creating subgraph.' + network + '.yaml')
-    let subgraph = fs.readFileSync('./scripts/subgraph.yaml', 'utf8')
+    console.log('Creating subgraph.yaml for ' + network)
+    let subgraph = fs.readFileSync('./subgraph.template.yaml', 'utf8')
 
     subgraph = subgraph.replace(/__NETWORK__/g, network)
     subgraph = subgraph.replace(
@@ -38,9 +42,7 @@ async function replaceContractAddresses() {
       /__FACTORYROUTERADDRESS__/g,
       "'" + addresses[network].Router + "'"
     )
-    if (network != 'development')
-      fs.writeFileSync('subgraph.' + network + '.yaml', subgraph, 'utf8')
-    else fs.writeFileSync('subgraph.yaml', subgraph, 'utf8')
+    fs.writeFileSync('subgraph.yaml', subgraph, 'utf8')
   }
 }