Feat/fee logic

api/accounts/accounts_test.go

@@ -280,7 +280,7 @@ func getStorageWithNonExistingRevision(t *testing.T) {
 }
 
 func initAccountServer(t *testing.T, enabledDeprecated bool) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	genesisBlock = thorChain.GenesisBlock()
@@ -296,7 +296,7 @@ func initAccountServer(t *testing.T, enabledDeprecated bool) {
 		t.Fatal(err)
 	}
 	claCall := tx.NewClause(&contractAddr).WithData(input)
-	transactionCall := buildTxWithClauses(tx.DynamicFeeTxType, thorChain.Repo().ChainTag(), claCall)
+	transactionCall := buildTxWithClauses(tx.LegacyTxType, thorChain.Repo().ChainTag(), claCall)
 	require.NoError(t,
 		thorChain.MintTransactions(
 			genesis.DevAccounts()[0],
@@ -317,6 +317,7 @@ func buildTxWithClauses(txType int, chainTag byte, clauses ...*tx.Clause) *tx.Tr
 		ChainTag(chainTag).
 		Expiration(10).
 		Gas(1000000).
+		MaxFeePerGas(big.NewInt(1000)).
 		Clauses(clauses).
 		MustBuild()
 	return tx.MustSign(trx, genesis.DevAccounts()[0].PrivateKey)

api/admin/health/health_api_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/vechain/thor/v2/comm"
 	"github.com/vechain/thor/v2/test/testchain"
+	"github.com/vechain/thor/v2/thor"
 	"github.com/vechain/thor/v2/txpool"
 )
 
@@ -33,12 +34,12 @@ func TestHealth(t *testing.T) {
 }
 
 func initAPIServer(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	router := mux.NewRouter()
 	NewAPI(
-		New(thorChain.Repo(), comm.New(thorChain.Repo(), txpool.New(thorChain.Repo(), nil, txpool.Options{}))),
+		New(thorChain.Repo(), comm.New(thorChain.Repo(), txpool.New(thorChain.Repo(), nil, txpool.Options{}, &thor.NoFork))),
 	).Mount(router, "/health")
 
 	ts = httptest.NewServer(router)

api/blocks/blocks_test.go

@@ -136,7 +136,7 @@ func testGetRawBlock(t *testing.T) {
 }
 
 func testGetBlockByHeight(t *testing.T) {
-	res, statusCode, err := tclient.RawHTTPClient().RawHTTPGet("/blocks/1")
+	res, statusCode, err := tclient.RawHTTPClient().RawHTTPGet("/blocks/2")
 	require.NoError(t, err)
 	rb := new(blocks.JSONCollapsedBlock)
 	if err := json.Unmarshal(res, &rb); err != nil {
@@ -225,7 +225,13 @@ func testGetBlockWithRevisionNumberTooHigh(t *testing.T) {
 }
 
 func initBlockServer(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	forks := thor.ForkConfig{
+		BLOCKLIST: 0,
+		VIP191:    1,
+		GALACTICA: 1,
+		VIP214:    2,
+	}
+	thorChain, err := testchain.NewIntegrationTestChain(forks)
 	require.NoError(t, err)
 
 	addr := thor.BytesToAddress([]byte("to"))
@@ -240,10 +246,11 @@ func initBlockServer(t *testing.T) {
 		BlockRef(tx.NewBlockRef(0)).
 		MustBuild()
 	legacyTx = tx.MustSign(legacyTx, genesis.DevAccounts()[0].PrivateKey)
+	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], legacyTx))
 
 	dynFeeTx := tx.NewTxBuilder(tx.DynamicFeeTxType).
 		ChainTag(thorChain.Repo().ChainTag()).
-		MaxFeePerGas(big.NewInt(100000)).
+		MaxFeePerGas(big.NewInt(thor.InitialBaseFee)).
 		MaxPriorityFeePerGas(big.NewInt(100)).
 		Expiration(10).
 		Gas(21000).
@@ -252,14 +259,13 @@ func initBlockServer(t *testing.T) {
 		BlockRef(tx.NewBlockRef(0)).
 		MustBuild()
 	dynFeeTx = tx.MustSign(dynFeeTx, genesis.DevAccounts()[0].PrivateKey)
-
-	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], legacyTx, dynFeeTx))
+	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], dynFeeTx))
 
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
 
 	genesisBlock = allBlocks[0]
-	blk = allBlocks[1]
+	blk = allBlocks[len(allBlocks)-1]
 
 	router := mux.NewRouter()
 	blocks.New(thorChain.Repo(), thorChain.Engine()).Mount(router, "/blocks")

api/debug/debug_test.go

@@ -534,7 +534,13 @@ func testStorageRangeDefaultOption(t *testing.T) {
 }
 
 func initDebugServer(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	forkConf := thor.ForkConfig{
+		BLOCKLIST: 0,
+		VIP191:    1,
+		GALACTICA: 1,
+		VIP214:    2,
+	}
+	thorChain, err := testchain.NewIntegrationTestChain(forkConf)
 	require.NoError(t, err)
 
 	addr := thor.BytesToAddress([]byte("to"))
@@ -561,6 +567,7 @@ func initDebugServer(t *testing.T) {
 		BlockRef(tx.NewBlockRef(0)).
 		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()).
@@ -576,17 +583,14 @@ func initDebugServer(t *testing.T) {
 		dynFeeTx,
 		genesis.DevAccounts()[0].PrivateKey,
 	)
-
-	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], transaction, noClausesTx, dynFeeTx))
-	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0]))
+	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0]), dynFeeTx)
 
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
 	blk = allBlocks[1]
 
