Merge pull request #500 from OffchainLabs/remove-support-for-tips

Remove support for tips

Author: edfelten

arbos/tx_processor.go

@@ -66,6 +66,10 @@ func (p *TxProcessor) PopCaller() {
 	p.Callers = p.Callers[:len(p.Callers)-1]
 }
 
+func (p *TxProcessor) DropTip() bool {
+	return p.state.FormatVersion() >= 2
+}
+
 func (p *TxProcessor) StartTxHook() (endTxNow bool, gasUsed uint64, err error, returnData []byte) {
 	// This hook is called before gas charging and will end the state transition if endTxNow is set to true
 	// Hence, we must charge for any l2 resources if endTxNow is returned true

go-ethereum

@@ -5,11 +5,12 @@ package arbtest
 
 import (
 	"context"
+	"math/big"
+	"testing"
+
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/offchainlabs/nitro/arbcompress"
 	"github.com/offchainlabs/nitro/arbos/l1pricing"
-	"math/big"
-	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -69,17 +70,13 @@ func TestTips(t *testing.T) {
 	}
 
 	tip := arbmath.BigMulByUint(arbmath.BigSub(tx.GasPrice(), basefee), receipt.GasUsed)
-	full := arbmath.BigMulByUint(tx.GasPrice(), receipt.GasUsed)
+	full := arbmath.BigMulByUint(basefee, receipt.GasUsed) // was gasprice before upgrade
 	networkRevenue := arbmath.BigSub(networkAfter, networkBefore)
-	colors.PrintMint("tip: ", tip, full, networkRevenue)
-
+	colors.PrintMint("price: ", tip, full, networkRevenue)
 	colors.PrintRed("used: ", receipt.GasUsed, basefee)
 
-	if !arbmath.BigEquals(tip, arbmath.BigMulByFrac(networkRevenue, 1, 5)) {
-		Fail(t, "1/5th of the network's revenue should be the tip")
-	}
 	if !arbmath.BigEquals(full, networkRevenue) {
-		Fail(t, "the network didn't receive the tip")
+		Fail(t, "the network didn't receive the funds")
 	}
 }