Revert NewDevnet refactor

api/accounts/accounts_test.go

@@ -176,7 +176,7 @@ func getStorage(t *testing.T) {
 func initAccountServer(t *testing.T) {
  db := muxdb.NewMem()
  stater := state.NewStater(db)
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
 
  b, _, _, err := gene.Build(stater)
  if err != nil {

api/blocks/blocks_test.go

@@ -76,7 +76,7 @@ func TestBlock(t *testing.T) {
 func initBlockServer(t *testing.T) {
  db := muxdb.NewMem()
  stater := state.NewStater(db)
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
 
  b, _, _, err := gene.Build(stater)
  if err != nil {

api/debug/debug.go

@@ -33,7 +33,7 @@ import (
  "github.com/vechain/thor/v2/xenv"
 )
 
-var devNetGenesisID = genesis.NewDevnet(uint64(1526400000)).ID()
+var devNetGenesisID = genesis.NewDevnet().ID()
 
 type Debug struct {
  repo *chain.Repository

api/node/node_test.go

@@ -38,7 +38,7 @@ func TestNode(t *testing.T) {
 func initCommServer(t *testing.T) {
  db := muxdb.NewMem()
  stater := state.NewStater(db)
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
 
  b, _, _, err := gene.Build(stater)
  if err != nil {

api/transactions/transactions_test.go

@@ -122,7 +122,7 @@ func httpPost(t *testing.T, url string, obj interface{}) []byte {
 func initTransactionServer(t *testing.T) {
  db := muxdb.NewMem()
  stater := state.NewStater(db)
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
 
  b, _, _, err := gene.Build(stater)
  if err != nil {

builtin/native_calls_test.go

@@ -492,7 +492,7 @@ func TestPrototypeNative(t *testing.T) {
  )
 
  db := muxdb.NewMem()
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
  genesisBlock, _, _, _ := gene.Build(state.NewStater(db))
  repo, _ := chain.NewRepository(db, genesisBlock)
  st := state.New(db, genesisBlock.Header().StateRoot(), 0, 0, 0)
@@ -766,7 +766,7 @@ func TestPrototypeNativeWithLongerBlockNumber(t *testing.T) {
  rand.Read(sig[:])
 
  db := muxdb.NewMem()
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
  genesisBlock, _, _, _ := gene.Build(state.NewStater(db))
  st := state.New(db, genesisBlock.Header().StateRoot(), 0, 0, 0)
  repo, _ := chain.NewRepository(db, genesisBlock)
@@ -836,7 +836,7 @@ func TestPrototypeNativeWithBlockNumber(t *testing.T) {
  rand.Read(sig[:])
 
  db := muxdb.NewMem()
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
  genesisBlock, _, _, _ := gene.Build(state.NewStater(db))
  st := state.New(db, genesisBlock.Header().StateRoot(), 0, 0, 0)
  repo, _ := chain.NewRepository(db, genesisBlock)
@@ -899,7 +899,7 @@ func newBlock(parent *block.Block, score uint64, timestamp uint64, privateKey *e
 func TestExtensionNative(t *testing.T) {
  db := muxdb.NewMem()
  st := state.New(db, thor.Bytes32{}, 0, 0, 0)
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
  genesisBlock, _, _, _ := gene.Build(state.NewStater(db))
  repo, _ := chain.NewRepository(db, genesisBlock)
  st.SetCode(builtin.Extension.Address, builtin.Extension.V2.RuntimeBytecodes())

chain/repository_test.go

@@ -25,7 +25,7 @@ func M(args ...interface{}) []interface{} {
 
 func newTestRepo() (*muxdb.MuxDB, *Repository) {
  db := muxdb.NewMem()
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
  b0, _, _, _ := g.Build(state.NewStater(db))
 
  repo, err := NewRepository(db, b0)
@@ -60,7 +60,7 @@ func newBlock(parent *block.Block, ts uint64, txs ...*tx.Transaction) *block.Blo
 
 func TestRepository(t *testing.T) {
  db := muxdb.NewMem()
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
  b0, _, _, _ := g.Build(state.NewStater(db))
 
  repo1, err := NewRepository(db, b0)

cmd/thor/main.go

@@ -245,7 +245,7 @@ func soloAction(ctx *cli.Context) error {
  defer func() { log.Info("exited") }()
 
  initLogger(ctx)
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
  // Solo forks from the start
  forkConfig := thor.ForkConfig{}
 

genesis/devnet.go

@@ -57,7 +57,8 @@ func DevAccounts() []DevAccount {
 }
 
 // NewDevnet create genesis for solo mode.
-func NewDevnet(launchTime uint64) *Genesis {
+func NewDevnet() *Genesis {
+ launchTime := uint64(1526400000) // 'Wed May 16 2018 00:00:00 GMT+0800 (CST)'
 
  executor := DevAccounts()[0].Address
  soloBlockSigner := DevAccounts()[0]

packer/packer_test.go

@@ -67,7 +67,7 @@ func (ti *txIterator) OnProcessed(txID thor.Bytes32, err error) {
 func TestP(t *testing.T) {
  db := muxdb.NewMem()
 
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
  b0, _, _, _ := g.Build(state.NewStater(db))
 
  repo, _ := chain.NewRepository(db, b0)
@@ -183,7 +183,7 @@ func TestForkVIP191(t *testing.T) {
 func TestBlocklist(t *testing.T) {
  db := muxdb.NewMem()
 
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
  b0, _, _, _ := g.Build(state.NewStater(db))
 
  repo, _ := chain.NewRepository(db, b0)

poa/seed_test.go

@@ -24,7 +24,7 @@ import (
 func TestSeeder_Generate(t *testing.T) {
  mockEpochInterval(10)
  db := muxdb.NewMem()
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
  b0, _, _, _ := g.Build(state.NewStater(db))
 
  repo, err := chain.NewRepository(db, b0)

runtime/resolved_tx_test.go

@@ -45,7 +45,7 @@ type testResolvedTransaction struct {
 func newTestResolvedTransaction(t *testing.T) (*testResolvedTransaction, error) {
  db := muxdb.NewMem()
 
- gen := genesis.NewDevnet(uint64(1526400000))
+ gen := genesis.NewDevnet()
 
  stater := state.NewStater(db)
  parent, _, _, err := gen.Build(stater)

runtime/runtime_test.go

@@ -31,7 +31,7 @@ func M(a ...interface{}) []interface{} {
 func TestContractSuicide(t *testing.T) {
  db := muxdb.NewMem()
 
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
  stater := state.NewStater(db)
  b0, _, _, err := g.Build(stater)
  assert.Nil(t, err)
@@ -106,7 +106,7 @@ func TestContractSuicide(t *testing.T) {
 func TestChainID(t *testing.T) {
  db := muxdb.NewMem()
 
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
 
  stater := state.NewStater(db)
  b0, _, _, err := g.Build(stater)
@@ -158,7 +158,7 @@ func TestChainID(t *testing.T) {
 func TestSelfBalance(t *testing.T) {
  db := muxdb.NewMem()
 
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
 
  stater := state.NewStater(db)
  b0, _, _, err := g.Build(stater)
@@ -212,7 +212,7 @@ func TestSelfBalance(t *testing.T) {
 func TestBlake2(t *testing.T) {
  db := muxdb.NewMem()
 
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
 
  stater := state.NewStater(db)
  b0, _, _, err := g.Build(stater)
@@ -341,7 +341,7 @@ func TestBlake2(t *testing.T) {
 func TestCall(t *testing.T) {
  db := muxdb.NewMem()
 
- g := genesis.NewDevnet(uint64(1526400000))
+ g := genesis.NewDevnet()
  b0, _, _, err := g.Build(state.NewStater(db))
  assert.Nil(t, err)
 

txpool/tx_object_test.go

@@ -23,7 +23,7 @@ import (
 )
 
 func newChainRepo(db *muxdb.MuxDB) *chain.Repository {
- gene := genesis.NewDevnet(uint64(1526400000))
+ gene := genesis.NewDevnet()
  b0, _, _, _ := gene.Build(state.NewStater(db))
  repo, _ := chain.NewRepository(db, b0)
  return repo

txpool/tx_pool_test.go

@@ -9,6 +9,7 @@ import (
  "crypto/rand"
  "encoding/hex"
  "fmt"
+ "math/big"
  "net/http"
  "net/http/httptest"
  "testing"