Merge branch 'master' into test-feeAndTipCaps

OffchainLabs · Mar 25, 2024 · bcc9186 · bcc9186
2 parents f3e74d2 + 5b1871c
commit bcc9186
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -130,13 +130,13 @@ jobs:
         if: matrix.test-mode == 'defaults'
         run: |
           packages=`go list ./...`
-          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/...
+          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -timeout 20m
 
       - name: run tests with race detection
         if: matrix.test-mode == 'race'
         run:  |
           packages=`go list ./...`
-          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -race
+          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -race -timeout 30m
 
       - name: run redis tests
         if: matrix.test-mode == 'defaults'

diff --git a/arbnode/dataposter/data_poster.go b/arbnode/dataposter/data_poster.go
@@ -580,13 +580,8 @@ func (p *DataPoster) feeAndTipCaps(ctx context.Context, nonce uint64, gasLimit u
 	blobGasUsed := params.BlobTxBlobGasPerBlob * numBlobs
 	currentBlobCost := arbmath.BigMulByUint(currentBlobFee, blobGasUsed)
 	currentNonBlobCost := arbmath.BigMulByUint(currentNonBlobFee, gasLimit)
-	currentTotalCost := arbmath.BigAdd(currentBlobCost, currentNonBlobCost)
-	if config.MaxFeeBidMultipleBips > 0 {
-		targetMaxCost = arbmath.BigMin(targetMaxCost, arbmath.BigMulByBips(currentTotalCost, config.MaxFeeBidMultipleBips))
-	}
-
 	newBlobFeeCap := arbmath.BigMul(targetMaxCost, currentBlobFee)
-	newBlobFeeCap.Div(newBlobFeeCap, currentTotalCost)
+	newBlobFeeCap.Div(newBlobFeeCap, arbmath.BigAdd(currentBlobCost, currentNonBlobCost))
 	if lastTx != nil && lastTx.BlobGasFeeCap() != nil {
 		newBlobFeeCap = arbmath.BigMax(newBlobFeeCap, arbmath.BigMulByBips(lastTx.BlobGasFeeCap(), minRbfIncrease))
 	}
@@ -603,6 +598,20 @@ func (p *DataPoster) feeAndTipCaps(ctx context.Context, nonce uint64, gasLimit u
 		newBlobFeeCap = arbmath.BigDivByUint(newBlobCost, blobGasUsed)
 	}
 
+	if config.MaxFeeBidMultipleBips > 0 {
+		// Limit the fee caps to be no greater than max(MaxFeeBidMultipleBips, minRbf)
+		maxNonBlobFee := arbmath.BigMulByBips(currentNonBlobFee, config.MaxFeeBidMultipleBips)
+		if lastTx != nil {
+			maxNonBlobFee = arbmath.BigMax(maxNonBlobFee, arbmath.BigMulByBips(lastTx.GasFeeCap(), minRbfIncrease))
+		}
+		maxBlobFee := arbmath.BigMulByBips(currentBlobFee, config.MaxFeeBidMultipleBips)
+		if lastTx != nil && lastTx.BlobGasFeeCap() != nil {
+			maxBlobFee = arbmath.BigMax(maxBlobFee, arbmath.BigMulByBips(lastTx.BlobGasFeeCap(), minRbfIncrease))
+		}
+		newBaseFeeCap = arbmath.BigMin(newBaseFeeCap, maxNonBlobFee)
+		newBlobFeeCap = arbmath.BigMin(newBlobFeeCap, maxBlobFee)
+	}
+
 	if arbmath.BigGreaterThan(newTipCap, newBaseFeeCap) {
 		log.Info(
 			"reducing new tip cap to new basefee cap",

diff --git a/broadcaster/broadcaster.go b/broadcaster/broadcaster.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 	"net"
+	"runtime/debug"
 
 	"github.com/gobwas/ws"
 
@@ -60,7 +61,7 @@ func (b *Broadcaster) NewBroadcastFeedMessage(message arbostypes.MessageWithMeta
 func (b *Broadcaster) BroadcastSingle(msg arbostypes.MessageWithMetadata, seq arbutil.MessageIndex) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			log.Error("recovered error in BroadcastSingle", "recover", r)
+			log.Error("recovered error in BroadcastSingle", "recover", r, "backtrace", string(debug.Stack()))
 			err = errors.New("panic in BroadcastSingle")
 		}
 	}()
@@ -84,7 +85,7 @@ func (b *Broadcaster) BroadcastSingleFeedMessage(bfm *m.BroadcastFeedMessage) {
 func (b *Broadcaster) BroadcastMessages(messages []arbostypes.MessageWithMetadata, seq arbutil.MessageIndex) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			log.Error("recovered error in BroadcastMessages", "recover", r)
+			log.Error("recovered error in BroadcastMessages", "recover", r, "backtrace", string(debug.Stack()))
 			err = errors.New("panic in BroadcastMessages")
 		}
 	}()