Fix side chain ID issue

bnb-chain · Jul 18, 2022 · beb5490 · beb5490
1 parent 9c4446c
commit beb5490
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/types/address_test.go b/types/address_test.go
@@ -198,8 +198,8 @@ func TestSmartChainAddress(t *testing.T) {
 }
 
 func TestForBep153(t *testing.T) {
-	bcAddr := "tbnb1q8eh7ytly7letp6aadxmzasmrpwyalkjf3rpvn"
-	// 0x01f37f117f27bf95875deb4db1761b185c4efed2
+	bcAddr := "tbnb1pnww8kx30sz4xfcqvn8wjhrn796nf4dqshlvlg"
+	// 0x0cdce3d8d17c0553270064cee95c73f17534d5a0
 
 	bz, err := types.GetFromBech32(bcAddr, "tbnb")
 	opAddr, err := bech32.ConvertAndEncode("bva", bz)

diff --git a/x/stake/cross_stake/cross_stake.go b/x/stake/cross_stake/cross_stake.go
@@ -76,7 +76,7 @@ func (app *CrossStakeApp) ExecuteSynPackage(ctx sdk.Context, payload []byte, rel
 }
 
 func (app *CrossStakeApp) handleDelegate(ctx sdk.Context, pack types.CrossStakeDelegateSynPackage, relayFee int64) (sdk.ExecuteResult, error) {
-	sideChainId := ctx.SideChainId()
+	sideChainId := app.stakeKeeper.ScKeeper.BscSideChainId(ctx)
 	if scCtx, err := app.stakeKeeper.ScKeeper.PrepareCtxForSideChain(ctx, sideChainId); err != nil {
 		return sdk.ExecuteResult{}, err
 	} else {
@@ -154,7 +154,7 @@ func (app *CrossStakeApp) handleDelegate(ctx sdk.Context, pack types.CrossStakeD
 }
 
 func (app *CrossStakeApp) handleUndelegate(ctx sdk.Context, pack types.CrossStakeUndelegateSynPackage, relayFee int64) (sdk.ExecuteResult, error) {
-	sideChainId := ctx.SideChainId()
+	sideChainId := app.stakeKeeper.ScKeeper.BscSideChainId(ctx)
 	if scCtx, err := app.stakeKeeper.ScKeeper.PrepareCtxForSideChain(ctx, sideChainId); err != nil {
 		return sdk.ExecuteResult{}, err
 	} else {
@@ -213,7 +213,7 @@ func (app *CrossStakeApp) handleUndelegate(ctx sdk.Context, pack types.CrossStak
 }
 
 func (app *CrossStakeApp) handleRedelegate(ctx sdk.Context, pack types.CrossStakeRedelegateSynPackage, relayFee int64) (sdk.ExecuteResult, error) {
-	sideChainId := ctx.SideChainId()
+	sideChainId := app.stakeKeeper.ScKeeper.BscSideChainId(ctx)
 	if scCtx, err := app.stakeKeeper.ScKeeper.PrepareCtxForSideChain(ctx, sideChainId); err != nil {
 		return sdk.ExecuteResult{}, err
 	} else {