Merge PR：smb fix (#1971)

* add log * change log * remove for test * optimize GetTxFeeAndFromHandler * remove log * encapsulate getTxFeeHandler for serial usage * optimize GetTxFeeHandler * optimize getTxFeeHandler
okx · May 2, 2022 · 5076a1f · 5076a1f
1 parent 1344c62
commit 5076a1f
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 42 deletions.
diff --git a/app/app.go b/app/app.go
@@ -532,6 +532,7 @@ func NewOKExChainApp(
 	app.SetParallelTxHandlers(updateFeeCollectorHandler(app.BankKeeper, app.SupplyKeeper), fixLogForParallelTxHandler(app.EvmKeeper))
 	app.SetPreDeliverTxHandler(preDeliverTxHandler(app.AccountKeeper))
 	app.SetPartialConcurrentHandlers(getTxFeeAndFromHandler(app.AccountKeeper))
+	app.SetGetTxFeeHandler(getTxFeeHandler())
 
 	if loadLatest {
 		err := app.LoadLatestVersion(app.keys[bam.MainStoreKey])

diff --git a/app/app_parallel.go b/app/app_parallel.go
@@ -1,9 +1,13 @@
 package app
 
 import (
+	"encoding/hex"
+	"strings"
+
 	ethermint "github.com/okex/exchain/app/types"
 	sdk "github.com/okex/exchain/libs/cosmos-sdk/types"
 	"github.com/okex/exchain/libs/cosmos-sdk/x/auth"
+	authante "github.com/okex/exchain/libs/cosmos-sdk/x/auth/ante"
 	"github.com/okex/exchain/libs/cosmos-sdk/x/bank"
 	"github.com/okex/exchain/libs/cosmos-sdk/x/supply"
 	"github.com/okex/exchain/x/evm"
@@ -61,3 +65,41 @@ func evmTxVerifySigHandler(chainID string, blockHeight int64, evmTx *evmtypes.Ms
 	}
 	return nil
 }
+
+func getTxFeeHandler() sdk.GetTxFeeHandler {
+	return func(tx sdk.Tx) (fee sdk.Coins) {
+		if feeTx, ok := tx.(authante.FeeTx); ok {
+			fee = feeTx.GetFee()
+		}
+
+		return
+	}
+}
+
+// getTxFeeAndFromHandler get tx fee and from
+func getTxFeeAndFromHandler(ak auth.AccountKeeper) sdk.GetTxFeeAndFromHandler {
+	return func(ctx sdk.Context, tx sdk.Tx) (fee sdk.Coins, isEvm bool, from string, to string, err error) {
+		if evmTx, ok := tx.(*evmtypes.MsgEthereumTx); ok {
+			isEvm = true
+			err = evmTx.VerifySig(evmTx.ChainID(), ctx.BlockHeight())
+			if err != nil {
+				return
+			}
+			fee = evmTx.GetFee()
+			from = evmTx.BaseTx.From
+			if len(from) > 2 {
+				from = strings.ToLower(from[2:])
+			}
+			if evmTx.To() != nil {
+				to = strings.ToLower(evmTx.To().String()[2:])
+			}
+		} else if feeTx, ok := tx.(authante.FeeTx); ok {
+			fee = feeTx.GetFee()
+			feePayer := feeTx.FeePayer(ctx)
+			feePayerAcc := ak.GetAccount(ctx, feePayer)
+			from = hex.EncodeToString(feePayerAcc.GetAddress())
+		}
+
+		return
+	}
+}
diff --git a/app/app_partial_concurrent.go b/app/app_partial_concurrent.go
diff --git a/libs/cosmos-sdk/baseapp/baseapp.go b/libs/cosmos-sdk/baseapp/baseapp.go
@@ -149,6 +149,7 @@ type BaseApp struct { // nolint: maligned
 	logFix                       sdk.LogFix
 
 	getTxFeeAndFromHandler sdk.GetTxFeeAndFromHandler
+	getTxFeeHandler        sdk.GetTxFeeHandler
 
 	// volatile states:
 	//
@@ -194,8 +195,8 @@ type BaseApp struct { // nolint: maligned
 
 	parallelTxManage *parallelTxManager
 	deliverTxsMgr    *DTTManager
-	feeForCollector sdk.Coins
-	feeChanged      bool	// used to judge whether should update the fee-collector account
+	feeForCollector  sdk.Coins
+	feeChanged       bool // used to judge whether should update the fee-collector account
 
 	chainCache *sdk.Cache
 	blockCache *sdk.Cache

diff --git a/libs/cosmos-sdk/baseapp/baseapp_runtx.go b/libs/cosmos-sdk/baseapp/baseapp_runtx.go
@@ -125,8 +125,8 @@ func (app *BaseApp) runtxWithInfo(info *runTxInfo, mode runTxMode, txBytes []byt
 	}
 	app.pin(RunAnte, false, mode)
 
-	if app.getTxFeeAndFromHandler != nil && mode == runTxModeDeliver {
-		fee, _, _, _, _ := app.getTxFeeAndFromHandler(info.ctx, tx)
+	if app.getTxFeeHandler != nil && mode == runTxModeDeliver {
+		fee := app.getTxFeeHandler(tx)
 		app.UpdateFeeForCollector(fee, true)
 	}
 

diff --git a/libs/cosmos-sdk/baseapp/options.go b/libs/cosmos-sdk/baseapp/options.go
@@ -184,3 +184,10 @@ func (app *BaseApp) SetPartialConcurrentHandlers(etf sdk.GetTxFeeAndFromHandler)
 	}
 	app.getTxFeeAndFromHandler = etf
 }
+
+func (app *BaseApp) SetGetTxFeeHandler(handler sdk.GetTxFeeHandler){
+	if app.sealed {
+		panic("SetGetTxFeeHandler() on sealed BaseApp")
+	}
+	app.getTxFeeHandler = handler
+}
diff --git a/libs/cosmos-sdk/types/handler.go b/libs/cosmos-sdk/types/handler.go
@@ -18,6 +18,7 @@ type UpdateFeeCollectorAccHandler func(ctx Context, balance Coins) error
 type LogFix func(logIndex []int, errs []error) (logs [][]byte)
 
 type GetTxFeeAndFromHandler func(ctx Context, tx Tx) (Coins, bool, string, string, error)
+type GetTxFeeHandler func(tx Tx) Coins
 
 // AnteDecorator wraps the next AnteHandler to perform custom pre- and post-processing.
 type AnteDecorator interface {