[action] simplify TxCommon interface

action/envelope.go

@@ -50,7 +50,6 @@ type (
 		Nonce() uint64
 		Gas() uint64
 		GasPrice() *big.Int
-		EffectiveGasPrice(*big.Int) *big.Int
 		TxDynamicGas
 		AccessList() types.AccessList
 		TxBlob
@@ -71,6 +70,7 @@ type (
 	TxDynamicGas interface {
 		GasTipCap() *big.Int
 		GasFeeCap() *big.Int
+		EffectiveGasPrice(*big.Int) *big.Int
 	}
 
 	TxBlob interface {

action/protocol/protocol.go

@@ -149,7 +149,7 @@ func SplitGas(ctx context.Context, tx action.TxDynamicGas, usedGas uint64) (*big
 	return priority.Mul(priority, gas), base.Mul(base, gas), nil
 }
 
-func EffectiveGasPrice(ctx context.Context, tx action.TxCommon) *big.Int {
+func EffectiveGasPrice(ctx context.Context, tx action.TxDynamicGas) *big.Int {
 	if !MustGetFeatureCtx(ctx).EnableDynamicFeeTx {
 		return nil
 	}

action/protocol/rewarding/protocol.go

@@ -387,7 +387,7 @@ func (p *Protocol) deleteStateV2(sm protocol.StateManager, key []byte) error {
 func (p *Protocol) settleSystemAction(
 	ctx context.Context,
 	sm protocol.StateManager,
-	act action.TxCommon,
+	act action.TxDynamicGas,
 	status uint64,
 	si int,
 	logs []*action.Log,
@@ -399,7 +399,7 @@ func (p *Protocol) settleSystemAction(
 func (p *Protocol) settleUserAction(
 	ctx context.Context,
 	sm protocol.StateManager,
-	act action.TxCommon,
+	act action.TxDynamicGas,
 	status uint64,
 	si int,
 	logs []*action.Log,
@@ -411,7 +411,7 @@ func (p *Protocol) settleUserAction(
 func (p *Protocol) settleAction(
 	ctx context.Context,
 	sm protocol.StateManager,
-	act action.TxCommon,
+	act action.TxDynamicGas,
 	status uint64,
 	si int,
 	isSystemAction bool,

action/protocol/staking/protocol.go

@@ -689,7 +689,7 @@ const (
 func (p *Protocol) settleAction(
 	ctx context.Context,
 	sm protocol.StateManager,
-	act action.TxCommon,
+	act action.TxDynamicGas,
 	status uint64,
 	logs []*action.Log,
 	tLogs []*action.TransactionLog,

go.mod

@@ -241,7 +241,7 @@ require (
 	lukechampine.com/blake3 v1.2.1 // indirect
 )
 
-//TODO: add tag for go-ethereum
+//Note: add tag for go-ethereum before cutting hard-fork release
 replace github.com/ethereum/go-ethereum => github.com/iotexproject/go-ethereum v0.5.0
 
 replace golang.org/x/xerrors => golang.org/x/xerrors v0.0.0-20190212162355-a5947ffaace3