tests passing

Author: patrick-ogrady

chain/genesis.go

@@ -87,7 +87,7 @@ func DefaultGenesis() *Genesis {
 		BlockTarget:    1,             // 1 Block per Second
 		TargetUnits:    10 * 512 * 60, // 5012 Units Per Block (~1.2MB of SetTx)
 		MinPrice:       1,             // (50 for easiest claim)
-		MinBlockCost:   1,             // Minimum Unit Overhead
+		MinBlockCost:   0,             // Minimum Unit Overhead
 	}
 }
 

cmd/quarkcli/cmd/genesis.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
+	"strconv"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
@@ -23,6 +24,8 @@ var (
 	claimReward        int64
 	lifelineUnitReward int64
 	beneficiaryReward  int64
+
+	magic uint64
 )
 
 func init() {
@@ -65,19 +68,30 @@ func init() {
 }
 
 var genesisCmd = &cobra.Command{
-	Use:   "genesis [options]",
+	Use:   "genesis [magic] [allocations file] [options]",
 	Short: "Creates a new genesis in the default location",
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		if len(args) == 0 {
-			return errors.New("missing allocations file")
+		if len(args) != 2 {
+			return errors.New("invalid args")
+		}
+
+		m, err := strconv.ParseUint(args[0], 10, 64)
+		if err != nil {
+			return err
 		}
+		magic = m
+		if magic == 0 {
+			return chain.ErrInvalidMagic
+		}
+
 		return nil
 	},
 	RunE: genesisFunc,
 }
 
 func genesisFunc(cmd *cobra.Command, args []string) error {
 	genesis := chain.DefaultGenesis()
+	genesis.Magic = magic
 	if minPrice >= 0 {
 		genesis.MinPrice = uint64(minPrice)
 	}
@@ -94,7 +108,7 @@ func genesisFunc(cmd *cobra.Command, args []string) error {
 		genesis.BeneficiaryReward = uint64(beneficiaryReward)
 	}
 
-	a, err := os.ReadFile(args[0])
+	a, err := os.ReadFile(args[1])
 	if err != nil {
 		return err
 	}
@@ -105,7 +119,7 @@ func genesisFunc(cmd *cobra.Command, args []string) error {
 	// Store hash instead
 	genesis.Allocations = allocs
 
-	b, err := chain.Marshal(genesis)
+	b, err := json.Marshal(genesis)
 	if err != nil {
 		return err
 	}

scripts/run.sh

@@ -68,13 +68,13 @@ go build -v -o /tmp/quark-cli ./cmd/quarkcli
 echo "creating allocations file"
 cat <<EOF > /tmp/allocations.json
 [{
-  "address":"0xa6273", "balance":100000
+  "address":"0xF9370fa73846393798C2d23aa2a4aBA7489d9810", "balance":100000
 }]
 EOF
 
 echo "creating VM genesis file"
 rm -f /tmp/quarkvm.genesis
-/tmp/quark-cli genesis /tmp/allocations.json --genesis-file /tmp/quarkvm.genesis
+/tmp/quark-cli genesis 1 /tmp/allocations.json --genesis-file /tmp/quarkvm.genesis
 
 echo "building runner"
 pushd ./tests/runner

tests/e2e/e2e_test.go

@@ -74,7 +74,7 @@ type instance struct {
 
 var _ = ginkgo.BeforeSuite(func() {
 	var err error
-	priv, err = crypto.GenerateKey()
+	priv, err = crypto.HexToECDSA("a1c0bd71ff64aebd666b04db0531d61479c2c031e4de38410de0609cbd6e66f0")
 	gomega.Ω(err).Should(gomega.BeNil())
 	sender = crypto.PubkeyToAddress(priv.PublicKey)
 

tests/integration/integration_test.go

@@ -7,6 +7,8 @@ package integration_test
 import (
 	"context"
 	"crypto/ecdsa"
+	"encoding/hex"
+	"encoding/json"
 	"flag"
 	"math/rand"
 	"net/http/httptest"
@@ -23,6 +25,7 @@ import (
 	ecommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/fatih/color"
+	log "github.com/inconshreveable/log15"
 	ginkgo "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 
@@ -99,6 +102,8 @@ var _ = ginkgo.BeforeSuite(func() {
 	gomega.Ω(err).Should(gomega.BeNil())
 	sender = crypto.PubkeyToAddress(priv.PublicKey)
 
+	log.Debug("generated key", "addr", sender, "priv", hex.EncodeToString(crypto.FromECDSA(priv)))
+
 	// create embedded VMs
 	instances = make([]instance, vms)
 
@@ -116,7 +121,7 @@ var _ = ginkgo.BeforeSuite(func() {
 			Balance: 10000000,
 		},
 	}
-	genesisBytes, err = chain.Marshal(genesis)
+	genesisBytes, err = json.Marshal(genesis)
 	gomega.Ω(err).Should(gomega.BeNil())
 
 	networkID := uint32(1)

vm/vm.go

@@ -139,14 +139,16 @@ func (vm *VM) Initialize(
 
 	// Parse genesis data
 	vm.genesis = new(chain.Genesis)
-	if _, err := chain.Unmarshal(genesisBytes, vm.genesis); err != nil {
+	if err := ejson.Unmarshal(genesisBytes, vm.genesis); err != nil {
 		log.Error("could not unmarshal genesis bytes")
 		return err
 	}
 	if err := vm.genesis.Verify(); err != nil {
 		log.Error("genesis is invalid")
 		return err
 	}
+	log.Debug("loaded genesis", "genesis", string(genesisBytes))
+
 	vm.mempool = mempool.New(vm.genesis, vm.config.MempoolSize)
 
 	if has { //nolint:nestif