Merge pull request #319 from stratosnet/dev

dev to release v0.11.2
stratosnet · Sep 27, 2023 · d746175 · d746175
2 parents 3167187 + c213bf1
commit d746175
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 BUILDDIR ?= $(CURDIR)/build
 LEDGER_ENABLED ?= false
 
-APP_VER := v0.11.0
+APP_VER := v0.11.2
 COMMIT := $(GIT_COMMIT_HASH)
 TEST_DOCKER_REPO=stratos-chain-e2e
 

diff --git a/app/app.go b/app/app.go
@@ -650,6 +650,18 @@ func (app *NewApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abc
 }
 
 func (app *NewApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
+	//todo: this is hotfix for voting power overflow of tendermint.
+	if ctx.BlockHeight() >= 16601 {
+		sdk.DefaultPowerReduction = sdk.NewIntFromUint64(1_000_000_000_000)
+	}
+
+	//todo: NOTE: fix the validator power store issue with mainnet launch
+	if ctx.BlockHeight() == 95000 {
+		err := app.stakingKeeper.FixValidatorByPowerIndexRecords(ctx)
+		if err != nil {
+			app.Logger().Error("An error occurred while fixing the ValidatorRecords", "ErrMsg", err.Error())
+		}
+	}
 	return app.mm.EndBlock(ctx, req)
 }
 

diff --git a/go.mod b/go.mod
@@ -179,7 +179,7 @@ require (
 replace (
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/cosmos/cosmos-sdk => github.com/stratosnet/cosmos-sdk v0.45.12-0.20230728194757-346af98d48ea
+	github.com/cosmos/cosmos-sdk => github.com/stratosnet/cosmos-sdk v0.45.12-0.20230927180229-33a41a26eb19
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )
diff --git a/go.sum b/go.sum
@@ -818,8 +818,8 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57N
 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/stratosnet/cosmos-sdk v0.45.12-0.20230728194757-346af98d48ea h1:ydNdNYLXLaCK96GqMRL2nR5sPXdznATfe5xJOqzg+6s=
-github.com/stratosnet/cosmos-sdk v0.45.12-0.20230728194757-346af98d48ea/go.mod h1:S+xNysh6M/EWH/iikUBZ0b1OdMd9jU/tfoHe8R27YGc=
+github.com/stratosnet/cosmos-sdk v0.45.12-0.20230927180229-33a41a26eb19 h1:CzoM/996Swk5McIUlYAhaLL1Sd5PWFp0l+7akaFEo0M=
+github.com/stratosnet/cosmos-sdk v0.45.12-0.20230927180229-33a41a26eb19/go.mod h1:S+xNysh6M/EWH/iikUBZ0b1OdMd9jU/tfoHe8R27YGc=
 github.com/stratosnet/ledger-stratos-go v0.0.0-20230728192009-175657d24cb0 h1:Y8vzNO2ieC7ViVbge7v0eT/ft3nzwVCH78soFeqSJr4=
 github.com/stratosnet/ledger-stratos-go v0.0.0-20230728192009-175657d24cb0/go.mod h1:9T0Ii/AMWWnJRtvKYKB4kDdraaOP76J+K5/IbRXQgyc=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=