Merge pull request #1061 from ethereum/staging

Quick Release

environments/grafana.yaml

@@ -30,6 +30,7 @@ services:
     image: grafana/promtail:2.6.1
     volumes:
       - /var/log:/var/log
+      - ./promtail-config.yml:/etc/promtail/config.yml
     command: -config.file=/etc/promtail/config.yml
     networks:
       - source-verify

environments/promtail-config.yml

@@ -0,0 +1,25 @@
+server:
+  http_listen_port: 9080
+
+positions:
+  filename: /var/log/positions.yaml # default
+
+clients:
+  - url: http://loki:3100/loki/api/v1/push
+
+scrape_configs:
+- job_name: system
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: varlogs
+      __path__: /var/log/*log
+- job_name: nginx
+  static_configs:
+    - targets:
+        - localhost
+      labels:
+        job: nginx
+        __path__: /var/log/nginx/*log
+        host: promtail

scripts/test_new_chain_support.sh

@@ -4,7 +4,7 @@
 
 # from https://stackoverflow.com/questions/55839004/circleci-regex-filtering-match-within-string 
 
-NEW_CHAIN_REGEX='.*add-chain-(\d+)'
+NEW_CHAIN_REGEX='.*(add|update)-chain-(\d+)'
 
 # if CIRCLE_PR_NUMBER is NOT set (meaning it is not a PR 
 # from a forked repository), then CIRCLE_BRANCH will 

test/chains/chain-tests.js

@@ -677,7 +677,7 @@ describe("Test Supported Chains", function () {
 
   // ZetaChain: Athens Testnet
   verifyContract(
-    "0x1f42652a86918fd84E74e066db94E3078d25Dd8D",
+    "0x52ef49D23630EF439a8177E1e966F1953f37473f",
     "7001",
     "ZetaChain Athens Testnet",
     ["shared/1_Storage.sol"],