forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 18:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cleaned up printlns

Browse source
This commit is contained in:
Dustin Brickwood 2018-05-09 16:56:54 -04:00
parent cb1f0db4a5
commit d5d0e9fc4a
2 changed files with 0 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
core/genesis.go
View file

@ -36,7 +36,6 @@ import (
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rlp"
"database/sql"
"github.com/ethereum/go-ethereum/shyftdb"
)
//go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go
@ -193,8 +192,6 @@ func WriteShyftGen(sqldb *sql.DB, gen *Genesis) {
for k, v := range gen.Alloc {
addr := k.String()
fmt.Println(addr,v.Balance)
fmt.Println("*************")
sqlStatement := `INSERT INTO accounts(addr, balance) VALUES(($1), ($2)) RETURNING addr`
insertErr := sqldb.QueryRow(sqlStatement, addr, v.Balance.String()).Scan(&addr)
@ -273,76 +270,6 @@ func (g *Genesis) configOrDefault(ghash common.Hash) *params.ChainConfig {
return params.AllEthashProtocolChanges
}
}
// ToBlock creates the genesis block and writes state of a genesis specification
// to the given database (or discards it if nil).
func (ga *Genesis) ToShyftBlock(sqldb *sql.DB) *types.Block {
//actual return
fmt.Println("++++++++++++++++++++++++++++++++++++")
fmt.Println(ga.Alloc)
//for addr, account := range g.Alloc {
// fmt.Println(addr, account.Balance)
// //sqldb.AddBalance(addr, account.Balance)
// //sqldb.SetCode(addr, account.Code)
// //sqldb.SetNonce(addr, account.Nonce)
//}
head := &types.Header{
Number: new(big.Int).SetUint64(ga.Number),
Nonce: types.EncodeNonce(ga.Nonce),
Time: new(big.Int).SetUint64(ga.Timestamp),
ParentHash: ga.ParentHash,
Extra: ga.ExtraData,
GasLimit: ga.GasLimit,
GasUsed: ga.GasUsed,
Difficulty: ga.Difficulty,
MixDigest: ga.Mixhash,
Coinbase: ga.Coinbase,
}
//if g.GasLimit == 0 {
// head.GasLimit = params.GenesisGasLimit
//}
//if g.Difficulty == nil {
// head.Difficulty = params.GenesisDifficulty
//}
//statedb.Commit(false)
//statedb.Database().TrieDB().Commit(root, true)
return types.NewBlock(head, nil, nil, nil)
}
//@NOTE:SHYFT
func (ga *Genesis) ShyftCommit(sqldb *sql.DB) (*types.Block) {
fmt.Println("********************************* GENESIS")
shyftBlock := ga.ToShyftBlock(sqldb)
//if shyftBlock.Number().Sign() != 0 {
// return nil
//}
//if err := WriteTd(db, block.Hash(), block.NumberU64(), g.Difficulty); err != nil {
// return nil, err
//}
if err := shyftdb.WriteBlock(sqldb, shyftBlock); err != nil {
return nil
}
//if err := WriteBlockReceipts(db, block.Hash(), block.NumberU64(), nil); err != nil {
// return nil, err
//}
//if err := WriteCanonicalHash(db, block.Hash(), block.NumberU64()); err != nil {
// return nil, err
//}
//if err := WriteHeadBlockHash(db, block.Hash()); err != nil {
// return nil, err
//}
//if err := WriteHeadHeaderHash(db, block.Hash()); err != nil {
// return nil, err
//}
//config := g.Config
//if config == nil {
// config = params.AllEthashProtocolChanges
//}
return shyftBlock
}
// ToBlock creates the genesis block and writes state of a genesis specification
// to the given database (or discards it if nil).
func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {

2
shyftdb/shyft_database_util.go
View file

@ -93,8 +93,6 @@ type SendAndReceive struct {
//}
//WriteBlock writes to block info to sql db
func WriteBlock(sqldb *sql.DB, block *types.Block) error {
fmt.Println("******************")
coinbase := block.Header().Coinbase.String()
number := block.Header().Number.String()
sqlStatement := `INSERT INTO blocks(hash, coinbase, number) VALUES(($1), ($2), ($3)) RETURNING number`