From 8bf70ebf984010cce1fb1f53e9c2d0791a91ec6c Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Mon, 12 Feb 2024 10:45:41 +0100 Subject: [PATCH 1/6] Update custom events to v4.8.5 --- shared/substrate/events.go | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index dea1dfba..a40ceddf 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -270,6 +270,7 @@ type EventRewarded struct { ClusterId types.H160 Era types.U32 NodeProviderId types.AccountID + Amount types.U128 Topics []types.Hash } From 1e95c85f028c54e4789791a9fcdf34341c4c45ab Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Mon, 26 Feb 2024 18:04:27 +0100 Subject: [PATCH 2/6] Add QA workflow --- .github/workflows/qa.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/qa.yaml diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml new file mode 100644 index 00000000..a3d4e36e --- /dev/null +++ b/.github/workflows/qa.yaml @@ -0,0 +1,24 @@ +# Copyright 2020 ChainSafe Systems +# SPDX-License-Identifier: LGPL-3.0-only + +name: Release to qa +on: + push: + branches: + - qa-cere + workflow_dispatch: + +permissions: + id-token: write + contents: read + +jobs: + build: + uses: Cerebellum-Network/reusable-workflows/.github/workflows/deploy-to-ecr.yaml@master + with: + runs-on: '["self-hosted", "cere-network-large"]' + environment: qa + aws_account_id: ${{ vars.QA_NETWORK_AWS_ACCOUNT_ID }} + repository: network-relayer + file: ./Dockerfile + secrets: inherit From ccf78021f2d6e65786bd204206859fb956719ce4 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Mon, 26 Feb 2024 18:12:39 +0100 Subject: [PATCH 3/6] Use aws_account_id from dev --- .github/workflows/qa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index a3d4e36e..e6a1ef87 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -18,7 +18,7 @@ jobs: with: runs-on: '["self-hosted", "cere-network-large"]' environment: qa - aws_account_id: ${{ vars.QA_NETWORK_AWS_ACCOUNT_ID }} + aws_account_id: ${{ vars.DEV_NETWORK_AWS_ACCOUNT_ID }} repository: network-relayer file: ./Dockerfile secrets: inherit From 4920970032092631a4fe2c3bc5ebb5310dc7c04e Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 27 Feb 2024 13:38:23 +0100 Subject: [PATCH 4/6] Update the DDC types to 5.0.0 --- shared/substrate/events.go | 82 ++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index a40ceddf..2fe660f2 100644 --- a/shared/substrate/events.go +++ b/shared/substrate/events.go @@ -208,13 +208,14 @@ type EventCharged struct { } type EventChargeFailed struct { - Phase types.Phase - ClusterId types.H160 - Era types.U32 - BatchIndex types.U32 - CustomerId types.AccountID - Amount types.U128 - Topics []types.Hash + 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 { @@ -266,18 +267,21 @@ type EventRewardingStarted struct { } type EventRewarded struct { - Phase types.Phase - ClusterId types.H160 - Era types.U32 - NodeProviderId types.AccountID - Amount types.U128 - Topics []types.Hash + 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 @@ -313,6 +317,17 @@ type EventAuthorisedCaller struct { Topics []types.Hash } +type EventChargeError struct { + Phase types.Phase + ClusterId types.H160 + Era types.U32 + BatchIndex types.U32 + CustomerId types.AccountID + Amount types.U128 + Error types.DispatchError + Topics []types.Hash +} + // DDC Staking events: type EventBonded struct { @@ -425,31 +440,32 @@ type EventClusterGovParamsSet struct { // DDC Customers events: type EventDeposited struct { - Phase types.Phase - Who types.AccountID - Amount types.U128 - Topics []types.Hash + Phase types.Phase + OwnerId types.AccountID + Amount types.U128 + Topics []types.Hash } type EventInitialDepositUnlock struct { - Phase types.Phase - Who types.AccountID - Amount types.U128 - Topics []types.Hash + Phase types.Phase + OwnerId types.AccountID + Amount types.U128 + Topics []types.Hash } type EventCustomersWithdrawn struct { - Phase types.Phase - Who types.AccountID - Amount types.U128 - Topics []types.Hash + Phase types.Phase + OwnerId types.AccountID + Amount types.U128 + Topics []types.Hash } type EventCustomersCharged struct { - Phase types.Phase - Who types.AccountID - Amount types.U128 - Topics []types.Hash + Phase types.Phase + OwnerId types.AccountID + Charged types.U128 + ExpectedToCharge types.U128 + Topics []types.Hash } type EventBucketCreated struct { @@ -464,6 +480,12 @@ type EventBucketUpdated struct { Topics []types.Hash } +type EventBucketRemoved struct { + Phase types.Phase + BucketId types.U64 + Topics []types.Hash +} + type Events struct { types.EventRecords events.Events @@ -512,6 +534,7 @@ type Events struct { DdcPayouts_RewardingFinished []EventRewardingFinished //nolint:stylecheck,golint DdcPayouts_BillingReportFinalized []EventBillingReportFinalized //nolint:stylecheck,golint DdcPayouts_AuthorisedCaller []EventAuthorisedCaller //nolint:stylecheck,golint + DdcPayouts_ChargeError []EventChargeError //nolint:stylecheck,golint DdcStaking_Bonded []EventBonded //nolint:stylecheck,golint DdcStaking_Unbonded []EventUnbonded //nolint:stylecheck,golint DdcStaking_Withdrawn []EventWithdrawn //nolint:stylecheck,golint @@ -534,4 +557,5 @@ type Events struct { DdcCustomers_Charged []EventCustomersCharged //nolint:stylecheck,golint DdcCustomers_BucketCreated []EventBucketCreated //nolint:stylecheck,golint DdcCustomers_BucketUpdated []EventBucketUpdated //nolint:stylecheck,golint + DdcCustomers_BucketRemoved []EventBucketRemoved //nolint:stylecheck,golint } From 883e68d03b92014b986e194a27b0f07bf3d05e88 Mon Sep 17 00:00:00 2001 From: yahortsaryk Date: Tue, 9 Apr 2024 12:56:34 +0200 Subject: [PATCH 5/6] build: gsrpc version bump --- 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 | 18 ++++++++++++------ 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, 57 insertions(+), 51 deletions(-) diff --git a/chains/substrate/connection.go b/chains/substrate/connection.go index 073272c4..e12a7ba3 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/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" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v9" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/rpc/author" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/connection_test.go b/chains/substrate/connection_test.go index b429f928..e23daff2 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" ) func TestConnect_QueryStorage(t *testing.T) { diff --git a/chains/substrate/listener.go b/chains/substrate/listener.go index a35518f9..5247e4d3 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/listener_test.go b/chains/substrate/listener_test.go index 9866d12a..503bfd64 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/v8/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types/codec" ) const ListenerTimeout = time.Second * 30 diff --git a/chains/substrate/test_helper_test.go b/chains/substrate/test_helper_test.go index e874d63b..98182717 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/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 466787c6..58c42783 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/v8/scale" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/scale" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types/codec" ) type voteState struct { diff --git a/chains/substrate/writer.go b/chains/substrate/writer.go index b35d97a2..93225347 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/v8/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types/codec" "github.com/ChainSafe/log15" ) diff --git a/chains/substrate/writer_test.go b/chains/substrate/writer_test.go index c4ec8cfd..39082934 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/v8/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/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 916287d5..d505b496 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/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 6f426b08..1adc254f 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/nonfungible_test.go b/e2e/nonfungible_test.go index c96e1025..0666cd93 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" log "github.com/ChainSafe/log15" ) diff --git a/e2e/parallel_test.go b/e2e/parallel_test.go index f3590104..138d14ce 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/v8/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/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 6534ed11..233b5b7f 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/v8/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types/codec" "github.com/ChainSafe/log15" "golang.org/x/crypto/blake2b" ) diff --git a/go.mod b/go.mod index 7e542b9d..251aa9e3 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.21 toolchain go1.21.5 require ( - 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/Cerebellum-Network/chainbridge-substrate-events v1.0.0-rc1 + github.com/Cerebellum-Network/chainbridge-utils v1.2.0-rc1 + github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v9.0.2 github.com/ChainSafe/log15 v1.0.0 github.com/ethereum/go-ethereum v1.13.11 github.com/prometheus/client_golang v1.18.0 diff --git a/go.sum b/go.sum index d90c72f9..30fe1e02 100644 --- a/go.sum +++ b/go.sum @@ -59,6 +59,8 @@ github.com/Cerebellum-Network/chainbridge-substrate-events v0.0.0-20240205145248 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-substrate-events v1.0.0-rc1 h1:Vp7P04aae3f0Hz/MfJJSYJUaMXgBNPGF8mYaN2iIJN8= +github.com/Cerebellum-Network/chainbridge-substrate-events v1.0.0-rc1/go.mod h1:Ub2P+OBiH+IIhYNcpgbb1hohG90cjIFC/vRkYEMbEno= 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= @@ -67,14 +69,18 @@ github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240123112715-6db11339 github.com/Cerebellum-Network/chainbridge-utils v1.0.7-0.20240123112715-6db113397ae7/go.mod h1:hNZH7DOtyHQqz22U/B1ecP5qzElQVD1DVM7NNB6Q38s= 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/chainbridge-utils v1.2.0-rc1 h1:K1B6znmrH/eiprqJdJewKdTN6alCx6tERlzsicSDR1E= +github.com/Cerebellum-Network/chainbridge-utils v1.2.0-rc1/go.mod h1:g8f0YUDoFbl1j2W7OHbncAwUwKJ+xO2FYd0q6MPb0mM= 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/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.1-rc h1:U/o8tNQzsjRz5lQS1Zdfhm4ot/vfviAD3mVaEI35egE= +github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.1-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.2-rc h1:R1ZegZvpBaCaZ8nYih8qZRiFqzoJYeNG0JVLnlEtleA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.2-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.4-rc h1:Rd0Px+IrX4M2woDxl49QCsT9l6CY1At4pFNKlhWTqpA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.4-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= +github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v9.0.2 h1:x5hfEv60V9flpG/zPPxCRw4OxWBZgoABf3QSvzuu6gY= +github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v9.0.2/go.mod h1:xaMq//F++u8q/cGcGAUvHEbMKfOeIY15ioQNCXjEUa0= 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= diff --git a/shared/substrate/client.go b/shared/substrate/client.go index 44508d77..58b7796c 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/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" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v9" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/events.go b/shared/substrate/events.go index 2fe660f2..68993381 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" ) type EventErc721Minted struct { diff --git a/shared/substrate/init.go b/shared/substrate/init.go index b71d84e8..65187a0f 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/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 715841b9..2fa6bbd8 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/v8/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/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 4893dbda..a17fa1f3 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/client.go b/shared/substrate/testing/client.go index 3e482373..a751005a 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/v8/signature" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/signature" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events.go b/shared/substrate/testing/events.go index ac626f6a..3ef80970 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/v8/types" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types/codec" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types/codec" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/testing/events_test.go b/shared/substrate/testing/events_test.go index c1aea0f4..5d0df272 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/v8" - "github.com/Cerebellum-Network/go-substrate-rpc-client/v8/types" + gsrpc "github.com/Cerebellum-Network/go-substrate-rpc-client/v9" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" ) func TestChain_Events(t *testing.T) { diff --git a/shared/substrate/testing/init.go b/shared/substrate/testing/init.go index 7b683e74..1d7249a2 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" ) // WARNING: THIS METHOD IS UNSAFE AND MAY PANIC diff --git a/shared/substrate/testing/query.go b/shared/substrate/testing/query.go index 4e9035d9..1f93a37a 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" "github.com/ChainSafe/log15" ) diff --git a/shared/substrate/types.go b/shared/substrate/types.go index f8bb6fda..8b85d1e7 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/v8/types" + "github.com/Cerebellum-Network/go-substrate-rpc-client/v9/types" ) const BridgePalletName = "ChainBridge" From 4c2089e763cb3fb4ce115b1c4ef8426e05494ed2 Mon Sep 17 00:00:00 2001 From: yahortsaryk Date: Tue, 9 Apr 2024 13:23:33 +0200 Subject: [PATCH 6/6] build: obsolete dependencies removed --- go.sum | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/go.sum b/go.sum index 30fe1e02..83a7557d 100644 --- a/go.sum +++ b/go.sum @@ -53,32 +53,10 @@ 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-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-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-substrate-events v1.0.0-rc1 h1:Vp7P04aae3f0Hz/MfJJSYJUaMXgBNPGF8mYaN2iIJN8= github.com/Cerebellum-Network/chainbridge-substrate-events v1.0.0-rc1/go.mod h1:Ub2P+OBiH+IIhYNcpgbb1hohG90cjIFC/vRkYEMbEno= -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/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/chainbridge-utils v1.2.0-rc1 h1:K1B6znmrH/eiprqJdJewKdTN6alCx6tERlzsicSDR1E= github.com/Cerebellum-Network/chainbridge-utils v1.2.0-rc1/go.mod h1:g8f0YUDoFbl1j2W7OHbncAwUwKJ+xO2FYd0q6MPb0mM= -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/v9 v8.0.1-rc h1:U/o8tNQzsjRz5lQS1Zdfhm4ot/vfviAD3mVaEI35egE= -github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.1-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= -github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.2-rc h1:R1ZegZvpBaCaZ8nYih8qZRiFqzoJYeNG0JVLnlEtleA= -github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.2-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= -github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.4-rc h1:Rd0Px+IrX4M2woDxl49QCsT9l6CY1At4pFNKlhWTqpA= -github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v8.0.4-rc/go.mod h1:3NiCQzqkio9HRDnP3Kck3RWFrF+pa7x/UYhD5vjmttA= github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v9.0.2 h1:x5hfEv60V9flpG/zPPxCRw4OxWBZgoABf3QSvzuu6gY= github.com/Cerebellum-Network/go-substrate-rpc-client/v9 v9.0.2/go.mod h1:xaMq//F++u8q/cGcGAUvHEbMKfOeIY15ioQNCXjEUa0= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM=