Add the dynamic fee tx and support for typed txs

api/accounts/accounts_test.go

@@ -286,7 +286,7 @@ func initAccountServer(t *testing.T, enabledDeprecated bool) {
 	genesisBlock = thorChain.GenesisBlock()
 	claTransfer := tx.NewClause(&addr).WithValue(value)
 	claDeploy := tx.NewClause(nil).WithData(bytecode)
-	transaction := buildTxWithClauses(thorChain.Repo().ChainTag(), claTransfer, claDeploy)
+	transaction := buildTxWithClauses(tx.LegacyTxType, thorChain.Repo().ChainTag(), claTransfer, claDeploy)
 	contractAddr = thor.CreateContractAddress(transaction.ID(), 1, 0)
 	method := "set"
 	abi, _ := ABI.New([]byte(abiJSON))
@@ -296,7 +296,7 @@ func initAccountServer(t *testing.T, enabledDeprecated bool) {
 		t.Fatal(err)
 	}
 	claCall := tx.NewClause(&contractAddr).WithData(input)
-	transactionCall := buildTxWithClauses(thorChain.Repo().ChainTag(), claCall)
+	transactionCall := buildTxWithClauses(tx.DynamicFeeTxType, thorChain.Repo().ChainTag(), claCall)
 	require.NoError(t,
 		thorChain.MintTransactions(
 			genesis.DevAccounts()[0],
@@ -312,17 +312,13 @@ func initAccountServer(t *testing.T, enabledDeprecated bool) {
 	ts = httptest.NewServer(router)
 }
 
-func buildTxWithClauses(chaiTag byte, clauses ...*tx.Clause) *tx.Transaction {
-	builder := new(tx.Builder).
-		ChainTag(chaiTag).
+func buildTxWithClauses(txType int, chainTag byte, clauses ...*tx.Clause) *tx.Transaction {
+	trx := tx.NewTxBuilder(txType).
+		ChainTag(chainTag).
 		Expiration(10).
-		Gas(1000000)
-	for _, c := range clauses {
-		builder.Clause(c)
-	}
-
-	trx := builder.Build()
-
+		Gas(1000000).
+		Clauses(clauses).
+		MustBuild()
 	return tx.MustSign(trx, genesis.DevAccounts()[0].PrivateKey)
 }
 

api/blocks/blocks_test.go

@@ -230,20 +230,30 @@ func initBlockServer(t *testing.T) {
 
 	addr := thor.BytesToAddress([]byte("to"))
 	cla := tx.NewClause(&addr).WithValue(big.NewInt(10000))
-	trx := tx.MustSign(
-		new(tx.Builder).
-			ChainTag(thorChain.Repo().ChainTag()).
-			GasPriceCoef(1).
-			Expiration(10).
-			Gas(21000).
-			Nonce(1).
-			Clause(cla).
-			BlockRef(tx.NewBlockRef(0)).
-			Build(),
-		genesis.DevAccounts()[0].PrivateKey,
-	)
-
-	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], trx))
+	legacyTx := tx.NewTxBuilder(tx.LegacyTxType).
+		ChainTag(thorChain.Repo().ChainTag()).
+		GasPriceCoef(1).
+		Expiration(10).
+		Gas(21000).
+		Nonce(1).
+		Clause(cla).
+		BlockRef(tx.NewBlockRef(0)).
+		MustBuild()
+	legacyTx = tx.MustSign(legacyTx, genesis.DevAccounts()[0].PrivateKey)
+
+	dynFeeTx := tx.NewTxBuilder(tx.DynamicFeeTxType).
+		ChainTag(thorChain.Repo().ChainTag()).
+		MaxFeePerGas(big.NewInt(100000)).
+		MaxPriorityFeePerGas(big.NewInt(100)).
+		Expiration(10).
+		Gas(21000).
+		Nonce(2).
+		Clause(cla).
+		BlockRef(tx.NewBlockRef(0)).
+		MustBuild()
+	dynFeeTx = tx.MustSign(dynFeeTx, genesis.DevAccounts()[0].PrivateKey)
+
+	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], legacyTx, dynFeeTx))
 
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)

api/blocks/types.go

