From d673c8cb2f2fde07b34536269b04c0a45b662ab9 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Fri, 18 May 2018 13:57:32 -0400 Subject: [PATCH] refactored block 0 --- core/genesis.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/genesis.go b/core/genesis.go index 1e39bfa094..b53a48235d 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -185,11 +185,13 @@ func WriteShyftGen(sqldb *sql.DB, gen *Genesis, block *types.Block) { panic(insertError) } } + + default: log.Info("Found Genesis Block") }}} -func WriteShyftBlockZero(sqldb *sql.DB, block *types.Block) error { +func WriteShyftBlockZero(sqldb *sql.DB, block *types.Block, gen *Genesis) error { if sqldb == nil { log.Info("Initializing Shyft Postgres DB") connStr := "user=postgres dbname=shyftdb sslmode=disable" @@ -201,13 +203,13 @@ func WriteShyftBlockZero(sqldb *sql.DB, block *types.Block) error { number := block.Header().Number.String() gasUsed := block.Header().GasUsed gasLimit := block.Header().GasLimit - txCount := block.Transactions().Len() uncleCount := len(block.Uncles()) parentHash := block.ParentHash().String() uncleHash := block.UncleHash().String() blockDifficulty := block.Difficulty().String() blockSize := block.Size().String() blockNonce := block.Nonce() + genesisTxCount := len(gen.Alloc) i, err := strconv.ParseInt(block.Time().String(), 10, 64) if err != nil { @@ -221,7 +223,7 @@ func WriteShyftBlockZero(sqldb *sql.DB, block *types.Block) error { switch { case err == sql.ErrNoRows: sqlStatement := `INSERT INTO blocks(hash, coinbase, number, gasUsed, gasLimit, txCount, uncleCount, age, parentHash, uncleHash, difficulty, size, nonce) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10), ($11), ($12),($13)) RETURNING number` - qerr := sqldb.QueryRow(sqlStatement, block.Header().Hash().Hex(), coinbase, number, gasUsed, gasLimit, txCount, uncleCount, age, parentHash, uncleHash, blockDifficulty, blockSize, blockNonce).Scan(&number) + qerr := sqldb.QueryRow(sqlStatement, block.Header().Hash().Hex(), coinbase, number, gasUsed, gasLimit, genesisTxCount, uncleCount, age, parentHash, uncleHash, blockDifficulty, blockSize, blockNonce).Scan(&number) if qerr != nil { panic(qerr) } @@ -260,7 +262,7 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis, sqldb *sql.DB) (*par } block, err := genesis.Commit(db) //@NOTE:SHYFT WRITE TO BLOCK ZERO DB - WriteShyftBlockZero(sqldb, block) + WriteShyftBlockZero(sqldb, block, genesis) //@NOTE:SHYFT WRITE TO DB WriteShyftGen(sqldb, genesis, block)