diff --git a/.circleci/config.yml b/.circleci/config.yml index d20909d01ba49..779bbfc9d553d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -236,6 +236,7 @@ jobs: - ".devnet/allocs-l1.json" - ".devnet/allocs-l2.json" - ".devnet/allocs-l2-delta.json" + - ".devnet/allocs-l2-ecotone.json" - ".devnet/addresses.json" - ".devnet-fault-proofs/allocs-l1.json" - ".devnet-fault-proofs/addresses.json" diff --git a/go.mod b/go.mod index ecb0905649363..cb09ad83892e5 100644 --- a/go.mod +++ b/go.mod @@ -252,7 +252,7 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/ethereum/go-ethereum v1.13.11 => github.com/base-org/op-geth v0.0.0-20240429235455-62ff62566682 +replace github.com/ethereum/go-ethereum v1.13.11 => github.com/base-org/op-geth v0.0.0-20240430004555-57f391c1492c //replace github.com/ethereum/go-ethereum v1.13.9 => ../op-geth diff --git a/go.sum b/go.sum index 8b6bae32bd582..3fb5886524956 100644 --- a/go.sum +++ b/go.sum @@ -50,8 +50,8 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/base-org/op-geth v0.0.0-20240429235455-62ff62566682 h1:mfFWGWZW4Bn/1A5zZFyAWlxNP7BFCg531OQ15tsbgEQ= -github.com/base-org/op-geth v0.0.0-20240429235455-62ff62566682/go.mod h1:K23yb9efVf9DdUOv/vl/Ux57Tng00rLaFqWYlFF45CA= +github.com/base-org/op-geth v0.0.0-20240430004555-57f391c1492c h1:U0aDbLq0uyOjZ7+QEiXDYO5qy4FzxkxvTeIbp8v8Zww= +github.com/base-org/op-geth v0.0.0-20240430004555-57f391c1492c/go.mod h1:K23yb9efVf9DdUOv/vl/Ux57Tng00rLaFqWYlFF45CA= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= diff --git a/op-e2e/Makefile b/op-e2e/Makefile index 6e41da2dd9f97..5702ae3b97723 100644 --- a/op-e2e/Makefile +++ b/op-e2e/Makefile @@ -66,5 +66,5 @@ clean: .PHONY: clean fuzz: - go test -ldflags=-extldflags=-Wl,-ld_classic -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzFastLZ ./ - go test -ldflags=-extldflags=-Wl,-ld_classic -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzFjordCostFunction ./ + go test -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzFastLZ ./ + go test -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzFjordCostFunction ./ diff --git a/op-e2e/system_test.go b/op-e2e/system_test.go index 38495cffe23f4..929ab7001b431 100644 --- a/op-e2e/system_test.go +++ b/op-e2e/system_test.go @@ -1401,7 +1401,7 @@ func testFees(t *testing.T, cfg SystemConfig) { blobFeeScaled := new(big.Int).Mul(big.NewInt(int64(blobBaseFeeScalar)), blobBaseFee) feeScaled.Add(feeScaled, blobFeeScaled) - result := new(big.Int).Mul(big.NewInt(71*1e6), feeScaled) + result := new(big.Int).Mul(types.MinTransactionSizeScaled, feeScaled) result.Div(result, big.NewInt(1e12)) adjustedGPOFee = result diff --git a/packages/contracts-bedrock/src/L2/GasPriceOracle.sol b/packages/contracts-bedrock/src/L2/GasPriceOracle.sol index f17af6e4af700..dc89a9407f829 100644 --- a/packages/contracts-bedrock/src/L2/GasPriceOracle.sol +++ b/packages/contracts-bedrock/src/L2/GasPriceOracle.sol @@ -37,7 +37,7 @@ contract GasPriceOracle is ISemver { // Hardcoded values for the Fjord upgrade calculation int32 private constant COST_INTERCEPT = -42_585_600; uint32 private constant COST_FASTLZ_COEF = 836_500; - uint256 private constant MIN_TRANSACTION_SIZE = 71; + uint256 private constant MIN_TRANSACTION_SIZE = 100; /// @notice Computes the L1 portion of the fee based on the size of the rlp encoded input /// transaction, the current L1 base fee, and the various dynamic parameters. diff --git a/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol b/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol index d5e73beeb68be..267f3856920c8 100644 --- a/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol +++ b/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol @@ -294,8 +294,8 @@ contract GasPriceOracleFjordActive_Test is GasPriceOracle_Test { uint256 price = gasPriceOracle.getL1Fee(data); // linearRegression = -42.5856 + 74 * 0.8365 = 19.3154 // under the minTxSize of 71, so output is ignored - // 71_000_000 * (20 * 16 * 2 * 1e6 + 3 * 1e6 * 15) / 1e12 - assertEq(price, 48635); + // 100_000_000 * (20 * 16 * 2 * 1e6 + 3 * 1e6 * 15) / 1e12 + assertEq(price, 68500); } /// @dev Tests that `getL1GasUsed` and `getL1Fee` return expected values