@@ -6,6 +6,8 @@
 package blocks
 
 import (
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/vechain/thor/v2/chain"
@@ -67,18 +69,20 @@ type JSONOutput struct {
 }
 
 type JSONEmbeddedTx struct {
-	ID           thor.Bytes32        `json:"id"`
-	ChainTag     byte                `json:"chainTag"`
-	BlockRef     string              `json:"blockRef"`
-	Expiration   uint32              `json:"expiration"`
-	Clauses      []*JSONClause       `json:"clauses"`
-	GasPriceCoef uint8               `json:"gasPriceCoef"`
-	Gas          uint64              `json:"gas"`
-	Origin       thor.Address        `json:"origin"`
-	Delegator    *thor.Address       `json:"delegator"`
-	Nonce        math.HexOrDecimal64 `json:"nonce"`
-	DependsOn    *thor.Bytes32       `json:"dependsOn"`
-	Size         uint32              `json:"size"`
+	ID                   thor.Bytes32        `json:"id"`
+	ChainTag             byte                `json:"chainTag"`
+	BlockRef             string              `json:"blockRef"`
+	Expiration           uint32              `json:"expiration"`
+	Clauses              []*JSONClause       `json:"clauses"`
+	GasPriceCoef         uint8               `json:"gasPriceCoef"`
+	MaxFeePerGas         *big.Int            `json:"maxFeePerGas,omitempty"`
+	MaxPriorityFeePerGas *big.Int            `json:"maxPriorityFeePerGas,omitempty"`
+	Gas                  uint64              `json:"gas"`
+	Origin               thor.Address        `json:"origin"`
+	Delegator            *thor.Address       `json:"delegator"`
+	Nonce                math.HexOrDecimal64 `json:"nonce"`
+	DependsOn            *thor.Bytes32       `json:"dependsOn"`
+	Size                 uint32              `json:"size"`
 
 	// receipt part
 	GasUsed  uint64                `json:"gasUsed"`
@@ -148,13 +152,13 @@ func buildJSONOutput(txID thor.Bytes32, index uint32, c *tx.Clause, o *tx.Output
 
 func buildJSONEmbeddedTxs(txs tx.Transactions, receipts tx.Receipts) []*JSONEmbeddedTx {
 	jTxs := make([]*JSONEmbeddedTx, 0, len(txs))
-	for itx, tx := range txs {
+	for itx, trx := range txs {
 		receipt := receipts[itx]
 
-		clauses := tx.Clauses()
-		blockRef := tx.BlockRef()
-		origin, _ := tx.Origin()
-		delegator, _ := tx.Delegator()
+		clauses := trx.Clauses()
+		blockRef := trx.BlockRef()
+		origin, _ := trx.Origin()
+		delegator, _ := trx.Delegator()
 
 		jcs := make([]*JSONClause, 0, len(clauses))
 		jos := make([]*JSONOutput, 0, len(receipt.Outputs))
@@ -166,31 +170,37 @@ func buildJSONEmbeddedTxs(txs tx.Transactions, receipts tx.Receipts) []*JSONEmbe
 				hexutil.Encode(c.Data()),
 			})
 			if !receipt.Reverted {
-				jos = append(jos, buildJSONOutput(tx.ID(), uint32(i), c, receipt.Outputs[i]))
+				jos = append(jos, buildJSONOutput(trx.ID(), uint32(i), c, receipt.Outputs[i]))
 			}
 		}
 
-		jTxs = append(jTxs, &JSONEmbeddedTx{
-			ID:           tx.ID(),
-			ChainTag:     tx.ChainTag(),
-			BlockRef:     hexutil.Encode(blockRef[:]),
-			Expiration:   tx.Expiration(),
-			Clauses:      jcs,
-			GasPriceCoef: tx.GasPriceCoef(),
-			Gas:          tx.Gas(),
-			Origin:       origin,
-			Delegator:    delegator,
-			Nonce:        math.HexOrDecimal64(tx.Nonce()),
-			DependsOn:    tx.DependsOn(),
-			Size:         uint32(tx.Size()),
+		embedTx := &JSONEmbeddedTx{
+			ID:         trx.ID(),
+			ChainTag:   trx.ChainTag(),
+			BlockRef:   hexutil.Encode(blockRef[:]),
+			Expiration: trx.Expiration(),
+			Clauses:    jcs,
+			Gas:        trx.Gas(),
+			Origin:     origin,
+			Delegator:  delegator,
+			Nonce:      math.HexOrDecimal64(trx.Nonce()),
+			DependsOn:  trx.DependsOn(),
+			Size:       uint32(trx.Size()),
 
 			GasUsed:  receipt.GasUsed,
 			GasPayer: receipt.GasPayer,
 			Paid:     (*math.HexOrDecimal256)(receipt.Paid),
 			Reward:   (*math.HexOrDecimal256)(receipt.Reward),
 			Reverted: receipt.Reverted,
 			Outputs:  jos,
-		})
+		}
+		if trx.Type() == tx.LegacyTxType {
+			embedTx.GasPriceCoef = trx.GasPriceCoef()
+		} else {
+			embedTx.MaxFeePerGas = trx.MaxFeePerGas()
+			embedTx.MaxPriorityFeePerGas = trx.MaxPriorityFeePerGas()
+		}
+		jTxs = append(jTxs, embedTx)
 	}
 	return jTxs
 }

api/debug/debug_test.go

@@ -541,16 +541,16 @@ func initDebugServer(t *testing.T) {
 
 	// Adding an empty clause transaction to the block to cover the case of
 	// scanning multiple txs before getting the right one
-	noClausesTx := new(tx.Builder).
+	noClausesTx := tx.NewTxBuilder(tx.LegacyTxType).
 		ChainTag(thorChain.Repo().ChainTag()).
 		Expiration(10).
 		Gas(21000).
-		Build()
+		MustBuild()
 	noClausesTx = tx.MustSign(noClausesTx, genesis.DevAccounts()[0].PrivateKey)
 
 	cla := tx.NewClause(&addr).WithValue(big.NewInt(10000))
 	cla2 := tx.NewClause(&addr).WithValue(big.NewInt(10000))
-	transaction = new(tx.Builder).
+	transaction = tx.NewTxBuilder(tx.LegacyTxType).
 		ChainTag(thorChain.Repo().ChainTag()).
 		GasPriceCoef(1).
 		Expiration(10).
@@ -559,10 +559,25 @@ func initDebugServer(t *testing.T) {
 		Clause(cla).
 		Clause(cla2).
 		BlockRef(tx.NewBlockRef(0)).
-		Build()
+		MustBuild()
 	transaction = tx.MustSign(transaction, genesis.DevAccounts()[0].PrivateKey)
 
-	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], transaction, noClausesTx))
+	dynFeeTx := tx.NewTxBuilder(tx.DynamicFeeTxType).
+		ChainTag(thorChain.Repo().ChainTag()).
+		Expiration(10).
+		Gas(21000).
+		MaxFeePerGas(big.NewInt(1000)).
+		MaxPriorityFeePerGas(big.NewInt(100000)).
+		Nonce(1).
+		Clause(cla).
+		BlockRef(tx.NewBlockRef(0)).
+		MustBuild()
+	dynFeeTx = tx.MustSign(
+		dynFeeTx,
+		genesis.DevAccounts()[0].PrivateKey,
+	)
+
+	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], transaction, noClausesTx, dynFeeTx))
 	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0]))
 
 	allBlocks, err := thorChain.GetAllBlocks()

