Fix txpool.add

Inphi · Inphi · commit 9e93167b5818 · 2022-10-03T07:30:34.000-07:00
diff --git a/core/tx_pool.go b/core/tx_pool.go
@@ -685,7 +685,7 @@ func (pool *TxPool) add(tx *types.Transaction, local bool) (replaced bool, err e
 	pool.filterKnownTxsLocked(txs, errs)
 	pool.filterInvalidTxsLocked(txs, errs, local)
 	pool.filterInvalidBlobTxsLocked(txs, errs)
-	if errs[0] != nil {
+	if errs[0] == nil {
 		return pool.addValidTx(tx, local)
 	}
 	return false, errs[0]
diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go
@@ -704,7 +704,7 @@ func setBlockhash(data *beacon.ExecutableDataV1) *beacon.ExecutableDataV1 {
 		GasUsed:     data.GasUsed,
 		Time:        data.Timestamp,
 		BaseFee:     data.BaseFeePerGas,
-		Blobs:       data.Blobs,
+		ExcessBlobs: data.ExcessBlobs,
 		Extra:       data.ExtraData,
 		MixDigest:   data.Random,
 	}

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ func (pool TxPool) add(tx types.Transaction, local bool) (replaced bool, err e`
`685`	`685`	`pool.filterKnownTxsLocked(txs, errs)`
`686`	`686`	`pool.filterInvalidTxsLocked(txs, errs, local)`
`687`	`687`	`pool.filterInvalidBlobTxsLocked(txs, errs)`
`688`		`- if errs[0] != nil {`
	`688`	`+ if errs[0] == nil {`
`689`	`689`	`return pool.addValidTx(tx, local)`
`690`	`690`	`}`
`691`	`691`	`return false, errs[0]`
Original file line number	Diff line number	Diff line change
`@@ -704,7 +704,7 @@ func setBlockhash(data beacon.ExecutableDataV1) beacon.ExecutableDataV1 {`
`704`	`704`	`GasUsed: data.GasUsed,`
`705`	`705`	`Time: data.Timestamp,`
`706`	`706`	`BaseFee: data.BaseFeePerGas,`
`707`		`- Blobs: data.Blobs,`
	`707`	`+ ExcessBlobs: data.ExcessBlobs,`
`708`	`708`	`Extra: data.ExtraData,`
`709`	`709`	`MixDigest: data.Random,`
`710`	`710`	`}`