Merge remote-tracking branch 'origin/main' into document-contracts-gitbook

Author: michalinacienciala

.git-blame-ignore-revs

@@ -13,6 +13,7 @@ e884d097787c1fd3f541088717c946f53503ea79
 e0880e124c2dcefa6a6fbb4e16ef4b8fe2ab861a
 bf037460a86573b61f62f9acec46f1688d44d409
 a2ec8c4724756d4422df491a978b9ea4e5bf7b99
+e991a52c9ea8049192fe0266cc27138d6b14d29c
 
 # Linting and formatting code for solidity/random-beacon.
 # Most of the changes were done by `yarn format:fix` to auto-fix the issues.

.github/workflows/client.yml

@@ -47,6 +47,23 @@ jobs:
             path-filter:
               - './!((docs-v1|docs|infrastructure|scripts|solidity-v1|token-stakedrop)/**)'
 
+  electrum-integration-detect-changes:
+    runs-on: ubuntu-latest
+    outputs:
+      path-filter: ${{ steps.filter.outputs.path-filter }}
+    steps:
+      - uses: actions/checkout@v3
+        if: github.event_name == 'pull_request'
+
+      - uses: dorny/paths-filter@v2
+        if: github.event_name == 'pull_request'
+        id: filter
+        with:
+          filters: |
+            path-filter:
+              - './config/_electrum_urls/**'
+              - './pkg/bitcoin/electrum/**'
+
   client-build-test-publish:
     needs: client-detect-changes
     if: |
@@ -94,6 +111,23 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
 
+      # Since build-push-action doesn't support outputing an image to multiple outputs
+      # we need to save it in a separate step. See: https://github.com/moby/buildkit/issues/1555
+      # Once multiple outputs are supported we can replace this step with
+      # `outputs` property configured in `Build Docker Build Image`:
+      #   outputs: |
+      #      type=image
+      #      type=docker,dest=/tmp/go-build-env-image.tar
+      - name: Save Docker Build Image
+        run: |
+          docker save --output /tmp/go-build-env-image.tar go-build-env
+
+      - name: Upload Docker Build Image
+        uses: actions/upload-artifact@v3
+        with:
+          name: go-build-env-image
+          path: /tmp/go-build-env-image.tar
+
       - name: Run Go tests
         run: |
           docker run \
@@ -263,3 +297,30 @@ jobs:
         with:
           version: "2022.1.3"
           install-go: false
+
+  client-integration-test:
+    needs: [electrum-integration-detect-changes, client-build-test-publish]
+    if: |
+      github.event_name != 'pull_request'
+        || needs.electrum-integration-detect-changes.outputs.path-filter == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Download Docker Build Image
+        uses: actions/download-artifact@v3
+        with:
+          name: go-build-env-image
+          path: /tmp
+
+      - name: Load Docker Build Image
+        run: |
+          docker load --input /tmp/go-build-env-image.tar
+
+      - name: Run Go Integration Tests
+        run: |
+          docker run \
+            --workdir /go/src/github.com/keep-network/keep-core \
+            go-build-env \
+            gotestsum -- -timeout 20m -tags=integration ./...

.github/workflows/contracts-ecdsa.yml

@@ -69,7 +69,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/ecdsa/yarn.lock
 
@@ -96,7 +99,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/ecdsa/yarn.lock
 
@@ -139,7 +145,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/ecdsa/yarn.lock
 
@@ -167,7 +176,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/ecdsa/yarn.lock
 
@@ -198,7 +210,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/ecdsa/yarn.lock
           registry-url: "https://registry.npmjs.org"
@@ -296,7 +311,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/ecdsa/yarn.lock
           registry-url: "https://registry.npmjs.org"

.github/workflows/contracts-random-beacon.yml

@@ -69,7 +69,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/random-beacon/yarn.lock
 
@@ -96,7 +99,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/random-beacon/yarn.lock
 
@@ -137,7 +143,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/random-beacon/yarn.lock
 
@@ -165,7 +174,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/random-beacon/yarn.lock
 
@@ -196,7 +208,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/random-beacon/yarn.lock
           registry-url: "https://registry.npmjs.org"
@@ -292,7 +307,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 was sometimes causing issues with
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877
+          node-version: "18.15.0"
           cache: "yarn"
           cache-dependency-path: solidity/random-beacon/yarn.lock
           registry-url: "https://registry.npmjs.org"

.github/workflows/npm-ecdsa.yml

@@ -25,7 +25,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 may cause issues with the
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877.
+          node-version: "18.15.0"
           registry-url: "https://registry.npmjs.org"
           cache: "yarn"
           cache-dependency-path: solidity/ecdsa/yarn.lock

.github/workflows/npm-random-beacon.yml

@@ -25,7 +25,10 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.x"
+          # Using fixed version, because 18.16 may cause issues with the
+          # artifacts generation during `hardhat compile` - see
+          # https://github.com/NomicFoundation/hardhat/issues/3877.
+          node-version: "18.15.0"
           registry-url: "https://registry.npmjs.org"
           cache: "yarn"
           cache-dependency-path: solidity/random-beacon/yarn.lock

.gitignore

@@ -15,6 +15,13 @@
 # Infrastructure
 /infrastructure/gcp/service-accounts*
 
+# Secret directory used in Kubernetes configurations
+/infrastructure/kube/**/.secret/
+/infrastructure/kube/**/*.secret
+
+# Backup directory for local copies of Kubernetes configurations
+/infrastructure/kube/**/.backup/
+
 # Keys
 keystore/
 keep_accounts

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18.3-alpine3.16 AS build-sources
+FROM golang:1.18.10-alpine3.16 AS build-sources
 
 ENV GOPATH=/go \
 	GOBIN=/go/bin \

cmd/cmd.go

@@ -36,6 +36,7 @@ func init() {
 		PingCommand,
 		EthereumCommand,
 		MaintainerCommand,
+		CoordinatorCommand,
 	)
 }