Merge pull request #1058 from ethereum/staging

Release

.circleci/continue_config.yml

@@ -218,7 +218,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: npx lerna bootstrap
+          command: npm install && npx lerna bootstrap
       - run:
           name: lint
           command: npm run lint
@@ -236,7 +236,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: npx lerna bootstrap
+          command: npm install && npx lerna bootstrap
       - run:
           name: build
           command: npx lerna run build
@@ -271,7 +271,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: npx lerna bootstrap
+          command: npm install && npx lerna bootstrap
       - run:
           name: build everything
           command: npx lerna run build

.circleci/new_branch.yml

@@ -26,7 +26,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: npx lerna bootstrap
+          command: npm install && npx lerna bootstrap
       - run:
           name: lint
           command: npm run lint
@@ -44,7 +44,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: npx lerna bootstrap
+          command: npm install && npx lerna bootstrap
       - run:
           name: build
           command: npx lerna run build

.circleci/nightly.yml

@@ -88,7 +88,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: npx lerna bootstrap
+          command: npm install && npx lerna bootstrap
       - run:
           name: build
           command: npx lerna run build

.circleci/test-chains-regularly.yml

@@ -18,7 +18,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: npx lerna bootstrap
+          command: npm install && npx lerna bootstrap
       - run:
           name: build and test
           command: npx lerna run build && npx lerna run test:chains

.github/pull_request_template.md

@@ -1,11 +1,20 @@
-Thank you for your contribution to the Sourcify project!
+<!-- If you are opening a chain support request PR please follow the template below. Otherwise you can write your own PR description -->
 
-Please check if your pull request fits one of the categories. If so, please use the templates provided at the links:
+# Add New Chain <chainId>
 
-- Requesting new chain support: Add your username and the branch name to the link below and open:
+Thanks for your pull request to add a new support in Sourcify.
 
-```
-https://github.com/ethereum/sourcify/compare/ethereum:sourcify:staging...<YOUR_USERNAME>:<BRANCH_NAME>?template=add-new-chain.md&title=Add+New+Chain+%3CchainId%3E
-```
+If you haven't done so, please follow the instructions on [how to request chain support](https://docs.sourcify.dev/docs/chain-support/) in docs.
 
