feat: explicitly return invalid txs when simulate gasless bundle

bnb-chain · Oct 22, 2024 · c6f24ef · c6f24ef
1 parent ceb1993
commit c6f24ef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/core/types/bundle_gasless.go b/core/types/bundle_gasless.go
@@ -10,11 +10,13 @@ type SimulateGaslessBundleArgs struct {
 }
 
 type GaslessTxSimResult struct {
-	Hash    common.Hash
-	GasUsed uint64
+	Hash      common.Hash
+	GasUsed   uint64
+	ErrorCode int
 }
 
 type SimulateGaslessBundleResp struct {
 	ValidResults     []GaslessTxSimResult
+	InvalidResults   []GaslessTxSimResult
 	BasedBlockNumber int64
 }
diff --git a/miner/worker_builder.go b/miner/worker_builder.go
@@ -503,7 +503,8 @@ func (w *worker) simulateBundle(
 }
 
 func (w *worker) simulateGaslessBundle(env *environment, bundle *types.Bundle) (*types.SimulateGaslessBundleResp, error) {
-	result := make([]types.GaslessTxSimResult, 0)
+	validResults := make([]types.GaslessTxSimResult, 0)
+	invalidResults := make([]types.GaslessTxSimResult, 0)
 
 	txIdx := 0
 	for _, tx := range bundle.Txs {
@@ -520,18 +521,23 @@ func (w *worker) simulateGaslessBundle(env *environment, bundle *types.Bundle) (
 			env.state.RevertToSnapshot(snap)
 			env.gasPool.SetGas(gp)
 			log.Error("fail to simulate gasless tx, skipped", "hash", tx.Hash(), "err", err)
+
+			if err != core.ErrGasLimitReached {
+				invalidResults = append(invalidResults, types.GaslessTxSimResult{Hash: tx.Hash()})
+			}
 		} else {
 			txIdx++
 
-			result = append(result, types.GaslessTxSimResult{
+			validResults = append(validResults, types.GaslessTxSimResult{
 				Hash:    tx.Hash(),
 				GasUsed: receipt.GasUsed,
 			})
 		}
 	}
 
 	return &types.SimulateGaslessBundleResp{
-		ValidResults:     result,
+		ValidResults:     validResults,
+		InvalidResults:   invalidResults,
 		BasedBlockNumber: env.header.Number.Int64(),
 	}, nil
 }