diff --git a/action/protocol/context.go b/action/protocol/context.go index 31a9e70922..c95f6699e5 100644 --- a/action/protocol/context.go +++ b/action/protocol/context.go @@ -108,7 +108,6 @@ type ( FixGasAndNonceUpdate bool FixUnproductiveDelegates bool CorrectGasRefund bool - EnableWeb3Rewarding bool SkipSystemActionNonce bool } @@ -244,7 +243,6 @@ func WithFeatureCtx(ctx context.Context) context.Context { FixGasAndNonceUpdate: g.IsOkhotsk(height), FixUnproductiveDelegates: g.IsOkhotsk(height), CorrectGasRefund: g.IsOkhotsk(height), - EnableWeb3Rewarding: g.IsPalau(height), SkipSystemActionNonce: g.IsPalau(height), }, ) diff --git a/state/factory/workingset.go b/state/factory/workingset.go index 538f7e147a..6bba8f8f30 100644 --- a/state/factory/workingset.go +++ b/state/factory/workingset.go @@ -10,7 +10,6 @@ import ( "sort" "github.com/iotexproject/go-pkgs/hash" - "github.com/iotexproject/iotex-proto/golang/iotextypes" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" @@ -35,8 +34,6 @@ var ( }, []string{"type"}, ) - - errUnsupportWeb3Rewarding = errors.New("unsupported web3 rewarding") ) func init() { @@ -148,9 +145,6 @@ func (ws *workingSet) runAction( if protocol.MustGetBlockCtx(ctx).GasLimit < protocol.MustGetActionCtx(ctx).IntrinsicGas { return nil, action.ErrGasLimit } - if !protocol.MustGetFeatureCtx(ctx).EnableWeb3Rewarding && isWeb3RewardingAction(elp) { - return nil, errUnsupportWeb3Rewarding - } // Reject execution of chainID not equal the node's chainID if err := validateChainID(ctx, elp.ChainID()); err != nil { return nil, err @@ -510,7 +504,7 @@ func (ws *workingSet) pickAndRunActions( switch errors.Cause(err) { case nil: // do nothing - case action.ErrChainID, errUnsupportWeb3Rewarding: + case action.ErrChainID: continue case action.ErrGasLimit: actionIterator.PopAccount() @@ -626,16 +620,3 @@ func (ws *workingSet) CreateBuilder( SetLogsBloom(calculateLogsBloom(ctx, ws.receipts)) return blkBuilder, nil } - -func isWeb3RewardingAction(selp action.SealedEnvelope) bool { - if selp.Encoding() != uint32(iotextypes.Encoding_ETHEREUM_RLP) { - return false - } - switch selp.Action().(type) { - case *action.ClaimFromRewardingFund, - *action.DepositToRewardingFund: - return true - default: - return false - } -}