-- New release: [release.md](https://github.com/ethereum/sourcify/compare/master...staging?template=release.md&title=Release+%3Cversion%3E)
+Please check the following items before submitting your pull request.
+
+## Checklist
+
+- [ ] The branch is named as `add-chain-<chainId>`.
+- [ ] I haven't modified the [chains.json](../../src/chains.json) file directly.
+- [ ] In [sourcify-chains.ts](../../src/sourcify-chains.ts) file
+  - [ ] I've set `supported: true`.
+  - [ ] I've set `monitored: false`.
+  - [ ] I haven't added an `rpc` field but the one in [chains.json](../../src/chains.json) is used (if not, please explain why).
+- [ ] I've added a test in [chain-tests.js](../../test/chains/chains-test.js) file.
+- [ ] `test-new-chain` test in Circle CI is passing.

environments/.env.dev

@@ -80,6 +80,7 @@ MOONSCAN_MOONRIVER_API_KEY=
 BOBASCAN_API_KEY=
 GNOSISSCAN_API_KEY=
 OPTIMISMSCAN_API_KEY=
+CRONOSCAN_API_KEY=
 
 # Needed to call create2 APIs, format is: TOKEN1,TOKEN2,...
 CREATE2_CLIENT_TOKENS=

environments/.env.latest

@@ -79,6 +79,7 @@ MOONSCAN_MOONRIVER_API_KEY=xxx
 BOBASCAN_API_KEY=xxx
 GNOSISSCAN_API_KEY=xxx
 OPTIMISMSCAN_API_KEY=xxx
+CRONOSCAN_API_KEY=xxx
 
 CREATE2_CLIENT_TOKENS=xxx
 

environments/.env.stable

@@ -77,6 +77,7 @@ MOONSCAN_MOONRIVER_API_KEY=xxx
 BOBASCAN_API_KEY=xxx
 GNOSISSCAN_API_KEY=xxx
 OPTIMISMSCAN_API_KEY=xxx
+CRONOSCAN_API_KEY=xxx
 
 CREATE2_CLIENT_TOKENS=xxx
 

scripts/find_replace.sh

@@ -39,6 +39,7 @@ if [ "$CIRCLE_BRANCH" == "staging" ]; then
     BOBASCAN_API_KEY=$BOBASCAN_API_KEY_STAGING
     GNOSISSCAN_API_KEY=$GNOSISSCAN_API_KEY_STAGING
     OPTIMISMSCAN_API_KEY=$OPTIMISMSCAN_API_KEY_STAGING
+    CRONOSCAN_API_KEY=$CRONOSCAN_API_KEY_STAGING
 fi
 
 if [ "$CIRCLE_BRANCH" == "master" ]; then
@@ -69,9 +70,10 @@ if [ "$CIRCLE_BRANCH" == "master" ]; then
     BOBASCAN_API_KEY=$BOBASCAN_API_KEY_MASTER
     GNOSISSCAN_API_KEY=$GNOSISSCAN_API_KEY_MASTER
     OPTIMISMSCAN_API_KEY=$OPTIMISMSCAN_API_KEY_MASTER
+    CRONOSCAN_API_KEY=$CRONOSCAN_API_KEY_MASTER
 fi
 
-for VAR_NAME in INFURA_ID ALCHEMY_ID AWS_S3_ACCESS_KEY_ID AWS_S3_SECRET_ACCESS_KEY IPFS_SECRET NPM_TOKEN PUBLIC_IP LOCAL_IP SESSION_SECRET ALCHEMY_ID_OPTIMISM ALCHEMY_ID_ARBITRUM CHAINSAFE_S3_ACCESS_KEY_ID CHAINSAFE_S3_SECRET_ACCESS_KEY ESTUARY_PINNING_SECRET WEB3_STORAGE_PINNING_SECRET CREATE2_CLIENT_TOKENS GRAFANA_HTTP_USER GRAFANA_HTTP_PASS ETHERSCAN_API_KEY ARBISCAN_API_KEY POLYGONSCAN_API_KEY BSCSCAN_API_KEY SNOWTRACE_API_KEY CELOSCAN_API_KEY MOONSCAN_MOONBEAM_API_KEY MOONSCAN_MOONRIVER_API_KEY BOBASCAN_API_KEY GNOSISSCAN_API_KEY OPTIMISMSCAN_API_KEY
+for VAR_NAME in INFURA_ID ALCHEMY_ID AWS_S3_ACCESS_KEY_ID AWS_S3_SECRET_ACCESS_KEY IPFS_SECRET NPM_TOKEN PUBLIC_IP LOCAL_IP SESSION_SECRET ALCHEMY_ID_OPTIMISM ALCHEMY_ID_ARBITRUM CHAINSAFE_S3_ACCESS_KEY_ID CHAINSAFE_S3_SECRET_ACCESS_KEY ESTUARY_PINNING_SECRET WEB3_STORAGE_PINNING_SECRET CREATE2_CLIENT_TOKENS GRAFANA_HTTP_USER GRAFANA_HTTP_PASS ETHERSCAN_API_KEY ARBISCAN_API_KEY POLYGONSCAN_API_KEY BSCSCAN_API_KEY SNOWTRACE_API_KEY CELOSCAN_API_KEY MOONSCAN_MOONBEAM_API_KEY MOONSCAN_MOONRIVER_API_KEY BOBASCAN_API_KEY GNOSISSCAN_API_KEY OPTIMISMSCAN_API_KEY CRONOSCAN_API_KEY
 do
     echo "find_repace.sh: replacing $VAR_NAME"
     VAR_VAL=$(eval "echo \${$VAR_NAME}")

src/Dockerfile.monitor

@@ -4,6 +4,6 @@ WORKDIR /home/app
 COPY packages ./packages
 COPY src ./src
 COPY *.json ./
-RUN npx lerna bootstrap --ci && npx lerna run build
+RUN npm install && npx lerna bootstrap --ci && npx lerna run build
 
 CMD ["npm", "run", "monitor:start"]

src/Dockerfile.server

@@ -4,6 +4,6 @@ WORKDIR /home/app
 COPY packages ./packages
 COPY src ./src
 COPY *.json ./
-RUN npx lerna bootstrap --ci && npx lerna run build
+RUN npm install && npx lerna bootstrap --ci && npx lerna run build
 
 CMD ["npm", "run", "server:start"]