Merge pull request #889 from ethereum/staging

Release 1.2.0
ethereum · Jan 11, 2023 · fb36eae · fb36eae
2 parents d318763 + bfa354f
commit fb36eae
Show file tree

Hide file tree

Showing 118 changed files with 34,921 additions and 2,135 deletions.
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -101,17 +101,29 @@ workflows:
               << pipeline.parameters.run-build-ui >>,
             ]
     jobs:
+      - tests-node-v16
+      - npm-publish:
+          filters:
+            branches:
+              only:
+                - master
+          requires:
+            - tests-node-v16
       - build-push-ipfs:
           run-build: << pipeline.parameters.run-build-ipfs >>
       # Always build monitor if there's a change in the server
       - build-push-monitor:
           run-build: << pipeline.parameters.run-build-server >>
+          requires:
+          - tests-node-v16
       - build-push-repository:
           run-build: << pipeline.parameters.run-build-repository >>
       - build-push-s3:
           run-build: << pipeline.parameters.run-build-s3 >>
       - build-push-server:
           run-build: << pipeline.parameters.run-build-server >>
+          requires:
+          - tests-node-v16
       - build-push-ui:
           run-build: << pipeline.parameters.run-build-ui >>
       - deploy:
@@ -134,17 +146,18 @@ workflows:
       - verification-e2e-sepolia:
           requires:
             - deploy
-  # Always run
-  node-build:
+
+  # Tests workflow for not staging or master
+  tests:
+    when:
+      and: 
+        - not:
+            equal: [ master, << pipeline.git.branch >> ]
+        - not: 
+            equal: [ staging, << pipeline.git.branch >> ]
     jobs:
-      - node-v16
-      - npm-publish:
-          filters:
-            branches:
-              only:
-                - master
-          requires:
-            - node-v16
+      - tests-node-v16
+
   # Has to run always. Can't regex filter on add-chain-{chainId} branch names see: https://stackoverflow.com/questions/55839004/circleci-regex-filtering-match-within-string
   test-new-chain:
     jobs:
@@ -194,7 +207,7 @@ jobs:
           no_output_timeout: 30m
           command: |
             ./scripts/deploy.sh
-  node-v16:
+  tests-node-v16:
     docker:
       - image: cimg/node:16.15
     working_directory: ~/source-verify

diff --git a/environments/.env.dev b/environments/.env.dev
@@ -4,7 +4,7 @@ SOLC_REPO=/tmp/solc-bin/linux-amd64
 SOLJSON_REPO=/tmp/solc-bin/soljson
 SERVER_PORT=5555
 SESSION_SECRET=yoursessionsecret
-IPFS_GATEWAY=http://ipfs.io/ipfs/
+IPFS_GATEWAY=https://ipfs.io/ipfs/
 
 # Repository web server config
 REPOSITORY_SERVER_URL=http://localhost:10000
@@ -52,11 +52,11 @@ IPFS_API_EXTERNAL_PORT=5002
 SERVER_URL=https://staging.sourcify.dev/server
 
 # Custom nodes
-NODE_ADDRESS=
-NODE_PORT_MAINNET=
-NODE_PORT_RINKEBY=
-NODE_PORT_GOERLI=
-NODE_PORT_SEPOLIA=
+NODE_URL_MAINNET=
+NODE_URL_RINKEBY=
+NODE_URL_GOERLI=
+NODE_URL_SEPOLIA=
+
 
 # Other config
 TESTING=false
@@ -71,4 +71,12 @@ ALCHEMY_ID_ARBITRUM=
 # Needed for the Import from Etherscan functionality
 ETHERSCAN_API_KEY=
 # Needed to call create2 APIs, format is: TOKEN1,TOKEN2,...
-CREATE2_CLIENT_TOKENS=
+CREATE2_CLIENT_TOKENS=
+
+GRAFANA_PATH=/home/gather/staging/data/grafana
+GRAFANA_HTTP_USER=xxx
+GRAFANA_HTTP_PASS=xxx
+GRAFANA_EXTERNAL_PORT=3000
+GRAFANA_LOKI_EXTERNAL_PORT=3100
+# Use if you'll have a running Loki instance, otherwise leave blank
+# GRAFANA_LOKI_URL=http://localhost:3100
diff --git a/environments/.env.latest b/environments/.env.latest
@@ -53,11 +53,10 @@ IPFS_API_EXTERNAL_PORT=5002
 SERVER_URL=https://staging.sourcify.dev/server
 
 # Custom nodes
