Merge pull request #1270 from ethereum-optimism/develop

Develop -> Master PR

.changeset/cool-birds-rescue.md

+---
+'@eth-optimism/l2geth': patch
+---
+
+Give a better error message for when the fee is too high when sending transactions to the sequencer

.changeset/dry-chairs-watch.md

+---
+'@eth-optimism/l2geth': patch
+---
+
+Fix a bug in the fee logic that allowed for fees that were too low to get through

.changeset/stupid-socks-build.md

+---
+'@eth-optimism/integration-tests': patch
+'@eth-optimism/batch-submitter': patch
+'@eth-optimism/common-ts': patch
+'@eth-optimism/contracts': patch
+'@eth-optimism/core-utils': patch
+'@eth-optimism/data-transport-layer': patch
+'@eth-optimism/message-relayer': patch
+'@eth-optimism/smock': patch
+---
+
+Update the typescript version to `4.3.5`

l2geth/rollup/fees/rollup_fee.go

@@ -3,6 +3,7 @@ package fees
 import (
 	"errors"
 	"fmt"
+	"math"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -115,7 +116,7 @@ func PaysEnough(opts *PaysEnoughOpts) error {
 		return fmt.Errorf("%w: no expected fee", errMissingInput)
 	}
 
-	fee := opts.ExpectedFee
+	fee := new(big.Int).Set(opts.ExpectedFee)
 	// Allow for a downward buffer to protect against L1 gas price volatility
 	if opts.ThresholdDown != nil {
 		fee = mulByFloat(fee, opts.ThresholdDown)
@@ -129,7 +130,7 @@ func PaysEnough(opts *PaysEnoughOpts) error {
 	if opts.ThresholdUp != nil {
 		// overpaying = user fee - expected fee
 		overpaying := new(big.Int).Sub(opts.UserFee, opts.ExpectedFee)
-		threshold := mulByFloat(overpaying, opts.ThresholdUp)
+		threshold := mulByFloat(opts.ExpectedFee, opts.ThresholdUp)
 		// if overpaying > threshold, return error
 		if overpaying.Cmp(threshold) == 1 {
 			return ErrFeeTooHigh
@@ -140,9 +141,10 @@ func PaysEnough(opts *PaysEnoughOpts) error {
 
 func mulByFloat(num *big.Int, float *big.Float) *big.Int {
 	n := new(big.Float).SetUint64(num.Uint64())
-	n = n.Mul(n, float)
-	value, _ := float.Uint64()
-	return new(big.Int).SetUint64(value)
+	product := n.Mul(n, float)
+	pfloat, _ := product.Float64()
+	rounded := math.Ceil(pfloat)
+	return new(big.Int).SetUint64(uint64(rounded))
 }
 
 // calculateL1GasLimit computes the L1 gasLimit based on the calldata and

l2geth/rollup/fees/rollup_fee_test.go

@@ -157,13 +157,40 @@ func TestPaysEnough(t *testing.T) {
 		},
 		"fee-threshold-up": {
 			opts: &PaysEnoughOpts{
-				UserFee:       common.Big3,
+				UserFee:       common.Big256,
 				ExpectedFee:   common.Big1,
 				ThresholdUp:   new(big.Float).SetFloat64(1.5),
 				ThresholdDown: nil,
 			},
 			err: ErrFeeTooHigh,
 		},
+		"fee-too-low-high": {
+			opts: &PaysEnoughOpts{
+				UserFee:       new(big.Int).SetUint64(10_000),
+				ExpectedFee:   new(big.Int).SetUint64(1),
+				ThresholdUp:   new(big.Float).SetFloat64(3),
+				ThresholdDown: new(big.Float).SetFloat64(0.8),
+			},
+			err: ErrFeeTooHigh,
+		},
+		"fee-too-low-down": {
+			opts: &PaysEnoughOpts{
+				UserFee:       new(big.Int).SetUint64(1),
+				ExpectedFee:   new(big.Int).SetUint64(10_000),
+				ThresholdUp:   new(big.Float).SetFloat64(3),
+				ThresholdDown: new(big.Float).SetFloat64(0.8),
+			},
+			err: ErrFeeTooLow,
+		},
+		"fee-too-low-down-2": {
+			opts: &PaysEnoughOpts{
+				UserFee:       new(big.Int).SetUint64(0),
+				ExpectedFee:   new(big.Int).SetUint64(10_000),
+				ThresholdUp:   new(big.Float).SetFloat64(3),
+				ThresholdDown: new(big.Float).SetFloat64(0.8),
+			},
+			err: ErrFeeTooLow,
+		},
 	}
 
 	for name, tt := range tests {

l2geth/rollup/sync_service.go

@@ -858,9 +858,6 @@ func (s *SyncService) verifyFee(tx *types.Transaction) error {
 	// Only count the calldata here as the overhead of the fully encoded
 	// RLP transaction is handled inside of EncodeL2GasLimit
 	expectedTxGasLimit := fees.EncodeTxGasLimit(tx.Data(), l1GasPrice, l2GasLimit, l2GasPrice)
-	if err != nil {
-		return err
-	}
 
 	// This should only happen if the unscaled transaction fee is greater than 18.44 ETH
 	if !expectedTxGasLimit.IsUint64() {
@@ -868,9 +865,10 @@ func (s *SyncService) verifyFee(tx *types.Transaction) error {
 	}
 
 	userFee := new(big.Int).Mul(new(big.Int).SetUint64(tx.Gas()), tx.GasPrice())
+	expectedFee := new(big.Int).Mul(expectedTxGasLimit, fees.BigTxGasPrice)
 	opts := fees.PaysEnoughOpts{
 		UserFee:       userFee,
-		ExpectedFee:   expectedTxGasLimit.Mul(expectedTxGasLimit, fees.BigTxGasPrice),
+		ExpectedFee:   expectedFee,
 		ThresholdUp:   s.feeThresholdUp,
 		ThresholdDown: s.feeThresholdDown,
 	}
@@ -881,7 +879,8 @@ func (s *SyncService) verifyFee(tx *types.Transaction) error {
 				fees.ErrFeeTooLow, userFee, expectedTxGasLimit, fees.BigTxGasPrice)
 		}
 		if errors.Is(err, fees.ErrFeeTooHigh) {
-			return fmt.Errorf("%w: %d", fees.ErrFeeTooHigh, userFee)
+			return fmt.Errorf("%w: %d, use less than %d * %f", fees.ErrFeeTooHigh, userFee,
+				expectedFee, s.feeThresholdDown)
 		}
 		return err
 	}

package.json

@@ -33,7 +33,7 @@
     "lerna": "^4.0.0",
     "patch-package": "^6.4.7",
     "prettier": "^2.3.1",
-    "typescript": "^4.2.3"
+    "typescript": "^4.3.5"
   },
   "scripts": {
     "clean": "yarn lerna run clean",

yarn.lock

@@ -14305,6 +14305,11 @@ typescript@^4.2.3, typescript@^4.3.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc"
   integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==
 
+typescript@^4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
+  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
+
 typewise-core@^1.2, typewise-core@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195"