From bf033a3b6086dfe5bb0ba02ef2141a7d3361755c Mon Sep 17 00:00:00 2001 From: j75689 Date: Fri, 1 Mar 2024 19:51:16 +0800 Subject: [PATCH 1/3] fix: publish ChainUndelegate event --- app/pub/sub/stake.go | 6 +++++- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/pub/sub/stake.go b/app/pub/sub/stake.go index 371871ccb..24a81a46b 100644 --- a/app/pub/sub/stake.go +++ b/app/pub/sub/stake.go @@ -96,7 +96,11 @@ func SubscribeStakeEvent(sub *pubsub.Subscriber) error { stagingArea.StakeData.appendDelegateEvent(e.ChainId, e.DelegateEvent) case stake.ChainUndelegateEvent: sub.Logger.Debug(fmt.Sprintf("undelegate event: %v \n", e)) - stagingArea.StakeData.appendUnDelegateEvent(e.ChainId, e.UndelegateEvent) + if e.IsFromTx { + stagingArea.StakeData.appendUnDelegateEvent(e.ChainId, e.UndelegateEvent) + } else { + toPublish.EventData.StakeData.appendUnDelegateEvent(e.ChainId, e.UndelegateEvent) + } case stake.ChainRedelegateEvent: sub.Logger.Debug(fmt.Sprintf("redelegate event: %v \n", e)) stagingArea.StakeData.appendReDelegateEvent(e.ChainId, e.RedelegateEvent) diff --git a/go.mod b/go.mod index 82399e540..3bae3bbc1 100644 --- a/go.mod +++ b/go.mod @@ -165,7 +165,7 @@ require ( replace ( github.com/Shopify/sarama v1.26.1 => github.com/Shopify/sarama v1.21.0 - github.com/cosmos/cosmos-sdk => github.com/bnb-chain/bnc-cosmos-sdk v0.26.8 + github.com/cosmos/cosmos-sdk => github.com/bnb-chain/bnc-cosmos-sdk v0.26.9-0.20240301114957-3629574b8727 github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20210702154020-550e1cd83ec1 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/tendermint/go-amino => github.com/bnb-chain/bnc-go-amino v0.14.1-binance.2 diff --git a/go.sum b/go.sum index d5e1fd9b5..5906d4865 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,8 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= -github.com/bnb-chain/bnc-cosmos-sdk v0.26.8 h1:YmkqrGKzzWzd5uV46Yem1+docY4hi3aNeCsxGUORzbg= -github.com/bnb-chain/bnc-cosmos-sdk v0.26.8/go.mod h1:OjdXpDHofs6gcPLM9oGD+mm8DPc6Lsevz0Kia53zt3Q= +github.com/bnb-chain/bnc-cosmos-sdk v0.26.9-0.20240301114957-3629574b8727 h1:Ob7w7+vhcWhUZrOjnBC/5ulIcShrEqhyWplpZnndu50= +github.com/bnb-chain/bnc-cosmos-sdk v0.26.9-0.20240301114957-3629574b8727/go.mod h1:OjdXpDHofs6gcPLM9oGD+mm8DPc6Lsevz0Kia53zt3Q= github.com/bnb-chain/bnc-go-amino v0.14.1-binance.2 h1:iAlp9gqG0f2LGAauf3ZiijWlT6NI+W2r9y70HH9LI3k= github.com/bnb-chain/bnc-go-amino v0.14.1-binance.2/go.mod h1:LiCO7jev+3HwLGAiN9gpD0z+jTz95RqgSavbse55XOY= github.com/bnb-chain/bnc-tendermint v0.32.3-bc.10 h1:E4iSwEbJCLYchHiHE1gnOM3jjmJXLBxARhy/RCl8CpI= From 6426d9400d72c839e9615b05e38c5c0023f6f102 Mon Sep 17 00:00:00 2001 From: j75689 Date: Fri, 1 Mar 2024 19:53:28 +0800 Subject: [PATCH 2/3] docs: update change log --- CHANGELOG.md | 8 +++++++- version/version.go | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20bee8392..614a47293 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ # Changelog +## v0.10.19 +This is the bug-fix release for the sunset of BNB Beacon Chain. + +FEATURES +* [\#1015](https://github.com/bnb-chain/node/pull/1015) [fix] fix: publish ChainUndelegate event and ledger sig issue + ## v0.10.18 -This is the buf-fix release for the sunset of BNB Beacon Chain. +This is the bug-fix release for the sunset of BNB Beacon Chain. FEATURES * [\#1014](https://github.com/bnb-chain/node/pull/1014) [fix] fix: publish completed UnbondingDelegation events to kafka in EndBlock diff --git a/version/version.go b/version/version.go index 83bb5e65a..377e18b92 100644 --- a/version/version.go +++ b/version/version.go @@ -12,7 +12,7 @@ var ( Version string ) -const NodeVersion = "v0.10.16" +const NodeVersion = "v0.10.19" func init() { Version = fmt.Sprintf("BNB Beacon Chain Release: %s;", NodeVersion) From b7eb215b1f39fb9a3557d70132eafc7cceac1883 Mon Sep 17 00:00:00 2001 From: j75689 Date: Tue, 5 Mar 2024 10:41:12 +0800 Subject: [PATCH 3/3] chore: bump bnc-cosmos-sdk to v0.26.9 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3bae3bbc1..4dbb0e4ac 100644 --- a/go.mod +++ b/go.mod @@ -165,7 +165,7 @@ require ( replace ( github.com/Shopify/sarama v1.26.1 => github.com/Shopify/sarama v1.21.0 - github.com/cosmos/cosmos-sdk => github.com/bnb-chain/bnc-cosmos-sdk v0.26.9-0.20240301114957-3629574b8727 + github.com/cosmos/cosmos-sdk => github.com/bnb-chain/bnc-cosmos-sdk v0.26.9 github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20210702154020-550e1cd83ec1 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/tendermint/go-amino => github.com/bnb-chain/bnc-go-amino v0.14.1-binance.2 diff --git a/go.sum b/go.sum index 5906d4865..f3d1241af 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,8 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= -github.com/bnb-chain/bnc-cosmos-sdk v0.26.9-0.20240301114957-3629574b8727 h1:Ob7w7+vhcWhUZrOjnBC/5ulIcShrEqhyWplpZnndu50= -github.com/bnb-chain/bnc-cosmos-sdk v0.26.9-0.20240301114957-3629574b8727/go.mod h1:OjdXpDHofs6gcPLM9oGD+mm8DPc6Lsevz0Kia53zt3Q= +github.com/bnb-chain/bnc-cosmos-sdk v0.26.9 h1:rglV9TGVoifbiEIOfBdfJy4GLXm16L6/zjoJduxEou8= +github.com/bnb-chain/bnc-cosmos-sdk v0.26.9/go.mod h1:OjdXpDHofs6gcPLM9oGD+mm8DPc6Lsevz0Kia53zt3Q= github.com/bnb-chain/bnc-go-amino v0.14.1-binance.2 h1:iAlp9gqG0f2LGAauf3ZiijWlT6NI+W2r9y70HH9LI3k= github.com/bnb-chain/bnc-go-amino v0.14.1-binance.2/go.mod h1:LiCO7jev+3HwLGAiN9gpD0z+jTz95RqgSavbse55XOY= github.com/bnb-chain/bnc-tendermint v0.32.3-bc.10 h1:E4iSwEbJCLYchHiHE1gnOM3jjmJXLBxARhy/RCl8CpI=