Skip to content

op-e2e: Use correct base fee in fees test #2888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mslipper merged 1 commit into from
Jun 29, 2022
Merged

op-e2e: Use correct base fee in fees test #2888

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions op-e2e/system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,22 +1032,25 @@ func TestFees(t *testing.T) {

ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
defer cancel()
coinbaseStartBalance, err := l2Seq.BalanceAt(ctx, header.Coinbase, header.Number.Sub(header.Number, big.NewInt(1)))
coinbaseStartBalance, err := l2Seq.BalanceAt(ctx, header.Coinbase, safeAddBig(header.Number, big.NewInt(-1)))
require.Nil(t, err)

ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
defer cancel()
coinbaseEndBalance, err := l2Seq.BalanceAt(ctx, header.Coinbase, nil)
coinbaseEndBalance, err := l2Seq.BalanceAt(ctx, header.Coinbase, header.Number)
require.Nil(t, err)

ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
defer cancel()
endBalance, err := l2Seq.BalanceAt(ctx, fromAddr, nil)
endBalance, err := l2Seq.BalanceAt(ctx, fromAddr, header.Number)
require.Nil(t, err)

ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
defer cancel()
baseFeeRecipientEndBalance, err := l2Seq.BalanceAt(ctx, cfg.BaseFeeRecipient, nil)
baseFeeRecipientEndBalance, err := l2Seq.BalanceAt(ctx, cfg.BaseFeeRecipient, header.Number)
require.Nil(t, err)

l1Header, err := sys.Clients["l1"].HeaderByNumber(ctx, nil)
require.Nil(t, err)

ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
Expand All @@ -1073,7 +1076,7 @@ func TestFees(t *testing.T) {
require.Nil(t, err)
l1GasUsed := calcL1GasUsed(bytes, overhead)
divisor := new(big.Int).Exp(big.NewInt(10), decimals, nil)
l1Fee := new(big.Int).Mul(l1GasUsed, header.BaseFee)
l1Fee := new(big.Int).Mul(l1GasUsed, l1Header.BaseFee)
l1Fee = l1Fee.Mul(l1Fee, scalar)
l1Fee = l1Fee.Div(l1Fee, divisor)
require.Equal(t, l1Fee, l1FeeRecipientDiff, "l1 fee mismatch")
Expand All @@ -1090,3 +1093,7 @@ func TestFees(t *testing.T) {
balanceDiff.Sub(balanceDiff, transferAmount)
require.Equal(t, balanceDiff, totalFee, "balances should add up")
}

func safeAddBig(a *big.Int, b *big.Int) *big.Int {
return new(big.Int).Add(a, b)
}