move genesis loading out of chain

Author: patrick-ogrady

chain/genesis.go

@@ -15,12 +15,6 @@ import (
 	log "github.com/inconshreveable/log15"
 )
 
-// All addresses on the C-Chain with > 2 transactions as of 1/15/22
-// Hash: 0xccbf8e430b30d08b5b3342208781c40b373d1b5885c1903828f367230a2568da
-
-//go:embed airdrops/011522.json
-var AirdropData []byte
-
 type Airdrop struct {
 	// Address strings are hex-formatted common.Address
 	Address common.Address `serialize:"true" json:"address"`
@@ -125,15 +119,15 @@ func (g *Genesis) Verify() error {
 	return nil
 }
 
-func (g *Genesis) Load(db database.KeyValueWriter) error {
+func (g *Genesis) Load(db database.KeyValueWriter, airdropData []byte) error {
 	if len(g.AirdropHash) > 0 {
-		h := common.BytesToHash(crypto.Keccak256(AirdropData)).Hex()
+		h := common.BytesToHash(crypto.Keccak256(airdropData)).Hex()
 		if g.AirdropHash != h {
 			return fmt.Errorf("expected standard allocation %s but got %s", g.AirdropHash, h)
 		}
 
 		standardAllocation := []*Airdrop{}
-		if err := json.Unmarshal(AirdropData, &standardAllocation); err != nil {
+		if err := json.Unmarshal(airdropData, &standardAllocation); err != nil {
 			return err
 		}
 
@@ -158,7 +152,3 @@ func (g *Genesis) Load(db database.KeyValueWriter) error {
 	}
 	return nil
 }
-
-func CleanAirdropData() {
-	AirdropData = nil
-}

cmd/spacescli/cmd/genesis.go

@@ -60,12 +60,6 @@ func init() {
 		-1,
 		"seconds per unit of fee that will be rewarded in a lifeline transaction",
 	)
-	genesisCmd.PersistentFlags().Int64Var(
-		&lifelineUnitReward,
-		"lifeline-unit-reward",
-		-1,
-		"seconds per unit of fee that will be rewarded in a lifeline transaction",
-	)
 	genesisCmd.PersistentFlags().StringVar(
 		&airdropHash,
 		"airdrop-hash",

chain/airdrops/011522.json renamed to cmd/spacesvm/airdrops/011522.json

@@ -15,6 +15,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
+// All addresses on the C-Chain with > 2 transactions as of 1/15/22
+// Hash: 0xccbf8e430b30d08b5b3342208781c40b373d1b5885c1903828f367230a2568da
+
+//go:embed airdrops/011522.json
+var AirdropData []byte
+
 func init() {
 	log.Root().SetHandler(log.LvlFilterHandler(log.LvlDebug, log.StreamHandler(os.Stderr, log.LogfmtFormat())))
 }
@@ -50,11 +56,14 @@ func runFunc(cmd *cobra.Command, args []string) error {
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: rpcchainvm.Handshake,
 		Plugins: map[string]plugin.Plugin{
-			"vm": rpcchainvm.New(&vm.VM{}),
+			"vm": rpcchainvm.New(&vm.VM{AirdropData: AirdropData}),
 		},
 
 		// A non-nil value here enables gRPC serving for this plugin...
 		GRPCServer: plugin.DefaultGRPCServer,
 	})
+
+	// Remove reference so VM can free when ready
+	AirdropData = nil
 	return nil
 }

cmd/spacesvm/main.go

@@ -10,6 +10,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"flag"
+	"fmt"
 	"math/rand"
 	"net/http/httptest"
 	"strings"
@@ -130,13 +131,10 @@ var _ = ginkgo.BeforeSuite(func() {
 			Address: sender,
 			Balance: 10000000,
 		},
-		{
-			Address: sender2,
-			Balance: 10000000,
-		},
 	}
-	genesis.AirdropHash = "0xccbf8e430b30d08b5b3342208781c40b373d1b5885c1903828f367230a2568da"
-	genesis.AirdropUnits = 100
+	airdropData := []byte(fmt.Sprintf(`[{"address":"%s"}]`, sender2))
+	genesis.AirdropHash = ecommon.BytesToHash(crypto.Keccak256(airdropData)).Hex()
+	genesis.AirdropUnits = 1000000000
 	genesisBytes, err = json.Marshal(genesis)
 	gomega.Ω(err).Should(gomega.BeNil())
 
@@ -157,13 +155,13 @@ var _ = ginkgo.BeforeSuite(func() {
 		db := manager.NewMemDB(avago_version.CurrentDatabase)
 
 		// TODO: test appsender
-		v := &vm.VM{}
+		v := &vm.VM{AirdropData: airdropData}
 		err := v.Initialize(
 			ctx,
 			db,
 			genesisBytes,
 			nil,
-			[]byte(`{"clearAirdropData":false}`),
+			nil,
 			toEngine,
 			nil,
 			app,

tests/integration/integration_test.go

@@ -18,8 +18,6 @@ type Config struct {
 
 	MempoolSize       int `serialize:"true" json:"mempoolSize"`
 	ActivityCacheSize int `serialize:"true" json:"activityCacheSize"`
-
-	ClearAirdropData bool `serialize:"true" json:"clearAirdropData"`
 }
 
 func (c *Config) SetDefaults() {
@@ -33,6 +31,4 @@ func (c *Config) SetDefaults() {
 
 	c.MempoolSize = 1024
 	c.ActivityCacheSize = 128
-
-	c.ClearAirdropData = true
 }

vm/config.go

@@ -40,10 +40,11 @@ var (
 )
 
 type VM struct {
-	ctx     *snow.Context
-	db      database.Database
-	config  Config
-	genesis *chain.Genesis
+	ctx         *snow.Context
+	db          database.Database
+	config      Config
+	genesis     *chain.Genesis
+	AirdropData []byte
 
 	bootstrapped bool
 
@@ -173,7 +174,7 @@ func (vm *VM) Initialize(
 		}
 
 		// Set Balances
-		if err := vm.genesis.Load(vm.db); err != nil {
+		if err := vm.genesis.Load(vm.db, vm.AirdropData); err != nil {
 			log.Error("could not set genesis allocation", "err", err)
 			return err
 		}
@@ -186,10 +187,7 @@ func (vm *VM) Initialize(
 		vm.preferred, vm.lastAccepted = gBlkID, genesisBlk
 		log.Info("initialized spacesvm from genesis", "block", gBlkID)
 	}
-
-	if vm.config.ClearAirdropData {
-		chain.CleanAirdropData()
-	}
+	vm.AirdropData = nil
 
 	go vm.builder.Build()
 	go vm.builder.Gossip()