Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release v0.11.4 Web3 Tx Receipt Fix #332

Merged
merged 4 commits into from
Dec 15, 2023
Merged

Release v0.11.4 Web3 Tx Receipt Fix #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e9c7c3
bug fix: total_mined_token can be initialized from genesis file (#329)
Xiong-stratos Dec 5, 2023
fef46ee
Update code status handling for getTransactionReceipt (#331)
BoThe1K Dec 15, 2023
f61749e
bump version to v0.11.4
alexstratos Dec 15, 2023
303de82
Merge branch 'main' into dev
alexstratos Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
BUILDDIR ?= $(CURDIR)/build
LEDGER_ENABLED ?= false

APP_VER := v0.11.3
APP_VER := v0.11.4
COMMIT := $(GIT_COMMIT_HASH)
TEST_DOCKER_REPO=stratos-chain-e2e

Expand Down
3 changes: 2 additions & 1 deletion rpc/namespaces/ethereum/eth/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/spf13/viper"

abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmrpctypes "github.com/tendermint/tendermint/rpc/core/types"

Expand Down Expand Up @@ -801,7 +802,7 @@ func (e *PublicAPI) GetTransactionReceipt(hash common.Hash) (*rpctypes.Transacti
)
// Set status codes based on tx result
status := ethtypes.ReceiptStatusSuccessful
if res.TxResult.GetCode() == 1 {
if res.TxResult.GetCode() != abci.CodeTypeOK {
status = ethtypes.ReceiptStatusFailed
} else {
// Get the transaction result from the log
Expand Down
2 changes: 1 addition & 1 deletion x/pot/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
// and the keeper's address to pubkey map
func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data *types.GenesisState) {
keeper.SetParams(ctx, data.Params)
keeper.SetTotalMinedTokens(ctx, sdk.NewCoin(keeper.RewardDenom(ctx), sdk.NewInt(0)))
keeper.SetTotalMinedTokens(ctx, data.GetTotalMinedToken())
keeper.SetLastDistributedEpoch(ctx, data.LastDistributedEpoch)

for _, immatureTotal := range data.ImmatureTotalInfo {
Expand Down