-NODE_ADDRESS=http://10.10.42.102
-NODE_PORT_MAINNET=8541
-NODE_PORT_RINKEBY=8544
-NODE_PORT_GOERLI=8545
-NODE_PORT_SEPOLIA=8546
+NODE_URL_MAINNET=http://10.10.42.102:8541
+NODE_URL_RINKEBY=http://10.10.42.102:8544
+NODE_URL_GOERLI=http://10.10.42.102:8545
+NODE_URL_SEPOLIA=http://10.10.42.102:8546
 
 # Other config
 TESTING=false
@@ -68,4 +67,11 @@ ALCHEMY_ID=xxx
 ALCHEMY_ID_OPTIMISM=xxx
 ALCHEMY_ID_ARBITRUM=xxx
 ETHERSCAN_API_KEY=xxx
-CREATE2_CLIENT_TOKENS=xxx
+CREATE2_CLIENT_TOKENS=xxx
+
+GRAFANA_PATH=/home/gather/staging/data/grafana
+GRAFANA_HTTP_USER=xxx
+GRAFANA_HTTP_PASS=xxx
+GRAFANA_EXTERNAL_PORT=13000
+GRAFANA_LOKI_EXTERNAL_PORT=13100
+GRAFANA_LOKI_URL=http://grafana-loki-latest:3100
diff --git a/environments/.env.secrets.gpg b/environments/.env.secrets.gpg
diff --git a/environments/.env.stable b/environments/.env.stable
@@ -50,11 +50,11 @@ IPFS_API_EXTERNAL_PORT=5003
 SERVER_URL=https://sourcify.dev/server
 
 # Custom nodes
-NODE_ADDRESS=http://10.10.42.102
-NODE_PORT_MAINNET=8541
-NODE_PORT_RINKEBY=8544
-NODE_PORT_GOERLI=8545
-NODE_PORT_SEPOLIA=8546
+NODE_URL_MAINNET=http://10.10.42.102:8541
+NODE_URL_RINKEBY=http://10.10.42.102:8544
+NODE_URL_GOERLI=http://10.10.42.102:8545
+NODE_URL_SEPOLIA=http://10.10.42.102:8546
+
 
 # Other config
 TESTING=false
@@ -65,4 +65,11 @@ ALCHEMY_ID=xxx
 ALCHEMY_ID_OPTIMISM=xxx
 ALCHEMY_ID_ARBITRUM=xxx
 ETHERSCAN_API_KEY=xxx
-CREATE2_CLIENT_TOKENS=xxx
+CREATE2_CLIENT_TOKENS=xxx
+
+GRAFANA_PATH=/home/sourcify/production/data/grafana
+GRAFANA_HTTP_USER=xxx
+GRAFANA_HTTP_PASS=xxx
+GRAFANA_EXTERNAL_PORT=13000
+GRAFANA_LOKI_EXTERNAL_PORT=13100
+GRAFANA_LOKI_URL=http://grafana-loki-stable:3100
diff --git a/environments/grafana.yaml b/environments/grafana.yaml
@@ -0,0 +1,48 @@
+version: "3.7"
+
+x-project-base: &project-base
+  env_file:
+    - .env
+  restart: always
+  networks:
+    - source-verify
+
+networks:
+  source-verify:
+
+services:
+  loki:
+    container_name: grafana-loki-${TAG}
+    image: grafana/loki:2.6.1
+    ports:
+      - "${GRAFANA_LOKI_EXTERNAL_PORT}:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+    networks:
+      - source-verify
+    restart: always
+
+  promtail:
+    container_name: grafana-promtail-${TAG}
+    image: grafana/promtail:2.6.1
+    volumes:
+      - /var/log:/var/log
+    command: -config.file=/etc/promtail/config.yml
+    networks:
+      - source-verify
+    restart: always
+
+  grafana:
+    container_name: grafana-grafana-${TAG}
+    image: grafana/grafana:9.3.1
+    ports:
+      - "${GRAFANA_EXTERNAL_PORT}:3000"
+    networks:
+      - source-verify
+    volumes:
+      - type: bind
+        source: ${GRAFANA_PATH}
+        target: /var/lib/grafana
+    environment:
+      - HTTP_USER="${GRAFANA_HTTP_USER}"
+      - HTTP_PASS="${GRAFANA_HTTP_PASS}"
+    restart: always
diff --git a/environments/ipfs.yaml b/environments/ipfs.yaml
@@ -26,7 +26,7 @@ services:
     volumes:
       - type: bind
         source: $REPOSITORY_PATH
-        target: /root/.ipfs/repository
+        target: /repository
       - type: bind
         source: ../services/ipfs/ipfs-${TAG}.key
         target: /app/ipfs-${TAG}.key