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

Update apis.go #3102

Draft
wants to merge 6 commits into
base: dev
Choose a base branch
from
Draft

Update apis.go #3102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f55781f
Update apis.go
ylsGit Mar 7, 2023
b3ba8b8
Merge branch 'dev' into yls/1685-tracetx
ylsGit Apr 13, 2023
3944375
fix panic of continueBroadcast
chengzhinei Apr 14, 2023
440ebc6
Merge branch 'dev' into yls/1685-tracetx
ylsGit Jun 6, 2023
37c07d5
upgrade (#3218)
zjg555543 Jul 20, 2023
700de23
Merge branch 'release/v1.7.1' into yls/1685-tracetx
Jul 21, 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
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ IGNORE_CHECK_GO=false
install_rocksdb_version:=$(ROCKSDB_VERSION)


Version=v1.7.5

Version=v1.7.1.1
CosmosSDK=v0.39.2
Tendermint=v0.33.9
Iavl=v0.14.3
Expand Down
4 changes: 1 addition & 3 deletions app/rpc/apis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/ethereum/go-ethereum/rpc"
"github.com/okex/exchain/app/rpc/namespaces/eth/txpool"
"github.com/okex/exchain/libs/cosmos-sdk/client/context"
"github.com/okex/exchain/libs/cosmos-sdk/server"
"github.com/okex/exchain/libs/tendermint/libs/log"
evmtypes "github.com/okex/exchain/x/evm/types"
"github.com/spf13/viper"
Expand All @@ -21,7 +20,6 @@ import (
"github.com/okex/exchain/app/rpc/namespaces/personal"
"github.com/okex/exchain/app/rpc/namespaces/web3"
rpctypes "github.com/okex/exchain/app/rpc/types"
cosmost "github.com/okex/exchain/libs/cosmos-sdk/store/types"
)

// RPC namespaces and API version
Expand Down Expand Up @@ -97,7 +95,7 @@ func GetAPIs(clientCtx context.CLIContext, log log.Logger, keys ...ethsecp256k1.
})
}

if viper.GetBool(FlagDebugAPI) && viper.GetString(server.FlagPruning) == cosmost.PruningOptionNothing {
if viper.GetBool(FlagDebugAPI) {
apis = append(apis, rpc.API{
Namespace: DebugNamespace,
Version: apiVersion,
Expand Down
13 changes: 9 additions & 4 deletions app/rpc/namespaces/eth/tx_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ func (pool *TxPool) insertTx(address common.Address, tx *evmtypes.MsgEthereumTx)

// iterate through the txPool map, check if need to continue broadcast tx and do it
func (pool *TxPool) continueBroadcast(api *PublicEthereumAPI, currentNonce uint64, address common.Address) error {
defer func() {
if r := recover(); r != nil {
fmt.Errorf("panic of continueBroadcast")
}
}()
i := 0
txsLen := len(pool.addressTxsPool[address])
var err error
Expand Down Expand Up @@ -245,12 +250,12 @@ func (pool *TxPool) continueBroadcast(api *PublicEthereumAPI, currentNonce uint6
if !strings.Contains(err.Error(), sdkerrors.ErrMempoolIsFull.Error()) &&
!strings.Contains(err.Error(), sdkerrors.ErrInvalidSequence.Error()) {
// tx has err, and err is not mempoolfull, the tx should be dropped
err = fmt.Errorf("broadcast failed and tx dropped. err:%s; nonce:%d; tx_hash:%s; address:%s\n",
err.Error(), pool.addressTxsPool[address][i].Data.AccountNonce, pool.addressTxsPool[address][i].Data.Hash.String(), address.String())
//err = fmt.Errorf("broadcast failed and tx dropped. err:%s; nonce:%d; tx_hash:%s; address:%s\n",
// err.Error(), pool.addressTxsPool[address][i].Data.AccountNonce, pool.addressTxsPool[address][i].Data.Hash.String(), address.String())
pool.dropTxs(i+1, address)
} else {
err = fmt.Errorf("broadcast failed. err:%s; nonce:%d; tx_hash:%s; address:%s\n",
err.Error(), pool.addressTxsPool[address][i].Data.AccountNonce, pool.addressTxsPool[address][i].Data.Hash.String(), address.String())
//err = fmt.Errorf("broadcast failed. err:%s; nonce:%d; tx_hash:%s; address:%s\n",
// err.Error(), pool.addressTxsPool[address][i].Data.AccountNonce, pool.addressTxsPool[address][i].Data.Hash.String(), address.String())
pool.dropTxs(i, address)
}
pool.logger.Error(err.Error())
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.17
require (
github.com/99designs/keyring v1.1.6
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
github.com/CosmWasm/wasmvm v1.0.0
github.com/CosmWasm/wasmvm v1.0.1
github.com/VictoriaMetrics/fastcache v1.8.0
github.com/Workiva/go-datastructures v1.0.53
github.com/alicebob/miniredis/v2 v2.17.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
github.com/CosmWasm/wasmvm v1.0.0 h1:NRmnHe3xXsKn2uEcB1F5Ha323JVAhON+BI6L177dlKc=
github.com/CosmWasm/wasmvm v1.0.0/go.mod h1:ei0xpvomwSdONsxDuONzV7bL1jSET1M8brEx0FCXc+A=
github.com/CosmWasm/wasmvm v1.0.1 h1:ZgkPm/nMiahE2CNjQRsOJTjF3eNkjeDVVWt3Pf7B0Gc=
github.com/CosmWasm/wasmvm v1.0.1/go.mod h1:ei0xpvomwSdONsxDuONzV7bL1jSET1M8brEx0FCXc+A=
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
Expand Down