ApplyGenesis fix

app/apply_genesis.go

@@ -7,13 +7,20 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/Fantom-foundation/go-lachesis/evmcore"
+	"github.com/Fantom-foundation/go-lachesis/inter"
 	"github.com/Fantom-foundation/go-lachesis/inter/sfctype"
 	"github.com/Fantom-foundation/go-lachesis/lachesis"
 )
 
 // ApplyGenesis writes initial state.
-func (s *Store) ApplyGenesis(net *lachesis.Config) (block *evmcore.EvmBlock, isNew bool, err error) {
+// TODO: replace first block with DB-migrations
+func (s *Store) ApplyGenesis(net *lachesis.Config, firstBlock *inter.Block) (block *evmcore.EvmBlock, isNew bool, err error) {
 	stored := s.getGenesisState()
+
+	if stored == nil && firstBlock != nil {
+		stored = &firstBlock.Root
+	}
+
 	if stored != nil {
 		block, err = calcGenesisBlock(net)
 		if err != nil {

gossip/evm_state_reader_test.go

@@ -32,7 +32,7 @@ func TestGetGenesisBlock(t *testing.T) {
 	net.Genesis.Alloc.Accounts[addrWithStorage] = accountWithCode
 
 	app := app.NewMemStore()
-	state, _, err := app.ApplyGenesis(&net)
+	state, _, err := app.ApplyGenesis(&net, nil)
 	if !assertar.NoError(err) {
 		return
 	}
@@ -79,7 +79,7 @@ func TestGetBlock(t *testing.T) {
 	net := lachesis.FakeNetConfig(genesis.FakeAccounts(0, 5, big.NewInt(0), pos.StakeToBalance(1)))
 
 	app := app.NewMemStore()
-	state, _, err := app.ApplyGenesis(&net)
+	state, _, err := app.ApplyGenesis(&net, nil)
 	if !assertar.NoError(err) {
 		return
 	}

gossip/handler_test.go

@@ -142,7 +142,7 @@ func testBroadcastEvent(t *testing.T, totalPeers int, forcedAggressiveBroadcast
 
 	// create stores
 	app := app.NewMemStore()
-	state, _, err := app.ApplyGenesis(&net)
+	state, _, err := app.ApplyGenesis(&net, nil)
 	if !assertar.NoError(err) {
 		return
 	}

gossip/helper_test.go

@@ -36,7 +36,7 @@ func newTestProtocolManager(nodesNum int, eventsNum int, newtx chan<- []*types.T
 	}
 
 	app := app.NewMemStore()
-	state, _, err := app.ApplyGenesis(&net)
+	state, _, err := app.ApplyGenesis(&net, nil)
 	if err != nil {
 		return nil, nil, err
 	}

integration/assembly.go

@@ -30,7 +30,9 @@ func MakeEngine(dataDir string, gossipCfg *gossip.Config) (*poset.Poset, *app.St
 
 	// write genesis
 
-	state, _, err := adb.ApplyGenesis(&gossipCfg.Net)
+	// TODO: replace first block with DB-migrations
+	firstBlock := gdb.GetBlock(0)
+	state, _, err := adb.ApplyGenesis(&gossipCfg.Net, firstBlock)
 	if err != nil {
 		utils.Fatalf("Failed to write App genesis state: %v", err)
 	}

version/version.go

@@ -8,5 +8,5 @@ func init() {
 	params.VersionMajor = 0    // Major version component of the current release
 	params.VersionMinor = 6    // Minor version component of the current release
 	params.VersionPatch = 0    // Patch version component of the current release
-	params.VersionMeta = "rc1" // Version metadata to append to the version string
+	params.VersionMeta = "rc.2" // Version metadata to append to the version string
 }