From 3be881f32c647973151a5c11a107522e7b3a573e Mon Sep 17 00:00:00 2001 From: Dmitriy Groschovskiy Date: Tue, 4 Apr 2023 17:16:13 +0300 Subject: [PATCH 01/43] Update dev.yaml --- .github/workflows/dev.yaml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index 2ca4db922..ccc828ad1 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -8,26 +8,17 @@ on: - dev-cere workflow_dispatch: +permissions: + id-token: write + contents: read + jobs: build: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/build-and-push-docker.yaml@1.0.0 + uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@1.3.0 with: runs-on: '["self-hosted", "cere-network-large-workers"]' - org: cerebellumnetwork environment: dev - image: crb-${{ github.event.repository.name }} - repository: crb-${{ github.event.repository.name }} + aws_account_id: ${{ vars.DEV_NETWORK_AWS_ACCOUNT_ID }} + repository: network-relayer file: ./Dockerfile secrets: inherit - - deploy: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-with-helm.yaml@1.0.0 - needs: build - with: - runs-on: '["self-hosted", "cere-network-dev-deployer"]' - helm-repo-path: network/network-relayer - helm-release: network-relayer - namespace: network - tag: ${{ needs.build.outputs.version }} - environment: dev - secrets: inherit From 3a87b94df11d6ba1f6ae080a6363f93dc9e57b7d Mon Sep 17 00:00:00 2001 From: Oleg Yankovich Date: Fri, 16 Jun 2023 14:37:27 +0400 Subject: [PATCH 02/43] Change version of the reusable-workflow to master --- .github/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index ccc828ad1..a1075a036 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -14,7 +14,7 @@ permissions: jobs: build: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@1.3.0 + uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@master with: runs-on: '["self-hosted", "cere-network-large-workers"]' environment: dev From 9e116fcfc939580f942cbed9d9b76ba818c3e8ae Mon Sep 17 00:00:00 2001 From: Oleg Yankovich Date: Fri, 16 Jun 2023 14:40:19 +0400 Subject: [PATCH 03/43] Change to the new workers --- .github/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index a1075a036..55b16015d 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -16,7 +16,7 @@ jobs: build: uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@master with: - runs-on: '["self-hosted", "cere-network-large-workers"]' + runs-on: '["self-hosted", "cere-network-large"]' environment: dev aws_account_id: ${{ vars.DEV_NETWORK_AWS_ACCOUNT_ID }} repository: network-relayer From 4830326f6fb3727758bd9d70b514163d5a5fc7c7 Mon Sep 17 00:00:00 2001 From: Oleg Yankovich Date: Fri, 16 Jun 2023 14:44:44 +0400 Subject: [PATCH 04/43] Change base docker image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7949b3ac9..55ed7bd13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN go mod download RUN cd cmd/chainbridge && go build -o /bridge . # # final stage -FROM debian:stretch-slim +FROM debian:buster-slim WORKDIR /app From 3914deff9c70bfbbc192782ad5a1573f3bd2100f Mon Sep 17 00:00:00 2001 From: Dmitriy Groschovskiy Date: Thu, 6 Jul 2023 00:40:36 +0300 Subject: [PATCH 05/43] Pin static ECR workflow template --- .github/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index 55b16015d..c6d05daea 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -14,7 +14,7 @@ permissions: jobs: build: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@master + uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@1.3.0 with: runs-on: '["self-hosted", "cere-network-large"]' environment: dev From 8531d75b6294471ea8757717061cb526e8459b98 Mon Sep 17 00:00:00 2001 From: Oleg Yankovich <33641729+krolol@users.noreply.github.com> Date: Thu, 10 Aug 2023 18:43:03 +0200 Subject: [PATCH 06/43] Migrate stage --- .github/workflows/dev.yaml | 2 +- .github/workflows/stage.yaml | 27 +++++++++------------------ 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index c6d05daea..55b16015d 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -14,7 +14,7 @@ permissions: jobs: build: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@1.3.0 + uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@master with: runs-on: '["self-hosted", "cere-network-large"]' environment: dev diff --git a/.github/workflows/stage.yaml b/.github/workflows/stage.yaml index e7c9fc881..c3edf7af0 100644 --- a/.github/workflows/stage.yaml +++ b/.github/workflows/stage.yaml @@ -9,26 +9,17 @@ on: - 'hotfix/**' workflow_dispatch: +permissions: + id-token: write + contents: read + jobs: build: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/build-and-push-docker.yaml@1.0.0 + uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@master with: - runs-on: '["self-hosted", "cere-network-large-workers"]' - org: cerebellumnetwork - environment: stage - image: crb-${{ github.event.repository.name }} - repository: crb-${{ github.event.repository.name }} + runs-on: '["self-hosted", "cere-network-large"]' + environment: stg + aws_account_id: ${{ vars.DEV_NETWORK_AWS_ACCOUNT_ID }} + repository: network-relayer file: ./Dockerfile secrets: inherit - - deploy: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-with-helm.yaml@1.0.0 - needs: build - with: - runs-on: '["self-hosted", "cere-network-stg-deployer"]' - helm-repo-path: network/network-relayer - helm-release: network-relayer - namespace: network - tag: ${{ needs.build.outputs.version }} - environment: stage - secrets: inherit From ac17d71d857131bd8079b18e4e6c05872d9ca9ac Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 14:59:39 +0400 Subject: [PATCH 07/43] Add workflow to disable relayers. --- .github/workflows/disable-relayers.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/disable-relayers.yml diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml new file mode 100644 index 000000000..350e657e7 --- /dev/null +++ b/.github/workflows/disable-relayers.yml @@ -0,0 +1,18 @@ +name: Disable Relayers + +on: + workflow_dispatch: + +jobs: + kubectl-setup-and-run: + runs-on: '["self-hosted", "cere-network-prd-deployer"]' + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Setup kubectl + uses: azure/setup-kubectl@v1 + with: + version: ${{ secrets.KUBECTL_VERSION }} + - name: Run kubectl get pods + run: | + kubectl get pods \ No newline at end of file From bffd406673156b589894712b8c53dba94b424f47 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 15:42:19 +0400 Subject: [PATCH 08/43] Fix runs-on for disable-relayers workflow. --- .github/workflows/disable-relayers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index 350e657e7..1f4c1624d 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -5,7 +5,7 @@ on: jobs: kubectl-setup-and-run: - runs-on: '["self-hosted", "cere-network-prd-deployer"]' + runs-on: ["self-hosted", "cere-network-prd-deployer"] steps: - name: Checkout code uses: actions/checkout@v2 @@ -15,4 +15,4 @@ jobs: version: ${{ secrets.KUBECTL_VERSION }} - name: Run kubectl get pods run: | - kubectl get pods \ No newline at end of file + kubectl get pods From 623553056d5de63017129ccacf25225950b34368 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 15:46:06 +0400 Subject: [PATCH 09/43] Add logging relayers in get pods for disable-relayers workflow. --- .github/workflows/disable-relayers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index 1f4c1624d..14bf01a7b 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -15,4 +15,4 @@ jobs: version: ${{ secrets.KUBECTL_VERSION }} - name: Run kubectl get pods run: | - kubectl get pods + kubectl get pods -n network From 13ac39082d0f4815090a78a3f7649f9f3c336f95 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 15:54:22 +0400 Subject: [PATCH 10/43] Add grep '^network-relayer' filter for get pods. --- .github/workflows/disable-relayers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index 14bf01a7b..d12e4eec9 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -15,4 +15,4 @@ jobs: version: ${{ secrets.KUBECTL_VERSION }} - name: Run kubectl get pods run: | - kubectl get pods -n network + kubectl get pods -n network | grep '^network-relayer' From 21c5dc262a9dc827e3e5b506ba69c44663870a92 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 15:55:49 +0400 Subject: [PATCH 11/43] Change pods to deployment. --- .github/workflows/disable-relayers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index d12e4eec9..459a13a16 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -15,4 +15,4 @@ jobs: version: ${{ secrets.KUBECTL_VERSION }} - name: Run kubectl get pods run: | - kubectl get pods -n network | grep '^network-relayer' + kubectl get deployment -n network | grep '^network-relayer' From 242879ba4916268523ca8133d3a8c009098325a6 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 15:57:07 +0400 Subject: [PATCH 12/43] Remove `grep '^network-relayer'` --- .github/workflows/disable-relayers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index 459a13a16..ba1d49309 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -15,4 +15,4 @@ jobs: version: ${{ secrets.KUBECTL_VERSION }} - name: Run kubectl get pods run: | - kubectl get deployment -n network | grep '^network-relayer' + kubectl get deployment -n network From 3476f83620fca041154a7d16a250e51fc86e1169 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 15:57:54 +0400 Subject: [PATCH 13/43] Revert "Remove `grep '^network-relayer'`" This reverts commit 242879ba4916268523ca8133d3a8c009098325a6. --- .github/workflows/disable-relayers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index ba1d49309..459a13a16 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -15,4 +15,4 @@ jobs: version: ${{ secrets.KUBECTL_VERSION }} - name: Run kubectl get pods run: | - kubectl get deployment -n network + kubectl get deployment -n network | grep '^network-relayer' From 3a09656c90e65dc73d6a093bdb617f3413536cec Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 16:04:42 +0400 Subject: [PATCH 14/43] Get a list of network-relayers. --- .github/workflows/disable-relayers.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index 459a13a16..8a217572c 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -15,4 +15,11 @@ jobs: version: ${{ secrets.KUBECTL_VERSION }} - name: Run kubectl get pods run: | - kubectl get deployment -n network | grep '^network-relayer' + # Get a list of network-relayers + deployments=$(kubectl get deployment -n network | grep '^network-relayer' | awk '{print $1}') + + # Iterate over the deployments and scale each one to 0 replicas + for deployment in $deployments; do + echo $deployment + done + From 9ddf6cf4d13af9275d16c2fb642abfde903dab05 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 16:11:22 +0400 Subject: [PATCH 15/43] Add enable-relayers workflow. --- .github/workflows/disable-relayers.yml | 8 ++++---- .github/workflows/enable-relayers.yml | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/enable-relayers.yml diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index 8a217572c..67101bbde 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -4,8 +4,8 @@ on: workflow_dispatch: jobs: - kubectl-setup-and-run: - runs-on: ["self-hosted", "cere-network-prd-deployer"] + disable-relayers: + runs-on: [ "self-hosted", "cere-network-prd-deployer" ] steps: - name: Checkout code uses: actions/checkout@v2 @@ -13,13 +13,13 @@ jobs: uses: azure/setup-kubectl@v1 with: version: ${{ secrets.KUBECTL_VERSION }} - - name: Run kubectl get pods + - name: Set replicas to 0 for relayers run: | # Get a list of network-relayers deployments=$(kubectl get deployment -n network | grep '^network-relayer' | awk '{print $1}') # Iterate over the deployments and scale each one to 0 replicas for deployment in $deployments; do - echo $deployment + kubectl scale deployment -n network --replicas=0 $deployment done diff --git a/.github/workflows/enable-relayers.yml b/.github/workflows/enable-relayers.yml new file mode 100644 index 000000000..5c03a0fa2 --- /dev/null +++ b/.github/workflows/enable-relayers.yml @@ -0,0 +1,25 @@ +name: Enable Relayers + +on: + workflow_dispatch: + +jobs: + enable-relayers: + runs-on: [ "self-hosted", "cere-network-prd-deployer" ] + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Setup kubectl + uses: azure/setup-kubectl@v1 + with: + version: ${{ secrets.KUBECTL_VERSION }} + - name: Set replicas to 1 for relayers + run: | + # Get a list of network-relayers + deployments=$(kubectl get deployment -n network | grep '^network-relayer' | awk '{print $1}') + + # Iterate over the deployments and scale each one to 1 replicas + for deployment in $deployments; do + kubectl scale deployment -n network --replicas=1 $deployment + done + From 2371b697f898bcf9bd7e67e3327f02187a236ed8 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 16:16:18 +0400 Subject: [PATCH 16/43] Grep only ^network-relayer-0 for test. --- .github/workflows/disable-relayers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index 67101bbde..111305994 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -16,7 +16,7 @@ jobs: - name: Set replicas to 0 for relayers run: | # Get a list of network-relayers - deployments=$(kubectl get deployment -n network | grep '^network-relayer' | awk '{print $1}') + deployments=$(kubectl get deployment -n network | grep '^network-relayer-0' | awk '{print $1}') # Iterate over the deployments and scale each one to 0 replicas for deployment in $deployments; do From 7b6fc599dcec53bb6cceaa930013a072fb5a9c84 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 16:23:41 +0400 Subject: [PATCH 17/43] Revert "Grep only ^network-relayer-0 for test." This reverts commit 2371b697f898bcf9bd7e67e3327f02187a236ed8. --- .github/workflows/disable-relayers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/disable-relayers.yml b/.github/workflows/disable-relayers.yml index 111305994..67101bbde 100644 --- a/.github/workflows/disable-relayers.yml +++ b/.github/workflows/disable-relayers.yml @@ -16,7 +16,7 @@ jobs: - name: Set replicas to 0 for relayers run: | # Get a list of network-relayers - deployments=$(kubectl get deployment -n network | grep '^network-relayer-0' | awk '{print $1}') + deployments=$(kubectl get deployment -n network | grep '^network-relayer' | awk '{print $1}') # Iterate over the deployments and scale each one to 0 replicas for deployment in $deployments; do From 910aeaa520f54fc5363bec1e768a30225d3912c5 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Mon, 2 Oct 2023 16:25:42 +0400 Subject: [PATCH 18/43] Update CHANGELOG. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94277aeeb..794ee5cd6 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ # Release Notes ## vNext -- ... +- Added workflows to disable and enable relayers. ## v2.7.0 - Added support of the Cere node v2.32.0 From 12c9bfe416c5097fe57ae535be2a3f8b8bf5bec9 Mon Sep 17 00:00:00 2001 From: Shamilkhan Date: Thu, 7 Dec 2023 17:39:47 +0400 Subject: [PATCH 19/43] Update `go-substrate-rpc-client` from v4 to v5 --- chains/substrate/connection.go | 10 +++++----- chains/substrate/connection_test.go | 2 +- chains/substrate/listener.go | 2 +- chains/substrate/listener_test.go | 4 ++-- chains/substrate/test_helper_test.go | 2 +- chains/substrate/types.go | 6 +++--- chains/substrate/writer.go | 4 ++-- chains/substrate/writer_test.go | 4 ++-- e2e/e2e_test.go | 2 +- e2e/fungible_test.go | 2 +- e2e/nonfungible_test.go | 2 +- e2e/parallel_test.go | 4 ++-- e2e/substrate/substrate.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- shared/substrate/client.go | 8 ++++---- shared/substrate/events.go | 2 +- shared/substrate/init.go | 2 +- shared/substrate/query.go | 4 ++-- shared/substrate/submit.go | 2 +- shared/substrate/testing/client.go | 4 ++-- shared/substrate/testing/events.go | 4 ++-- shared/substrate/testing/events_test.go | 4 ++-- shared/substrate/testing/init.go | 2 +- shared/substrate/testing/query.go | 2 +- shared/substrate/types.go | 2 +- 26 files changed, 45 insertions(+), 45 deletions(-) diff --git a/chains/substrate/connection.go b/chains/substrate/connection.go index a0425d4e6..f17f0cac0 100644 --- a/chains/substrate/connection.go +++ b/chains/substrate/connection.go @@ -9,11 +9,11 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v4" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/rpc/author" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v5" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/rpc/author" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/connection_test.go b/chains/substrate/connection_test.go index 7dd188439..32665d7e7 100644 --- a/chains/substrate/connection_test.go +++ b/chains/substrate/connection_test.go @@ -6,7 +6,7 @@ package substrate import ( "testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" ) func TestConnect_QueryStorage(t *testing.T) { diff --git a/chains/substrate/listener.go b/chains/substrate/listener.go index 36e3310c7..cd848ef2f 100644 --- a/chains/substrate/listener.go +++ b/chains/substrate/listener.go @@ -14,7 +14,7 @@ import ( "github.com/Cerebellum-Network/chainbridge-utils/blockstore" metrics "github.com/Cerebellum-Network/chainbridge-utils/metrics/types" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/listener_test.go b/chains/substrate/listener_test.go index 1571c0e76..5e4bf04ac 100644 --- a/chains/substrate/listener_test.go +++ b/chains/substrate/listener_test.go @@ -14,8 +14,8 @@ import ( subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/blockstore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" ) const ListenerTimeout = time.Second * 30 diff --git a/chains/substrate/test_helper_test.go b/chains/substrate/test_helper_test.go index 7aa33d9ad..c81b7872c 100644 --- a/chains/substrate/test_helper_test.go +++ b/chains/substrate/test_helper_test.go @@ -10,7 +10,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/keystore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common/hexutil" ) diff --git a/chains/substrate/types.go b/chains/substrate/types.go index 5b61f9175..bfdc36d6a 100644 --- a/chains/substrate/types.go +++ b/chains/substrate/types.go @@ -7,9 +7,9 @@ import ( "math/big" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/scale" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/scale" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" ) type voteState struct { diff --git a/chains/substrate/writer.go b/chains/substrate/writer.go index 0d89a66b3..3dfd2374d 100644 --- a/chains/substrate/writer.go +++ b/chains/substrate/writer.go @@ -14,8 +14,8 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" metrics "github.com/Cerebellum-Network/chainbridge-utils/metrics/types" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/writer_test.go b/chains/substrate/writer_test.go index 94a014fac..c8e838e3e 100644 --- a/chains/substrate/writer_test.go +++ b/chains/substrate/writer_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 7e720d3ae..044cd20ee 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -22,7 +22,7 @@ import ( subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/core" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" log "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common" ) diff --git a/e2e/fungible_test.go b/e2e/fungible_test.go index 76a353441..78931bfbc 100644 --- a/e2e/fungible_test.go +++ b/e2e/fungible_test.go @@ -13,7 +13,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/ethereum" ethtest "github.com/Cerebellum-Network/ChainBridge/shared/ethereum/testing" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/nonfungible_test.go b/e2e/nonfungible_test.go index 008e80e7f..77361ecb2 100644 --- a/e2e/nonfungible_test.go +++ b/e2e/nonfungible_test.go @@ -11,7 +11,7 @@ import ( sub "github.com/Cerebellum-Network/ChainBridge/e2e/substrate" ethtest "github.com/Cerebellum-Network/ChainBridge/shared/ethereum/testing" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/parallel_test.go b/e2e/parallel_test.go index 718fec683..27e453687 100644 --- a/e2e/parallel_test.go +++ b/e2e/parallel_test.go @@ -15,8 +15,8 @@ import ( subutils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" log "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common" ) diff --git a/e2e/substrate/substrate.go b/e2e/substrate/substrate.go index c4baa9846..c276b6694 100644 --- a/e2e/substrate/substrate.go +++ b/e2e/substrate/substrate.go @@ -13,8 +13,8 @@ import ( "github.com/Cerebellum-Network/chainbridge-utils/core" "github.com/Cerebellum-Network/chainbridge-utils/keystore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" "github.com/ChainSafe/log15" "golang.org/x/crypto/blake2b" ) diff --git a/go.mod b/go.mod index 0b2585f5e..1a96a4e88 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328-b293e9eceda0 github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868 - github.com/Cerebellum-Network/go-substrate-rpc-client/v4 v4.0.10-cere.0.20221125132510-a26124f21c96 + github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v5.0.0 github.com/ChainSafe/log15 v1.0.0 github.com/ethereum/go-ethereum v1.10.17 github.com/prometheus/client_golang v1.13.0 diff --git a/go.sum b/go.sum index 7031281e6..9cf715a9d 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328 github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328-b293e9eceda0/go.mod h1:fZ95egyWaXKGMyof3dRibM/y4MouAC+L+9DdD/km8cw= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868 h1:0Vbb5JVBtE4G5SqksaJ/UcF4FT2QbTHcHmkl4py40X8= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868/go.mod h1:tdRalIIfnSzu9UX0DkyzUcysg3U4DMXUBQrwTG2kU2c= -github.com/Cerebellum-Network/go-substrate-rpc-client/v4 v4.0.10-cere.0.20221125132510-a26124f21c96 h1:TW3Am+cgEGChz+GVaXfUhsocNLeILIzPLkZh8f8i4/E= -github.com/Cerebellum-Network/go-substrate-rpc-client/v4 v4.0.10-cere.0.20221125132510-a26124f21c96/go.mod h1:a598oNr73JhT5UQH1DJ9IEAkl1M3yshnAsm7U2F7gjI= +github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v4.0.10-cere.0.20221125132510-a26124f21c96 h1:TW3Am+cgEGChz+GVaXfUhsocNLeILIzPLkZh8f8i4/E= +github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v4.0.10-cere.0.20221125132510-a26124f21c96/go.mod h1:a598oNr73JhT5UQH1DJ9IEAkl1M3yshnAsm7U2F7gjI= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/ChainSafe/log15 v1.0.0 h1:vRDVtWtVwIH5uSCBvgTTZh6FA58UBJ6+QiiypaZfBf8= diff --git a/shared/substrate/client.go b/shared/substrate/client.go index e6ab9f6fb..14b86fa72 100644 --- a/shared/substrate/client.go +++ b/shared/substrate/client.go @@ -8,10 +8,10 @@ import ( "math/big" "github.com/Cerebellum-Network/chainbridge-utils/msg" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v4" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v5" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index 88c2526fd..b0164cadf 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -5,7 +5,7 @@ package utils import ( events "github.com/Cerebellum-Network/chainbridge-substrate-events" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" ) type EventErc721Minted struct { diff --git a/shared/substrate/init.go b/shared/substrate/init.go index 426e3c39e..9f928e036 100644 --- a/shared/substrate/init.go +++ b/shared/substrate/init.go @@ -5,7 +5,7 @@ package utils import ( "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" ) func InitializeChain(client *Client, relayers []types.AccountID, chains []msg.ChainId, resources map[msg.ResourceId]Method, threshold uint32) error { diff --git a/shared/substrate/query.go b/shared/substrate/query.go index 49a19a906..6a56ee25e 100644 --- a/shared/substrate/query.go +++ b/shared/substrate/query.go @@ -7,8 +7,8 @@ import ( "fmt" "math/big" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" ) func QueryStorage(client *Client, prefix, method string, arg1, arg2 []byte, result interface{}) (bool, error) { diff --git a/shared/substrate/submit.go b/shared/substrate/submit.go index 26a5be4b9..66ecd7058 100644 --- a/shared/substrate/submit.go +++ b/shared/substrate/submit.go @@ -8,7 +8,7 @@ import ( "math/big" "sync" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/client.go b/shared/substrate/testing/client.go index a91880041..5a3de9eed 100644 --- a/shared/substrate/testing/client.go +++ b/shared/substrate/testing/client.go @@ -10,8 +10,8 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events.go b/shared/substrate/testing/events.go index 46a1b558e..80a8ef1b0 100644 --- a/shared/substrate/testing/events.go +++ b/shared/substrate/testing/events.go @@ -8,8 +8,8 @@ import ( "time" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events_test.go b/shared/substrate/testing/events_test.go index 0f6e1ab7f..1799383f4 100644 --- a/shared/substrate/testing/events_test.go +++ b/shared/substrate/testing/events_test.go @@ -9,8 +9,8 @@ import ( "github.com/Cerebellum-Network/ChainBridge/e2e/substrate" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v4" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v5" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" ) func TestChain_Events(t *testing.T) { diff --git a/shared/substrate/testing/init.go b/shared/substrate/testing/init.go index 43c0c896a..0b8b8d8c9 100644 --- a/shared/substrate/testing/init.go +++ b/shared/substrate/testing/init.go @@ -9,7 +9,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" ) // WARNING: THIS METHOD IS UNSAFE AND MAY PANIC diff --git a/shared/substrate/testing/query.go b/shared/substrate/testing/query.go index 85d51a6b3..c6d2078de 100644 --- a/shared/substrate/testing/query.go +++ b/shared/substrate/testing/query.go @@ -9,7 +9,7 @@ import ( "testing" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/types.go b/shared/substrate/types.go index 2a6f77fa8..c140debb3 100644 --- a/shared/substrate/types.go +++ b/shared/substrate/types.go @@ -4,7 +4,7 @@ package utils import ( - "github.com/Cerebellum-Network/go-substrate-rpc-client/v4/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" ) const BridgePalletName = "ChainBridge" From 49d3e755ee42c1f9a8fbc1bcae6ac3c2b0103400 Mon Sep 17 00:00:00 2001 From: rakanalh Date: Mon, 11 Dec 2023 15:48:46 +0300 Subject: [PATCH 20/43] Update go.mod and go.sum --- go.mod | 32 ++++++++++--------- go.sum | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 112 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 1a96a4e88..52513ec05 100644 --- a/go.mod +++ b/go.mod @@ -3,28 +3,28 @@ module github.com/Cerebellum-Network/ChainBridge go 1.18 require ( - github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328-b293e9eceda0 - github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868 - github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v5.0.0 + github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211120930-d4b3bce26dc4 + github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211120736-32591d4c2bde + github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v5.0.0-cere github.com/ChainSafe/log15 v1.0.0 - github.com/ethereum/go-ethereum v1.10.17 + github.com/ethereum/go-ethereum v1.10.20 github.com/prometheus/client_golang v1.13.0 - github.com/stretchr/testify v1.7.0 - github.com/urfave/cli/v2 v2.3.0 - golang.org/x/crypto v0.1.0 + github.com/stretchr/testify v1.7.2 + github.com/urfave/cli/v2 v2.10.2 + golang.org/x/crypto v0.7.0 ) require ( github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/btcsuite/btcd/btcec/v2 v2.1.3 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deckarep/golang-set v1.8.0 // indirect - github.com/decred/base58 v1.0.3 // indirect + github.com/decred/base58 v1.0.4 // indirect github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect github.com/go-ole/go-ole v1.2.1 // indirect @@ -37,7 +37,7 @@ require ( github.com/mattn/go-colorable v0.1.8 // indirect github.com/mattn/go-isatty v0.0.12 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect + github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect github.com/pierrec/xxHash v0.1.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.2.0 // indirect @@ -45,15 +45,17 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/rjeczalik/notify v0.9.1 // indirect github.com/rs/cors v1.8.2 // indirect - github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/tklauser/go-sysconf v0.3.5 // indirect github.com/tklauser/numcpus v0.2.2 // indirect github.com/vedhavyas/go-subkey v1.0.3 // indirect - golang.org/x/sys v0.1.0 // indirect - golang.org/x/term v0.1.0 // indirect + github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect + github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/term v0.6.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 9cf715a9d..7c589af63 100644 --- a/go.sum +++ b/go.sum @@ -35,27 +35,46 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= +github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328-b293e9eceda0 h1:kuKAKJSHU1KRnX8IPY7Tw37eH7C4D4j+u8UlUX0Vq94= github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328-b293e9eceda0/go.mod h1:fZ95egyWaXKGMyof3dRibM/y4MouAC+L+9DdD/km8cw= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211120930-d4b3bce26dc4 h1:d7jYW/nrIIqfxriPzJjP23fKHeIjvbpnhnXDZUIcqDs= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211120930-d4b3bce26dc4/go.mod h1:Kn8azikAULwrjU6CuC1ADInAe/YkkCKentoUS4MCOY0= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868 h1:0Vbb5JVBtE4G5SqksaJ/UcF4FT2QbTHcHmkl4py40X8= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868/go.mod h1:tdRalIIfnSzu9UX0DkyzUcysg3U4DMXUBQrwTG2kU2c= -github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v4.0.10-cere.0.20221125132510-a26124f21c96 h1:TW3Am+cgEGChz+GVaXfUhsocNLeILIzPLkZh8f8i4/E= -github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v4.0.10-cere.0.20221125132510-a26124f21c96/go.mod h1:a598oNr73JhT5UQH1DJ9IEAkl1M3yshnAsm7U2F7gjI= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211120736-32591d4c2bde h1:GAZq4k9HIyzZWf5BPYzczWGDx0ky1xa6EKeLcXUbJ3A= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211120736-32591d4c2bde/go.mod h1:4OjcEw2JXLdKkioDSJcvMwGYHtnqsZkmizp3gj9CBR8= +github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v5.0.0-cere h1:b7ASd4nlbZYKxrfzI6NsyrWigdYN5BKiNw1UpOCe4nc= +github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v5.0.0-cere/go.mod h1:Xn72GPEJrEq4nm2Pc2cJ3hA9fGkWiHTDdEndzfctywg= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/ChainSafe/log15 v1.0.0 h1:vRDVtWtVwIH5uSCBvgTTZh6FA58UBJ6+QiiypaZfBf8= github.com/ChainSafe/log15 v1.0.0/go.mod h1:5v1+ALHtdW0NfAeeoYyKmzCAMcAeqkdhIg4uxXWIgOg= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= +github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -65,6 +84,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= +github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= +github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= @@ -80,12 +101,26 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= +github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.1.3 h1:xM/n3yIhHAhHy04z4i43C8p4ehixJZMsnrVJkgl+MTE= github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= +github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k= +github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= +github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= +github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= +github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= +github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= +github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= +github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= +github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= +github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= +github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= @@ -107,20 +142,27 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= +github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/decred/base58 v1.0.3 h1:KGZuh8d1WEMIrK0leQRM47W85KqCAdl2N+uagbctdDI= github.com/decred/base58 v1.0.3/go.mod h1:pXP9cXCfM2sFLb2viz2FNIdeMWmZDBKG3ZBYbiSM78E= +github.com/decred/base58 v1.0.4 h1:QJC6B0E0rXOPA8U/kw2rP+qiRJsUaE2Er+pYb3siUeA= +github.com/decred/base58 v1.0.4/go.mod h1:jJswKPEdvpFpvf7dsDvFZyLT22xZ9lWqEByX38oGd9E= github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= +github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -135,12 +177,16 @@ github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/go-ethereum v1.10.13/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw= github.com/ethereum/go-ethereum v1.10.17 h1:XEcumY+qSr1cZQaWsQs5Kck3FHB0V2RiMHPdTBJ+oT8= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= +github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= +github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -241,6 +287,7 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -250,6 +297,7 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= @@ -267,6 +315,7 @@ github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iU github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204 h1:+EYBkW+dbi3F/atB+LSQZSWh7+HNrV3A/N0y6DSoy9k= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= @@ -283,12 +332,17 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= +github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= +github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -301,9 +355,11 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= +github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= @@ -331,6 +387,8 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= @@ -346,6 +404,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= +github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaGHBu1fghwxIPiopAHV06JlXrMHjk= +github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6sSUts3g1irPVHyk/DGslwQsNOo9I7smJfNU= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= @@ -366,14 +426,18 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= +github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= @@ -423,8 +487,11 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= @@ -438,11 +505,14 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= +github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= +github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -453,6 +523,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= @@ -462,15 +533,23 @@ github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefld github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y= +github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/vedhavyas/go-subkey v1.0.3 h1:iKR33BB/akKmcR2PMlXPBeeODjWLM90EL98OrOGs8CA= github.com/vedhavyas/go-subkey v1.0.3/go.mod h1:CloUaFQSSTdWnINfBRFjVMkWXZANW+nd8+TI5jYcl6Y= +github.com/vedhavyas/go-subkey/v2 v2.0.0 h1:LemDIsrVtRSOkp0FA8HxP6ynfKjeOj3BY2U9UNfeDMA= +github.com/vedhavyas/go-subkey/v2 v2.0.0/go.mod h1:95aZ+XDCWAUUynjlmi7BtPExjXgXxByE0WfBwbmIRH4= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -483,6 +562,7 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -490,13 +570,18 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -532,6 +617,7 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -571,6 +657,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -647,15 +734,20 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -832,6 +924,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 67efe39946064a5b846b983e0dd0f445c0a7cba6 Mon Sep 17 00:00:00 2001 From: rakanalh Date: Mon, 11 Dec 2023 20:32:45 +0300 Subject: [PATCH 21/43] Update to use go-substrate-rpc-client v6 --- chains/substrate/connection.go | 10 +++++----- chains/substrate/connection_test.go | 2 +- chains/substrate/listener.go | 2 +- chains/substrate/listener_test.go | 4 ++-- chains/substrate/test_helper_test.go | 2 +- chains/substrate/types.go | 6 +++--- chains/substrate/writer.go | 4 ++-- chains/substrate/writer_test.go | 4 ++-- e2e/e2e_test.go | 2 +- e2e/fungible_test.go | 2 +- e2e/nonfungible_test.go | 2 +- e2e/parallel_test.go | 4 ++-- e2e/substrate/substrate.go | 4 ++-- go.mod | 6 +++--- go.sum | 8 ++++++-- shared/substrate/client.go | 8 ++++---- shared/substrate/events.go | 2 +- shared/substrate/init.go | 2 +- shared/substrate/query.go | 4 ++-- shared/substrate/submit.go | 2 +- shared/substrate/testing/client.go | 4 ++-- shared/substrate/testing/events.go | 4 ++-- shared/substrate/testing/events_test.go | 4 ++-- shared/substrate/testing/init.go | 2 +- shared/substrate/testing/query.go | 2 +- shared/substrate/types.go | 2 +- 26 files changed, 51 insertions(+), 47 deletions(-) diff --git a/chains/substrate/connection.go b/chains/substrate/connection.go index f17f0cac0..b1f7e2bf0 100644 --- a/chains/substrate/connection.go +++ b/chains/substrate/connection.go @@ -9,11 +9,11 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v5" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/rpc/author" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v6" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/rpc/author" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/connection_test.go b/chains/substrate/connection_test.go index 32665d7e7..c76ead10b 100644 --- a/chains/substrate/connection_test.go +++ b/chains/substrate/connection_test.go @@ -6,7 +6,7 @@ package substrate import ( "testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" ) func TestConnect_QueryStorage(t *testing.T) { diff --git a/chains/substrate/listener.go b/chains/substrate/listener.go index cd848ef2f..cc6fdf599 100644 --- a/chains/substrate/listener.go +++ b/chains/substrate/listener.go @@ -14,7 +14,7 @@ import ( "github.com/Cerebellum-Network/chainbridge-utils/blockstore" metrics "github.com/Cerebellum-Network/chainbridge-utils/metrics/types" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/listener_test.go b/chains/substrate/listener_test.go index 5e4bf04ac..afd7faba9 100644 --- a/chains/substrate/listener_test.go +++ b/chains/substrate/listener_test.go @@ -14,8 +14,8 @@ import ( subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/blockstore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" ) const ListenerTimeout = time.Second * 30 diff --git a/chains/substrate/test_helper_test.go b/chains/substrate/test_helper_test.go index c81b7872c..ba675efe7 100644 --- a/chains/substrate/test_helper_test.go +++ b/chains/substrate/test_helper_test.go @@ -10,7 +10,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/keystore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common/hexutil" ) diff --git a/chains/substrate/types.go b/chains/substrate/types.go index bfdc36d6a..234b0c260 100644 --- a/chains/substrate/types.go +++ b/chains/substrate/types.go @@ -7,9 +7,9 @@ import ( "math/big" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/scale" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/scale" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" ) type voteState struct { diff --git a/chains/substrate/writer.go b/chains/substrate/writer.go index 3dfd2374d..e8d474ce2 100644 --- a/chains/substrate/writer.go +++ b/chains/substrate/writer.go @@ -14,8 +14,8 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" metrics "github.com/Cerebellum-Network/chainbridge-utils/metrics/types" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/writer_test.go b/chains/substrate/writer_test.go index c8e838e3e..1d6376783 100644 --- a/chains/substrate/writer_test.go +++ b/chains/substrate/writer_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 044cd20ee..4e800aac5 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -22,7 +22,7 @@ import ( subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/core" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" log "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common" ) diff --git a/e2e/fungible_test.go b/e2e/fungible_test.go index 78931bfbc..6713467e2 100644 --- a/e2e/fungible_test.go +++ b/e2e/fungible_test.go @@ -13,7 +13,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/ethereum" ethtest "github.com/Cerebellum-Network/ChainBridge/shared/ethereum/testing" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/nonfungible_test.go b/e2e/nonfungible_test.go index 77361ecb2..10b9c23e9 100644 --- a/e2e/nonfungible_test.go +++ b/e2e/nonfungible_test.go @@ -11,7 +11,7 @@ import ( sub "github.com/Cerebellum-Network/ChainBridge/e2e/substrate" ethtest "github.com/Cerebellum-Network/ChainBridge/shared/ethereum/testing" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/parallel_test.go b/e2e/parallel_test.go index 27e453687..1651ce115 100644 --- a/e2e/parallel_test.go +++ b/e2e/parallel_test.go @@ -15,8 +15,8 @@ import ( subutils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" log "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common" ) diff --git a/e2e/substrate/substrate.go b/e2e/substrate/substrate.go index c276b6694..ff0ae8ab7 100644 --- a/e2e/substrate/substrate.go +++ b/e2e/substrate/substrate.go @@ -13,8 +13,8 @@ import ( "github.com/Cerebellum-Network/chainbridge-utils/core" "github.com/Cerebellum-Network/chainbridge-utils/keystore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" "github.com/ChainSafe/log15" "golang.org/x/crypto/blake2b" ) diff --git a/go.mod b/go.mod index 52513ec05..661930c38 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/Cerebellum-Network/ChainBridge go 1.18 require ( - github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211120930-d4b3bce26dc4 - github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211120736-32591d4c2bde - github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v5.0.0-cere + github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211165630-993f26e9a035 + github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211165938-370a3dd1e56e + github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.0 github.com/ChainSafe/log15 v1.0.0 github.com/ethereum/go-ethereum v1.10.20 github.com/prometheus/client_golang v1.13.0 diff --git a/go.sum b/go.sum index 7c589af63..3f6b61260 100644 --- a/go.sum +++ b/go.sum @@ -57,12 +57,16 @@ github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328 github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328-b293e9eceda0/go.mod h1:fZ95egyWaXKGMyof3dRibM/y4MouAC+L+9DdD/km8cw= github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211120930-d4b3bce26dc4 h1:d7jYW/nrIIqfxriPzJjP23fKHeIjvbpnhnXDZUIcqDs= github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211120930-d4b3bce26dc4/go.mod h1:Kn8azikAULwrjU6CuC1ADInAe/YkkCKentoUS4MCOY0= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211165630-993f26e9a035 h1:W6yGEmtDF19/DZ0rPx7k4sSxl3LpIRcPZptnPc2NVnE= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211165630-993f26e9a035/go.mod h1:DaTdD8B1Fd/dlHOmRbUJa1jg3yjeAn+oAVWtTe3V02Q= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868 h1:0Vbb5JVBtE4G5SqksaJ/UcF4FT2QbTHcHmkl4py40X8= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868/go.mod h1:tdRalIIfnSzu9UX0DkyzUcysg3U4DMXUBQrwTG2kU2c= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211120736-32591d4c2bde h1:GAZq4k9HIyzZWf5BPYzczWGDx0ky1xa6EKeLcXUbJ3A= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211120736-32591d4c2bde/go.mod h1:4OjcEw2JXLdKkioDSJcvMwGYHtnqsZkmizp3gj9CBR8= -github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v5.0.0-cere h1:b7ASd4nlbZYKxrfzI6NsyrWigdYN5BKiNw1UpOCe4nc= -github.com/Cerebellum-Network/go-substrate-rpc-client/v5 v5.0.0-cere/go.mod h1:Xn72GPEJrEq4nm2Pc2cJ3hA9fGkWiHTDdEndzfctywg= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211165938-370a3dd1e56e h1:cSvuiPUUyOkjljPUdW7hdyClxd+jESJ+928BtE1zRbQ= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211165938-370a3dd1e56e/go.mod h1:4ie7cbF3gRXs+r5yvvItt2B+cr3ARMDwCWjMtaEAHqw= +github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.0 h1:XkwNv3q7txn9qaNeuQwOyMUAznldgByV0WqY+g0hqAA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.0/go.mod h1:rOHTPlfCs+jqc9zPRTtH1XK8BsBeR2cdNBEoijjyi1Y= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/ChainSafe/log15 v1.0.0 h1:vRDVtWtVwIH5uSCBvgTTZh6FA58UBJ6+QiiypaZfBf8= diff --git a/shared/substrate/client.go b/shared/substrate/client.go index 14b86fa72..db600cc3e 100644 --- a/shared/substrate/client.go +++ b/shared/substrate/client.go @@ -8,10 +8,10 @@ import ( "math/big" "github.com/Cerebellum-Network/chainbridge-utils/msg" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v5" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v6" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index b0164cadf..ad1f85b22 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -5,7 +5,7 @@ package utils import ( events "github.com/Cerebellum-Network/chainbridge-substrate-events" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" ) type EventErc721Minted struct { diff --git a/shared/substrate/init.go b/shared/substrate/init.go index 9f928e036..b7f1e9a80 100644 --- a/shared/substrate/init.go +++ b/shared/substrate/init.go @@ -5,7 +5,7 @@ package utils import ( "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" ) func InitializeChain(client *Client, relayers []types.AccountID, chains []msg.ChainId, resources map[msg.ResourceId]Method, threshold uint32) error { diff --git a/shared/substrate/query.go b/shared/substrate/query.go index 6a56ee25e..273d11d78 100644 --- a/shared/substrate/query.go +++ b/shared/substrate/query.go @@ -7,8 +7,8 @@ import ( "fmt" "math/big" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" ) func QueryStorage(client *Client, prefix, method string, arg1, arg2 []byte, result interface{}) (bool, error) { diff --git a/shared/substrate/submit.go b/shared/substrate/submit.go index 66ecd7058..f2472289e 100644 --- a/shared/substrate/submit.go +++ b/shared/substrate/submit.go @@ -8,7 +8,7 @@ import ( "math/big" "sync" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/client.go b/shared/substrate/testing/client.go index 5a3de9eed..e96677ae8 100644 --- a/shared/substrate/testing/client.go +++ b/shared/substrate/testing/client.go @@ -10,8 +10,8 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events.go b/shared/substrate/testing/events.go index 80a8ef1b0..d2013d4cf 100644 --- a/shared/substrate/testing/events.go +++ b/shared/substrate/testing/events.go @@ -8,8 +8,8 @@ import ( "time" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events_test.go b/shared/substrate/testing/events_test.go index 1799383f4..fee6e408f 100644 --- a/shared/substrate/testing/events_test.go +++ b/shared/substrate/testing/events_test.go @@ -9,8 +9,8 @@ import ( "github.com/Cerebellum-Network/ChainBridge/e2e/substrate" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v5" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v6" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" ) func TestChain_Events(t *testing.T) { diff --git a/shared/substrate/testing/init.go b/shared/substrate/testing/init.go index 0b8b8d8c9..0e0dfbb61 100644 --- a/shared/substrate/testing/init.go +++ b/shared/substrate/testing/init.go @@ -9,7 +9,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" ) // WARNING: THIS METHOD IS UNSAFE AND MAY PANIC diff --git a/shared/substrate/testing/query.go b/shared/substrate/testing/query.go index c6d2078de..ecedd2034 100644 --- a/shared/substrate/testing/query.go +++ b/shared/substrate/testing/query.go @@ -9,7 +9,7 @@ import ( "testing" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/types.go b/shared/substrate/types.go index c140debb3..017d1f738 100644 --- a/shared/substrate/types.go +++ b/shared/substrate/types.go @@ -4,7 +4,7 @@ package utils import ( - "github.com/Cerebellum-Network/go-substrate-rpc-client/v5/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" ) const BridgePalletName = "ChainBridge" From 66db3c8fe0548b766cf32780af4f08e94a73c0f6 Mon Sep 17 00:00:00 2001 From: rakanalh Date: Mon, 11 Dec 2023 20:32:59 +0300 Subject: [PATCH 22/43] Fix old docker base --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7949b3ac9..55ed7bd13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN go mod download RUN cd cmd/chainbridge && go build -o /bridge . # # final stage -FROM debian:stretch-slim +FROM debian:buster-slim WORKDIR /app From 9298ea0b12f3778659a42f9d6d551c0901f671a2 Mon Sep 17 00:00:00 2001 From: rakanalh Date: Mon, 11 Dec 2023 20:42:47 +0300 Subject: [PATCH 23/43] Update docker-image version from docker-hub --- docker-compose-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-e2e.yml b/docker-compose-e2e.yml index 03dc2c9ae..459f8ad3a 100644 --- a/docker-compose-e2e.yml +++ b/docker-compose-e2e.yml @@ -16,7 +16,7 @@ services: - "8546:8545" sub-chain: - image: "cerebellumnetwork/pos-node:v2.32.0-rc1" + image: "cerebellumnetwork/pos-node:v4.8.2" container_name: sub-chain command: bash -c "/usr/local/bin/cere --dev --alice --ws-external --rpc-external" ports: From 3554c580366e85e7bf71fc8aff95e9a614196a0b Mon Sep 17 00:00:00 2001 From: rakanalh Date: Tue, 12 Dec 2023 13:33:33 +0300 Subject: [PATCH 24/43] Update substrate-rpc-client version --- go.mod | 6 +++--- go.sum | 20 ++++++-------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 661930c38..4348f31cd 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/Cerebellum-Network/ChainBridge go 1.18 require ( - github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211165630-993f26e9a035 - github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211165938-370a3dd1e56e - github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.0 + github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212102946-fbb90fffdd82 + github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212103035-1ab2a68624e4 + github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.1 github.com/ChainSafe/log15 v1.0.0 github.com/ethereum/go-ethereum v1.10.20 github.com/prometheus/client_golang v1.13.0 diff --git a/go.sum b/go.sum index 3f6b61260..a906442b5 100644 --- a/go.sum +++ b/go.sum @@ -53,20 +53,12 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328-b293e9eceda0 h1:kuKAKJSHU1KRnX8IPY7Tw37eH7C4D4j+u8UlUX0Vq94= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20221201135328-b293e9eceda0/go.mod h1:fZ95egyWaXKGMyof3dRibM/y4MouAC+L+9DdD/km8cw= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211120930-d4b3bce26dc4 h1:d7jYW/nrIIqfxriPzJjP23fKHeIjvbpnhnXDZUIcqDs= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211120930-d4b3bce26dc4/go.mod h1:Kn8azikAULwrjU6CuC1ADInAe/YkkCKentoUS4MCOY0= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211165630-993f26e9a035 h1:W6yGEmtDF19/DZ0rPx7k4sSxl3LpIRcPZptnPc2NVnE= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231211165630-993f26e9a035/go.mod h1:DaTdD8B1Fd/dlHOmRbUJa1jg3yjeAn+oAVWtTe3V02Q= -github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868 h1:0Vbb5JVBtE4G5SqksaJ/UcF4FT2QbTHcHmkl4py40X8= -github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20221201134821-d1bef8924868/go.mod h1:tdRalIIfnSzu9UX0DkyzUcysg3U4DMXUBQrwTG2kU2c= -github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211120736-32591d4c2bde h1:GAZq4k9HIyzZWf5BPYzczWGDx0ky1xa6EKeLcXUbJ3A= -github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211120736-32591d4c2bde/go.mod h1:4OjcEw2JXLdKkioDSJcvMwGYHtnqsZkmizp3gj9CBR8= -github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211165938-370a3dd1e56e h1:cSvuiPUUyOkjljPUdW7hdyClxd+jESJ+928BtE1zRbQ= -github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231211165938-370a3dd1e56e/go.mod h1:4ie7cbF3gRXs+r5yvvItt2B+cr3ARMDwCWjMtaEAHqw= -github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.0 h1:XkwNv3q7txn9qaNeuQwOyMUAznldgByV0WqY+g0hqAA= -github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.0/go.mod h1:rOHTPlfCs+jqc9zPRTtH1XK8BsBeR2cdNBEoijjyi1Y= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212102946-fbb90fffdd82 h1:FuW52r35MZExOGki+nDw3MDpp4TvqCoSyFjOzXqZAGw= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212102946-fbb90fffdd82/go.mod h1:qJXDQYKsfJYGxG34HCbV6puHZZvwrIM5hBGhJJQEH5Q= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212103035-1ab2a68624e4 h1:cTt7yBL41fjayAf4kqktmHfgelH0WTznXWkeQylQb7U= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212103035-1ab2a68624e4/go.mod h1:VZKNUpXjp69EKeGgxq7cG/YkRCLW0zzgGDocCVov+ic= +github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.1 h1:xBrXqekPlFasJzP6gr69hjVrx77qHdSPcGG68CuriNw= +github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.1/go.mod h1:rOHTPlfCs+jqc9zPRTtH1XK8BsBeR2cdNBEoijjyi1Y= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/ChainSafe/log15 v1.0.0 h1:vRDVtWtVwIH5uSCBvgTTZh6FA58UBJ6+QiiypaZfBf8= From a024538630b083e4c1db36b6de7679a15bdba8d4 Mon Sep 17 00:00:00 2001 From: rakanalh Date: Tue, 12 Dec 2023 20:19:24 +0300 Subject: [PATCH 25/43] Update dependencies --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 4348f31cd..e26b145d2 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/Cerebellum-Network/ChainBridge go 1.18 require ( - github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212102946-fbb90fffdd82 - github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212103035-1ab2a68624e4 - github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.1 + github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212171550-90c22902cc9f + github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378 + github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2 github.com/ChainSafe/log15 v1.0.0 github.com/ethereum/go-ethereum v1.10.20 github.com/prometheus/client_golang v1.13.0 diff --git a/go.sum b/go.sum index a906442b5..eb7a89f39 100644 --- a/go.sum +++ b/go.sum @@ -53,12 +53,12 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212102946-fbb90fffdd82 h1:FuW52r35MZExOGki+nDw3MDpp4TvqCoSyFjOzXqZAGw= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212102946-fbb90fffdd82/go.mod h1:qJXDQYKsfJYGxG34HCbV6puHZZvwrIM5hBGhJJQEH5Q= -github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212103035-1ab2a68624e4 h1:cTt7yBL41fjayAf4kqktmHfgelH0WTznXWkeQylQb7U= -github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212103035-1ab2a68624e4/go.mod h1:VZKNUpXjp69EKeGgxq7cG/YkRCLW0zzgGDocCVov+ic= -github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.1 h1:xBrXqekPlFasJzP6gr69hjVrx77qHdSPcGG68CuriNw= -github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.1/go.mod h1:rOHTPlfCs+jqc9zPRTtH1XK8BsBeR2cdNBEoijjyi1Y= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212171550-90c22902cc9f h1:NZ1pd95mCSu5iSe3pAiW9xnv+Iu8ph9AHVc5e/h8oHo= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212171550-90c22902cc9f/go.mod h1:qfTZtnktDD4J39sWiMBc/6rokt6FKWdQC1dO9K7IaOE= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378 h1:C690sCJMOXV41f1b1nP48ypz/cGY4Yp9MKyKb7A4/4g= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378/go.mod h1:D5o++aho1srs5AmENhtBhbD6JGKEqIVoGtKgSeipd8s= +github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2 h1:UzPU72po6gcitD0lBIfn3kk/a6WJyrEFZaF8zH+non4= +github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2/go.mod h1:rOHTPlfCs+jqc9zPRTtH1XK8BsBeR2cdNBEoijjyi1Y= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/ChainSafe/log15 v1.0.0 h1:vRDVtWtVwIH5uSCBvgTTZh6FA58UBJ6+QiiypaZfBf8= From 56888c5e4870073fe2539fe68a10dd2aa1e19175 Mon Sep 17 00:00:00 2001 From: Oleg Yankovich <33641729+krolol@users.noreply.github.com> Date: Wed, 13 Dec 2023 03:10:08 +0100 Subject: [PATCH 26/43] Migrate to the new infra --- .github/workflows/prod.yaml | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml index 3d9f311a5..1017e473c 100644 --- a/.github/workflows/prod.yaml +++ b/.github/workflows/prod.yaml @@ -8,26 +8,17 @@ on: - master-cere workflow_dispatch: +permissions: + id-token: write + contents: read + jobs: build: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/build-and-push-docker.yaml@1.0.0 + uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@master with: - runs-on: '["self-hosted", "cere-network-large-workers"]' - org: cerebellumnetwork - environment: prod - image: crb-${{ github.event.repository.name }} - repository: crb-${{ github.event.repository.name }} + runs-on: '["self-hosted", "cere-network-large"]' + environment: prd + aws_account_id: ${{ vars.DEV_NETWORK_AWS_ACCOUNT_ID }} + repository: network-relayer file: ./Dockerfile secrets: inherit - - deploy: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-with-helm.yaml@1.0.0 - needs: build - with: - runs-on: '["self-hosted", "cere-network-prd-deployer"]' - helm-repo-path: network/network-relayer - helm-release: network-relayer - namespace: network - tag: ${{ needs.build.outputs.version }} - environment: prod - secrets: inherit From ede890a9297a3c2039870d2edaf95f652a92c6d7 Mon Sep 17 00:00:00 2001 From: Oleg Yankovich <33641729+krolol@users.noreply.github.com> Date: Wed, 13 Dec 2023 03:11:22 +0100 Subject: [PATCH 27/43] Migrate to the new infra --- .github/workflows/prod.yaml | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml index 3d9f311a5..1017e473c 100644 --- a/.github/workflows/prod.yaml +++ b/.github/workflows/prod.yaml @@ -8,26 +8,17 @@ on: - master-cere workflow_dispatch: +permissions: + id-token: write + contents: read + jobs: build: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/build-and-push-docker.yaml@1.0.0 + uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@master with: - runs-on: '["self-hosted", "cere-network-large-workers"]' - org: cerebellumnetwork - environment: prod - image: crb-${{ github.event.repository.name }} - repository: crb-${{ github.event.repository.name }} + runs-on: '["self-hosted", "cere-network-large"]' + environment: prd + aws_account_id: ${{ vars.DEV_NETWORK_AWS_ACCOUNT_ID }} + repository: network-relayer file: ./Dockerfile secrets: inherit - - deploy: - uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-with-helm.yaml@1.0.0 - needs: build - with: - runs-on: '["self-hosted", "cere-network-prd-deployer"]' - helm-repo-path: network/network-relayer - helm-release: network-relayer - namespace: network - tag: ${{ needs.build.outputs.version }} - environment: prod - secrets: inherit From cc7e3c5ef339ea20cc80a3c93edc8f50e7ac8c55 Mon Sep 17 00:00:00 2001 From: rakanalh Date: Thu, 21 Dec 2023 15:11:57 +0300 Subject: [PATCH 28/43] Add logs for proposal creation --- chains/ethereum/writer_methods.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chains/ethereum/writer_methods.go b/chains/ethereum/writer_methods.go index 3faaeff7a..e0cac778e 100644 --- a/chains/ethereum/writer_methods.go +++ b/chains/ethereum/writer_methods.go @@ -98,6 +98,7 @@ func (w *writer) createErc20Proposal(m msg.Message) bool { w.executeProposal(m, data, dataHash) return true } else { + w.log.Info("Proposal did not pass yet.") return false } } @@ -110,6 +111,7 @@ func (w *writer) createErc20Proposal(m msg.Message) bool { } // watch for execution event + w.log.Info("Submitting proposal transactions") go w.watchThenExecute(m, data, dataHash, latestBlock) w.voteProposal(m, dataHash) From db8a3ea97dca874932eee85ad46dfc27c696bb65 Mon Sep 17 00:00:00 2001 From: rakanalh Date: Thu, 21 Dec 2023 15:21:48 +0300 Subject: [PATCH 29/43] Add one more --- chains/ethereum/writer_methods.go | 1 + 1 file changed, 1 insertion(+) diff --git a/chains/ethereum/writer_methods.go b/chains/ethereum/writer_methods.go index e0cac778e..5ff24d869 100644 --- a/chains/ethereum/writer_methods.go +++ b/chains/ethereum/writer_methods.go @@ -114,6 +114,7 @@ func (w *writer) createErc20Proposal(m msg.Message) bool { w.log.Info("Submitting proposal transactions") go w.watchThenExecute(m, data, dataHash, latestBlock) + w.log.Info("Submit vote on proposal") w.voteProposal(m, dataHash) return true From 1d9e6c093349508e237bc0e1216191cd9b3f6470 Mon Sep 17 00:00:00 2001 From: rakanalh Date: Thu, 21 Dec 2023 15:26:34 +0300 Subject: [PATCH 30/43] TODO --- chains/ethereum/writer_methods.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/chains/ethereum/writer_methods.go b/chains/ethereum/writer_methods.go index 5ff24d869..7a4cc8200 100644 --- a/chains/ethereum/writer_methods.go +++ b/chains/ethereum/writer_methods.go @@ -92,6 +92,11 @@ func (w *writer) createErc20Proposal(m msg.Message) bool { data := ConstructErc20ProposalData(m.Payload[0].([]byte), m.Payload[1].([]byte)) dataHash := utils.Hash(append(w.cfg.erc20HandlerContract.Bytes(), data...)) + // TODO: @MAKS + // We are going into this block and returning False from the second branch + // of the inner if-statement. This is because shouldVote is returning False and proposalIsPassed is returning False. + // GO TO LINE 38... + y // that's where the issue is. if !w.shouldVote(m, dataHash) { if w.proposalIsPassed(m.Source, m.DepositNonce, dataHash) { // We should not vote for this proposal but it is ready to be executed @@ -110,6 +115,8 @@ func (w *writer) createErc20Proposal(m msg.Message) bool { return false } + // TODO: MAKS + // We don't reach this! // watch for execution event w.log.Info("Submitting proposal transactions") go w.watchThenExecute(m, data, dataHash, latestBlock) From b3ca73b917807ed2c04a13c1371777f606d44c20 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Thu, 21 Dec 2023 18:35:54 +0100 Subject: [PATCH 31/43] Log Proposal for debug purpose --- chains/ethereum/writer_methods.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/chains/ethereum/writer_methods.go b/chains/ethereum/writer_methods.go index 7a4cc8200..4de7114dd 100644 --- a/chains/ethereum/writer_methods.go +++ b/chains/ethereum/writer_methods.go @@ -6,6 +6,8 @@ package ethereum import ( "context" "errors" + "fmt" + "github.com/ethereum/go-ethereum/common" "math/big" "time" @@ -31,6 +33,9 @@ var ErrFatalQuery = errors.New("query of chain state failed") // proposalIsComplete returns true if the proposal state is either Passed, Transferred or Cancelled func (w *writer) proposalIsComplete(srcId msg.ChainId, nonce msg.Nonce, dataHash [32]byte) bool { prop, err := w.bridgeContract.GetProposal(w.conn.CallOpts(), uint8(srcId), uint64(nonce), dataHash) + w.log.Info("Proposal", "src", prop) + fmt.Println(prop) + if err != nil { w.log.Error("Failed to check proposal existence", "err", err) return false @@ -92,11 +97,15 @@ func (w *writer) createErc20Proposal(m msg.Message) bool { data := ConstructErc20ProposalData(m.Payload[0].([]byte), m.Payload[1].([]byte)) dataHash := utils.Hash(append(w.cfg.erc20HandlerContract.Bytes(), data...)) + w.log.Info("Proposal Amount", "src", new(big.Int).SetBytes(m.Payload[0].([]byte)).String()) + w.log.Info("Proposal Destination Address", "src", common.BytesToAddress(m.Payload[1].([]byte))) + w.log.Info("Proposal dataHash", "src", dataHash) + // TODO: @MAKS // We are going into this block and returning False from the second branch // of the inner if-statement. This is because shouldVote is returning False and proposalIsPassed is returning False. // GO TO LINE 38... - y // that's where the issue is. + // that's where the issue is. if !w.shouldVote(m, dataHash) { if w.proposalIsPassed(m.Source, m.DepositNonce, dataHash) { // We should not vote for this proposal but it is ready to be executed From 31809a9b0ccb1cba1be2d14dcd2cf2bbf85b2b5c Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Wed, 27 Dec 2023 13:03:33 +0100 Subject: [PATCH 32/43] Clean up --- chains/ethereum/writer_methods.go | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/chains/ethereum/writer_methods.go b/chains/ethereum/writer_methods.go index 4de7114dd..79d9b29db 100644 --- a/chains/ethereum/writer_methods.go +++ b/chains/ethereum/writer_methods.go @@ -6,7 +6,6 @@ package ethereum import ( "context" "errors" - "fmt" "github.com/ethereum/go-ethereum/common" "math/big" "time" @@ -33,8 +32,7 @@ var ErrFatalQuery = errors.New("query of chain state failed") // proposalIsComplete returns true if the proposal state is either Passed, Transferred or Cancelled func (w *writer) proposalIsComplete(srcId msg.ChainId, nonce msg.Nonce, dataHash [32]byte) bool { prop, err := w.bridgeContract.GetProposal(w.conn.CallOpts(), uint8(srcId), uint64(nonce), dataHash) - w.log.Info("Proposal", "src", prop) - fmt.Println(prop) + w.log.Debug("Proposal", "src", prop) if err != nil { w.log.Error("Failed to check proposal existence", "err", err) @@ -97,15 +95,10 @@ func (w *writer) createErc20Proposal(m msg.Message) bool { data := ConstructErc20ProposalData(m.Payload[0].([]byte), m.Payload[1].([]byte)) dataHash := utils.Hash(append(w.cfg.erc20HandlerContract.Bytes(), data...)) - w.log.Info("Proposal Amount", "src", new(big.Int).SetBytes(m.Payload[0].([]byte)).String()) - w.log.Info("Proposal Destination Address", "src", common.BytesToAddress(m.Payload[1].([]byte))) - w.log.Info("Proposal dataHash", "src", dataHash) + w.log.Debug("Proposal Amount", "src", new(big.Int).SetBytes(m.Payload[0].([]byte)).String()) + w.log.Debug("Proposal Destination Address", "src", common.BytesToAddress(m.Payload[1].([]byte))) + w.log.Debug("Proposal DataHash", "src", dataHash) - // TODO: @MAKS - // We are going into this block and returning False from the second branch - // of the inner if-statement. This is because shouldVote is returning False and proposalIsPassed is returning False. - // GO TO LINE 38... - // that's where the issue is. if !w.shouldVote(m, dataHash) { if w.proposalIsPassed(m.Source, m.DepositNonce, dataHash) { // We should not vote for this proposal but it is ready to be executed @@ -124,9 +117,6 @@ func (w *writer) createErc20Proposal(m msg.Message) bool { return false } - // TODO: MAKS - // We don't reach this! - // watch for execution event w.log.Info("Submitting proposal transactions") go w.watchThenExecute(m, data, dataHash, latestBlock) From a4a38f15a49639e8775b3f3364467fe3abcb60f4 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Fri, 12 Jan 2024 18:06:00 +0100 Subject: [PATCH 33/43] Update gsrpc to v7 --- chains/substrate/connection.go | 10 +- chains/substrate/connection_test.go | 2 +- chains/substrate/listener.go | 2 +- chains/substrate/listener_test.go | 4 +- chains/substrate/test_helper_test.go | 2 +- chains/substrate/types.go | 6 +- chains/substrate/writer.go | 4 +- chains/substrate/writer_test.go | 4 +- e2e/e2e_test.go | 2 +- e2e/fungible_test.go | 2 +- e2e/nonfungible_test.go | 2 +- e2e/parallel_test.go | 4 +- e2e/substrate/substrate.go | 4 +- go.mod | 94 ++++++++++------- go.sum | 132 +++++++++++++++++++++++- shared/substrate/client.go | 8 +- shared/substrate/events.go | 2 +- shared/substrate/init.go | 2 +- shared/substrate/query.go | 4 +- shared/substrate/submit.go | 2 +- shared/substrate/testing/client.go | 4 +- shared/substrate/testing/events.go | 4 +- shared/substrate/testing/events_test.go | 4 +- shared/substrate/testing/init.go | 2 +- shared/substrate/testing/query.go | 2 +- shared/substrate/types.go | 2 +- 26 files changed, 230 insertions(+), 80 deletions(-) diff --git a/chains/substrate/connection.go b/chains/substrate/connection.go index b1f7e2bf0..6728110c4 100644 --- a/chains/substrate/connection.go +++ b/chains/substrate/connection.go @@ -9,11 +9,11 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v6" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/rpc/author" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v7" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/rpc/author" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/connection_test.go b/chains/substrate/connection_test.go index c76ead10b..a10811f4f 100644 --- a/chains/substrate/connection_test.go +++ b/chains/substrate/connection_test.go @@ -6,7 +6,7 @@ package substrate import ( "testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" ) func TestConnect_QueryStorage(t *testing.T) { diff --git a/chains/substrate/listener.go b/chains/substrate/listener.go index cc6fdf599..675718cae 100644 --- a/chains/substrate/listener.go +++ b/chains/substrate/listener.go @@ -14,7 +14,7 @@ import ( "github.com/Cerebellum-Network/chainbridge-utils/blockstore" metrics "github.com/Cerebellum-Network/chainbridge-utils/metrics/types" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/listener_test.go b/chains/substrate/listener_test.go index afd7faba9..e8578e753 100644 --- a/chains/substrate/listener_test.go +++ b/chains/substrate/listener_test.go @@ -14,8 +14,8 @@ import ( subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/blockstore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" ) const ListenerTimeout = time.Second * 30 diff --git a/chains/substrate/test_helper_test.go b/chains/substrate/test_helper_test.go index ba675efe7..91920af7d 100644 --- a/chains/substrate/test_helper_test.go +++ b/chains/substrate/test_helper_test.go @@ -10,7 +10,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/keystore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common/hexutil" ) diff --git a/chains/substrate/types.go b/chains/substrate/types.go index 234b0c260..74402a5f4 100644 --- a/chains/substrate/types.go +++ b/chains/substrate/types.go @@ -7,9 +7,9 @@ import ( "math/big" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/scale" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/scale" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" ) type voteState struct { diff --git a/chains/substrate/writer.go b/chains/substrate/writer.go index e8d474ce2..0a922ae7c 100644 --- a/chains/substrate/writer.go +++ b/chains/substrate/writer.go @@ -14,8 +14,8 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" metrics "github.com/Cerebellum-Network/chainbridge-utils/metrics/types" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/writer_test.go b/chains/substrate/writer_test.go index 1d6376783..93caf6de1 100644 --- a/chains/substrate/writer_test.go +++ b/chains/substrate/writer_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 4e800aac5..b2964edf7 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -22,7 +22,7 @@ import ( subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/core" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" log "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common" ) diff --git a/e2e/fungible_test.go b/e2e/fungible_test.go index 6713467e2..1eb32a367 100644 --- a/e2e/fungible_test.go +++ b/e2e/fungible_test.go @@ -13,7 +13,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/ethereum" ethtest "github.com/Cerebellum-Network/ChainBridge/shared/ethereum/testing" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/nonfungible_test.go b/e2e/nonfungible_test.go index 10b9c23e9..91b13876d 100644 --- a/e2e/nonfungible_test.go +++ b/e2e/nonfungible_test.go @@ -11,7 +11,7 @@ import ( sub "github.com/Cerebellum-Network/ChainBridge/e2e/substrate" ethtest "github.com/Cerebellum-Network/ChainBridge/shared/ethereum/testing" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/parallel_test.go b/e2e/parallel_test.go index 1651ce115..a21f59ad5 100644 --- a/e2e/parallel_test.go +++ b/e2e/parallel_test.go @@ -15,8 +15,8 @@ import ( subutils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" log "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common" ) diff --git a/e2e/substrate/substrate.go b/e2e/substrate/substrate.go index ff0ae8ab7..6895cb628 100644 --- a/e2e/substrate/substrate.go +++ b/e2e/substrate/substrate.go @@ -13,8 +13,8 @@ import ( "github.com/Cerebellum-Network/chainbridge-utils/core" "github.com/Cerebellum-Network/chainbridge-utils/keystore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" "github.com/ChainSafe/log15" "golang.org/x/crypto/blake2b" ) diff --git a/go.mod b/go.mod index e26b145d2..df57f3bbd 100644 --- a/go.mod +++ b/go.mod @@ -1,61 +1,83 @@ module github.com/Cerebellum-Network/ChainBridge -go 1.18 +go 1.21 + +toolchain go1.21.5 require ( - github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212171550-90c22902cc9f - github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378 - github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2 + github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231-4f2db1e7a3d9 + github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d + github.com/Cerebellum-Network/go-substrate-rpc-client/v7 v7.0.1-rc github.com/ChainSafe/log15 v1.0.0 - github.com/ethereum/go-ethereum v1.10.20 - github.com/prometheus/client_golang v1.13.0 - github.com/stretchr/testify v1.7.2 - github.com/urfave/cli/v2 v2.10.2 - golang.org/x/crypto v0.7.0 + github.com/ethereum/go-ethereum v1.13.10 + github.com/prometheus/client_golang v1.18.0 + github.com/stretchr/testify v1.8.4 + github.com/urfave/cli/v2 v2.27.1 + golang.org/x/crypto v0.18.0 ) require ( - github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect + github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2 // indirect + github.com/ChainSafe/go-schnorrkel v1.1.0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/StackExchange/wmi v1.2.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/bits-and-blooms/bitset v1.13.0 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/consensys/bavard v0.1.13 // indirect + github.com/consensys/gnark-crypto v0.12.1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect + github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deckarep/golang-set v1.8.0 // indirect - github.com/decred/base58 v1.0.4 // indirect - github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect - github.com/go-ole/go-ole v1.2.1 // indirect + github.com/deckarep/golang-set/v2 v2.6.0 // indirect + github.com/decred/base58 v1.0.5 // indirect + github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect + github.com/ethereum/c-kzg-4844 v0.4.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-stack/stack v1.8.1 // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/google/uuid v1.2.0 // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.5.0 // indirect + github.com/gorilla/websocket v1.5.1 // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect - github.com/mattn/go-colorable v0.1.8 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/holiman/uint256 v1.2.4 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect + github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/pierrec/xxHash v0.1.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect - github.com/rjeczalik/notify v0.9.1 // indirect - github.com/rs/cors v1.8.2 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect + github.com/rjeczalik/notify v0.9.3 // indirect + github.com/rs/cors v1.10.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect + github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect - github.com/tklauser/go-sysconf v0.3.5 // indirect - github.com/tklauser/numcpus v0.2.2 // indirect + github.com/supranational/blst v0.3.11 // indirect + github.com/tklauser/go-sysconf v0.3.13 // indirect + github.com/tklauser/numcpus v0.7.0 // indirect github.com/vedhavyas/go-subkey v1.0.3 // indirect github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect - github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect + github.com/yusufpapurcu/wmi v1.2.3 // indirect + golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect + golang.org/x/mod v0.14.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.16.0 // indirect + golang.org/x/tools v0.17.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + rsc.io/tmplfunc v0.0.3 // indirect ) diff --git a/go.sum b/go.sum index eb7a89f39..b381ccb74 100644 --- a/go.sum +++ b/go.sum @@ -53,23 +53,34 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212171550-90c22902cc9f h1:NZ1pd95mCSu5iSe3pAiW9xnv+Iu8ph9AHVc5e/h8oHo= -github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20231212171550-90c22902cc9f/go.mod h1:qfTZtnktDD4J39sWiMBc/6rokt6FKWdQC1dO9K7IaOE= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231-4f2db1e7a3d9 h1:GQsw7GBiKOxx2l8smpruOl+v6G0zdM6akK+3fC3tDBU= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231-4f2db1e7a3d9/go.mod h1:a8Bhm44mzr1b4tGwPbpISsGymroqjLs32UvQrjJT3k0= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378 h1:C690sCJMOXV41f1b1nP48ypz/cGY4Yp9MKyKb7A4/4g= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378/go.mod h1:D5o++aho1srs5AmENhtBhbD6JGKEqIVoGtKgSeipd8s= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d h1:KnNrLMmqyVLMgNMgSp2cIBsJLUnC2vVyUgq9sEZUND0= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d/go.mod h1:0eIvn9zbYgT08igtFhtkQJzAHhG8CwSq+BCmsq7NCU8= github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2 h1:UzPU72po6gcitD0lBIfn3kk/a6WJyrEFZaF8zH+non4= github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2/go.mod h1:rOHTPlfCs+jqc9zPRTtH1XK8BsBeR2cdNBEoijjyi1Y= +github.com/Cerebellum-Network/go-substrate-rpc-client/v7 v7.0.1-rc h1:HGg29xHzn64oYqlsPDGfi2eHJHYWp9hqzVjjW1k58/0= +github.com/Cerebellum-Network/go-substrate-rpc-client/v7 v7.0.1-rc/go.mod h1:jWRJ6bf690StnOgY9hxZ8bR8CPDk3+dd6aGU0StFKM8= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= +github.com/ChainSafe/go-schnorrkel v1.1.0 h1:rZ6EU+CZFCjB4sHUE1jIu8VDoB/wRKZxoe1tkcO71Wk= +github.com/ChainSafe/go-schnorrkel v1.1.0/go.mod h1:ABkENxiP+cvjFiByMIZ9LYbRoNNLeBLiakC1XeTFxfE= github.com/ChainSafe/log15 v1.0.0 h1:vRDVtWtVwIH5uSCBvgTTZh6FA58UBJ6+QiiypaZfBf8= github.com/ChainSafe/log15 v1.0.0/go.mod h1:5v1+ALHtdW0NfAeeoYyKmzCAMcAeqkdhIg4uxXWIgOg= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= +github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= +github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -95,6 +106,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= +github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= @@ -104,6 +117,8 @@ github.com/btcsuite/btcd/btcec/v2 v2.1.3 h1:xM/n3yIhHAhHy04z4i43C8p4ehixJZMsnrVJ github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k= github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= +github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= +github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= @@ -121,10 +136,13 @@ github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOC github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -132,7 +150,11 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= +github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= +github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= +github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M= +github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -140,6 +162,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSY github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= +github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= @@ -150,14 +176,22 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= +github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM= +github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/base58 v1.0.3 h1:KGZuh8d1WEMIrK0leQRM47W85KqCAdl2N+uagbctdDI= github.com/decred/base58 v1.0.3/go.mod h1:pXP9cXCfM2sFLb2viz2FNIdeMWmZDBKG3ZBYbiSM78E= github.com/decred/base58 v1.0.4 h1:QJC6B0E0rXOPA8U/kw2rP+qiRJsUaE2Er+pYb3siUeA= github.com/decred/base58 v1.0.4/go.mod h1:jJswKPEdvpFpvf7dsDvFZyLT22xZ9lWqEByX38oGd9E= +github.com/decred/base58 v1.0.5 h1:hwcieUM3pfPnE/6p3J100zoRfGkQxBulZHo7GZfOqic= +github.com/decred/base58 v1.0.5/go.mod h1:s/8lukEHFA6bUQQb/v3rjUySJ2hu+RioCzLukAVkrfw= github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= @@ -178,17 +212,23 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= +github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/ethereum/go-ethereum v1.10.13/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw= github.com/ethereum/go-ethereum v1.10.17 h1:XEcumY+qSr1cZQaWsQs5Kck3FHB0V2RiMHPdTBJ+oT8= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= +github.com/ethereum/go-ethereum v1.13.10 h1:Ppdil79nN+Vc+mXfge0AuUgmKWuVv4eMqzoIVSdqZek= +github.com/ethereum/go-ethereum v1.13.10/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= @@ -210,6 +250,10 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= @@ -222,6 +266,7 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -252,10 +297,13 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -270,9 +318,11 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa h1:Q75Upo5UN4JbPFURXZ8nLKYUvF85dyFRop/vQ0Rv+64= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -283,9 +333,12 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -293,6 +346,8 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -310,6 +365,8 @@ github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZ github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= +github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204 h1:+EYBkW+dbi3F/atB+LSQZSWh7+HNrV3A/N0y6DSoy9k= @@ -366,6 +423,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -383,6 +441,8 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -390,13 +450,21 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= @@ -406,6 +474,9 @@ github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxd github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= +github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= +github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -454,11 +525,15 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= @@ -467,6 +542,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= +github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -474,15 +551,21 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= +github.com/rjeczalik/notify v0.9.3 h1:6rJAzHTGKXGj76sbRgDiDcYj/HniypXmSJo1SWakZeY= +github.com/rjeczalik/notify v0.9.3/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -493,6 +576,8 @@ github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfP github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= +github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -507,6 +592,7 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= +github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -520,25 +606,37 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= +github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= +github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4= +github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0= github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= +github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4= +github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= +github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y= github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= +github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= +github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/vedhavyas/go-subkey v1.0.3 h1:iKR33BB/akKmcR2PMlXPBeeODjWLM90EL98OrOGs8CA= github.com/vedhavyas/go-subkey v1.0.3/go.mod h1:CloUaFQSSTdWnINfBRFjVMkWXZANW+nd8+TI5jYcl6Y= +github.com/vedhavyas/go-subkey v1.0.4 h1:QwjBZx4w7qXC2lmqol2jJfhaNXPI9BsgLZiMiCwqGDU= +github.com/vedhavyas/go-subkey v1.0.4/go.mod h1:aOIil/KS9hJlnr9ZSQKSoXdu/MbnkCxG4x9IOlLsMtI= github.com/vedhavyas/go-subkey/v2 v2.0.0 h1:LemDIsrVtRSOkp0FA8HxP6ynfKjeOj3BY2U9UNfeDMA= github.com/vedhavyas/go-subkey/v2 v2.0.0/go.mod h1:95aZ+XDCWAUUynjlmi7BtPExjXgXxByE0WfBwbmIRH4= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= @@ -546,10 +644,14 @@ github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+m github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e h1:+SOyEddqYF09QP7vr7CgJ1eti3pY9Fn3LHO1M1r/0sI= +github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= +github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -578,6 +680,8 @@ golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -591,6 +695,10 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e h1:723BNChdd0c2Wk6WOE320qGBiPtYx0F0Bbm1kriShfE= +golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= +golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -613,6 +721,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -656,6 +766,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -675,9 +787,12 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -692,6 +807,7 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -733,10 +849,13 @@ golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -744,6 +863,8 @@ golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -760,6 +881,7 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -806,6 +928,8 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -895,6 +1019,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -934,3 +1060,5 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= +rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= diff --git a/shared/substrate/client.go b/shared/substrate/client.go index db600cc3e..6a0a569b8 100644 --- a/shared/substrate/client.go +++ b/shared/substrate/client.go @@ -8,10 +8,10 @@ import ( "math/big" "github.com/Cerebellum-Network/chainbridge-utils/msg" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v6" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v7" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index ad1f85b22..3792c6612 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -5,7 +5,7 @@ package utils import ( events "github.com/Cerebellum-Network/chainbridge-substrate-events" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" ) type EventErc721Minted struct { diff --git a/shared/substrate/init.go b/shared/substrate/init.go index b7f1e9a80..a34c139ba 100644 --- a/shared/substrate/init.go +++ b/shared/substrate/init.go @@ -5,7 +5,7 @@ package utils import ( "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" ) func InitializeChain(client *Client, relayers []types.AccountID, chains []msg.ChainId, resources map[msg.ResourceId]Method, threshold uint32) error { diff --git a/shared/substrate/query.go b/shared/substrate/query.go index 273d11d78..675a6170e 100644 --- a/shared/substrate/query.go +++ b/shared/substrate/query.go @@ -7,8 +7,8 @@ import ( "fmt" "math/big" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" ) func QueryStorage(client *Client, prefix, method string, arg1, arg2 []byte, result interface{}) (bool, error) { diff --git a/shared/substrate/submit.go b/shared/substrate/submit.go index f2472289e..00d23be06 100644 --- a/shared/substrate/submit.go +++ b/shared/substrate/submit.go @@ -8,7 +8,7 @@ import ( "math/big" "sync" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/client.go b/shared/substrate/testing/client.go index e96677ae8..6020be550 100644 --- a/shared/substrate/testing/client.go +++ b/shared/substrate/testing/client.go @@ -10,8 +10,8 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events.go b/shared/substrate/testing/events.go index d2013d4cf..700e10ff3 100644 --- a/shared/substrate/testing/events.go +++ b/shared/substrate/testing/events.go @@ -8,8 +8,8 @@ import ( "time" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events_test.go b/shared/substrate/testing/events_test.go index fee6e408f..8024a0ac6 100644 --- a/shared/substrate/testing/events_test.go +++ b/shared/substrate/testing/events_test.go @@ -9,8 +9,8 @@ import ( "github.com/Cerebellum-Network/ChainBridge/e2e/substrate" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v6" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v7" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" ) func TestChain_Events(t *testing.T) { diff --git a/shared/substrate/testing/init.go b/shared/substrate/testing/init.go index 0e0dfbb61..d2961b7a2 100644 --- a/shared/substrate/testing/init.go +++ b/shared/substrate/testing/init.go @@ -9,7 +9,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" ) // WARNING: THIS METHOD IS UNSAFE AND MAY PANIC diff --git a/shared/substrate/testing/query.go b/shared/substrate/testing/query.go index ecedd2034..e5744ebe3 100644 --- a/shared/substrate/testing/query.go +++ b/shared/substrate/testing/query.go @@ -9,7 +9,7 @@ import ( "testing" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/types.go b/shared/substrate/types.go index 017d1f738..4f82e675c 100644 --- a/shared/substrate/types.go +++ b/shared/substrate/types.go @@ -4,7 +4,7 @@ package utils import ( - "github.com/Cerebellum-Network/go-substrate-rpc-client/v6/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" ) const BridgePalletName = "ChainBridge" From 1546e2a3692bb20132b45a70b217e3c115b4452b Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Mon, 15 Jan 2024 11:44:18 +0100 Subject: [PATCH 34/43] Update Go version in Docker --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 55ed7bd13..cdcc080a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2020 ChainSafe Systems # SPDX-License-Identifier: LGPL-3.0-only -FROM golang:1.18-stretch AS builder +FROM golang:1.21.5-alpine AS builder ADD . /src WORKDIR /src RUN go mod download From f3378b4839a80a65a0c395f1f548ae7691c18239 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 16 Jan 2024 17:01:01 +0100 Subject: [PATCH 35/43] Handle error before proceeding farther --- cmd/chainbridge/main.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cmd/chainbridge/main.go b/cmd/chainbridge/main.go index 71b6c9145..bf09f555d 100644 --- a/cmd/chainbridge/main.go +++ b/cmd/chainbridge/main.go @@ -201,16 +201,15 @@ func run(ctx *cli.Context) error { return errors.New("unrecognized Chain Type") } + if err != nil { + return err + } + if chain.Scan { c.AddChain(newChain) } else { c.SetRouter(newChain) } - - if err != nil { - return err - } - } // Start prometheus and health server @@ -238,7 +237,7 @@ func run(ctx *cli.Context) error { http.HandleFunc(fmt.Sprintf("/health/%s", c.Name()), h.HealthStatus) } // nolint - // ToDo: enable linter after fixint required timeouts vulnerability https://deepsource.io/directory/analyzers/go/issues/GO-S2114 + // ToDo: enable linter after fixint required timeouts vulnerability https://deepsource.io/directory/analyzers/go/issues/GO-S2114 err := http.ListenAndServe(fmt.Sprintf(":%d", port), nil) if errors.Is(err, http.ErrServerClosed) { log.Info("Health status server is shutting down", err) From 34b832704f6e85672b35c24dab8f755fee5e333b Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 23 Jan 2024 12:35:40 +0100 Subject: [PATCH 36/43] Update chainbridge-utils to fix blockstore issue --- go.mod | 3 ++- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index df57f3bbd..455966da6 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.5 require ( github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231-4f2db1e7a3d9 - github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d + github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240123112715-6db113397ae7 github.com/Cerebellum-Network/go-substrate-rpc-client/v7 v7.0.1-rc github.com/ChainSafe/log15 v1.0.0 github.com/ethereum/go-ethereum v1.13.10 @@ -41,6 +41,7 @@ require ( github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-stack/stack v1.8.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/renameio/v2 v2.0.0 // indirect github.com/google/uuid v1.5.0 // indirect github.com/gorilla/websocket v1.5.1 // indirect github.com/gtank/merlin v0.1.1 // indirect diff --git a/go.sum b/go.sum index b381ccb74..d29f2ef9e 100644 --- a/go.sum +++ b/go.sum @@ -59,6 +59,8 @@ github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff0 github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378/go.mod h1:D5o++aho1srs5AmENhtBhbD6JGKEqIVoGtKgSeipd8s= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d h1:KnNrLMmqyVLMgNMgSp2cIBsJLUnC2vVyUgq9sEZUND0= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d/go.mod h1:0eIvn9zbYgT08igtFhtkQJzAHhG8CwSq+BCmsq7NCU8= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240123112715-6db113397ae7 h1:ozLhYzcGPyM7BDDnJAT+34ZHc2VY6FWyV3rFxxNBEiM= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240123112715-6db113397ae7/go.mod h1:hNZH7DOtyHQqz22U/B1ecP5qzElQVD1DVM7NNB6Q38s= github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2 h1:UzPU72po6gcitD0lBIfn3kk/a6WJyrEFZaF8zH+non4= github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2/go.mod h1:rOHTPlfCs+jqc9zPRTtH1XK8BsBeR2cdNBEoijjyi1Y= github.com/Cerebellum-Network/go-substrate-rpc-client/v7 v7.0.1-rc h1:HGg29xHzn64oYqlsPDGfi2eHJHYWp9hqzVjjW1k58/0= @@ -333,6 +335,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= +github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= From ce9bcf1930aa2ede8bbb50c71cce275e7902b418 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 6 Feb 2024 15:04:52 +0100 Subject: [PATCH 37/43] Add ddc_payouts events --- shared/substrate/events.go | 208 +++++++++++++++++++++++++++++++------ 1 file changed, 179 insertions(+), 29 deletions(-) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index 3792c6612..0b60efd76 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -181,36 +181,186 @@ type EventDataStringChanged struct { Topics []types.Hash } +type EventBillingReportInitialized struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Topics []types.Hash +} + +type EventChargingStarted struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Topics []types.Hash +} + +type EventCharged struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + BatchIndex types.U32 + CustomerId types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventChargeFailed struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + BatchIndex types.U32 + CustomerId types.AccountID + Charged types.U128 + ExpectedToCharge types.U128 + Topics []types.Hash +} + +type EventIndebted struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + BatchIndex types.U32 + CustomerId types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventChargingFinished struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Topics []types.Hash +} + +type EventTreasuryFeesCollected struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Amount types.U128 + Topics []types.Hash +} + +type EventClusterReserveFeesCollected struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Amount types.U128 + Topics []types.Hash +} + +type EventValidatorFeesCollected struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Amount types.U128 + Topics []types.Hash +} + +type EventRewardingStarted struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Topics []types.Hash +} + +type EventRewarded struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + BatchIndex types.U32 + NodeProviderId types.AccountID + Rewarded types.U128 + ExpectedToReward types.U128 + Topics []types.Hash +} + +type EventNotDistributedReward struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + BatchIndex types.U32 + NodeProviderId types.AccountID + ExpectedReward types.U128 + DistributedReward types.U128 + Topics []types.Hash +} + +type EventNotDistributedOverallReward struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + ExpectedReward types.U128 + TotalDistributedReward types.U128 + Topics []types.Hash +} + +type EventRewardingFinished struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Topics []types.Hash +} + +type EventBillingReportFinalized struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + Topics []types.Hash +} + +type EventAuthorisedCaller struct { + Phase types.Phase + AuthorisedCaller types.AccountID + Topics []types.Hash +} + type Events struct { types.EventRecords events.Events - Erc721_Minted []EventErc721Minted //nolint:stylecheck,golint - Erc721_Transferred []EventErc721Transferred //nolint:stylecheck,golint - Erc721_Burned []EventErc721Burned //nolint:stylecheck,golint - Erc20_Remark []EventErc20Remark //nolint:stylecheck,golint - Nfts_DepositAsset []EventNFTDeposited //nolint:stylecheck,golint - Council_Proposed []types.EventCouncilProposed //nolint:stylecheck,golint - Council_Voted []types.EventCouncilVoted //nolint:stylecheck,golint - Council_Approved []types.EventCouncilApproved //nolint:stylecheck,golint - Council_Disapproved []types.EventCouncilDisapproved //nolint:stylecheck,golint - Council_Executed []types.EventCouncilExecuted //nolint:stylecheck,golint - Council_MemberExecuted []types.EventCouncilMemberExecuted //nolint:stylecheck,golint - Council_Closed []types.EventCouncilClosed //nolint:stylecheck,golint - Fees_FeeChanged []EventFeeChanged //nolint:stylecheck,golint - MultiAccount_NewMultiAccount []EventNewMultiAccount //nolint:stylecheck,golint - MultiAccount_MultiAccountUpdated []EventMultiAccountUpdated //nolint:stylecheck,golint - MultiAccount_MultiAccountRemoved []EventMultiAccountRemoved //nolint:stylecheck,golint - MultiAccount_NewMultisig []EventNewMultisig //nolint:stylecheck,golint - MultiAccount_MultisigApproval []EventMultisigApproval //nolint:stylecheck,golint - MultiAccount_MultisigExecuted []EventMultisigExecuted //nolint:stylecheck,golint - MultiAccount_MultisigCancelled []EventMultisigCancelled //nolint:stylecheck,golint - TreasuryReward_TreasuryMinting []EventTreasuryMinting //nolint:stylecheck,golint - Nft_Transferred []EventNftTransferred //nolint:stylecheck,golint - RadClaims_Claimed []EventRadClaimsClaimed //nolint:stylecheck,golint - RadClaims_RootHashStored []EventRadClaimsRootHashStored //nolint:stylecheck,golint - Registry_Mint []EventRegistryMint //nolint:stylecheck,golint - Registry_RegistryCreated []EventRegistryRegistryCreated //nolint:stylecheck,golint - Registry_RegistryTmp []EventRegistryTmp //nolint:stylecheck,golint - CereDDCModule_DataStringSet []EventDataStringSet //nolint:stylecheck,golint - CereDDCModule_DataStringChanged []EventDataStringChanged //nolint:stylecheck,golint + Erc721_Minted []EventErc721Minted //nolint:stylecheck,golint + Erc721_Transferred []EventErc721Transferred //nolint:stylecheck,golint + Erc721_Burned []EventErc721Burned //nolint:stylecheck,golint + Erc20_Remark []EventErc20Remark //nolint:stylecheck,golint + Nfts_DepositAsset []EventNFTDeposited //nolint:stylecheck,golint + Council_Proposed []types.EventCouncilProposed //nolint:stylecheck,golint + Council_Voted []types.EventCouncilVoted //nolint:stylecheck,golint + Council_Approved []types.EventCouncilApproved //nolint:stylecheck,golint + Council_Disapproved []types.EventCouncilDisapproved //nolint:stylecheck,golint + Council_Executed []types.EventCouncilExecuted //nolint:stylecheck,golint + Council_MemberExecuted []types.EventCouncilMemberExecuted //nolint:stylecheck,golint + Council_Closed []types.EventCouncilClosed //nolint:stylecheck,golint + Fees_FeeChanged []EventFeeChanged //nolint:stylecheck,golint + MultiAccount_NewMultiAccount []EventNewMultiAccount //nolint:stylecheck,golint + MultiAccount_MultiAccountUpdated []EventMultiAccountUpdated //nolint:stylecheck,golint + MultiAccount_MultiAccountRemoved []EventMultiAccountRemoved //nolint:stylecheck,golint + MultiAccount_NewMultisig []EventNewMultisig //nolint:stylecheck,golint + MultiAccount_MultisigApproval []EventMultisigApproval //nolint:stylecheck,golint + MultiAccount_MultisigExecuted []EventMultisigExecuted //nolint:stylecheck,golint + MultiAccount_MultisigCancelled []EventMultisigCancelled //nolint:stylecheck,golint + TreasuryReward_TreasuryMinting []EventTreasuryMinting //nolint:stylecheck,golint + Nft_Transferred []EventNftTransferred //nolint:stylecheck,golint + RadClaims_Claimed []EventRadClaimsClaimed //nolint:stylecheck,golint + RadClaims_RootHashStored []EventRadClaimsRootHashStored //nolint:stylecheck,golint + Registry_Mint []EventRegistryMint //nolint:stylecheck,golint + Registry_RegistryCreated []EventRegistryRegistryCreated //nolint:stylecheck,golint + Registry_RegistryTmp []EventRegistryTmp //nolint:stylecheck,golint + CereDDCModule_DataStringSet []EventDataStringSet //nolint:stylecheck,golint + CereDDCModule_DataStringChanged []EventDataStringChanged //nolint:stylecheck,golint + DdcPayouts_BillingReportInitialized []EventBillingReportInitialized //nolint:stylecheck,golint + DdcPayouts_ChargingStarted []EventChargingStarted //nolint:stylecheck,golint + DdcPayouts_Charged []EventCharged //nolint:stylecheck,golint + DdcPayouts_ChargedFailed []EventChargeFailed //nolint:stylecheck,golint + DdcPayouts_Indebted []EventIndebted //nolint:stylecheck,golint + DdcPayouts_ChargingFinished []EventChargingFinished //nolint:stylecheck,golint + DdcPayouts_TreasuryFeesCollected []EventTreasuryFeesCollected //nolint:stylecheck,golint + DdcPayouts_ClusterReserveFeesCollected []EventClusterReserveFeesCollected //nolint:stylecheck,golint + DdcPayouts_ValidatorFeesCollected []EventValidatorFeesCollected //nolint:stylecheck,golint + DdcPayouts_RewardingStarted []EventRewardingStarted //nolint:stylecheck,golint + DdcPayouts_Rewarded []EventRewarded //nolint:stylecheck,golint + DdcPayouts_NotDistributedReward []EventNotDistributedReward //nolint:stylecheck,golint + DdcPayouts_NotDistributedOverallReward []EventNotDistributedOverallReward //nolint:stylecheck,golint + DdcPayouts_RewardingFinished []EventRewardingFinished //nolint:stylecheck,golint + DdcPayouts_BillingReportFinalized []EventBillingReportFinalized //nolint:stylecheck,golint + DdcPayouts_AuthorisedCaller []EventAuthorisedCaller //nolint:stylecheck,golint } From e45177b23421d4765c38ef48cbe3eb88b6676875 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 6 Feb 2024 15:42:46 +0100 Subject: [PATCH 38/43] Update gsrpc to v8 --- chains/substrate/connection.go | 10 +++++----- chains/substrate/connection_test.go | 2 +- chains/substrate/listener.go | 2 +- chains/substrate/listener_test.go | 4 ++-- chains/substrate/test_helper_test.go | 2 +- chains/substrate/types.go | 6 +++--- chains/substrate/writer.go | 4 ++-- chains/substrate/writer_test.go | 4 ++-- e2e/e2e_test.go | 2 +- e2e/fungible_test.go | 2 +- e2e/nonfungible_test.go | 2 +- e2e/parallel_test.go | 4 ++-- e2e/substrate/substrate.go | 4 ++-- go.mod | 11 +++++------ go.sum | 16 ++++++++++++++-- shared/substrate/client.go | 8 ++++---- shared/substrate/events.go | 2 +- shared/substrate/init.go | 2 +- shared/substrate/query.go | 4 ++-- shared/substrate/submit.go | 2 +- shared/substrate/testing/client.go | 4 ++-- shared/substrate/testing/events.go | 4 ++-- shared/substrate/testing/events_test.go | 4 ++-- shared/substrate/testing/init.go | 2 +- shared/substrate/testing/query.go | 2 +- shared/substrate/types.go | 2 +- 26 files changed, 61 insertions(+), 50 deletions(-) diff --git a/chains/substrate/connection.go b/chains/substrate/connection.go index 6728110c4..073272c40 100644 --- a/chains/substrate/connection.go +++ b/chains/substrate/connection.go @@ -9,11 +9,11 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v7" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/rpc/author" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v8" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/rpc/author" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/connection_test.go b/chains/substrate/connection_test.go index a10811f4f..b429f928f 100644 --- a/chains/substrate/connection_test.go +++ b/chains/substrate/connection_test.go @@ -6,7 +6,7 @@ package substrate import ( "testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" ) func TestConnect_QueryStorage(t *testing.T) { diff --git a/chains/substrate/listener.go b/chains/substrate/listener.go index 675718cae..a35518f9a 100644 --- a/chains/substrate/listener.go +++ b/chains/substrate/listener.go @@ -14,7 +14,7 @@ import ( "github.com/Cerebellum-Network/chainbridge-utils/blockstore" metrics "github.com/Cerebellum-Network/chainbridge-utils/metrics/types" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/listener_test.go b/chains/substrate/listener_test.go index e8578e753..9866d12a8 100644 --- a/chains/substrate/listener_test.go +++ b/chains/substrate/listener_test.go @@ -14,8 +14,8 @@ import ( subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/blockstore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" ) const ListenerTimeout = time.Second * 30 diff --git a/chains/substrate/test_helper_test.go b/chains/substrate/test_helper_test.go index 91920af7d..e874d63b2 100644 --- a/chains/substrate/test_helper_test.go +++ b/chains/substrate/test_helper_test.go @@ -10,7 +10,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/keystore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common/hexutil" ) diff --git a/chains/substrate/types.go b/chains/substrate/types.go index 74402a5f4..466787c62 100644 --- a/chains/substrate/types.go +++ b/chains/substrate/types.go @@ -7,9 +7,9 @@ import ( "math/big" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/scale" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/scale" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" ) type voteState struct { diff --git a/chains/substrate/writer.go b/chains/substrate/writer.go index 0a922ae7c..b35d97a2a 100644 --- a/chains/substrate/writer.go +++ b/chains/substrate/writer.go @@ -14,8 +14,8 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" metrics "github.com/Cerebellum-Network/chainbridge-utils/metrics/types" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/writer_test.go b/chains/substrate/writer_test.go index 93caf6de1..c4ec8cfd6 100644 --- a/chains/substrate/writer_test.go +++ b/chains/substrate/writer_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index b2964edf7..916287d58 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -22,7 +22,7 @@ import ( subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/core" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" log "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common" ) diff --git a/e2e/fungible_test.go b/e2e/fungible_test.go index 1eb32a367..6f426b089 100644 --- a/e2e/fungible_test.go +++ b/e2e/fungible_test.go @@ -13,7 +13,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/ethereum" ethtest "github.com/Cerebellum-Network/ChainBridge/shared/ethereum/testing" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/nonfungible_test.go b/e2e/nonfungible_test.go index 91b13876d..c96e1025d 100644 --- a/e2e/nonfungible_test.go +++ b/e2e/nonfungible_test.go @@ -11,7 +11,7 @@ import ( sub "github.com/Cerebellum-Network/ChainBridge/e2e/substrate" ethtest "github.com/Cerebellum-Network/ChainBridge/shared/ethereum/testing" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/parallel_test.go b/e2e/parallel_test.go index a21f59ad5..f35901049 100644 --- a/e2e/parallel_test.go +++ b/e2e/parallel_test.go @@ -15,8 +15,8 @@ import ( subutils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" subtest "github.com/Cerebellum-Network/ChainBridge/shared/substrate/testing" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" log "github.com/ChainSafe/log15" "github.com/ethereum/go-ethereum/common" ) diff --git a/e2e/substrate/substrate.go b/e2e/substrate/substrate.go index 6895cb628..6534ed118 100644 --- a/e2e/substrate/substrate.go +++ b/e2e/substrate/substrate.go @@ -13,8 +13,8 @@ import ( "github.com/Cerebellum-Network/chainbridge-utils/core" "github.com/Cerebellum-Network/chainbridge-utils/keystore" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" "github.com/ChainSafe/log15" "golang.org/x/crypto/blake2b" ) diff --git a/go.mod b/go.mod index 455966da6..36d92b19a 100644 --- a/go.mod +++ b/go.mod @@ -5,11 +5,11 @@ go 1.21 toolchain go1.21.5 require ( - github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231-4f2db1e7a3d9 - github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240123112715-6db113397ae7 - github.com/Cerebellum-Network/go-substrate-rpc-client/v7 v7.0.1-rc + github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240205145248-91ef5604e469 + github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240205092257-877ee052801b + github.com/Cerebellum-Network/go-substrate-rpc-client/v8 v8.0.4-rc github.com/ChainSafe/log15 v1.0.0 - github.com/ethereum/go-ethereum v1.13.10 + github.com/ethereum/go-ethereum v1.13.11 github.com/prometheus/client_golang v1.18.0 github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.27.1 @@ -17,7 +17,6 @@ require ( ) require ( - github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2 // indirect github.com/ChainSafe/go-schnorrkel v1.1.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/StackExchange/wmi v1.2.1 // indirect @@ -70,7 +69,7 @@ require ( github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect + golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sync v0.6.0 // indirect diff --git a/go.sum b/go.sum index d29f2ef9e..ca19df52b 100644 --- a/go.sum +++ b/go.sum @@ -55,16 +55,24 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231-4f2db1e7a3d9 h1:GQsw7GBiKOxx2l8smpruOl+v6G0zdM6akK+3fC3tDBU= github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231-4f2db1e7a3d9/go.mod h1:a8Bhm44mzr1b4tGwPbpISsGymroqjLs32UvQrjJT3k0= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240205145248-91ef5604e469 h1:YLLljigl3FoZgO78MdRdQ6BnBPd3w+YwgumpsfnJ9FQ= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240205145248-91ef5604e469/go.mod h1:nFWpnpirwK/0+jE0efOVg9qZpSPnk3UidR/W4lCP9d4= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378 h1:C690sCJMOXV41f1b1nP48ypz/cGY4Yp9MKyKb7A4/4g= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378/go.mod h1:D5o++aho1srs5AmENhtBhbD6JGKEqIVoGtKgSeipd8s= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d h1:KnNrLMmqyVLMgNMgSp2cIBsJLUnC2vVyUgq9sEZUND0= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d/go.mod h1:0eIvn9zbYgT08igtFhtkQJzAHhG8CwSq+BCmsq7NCU8= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240123112715-6db113397ae7 h1:ozLhYzcGPyM7BDDnJAT+34ZHc2VY6FWyV3rFxxNBEiM= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240123112715-6db113397ae7/go.mod h1:hNZH7DOtyHQqz22U/B1ecP5qzElQVD1DVM7NNB6Q38s= -github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2 h1:UzPU72po6gcitD0lBIfn3kk/a6WJyrEFZaF8zH+non4= -github.com/Cerebellum-Network/go-substrate-rpc-client/v6 v6.0.2/go.mod h1:rOHTPlfCs+jqc9zPRTtH1XK8BsBeR2cdNBEoijjyi1Y= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240205092257-877ee052801b h1:qoGaL+iBejT5hK3sJD2DMtOHsRxlpLy7YssGRCi6AL0= +github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240205092257-877ee052801b/go.mod h1:F6zsU7xTRF8CHOyXAZWvMGoLJ5XV8MRc5R0t3qw3oaY= github.com/Cerebellum-Network/go-substrate-rpc-client/v7 v7.0.1-rc h1:HGg29xHzn64oYqlsPDGfi2eHJHYWp9hqzVjjW1k58/0= github.com/Cerebellum-Network/go-substrate-rpc-client/v7 v7.0.1-rc/go.mod h1:jWRJ6bf690StnOgY9hxZ8bR8CPDk3+dd6aGU0StFKM8= +github.com/Cerebellum-Network/go-substrate-rpc-client/v8 v8.0.1-rc h1:U/o8tNQzsjRz5lQS1Zdfhm4ot/vfviAD3mVaEI35egE= +github.com/Cerebellum-Network/go-substrate-rpc-client/v8 v8.0.1-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v8 v8.0.2-rc h1:R1ZegZvpBaCaZ8nYih8qZRiFqzoJYeNG0JVLnlEtleA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v8 v8.0.2-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v8 v8.0.4-rc h1:Rd0Px+IrX4M2woDxl49QCsT9l6CY1At4pFNKlhWTqpA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v8 v8.0.4-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/ChainSafe/go-schnorrkel v1.1.0 h1:rZ6EU+CZFCjB4sHUE1jIu8VDoB/wRKZxoe1tkcO71Wk= @@ -223,6 +231,8 @@ github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2 github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= github.com/ethereum/go-ethereum v1.13.10 h1:Ppdil79nN+Vc+mXfge0AuUgmKWuVv4eMqzoIVSdqZek= github.com/ethereum/go-ethereum v1.13.10/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= +github.com/ethereum/go-ethereum v1.13.11 h1:b51Dsm+rEg7anFRUMGB8hODXHvNfcRKzz9vcj8wSdUs= +github.com/ethereum/go-ethereum v1.13.11/go.mod h1:gFtlVORuUcT+UUIcJ/veCNjkuOSujCi338uSHJrYAew= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -703,6 +713,8 @@ golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e h1:723BNChdd0c2Wk6WOE320qGBi golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= +golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo= +golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= diff --git a/shared/substrate/client.go b/shared/substrate/client.go index 6a0a569b8..44508d773 100644 --- a/shared/substrate/client.go +++ b/shared/substrate/client.go @@ -8,10 +8,10 @@ import ( "math/big" "github.com/Cerebellum-Network/chainbridge-utils/msg" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v7" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v8" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index 3792c6612..e846edbd3 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -5,7 +5,7 @@ package utils import ( events "github.com/Cerebellum-Network/chainbridge-substrate-events" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" ) type EventErc721Minted struct { diff --git a/shared/substrate/init.go b/shared/substrate/init.go index a34c139ba..b71d84e8d 100644 --- a/shared/substrate/init.go +++ b/shared/substrate/init.go @@ -5,7 +5,7 @@ package utils import ( "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" ) func InitializeChain(client *Client, relayers []types.AccountID, chains []msg.ChainId, resources map[msg.ResourceId]Method, threshold uint32) error { diff --git a/shared/substrate/query.go b/shared/substrate/query.go index 675a6170e..715841b9b 100644 --- a/shared/substrate/query.go +++ b/shared/substrate/query.go @@ -7,8 +7,8 @@ import ( "fmt" "math/big" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" ) func QueryStorage(client *Client, prefix, method string, arg1, arg2 []byte, result interface{}) (bool, error) { diff --git a/shared/substrate/submit.go b/shared/substrate/submit.go index 00d23be06..4893dbda9 100644 --- a/shared/substrate/submit.go +++ b/shared/substrate/submit.go @@ -8,7 +8,7 @@ import ( "math/big" "sync" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/client.go b/shared/substrate/testing/client.go index 6020be550..3e4823730 100644 --- a/shared/substrate/testing/client.go +++ b/shared/substrate/testing/client.go @@ -10,8 +10,8 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events.go b/shared/substrate/testing/events.go index 700e10ff3..ac626f6a0 100644 --- a/shared/substrate/testing/events.go +++ b/shared/substrate/testing/events.go @@ -8,8 +8,8 @@ import ( "time" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events_test.go b/shared/substrate/testing/events_test.go index 8024a0ac6..c1aea0f40 100644 --- a/shared/substrate/testing/events_test.go +++ b/shared/substrate/testing/events_test.go @@ -9,8 +9,8 @@ import ( "github.com/Cerebellum-Network/ChainBridge/e2e/substrate" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v7" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v8" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" ) func TestChain_Events(t *testing.T) { diff --git a/shared/substrate/testing/init.go b/shared/substrate/testing/init.go index d2961b7a2..7b683e744 100644 --- a/shared/substrate/testing/init.go +++ b/shared/substrate/testing/init.go @@ -9,7 +9,7 @@ import ( utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" "github.com/Cerebellum-Network/chainbridge-utils/msg" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" ) // WARNING: THIS METHOD IS UNSAFE AND MAY PANIC diff --git a/shared/substrate/testing/query.go b/shared/substrate/testing/query.go index e5744ebe3..4e9035d91 100644 --- a/shared/substrate/testing/query.go +++ b/shared/substrate/testing/query.go @@ -9,7 +9,7 @@ import ( "testing" utils "github.com/Cerebellum-Network/ChainBridge/shared/substrate" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/types.go b/shared/substrate/types.go index 4f82e675c..f8bb6fda9 100644 --- a/shared/substrate/types.go +++ b/shared/substrate/types.go @@ -4,7 +4,7 @@ package utils import ( - "github.com/Cerebellum-Network/go-substrate-rpc-client/v7/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" ) const BridgePalletName = "ChainBridge" From dec0efa4a4c973f43a1a08295dab7707abc225d3 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 6 Feb 2024 16:49:00 +0100 Subject: [PATCH 39/43] Use events from v4.8.4 --- shared/substrate/events.go | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index 0b60efd76..937b47de5 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -206,14 +206,13 @@ type EventCharged struct { } type EventChargeFailed struct { - Phase types.Phase - ClusterId types.H160 - Era types.U32 - BatchIndex types.U32 - CustomerId types.AccountID - Charged types.U128 - ExpectedToCharge types.U128 - Topics []types.Hash + Phase types.Phase + ClusterId types.H160 + Era types.U32 + BatchIndex types.U32 + CustomerId types.AccountID + Amount types.U128 + Topics []types.Hash } type EventIndebted struct { @@ -265,21 +264,17 @@ type EventRewardingStarted struct { } type EventRewarded struct { - Phase types.Phase - ClusterId types.H160 - Era types.U32 - BatchIndex types.U32 - NodeProviderId types.AccountID - Rewarded types.U128 - ExpectedToReward types.U128 - Topics []types.Hash + Phase types.Phase + ClusterId types.H160 + Era types.U32 + NodeProviderId types.AccountID + Topics []types.Hash } type EventNotDistributedReward struct { Phase types.Phase ClusterId types.H160 Era types.U32 - BatchIndex types.U32 NodeProviderId types.AccountID ExpectedReward types.U128 DistributedReward types.U128 From 98a89c7c56334f5d80816cbe4d8dd8caa0887195 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 6 Feb 2024 17:21:58 +0100 Subject: [PATCH 40/43] Add DDC Staking events v4.8.4 --- shared/substrate/events.go | 65 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index 937b47de5..9f5320853 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -181,6 +181,8 @@ type EventDataStringChanged struct { Topics []types.Hash } +// DDC Payouts events: + type EventBillingReportInitialized struct { Phase types.Phase ClusterId types.H160 @@ -310,6 +312,61 @@ type EventAuthorisedCaller struct { Topics []types.Hash } +// DDC Staking events: + +type EventBonded struct { + Phase types.Phase + Who types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventUnbonded struct { + Phase types.Phase + Who types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventWithdrawn struct { + Phase types.Phase + Who types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventChilled struct { + Phase types.Phase + Who types.AccountID + Topics []types.Hash +} + +type EventChillSoon struct { + Phase types.Phase + Who types.AccountID + ClusterId types.H160 + BlockNumber types.BlockNumber + Topics []types.Hash +} + +type EventActivated struct { + Phase types.Phase + Who types.AccountID + Topics []types.Hash +} + +type EventLeaveSoon struct { + Phase types.Phase + Who types.AccountID + Topics []types.Hash +} + +type EventLeft struct { + Phase types.Phase + Who types.AccountID + Topics []types.Hash +} + type Events struct { types.EventRecords events.Events @@ -358,4 +415,12 @@ type Events struct { DdcPayouts_RewardingFinished []EventRewardingFinished //nolint:stylecheck,golint DdcPayouts_BillingReportFinalized []EventBillingReportFinalized //nolint:stylecheck,golint DdcPayouts_AuthorisedCaller []EventAuthorisedCaller //nolint:stylecheck,golint + DdcStaking_Bonded []EventBonded //nolint:stylecheck,golint + DdcStaking_Unbonded []EventUnbonded //nolint:stylecheck,golint + DdcStaking_Withdrawn []EventWithdrawn //nolint:stylecheck,golint + DdcStaking_Chilled []EventChilled //nolint:stylecheck,golint + DdcStaking_ChillSoon []EventChillSoon //nolint:stylecheck,golint + DdcStaking_Activated []EventActivated //nolint:stylecheck,golint + DdcStaking_LeaveSoon []EventLeaveSoon //nolint:stylecheck,golint + DdcStaking_Left []EventLeft //nolint:stylecheck,golint } From adf4c997ce6d69f9645941207e51b3a0e90c45b3 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 6 Feb 2024 17:57:56 +0100 Subject: [PATCH 41/43] Add DDC Nodes events v4.8.4 --- shared/substrate/events.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index 9f5320853..a3848a79b 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -367,6 +367,26 @@ type EventLeft struct { Topics []types.Hash } +// DDC Nodes events: + +type EventNodeCreated struct { + Phase types.Phase + NodePubKey [32]byte + Topics []types.Hash +} + +type EventNodeDeleted struct { + Phase types.Phase + NodePubKey [32]byte + Topics []types.Hash +} + +type EventNodeParamsChanged struct { + Phase types.Phase + NodePubKey [32]byte + Topics []types.Hash +} + type Events struct { types.EventRecords events.Events @@ -423,4 +443,7 @@ type Events struct { DdcStaking_Activated []EventActivated //nolint:stylecheck,golint DdcStaking_LeaveSoon []EventLeaveSoon //nolint:stylecheck,golint DdcStaking_Left []EventLeft //nolint:stylecheck,golint + DdcNodes_NodeCreated []EventNodeCreated //nolint:stylecheck,golint + DdcNodes_NodeDeleted []EventNodeDeleted //nolint:stylecheck,golint + DdcNodes_NodeParamsChanged []EventNodeParamsChanged //nolint:stylecheck,golint } From b47ac2462b42a9688c52eee83fd413cac84ef04a Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 6 Feb 2024 18:19:46 +0100 Subject: [PATCH 42/43] Add DDC Customers events v4.8.4 --- shared/substrate/events.go | 87 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index a3848a79b..f4a5f2e3b 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -387,6 +387,82 @@ type EventNodeParamsChanged struct { Topics []types.Hash } +// DDC Clusters events: + +type EventClusterCreated struct { + Phase types.Phase + ClusterId types.H160 + Topics []types.Hash +} + +type EventClusterNodeAdded struct { + Phase types.Phase + ClusterId types.H160 + NodePubKey [32]byte + Topics []types.Hash +} + +type EventClusterNodeRemoved struct { + Phase types.Phase + ClusterId types.H160 + NodePubKey [32]byte + Topics []types.Hash +} + +type EventClusterParamsSet struct { + Phase types.Phase + ClusterId types.H160 + Topics []types.Hash +} + +type EventClusterGovParamsSet struct { + Phase types.Phase + ClusterId types.H160 + Topics []types.Hash +} + +// DDC Customers events: + +type EventDeposited struct { + Phase types.Phase + Who types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventInitialDepositUnlock struct { + Phase types.Phase + Who types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventCustomersWithdrawn struct { + Phase types.Phase + Who types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventCustomersCharged struct { + Phase types.Phase + Who types.AccountID + Amount types.U128 + Topics []types.Hash +} + +type EventBucketCreated struct { + Phase types.Phase + BucketId types.U64 + Topics []types.Hash +} + +type EventBucketUpdated struct { + Phase types.Phase + BucketId types.U64 + Topics []types.Hash +} + type Events struct { types.EventRecords events.Events @@ -446,4 +522,15 @@ type Events struct { DdcNodes_NodeCreated []EventNodeCreated //nolint:stylecheck,golint DdcNodes_NodeDeleted []EventNodeDeleted //nolint:stylecheck,golint DdcNodes_NodeParamsChanged []EventNodeParamsChanged //nolint:stylecheck,golint + DdcClusters_ClusterCreated []EventClusterCreated //nolint:stylecheck,golint + DdcClusters_ClusterNodeAdded []EventClusterNodeAdded //nolint:stylecheck,golint + DdcClusters_ClusterNodeRemoved []EventClusterNodeRemoved //nolint:stylecheck,golint + DdcClusters_ClusterParamsSet []EventClusterParamsSet //nolint:stylecheck,golint + DdcClusters_EventClusterGovParamsSet []EventClusterGovParamsSet //nolint:stylecheck,golint + DdcCustomers_Deposited []EventDeposited //nolint:stylecheck,golint + DdcCustomers_InitialDepositUnlock []EventInitialDepositUnlock //nolint:stylecheck,golint + DdcCustomers_Withdrawn []EventCustomersWithdrawn //nolint:stylecheck,golint + DdcCustomers_Charged []EventCustomersCharged //nolint:stylecheck,golint + DdcCustomers_BucketCreated []EventBucketCreated //nolint:stylecheck,golint + DdcCustomers_BucketUpdated []EventBucketUpdated //nolint:stylecheck,golint } From 429521af472195ad525f7f77fa18d058f3b0f36e Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Wed, 7 Feb 2024 12:41:59 +0100 Subject: [PATCH 43/43] Update substrate event commit because substrate event commit were squashed --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 36d92b19a..7e542b9d9 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.5 require ( - github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240205145248-91ef5604e469 + github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240207110321-e3fe6ef7286d github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240205092257-877ee052801b github.com/Cerebellum-Network/go-substrate-rpc-client/v8 v8.0.4-rc github.com/ChainSafe/log15 v1.0.0 diff --git a/go.sum b/go.sum index ca19df52b..d90c72f90 100644 --- a/go.sum +++ b/go.sum @@ -57,6 +57,8 @@ github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231 github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240112154231-4f2db1e7a3d9/go.mod h1:a8Bhm44mzr1b4tGwPbpISsGymroqjLs32UvQrjJT3k0= github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240205145248-91ef5604e469 h1:YLLljigl3FoZgO78MdRdQ6BnBPd3w+YwgumpsfnJ9FQ= github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240205145248-91ef5604e469/go.mod h1:nFWpnpirwK/0+jE0efOVg9qZpSPnk3UidR/W4lCP9d4= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240207110321-e3fe6ef7286d h1:RVM8eeEMhNXud8I/pJjexOXg/umm2Uk/+eIjp+5gT2A= +github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240207110321-e3fe6ef7286d/go.mod h1:nFWpnpirwK/0+jE0efOVg9qZpSPnk3UidR/W4lCP9d4= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378 h1:C690sCJMOXV41f1b1nP48ypz/cGY4Yp9MKyKb7A4/4g= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20231212171702-a0793ff00378/go.mod h1:D5o++aho1srs5AmENhtBhbD6JGKEqIVoGtKgSeipd8s= github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240112163437-0f11d09acc2d h1:KnNrLMmqyVLMgNMgSp2cIBsJLUnC2vVyUgq9sEZUND0=