-	forkConfig := thor.GetForkConfig(blk.Header().ID())
 	router := mux.NewRouter()
-	debug = New(thorChain.Repo(), thorChain.Stater(), forkConfig, 21000, true, thorChain.Engine(), []string{"all"}, false)
+	debug = New(thorChain.Repo(), thorChain.Stater(), forkConf, 21000, true, thorChain.Engine(), []string{"all"}, false)
 	debug.Mount(router, "/debug")
 	ts = httptest.NewServer(router)
 }

api/events/events_test.go

@@ -178,7 +178,7 @@ func testEventWithBlocks(t *testing.T, expectedBlocks int) {
 
 // Init functions
 func initEventServer(t *testing.T, limit uint64) *testchain.Chain {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	router := mux.NewRouter()

api/metrics_test.go

@@ -34,7 +34,7 @@ func init() {
 }
 
 func TestMetricsMiddleware(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	// inject some invalid data to db
@@ -99,11 +99,11 @@ func TestMetricsMiddleware(t *testing.T) {
 }
 
 func TestWebsocketMetrics(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	router := mux.NewRouter()
-	sub := subscriptions.New(thorChain.Repo(), []string{"*"}, 10, txpool.New(thorChain.Repo(), thorChain.Stater(), txpool.Options{}), true)
+	sub := subscriptions.New(thorChain.Repo(), []string{"*"}, 10, txpool.New(thorChain.Repo(), thorChain.Stater(), txpool.Options{}, &thor.NoFork), true)
 	sub.Mount(router, "/subscriptions")
 	router.PathPrefix("/metrics").Handler(metrics.HTTPHandler())
 	router.Use(metricsMiddleware)

api/node/node_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/vechain/thor/v2/api/node"
 	"github.com/vechain/thor/v2/comm"
 	"github.com/vechain/thor/v2/test/testchain"
+	"github.com/vechain/thor/v2/thor"
 	"github.com/vechain/thor/v2/thorclient"
 	"github.com/vechain/thor/v2/txpool"
 )
@@ -31,7 +32,7 @@ func TestNode(t *testing.T) {
 }
 
 func initCommServer(t *testing.T) {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	thorChain, err := testchain.NewIntegrationTestChain(testchain.IntTestChainForkConfig)
 	require.NoError(t, err)
 
 	communicator := comm.New(
@@ -40,7 +41,7 @@ func initCommServer(t *testing.T) {
 			Limit:           10000,
 			LimitPerAccount: 16,
 			MaxLifetime:     10 * time.Minute,
-		}),
+		}, &thor.NoFork),
 	)
 
 	router := mux.NewRouter()

api/subscriptions/beat2_reader_test.go

@@ -47,10 +47,11 @@ func TestBeat2Reader_Read_NoNewBlocksToRead(t *testing.T) {
 	thorChain := initChain(t)
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
-	newBlock := allBlocks[1]
+	// taking best block to include also galactica block
+	bestBlk := allBlocks[len(allBlocks)-1]
 
 	// Act
-	beatReader := newBeat2Reader(thorChain.Repo(), newBlock.Header().ID(), newMessageCache[Beat2Message](10))
+	beatReader := newBeat2Reader(thorChain.Repo(), bestBlk.Header().ID(), newMessageCache[Beat2Message](10))
 	res, ok, err := beatReader.Read()
 
 	// Assert

api/subscriptions/beat_reader_test.go

@@ -44,10 +44,11 @@ func TestBeatReader_Read_NoNewBlocksToRead(t *testing.T) {
 	thorChain := initChain(t)
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
-	newBlock := allBlocks[1]
+	// taking best block to include also galactica block
+	bestBlock := allBlocks[len(allBlocks)-1]
 
 	// Act
-	beatReader := newBeatReader(thorChain.Repo(), newBlock.Header().ID(), newMessageCache[BeatMessage](10))
+	beatReader := newBeatReader(thorChain.Repo(), bestBlock.Header().ID(), newMessageCache[BeatMessage](10))
 	res, ok, err := beatReader.Read()
 
 	// Assert

api/subscriptions/block_reader_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/vechain/thor/v2/genesis"
@@ -26,7 +25,8 @@ func TestBlockReader_Read(t *testing.T) {
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
 	genesisBlk := allBlocks[0]
-	newBlock := allBlocks[1]
+	firstBlk := allBlocks[1]
+	bestBlk := allBlocks[len(allBlocks)-1]
 
 	// Test case 1: Successful read next blocks
 	br := newBlockReader(thorChain.Repo(), genesisBlk.Header().ID())
@@ -37,12 +37,22 @@ func TestBlockReader_Read(t *testing.T) {
 	if resBlock, ok := res[0].(*BlockMessage); !ok {
 		t.Fatal("unexpected type")
 	} else {
-		assert.Equal(t, newBlock.Header().Number(), resBlock.Number)
-		assert.Equal(t, newBlock.Header().ParentID(), resBlock.ParentID)
+		assert.Equal(t, firstBlk.Header().Number(), resBlock.Number)
+		assert.Equal(t, firstBlk.Header().ParentID(), resBlock.ParentID)
+	}
+
+	res, ok, err = br.Read()
+	assert.NoError(t, err)
+	assert.True(t, ok)
+	if resBlock, ok := res[0].(*BlockMessage); !ok {
+		t.Fatal("unexpected type")
+	} else {
+		assert.Equal(t, bestBlk.Header().Number(), resBlock.Number)
+		assert.Equal(t, bestBlk.Header().ParentID(), resBlock.ParentID)
 	}
 
 	// Test case 2: There is no new block
-	br = newBlockReader(thorChain.Repo(), newBlock.Header().ID())
+	br = newBlockReader(thorChain.Repo(), bestBlk.Header().ID())
 	res, ok, err = br.Read()
 
 	assert.NoError(t, err)
@@ -59,7 +69,13 @@ func TestBlockReader_Read(t *testing.T) {
 }
 
 func initChain(t *testing.T) *testchain.Chain {
-	thorChain, err := testchain.NewIntegrationTestChain()
+	forks := thor.ForkConfig{
+		BLOCKLIST: 0,
+		VIP191:    1,
+		GALACTICA: 1,
+		VIP214:    2,
+	}
+	thorChain, err := testchain.NewIntegrationTestChain(forks)
 	require.NoError(t, err)
 
 	addr := thor.BytesToAddress([]byte("to"))
@@ -74,21 +90,19 @@ func initChain(t *testing.T) *testchain.Chain {
 		BlockRef(tx.NewBlockRef(0)).
 		MustBuild()
 	tr = tx.MustSign(tr, genesis.DevAccounts()[0].PrivateKey)
+	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], tr))
 
 	txDeploy := tx.NewTxBuilder(tx.DynamicFeeTxType).
 		ChainTag(thorChain.Repo().ChainTag()).
-		MaxFeePerGas(big.NewInt(1)).
+		MaxFeePerGas(big.NewInt(thor.InitialBaseFee)).
 		Expiration(100).
 		Gas(1_000_000).
 		Nonce(3).
 		Clause(tx.NewClause(nil).WithData(common.Hex2Bytes(eventcontract.HexBytecode))).
 		BlockRef(tx.NewBlockRef(0)).
 		MustBuild()
-	sigTxDeploy, err := crypto.Sign(txDeploy.SigningHash().Bytes(), genesis.DevAccounts()[1].PrivateKey)
-	require.NoError(t, err)
-	txDeploy = txDeploy.WithSignature(sigTxDeploy)
-
-	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], tr, txDeploy))
+	txDeploy = tx.MustSign(txDeploy, genesis.DevAccounts()[0].PrivateKey)
+	require.NoError(t, thorChain.MintTransactions(genesis.DevAccounts()[0], txDeploy))
 
 	return thorChain
 }