api/subscriptions/block_reader_test.go

@@ -64,26 +64,26 @@ func initChain(t *testing.T) *testchain.Chain {
 
 	addr := thor.BytesToAddress([]byte("to"))
 	cla := tx.NewClause(&addr).WithValue(big.NewInt(10000))
-	tr := new(tx.Builder).
+	tr := tx.NewTxBuilder(tx.LegacyTxType).
 		ChainTag(thorChain.Repo().ChainTag()).
 		GasPriceCoef(1).
 		Expiration(10).
 		Gas(21000).
 		Nonce(1).
 		Clause(cla).
 		BlockRef(tx.NewBlockRef(0)).
-		Build()
+		MustBuild()
 	tr = tx.MustSign(tr, genesis.DevAccounts()[0].PrivateKey)
 
-	txDeploy := new(tx.Builder).
+	txDeploy := tx.NewTxBuilder(tx.DynamicFeeTxType).
 		ChainTag(thorChain.Repo().ChainTag()).
-		GasPriceCoef(1).
+		MaxFeePerGas(big.NewInt(1)).
 		Expiration(100).
 		Gas(1_000_000).
 		Nonce(3).
 		Clause(tx.NewClause(nil).WithData(common.Hex2Bytes(eventcontract.HexBytecode))).
 		BlockRef(tx.NewBlockRef(0)).
-		Build()
+		MustBuild()
 	sigTxDeploy, err := crypto.Sign(txDeploy.SigningHash().Bytes(), genesis.DevAccounts()[1].PrivateKey)
 	require.NoError(t, err)
 	txDeploy = txDeploy.WithSignature(sigTxDeploy)

api/subscriptions/pending_tx_test.go

@@ -95,7 +95,7 @@ func TestPendingTx_DispatchLoop(t *testing.T) {
 	p.Subscribe(txCh)
 
 	// Add a new tx to the mempool
-	transaction := createTx(repo, 0)
+	transaction := createTx(repo, 0, tx.LegacyTxType)
 	txPool.AddLocal(transaction)
 
 	// Start the dispatch loop
@@ -113,7 +113,7 @@ func TestPendingTx_DispatchLoop(t *testing.T) {
 	p.Unsubscribe(txCh)
 
 	// Add another tx to the mempool
-	tx2 := createTx(repo, 1)
+	tx2 := createTx(repo, 1, tx.DynamicFeeTxType)
 	txPool.AddLocal(tx2)
 
 	// Assert that the channel did not receive the second transaction
@@ -147,24 +147,6 @@ func addNewBlock(repo *chain.Repository, stater *state.Stater, b0 *block.Block,
 	}
 }
 
-func createTx(repo *chain.Repository, addressNumber uint) *tx.Transaction {
-	addr := thor.BytesToAddress([]byte("to"))
-	cla := tx.NewClause(&addr).WithValue(big.NewInt(10000))
-
-	return tx.MustSign(
-		new(tx.Builder).
-			ChainTag(repo.ChainTag()).
-			GasPriceCoef(1).
-			Expiration(1000).
-			Gas(21000).
-			Nonce(uint64(datagen.RandInt())).
-			Clause(cla).
-			BlockRef(tx.NewBlockRef(0)).
-			Build(),
-		genesis.DevAccounts()[addressNumber].PrivateKey,
-	)
-}
-
 func TestPendingTx_NoWriteAfterUnsubscribe(t *testing.T) {
 	// Arrange
 	thorChain := initChain(t)
@@ -183,7 +165,7 @@ func TestPendingTx_NoWriteAfterUnsubscribe(t *testing.T) {
 
 	done := make(chan struct{})
 	// Attempt to write a new transaction
-	trx := createTx(thorChain.Repo(), 0)
+	trx := createTx(thorChain.Repo(), 0, tx.LegacyTxType)
 	assert.NotPanics(t, func() {
 		p.dispatch(trx, done) // dispatch should not panic after unsubscribe
 	}, "Dispatching after unsubscribe should not panic")
@@ -221,7 +203,7 @@ func TestPendingTx_UnsubscribeOnWebSocketClose(t *testing.T) {
 	defer ws.Close()
 
 	// Add a transaction
-	trx := createTx(thorChain.Repo(), 0)
+	trx := createTx(thorChain.Repo(), 0, tx.LegacyTxType)
 	txPool.AddLocal(trx)
 
 	// Wait to receive transaction
@@ -242,3 +224,22 @@ func TestPendingTx_UnsubscribeOnWebSocketClose(t *testing.T) {
 	require.Equal(t, len(sub.pendingTx.listeners), 0)
 	sub.pendingTx.mu.Unlock()
 }
+
+func createTx(repo *chain.Repository, addressNumber uint, txType int) *tx.Transaction {
+	addr := thor.BytesToAddress([]byte("to"))
+	cla := tx.NewClause(&addr).WithValue(big.NewInt(10000))
+
+	trx := tx.NewTxBuilder(txType).
+		ChainTag(repo.ChainTag()).
+		GasPriceCoef(1).
+		Expiration(1000).
+		Gas(21000).
+		Nonce(uint64(datagen.RandInt())).
+		Clause(cla).
+		BlockRef(tx.NewBlockRef(0)).
+		MustBuild()
+	return tx.MustSign(
+		trx,
+		genesis.DevAccounts()[addressNumber].PrivateKey,
+	)
+}