Merge pull request #175 from Cerebellum-Network/dev-cere

Release v2.11.0-cere
Cerebellum-Network · Apr 9, 2024 · 682de5e · 682de5e
2 parents 0c55d1a + 12a874b
commit 682de5e
Show file tree

Hide file tree

Showing 27 changed files with 128 additions and 95 deletions.
diff --git a/.github/workflows/qa.yaml 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.DEV_NETWORK_AWS_ACCOUNT_ID }}
+      repository: network-relayer
+      file: ./Dockerfile
+    secrets: inherit
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -53,28 +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-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-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/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/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.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/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
@@ -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
@@ -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 {
@@ -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,17 +267,21 @@ type EventRewardingStarted struct {
 }
 
 type EventRewarded struct {
-	Phase          types.Phase
-	ClusterId      types.H160
-	Era            types.U32
-	NodeProviderId types.AccountID
-	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
@@ -312,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 {
@@ -424,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 {
@@ -463,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
@@ -511,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
@@ -533,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
 }
diff --git 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
@@ -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) {