api/subscriptions/event_reader_test.go

@@ -20,7 +20,8 @@ func TestEventReader_Read(t *testing.T) {
 	allBlocks, err := thorChain.GetAllBlocks()
 	require.NoError(t, err)
 	genesisBlk := allBlocks[0]
-	newBlock := allBlocks[1]
+	// taking best block to include also galactica block
+	bestBlk := allBlocks[len(allBlocks)-1]
 
 	er := &eventReader{
 		repo:        thorChain.Repo(),
@@ -34,13 +35,19 @@ func TestEventReader_Read(t *testing.T) {
 	assert.Empty(t, events)
 	assert.False(t, ok)
 
-	// Test case 2: Events are available to read
+	// Test case 2: There are no events available to read
 	er = newEventReader(thorChain.Repo(), genesisBlk.Header().ID(), &EventFilter{})
 
 	events, ok, err = er.Read()
+	assert.NoError(t, err)
+	assert.True(t, ok)
+	assert.Zero(t, len(events))
 
+	// Test case 3: There are no events available to read
+	events, ok, err = er.Read()
 	assert.NoError(t, err)
 	assert.True(t, ok)
+
 	var eventMessages []*EventMessage
 	for _, event := range events {
 		if msg, ok := event.(*EventMessage); ok {
@@ -51,8 +58,8 @@ func TestEventReader_Read(t *testing.T) {
 	}
 	assert.Equal(t, 2, len(eventMessages))
 	eventMsg := eventMessages[0]
-	assert.Equal(t, newBlock.Header().ID(), eventMsg.Meta.BlockID)
-	assert.Equal(t, newBlock.Header().Number(), eventMsg.Meta.BlockNumber)
+	assert.Equal(t, bestBlk.Header().ID(), eventMsg.Meta.BlockID)
+	assert.Equal(t, bestBlk.Header().Number(), eventMsg.Meta.BlockNumber)
 }
 
 type mockBlockReaderWithError struct{}