Merge pull request #21 from ShyftNetwork/writeGenesis

Write genesis

blockExplorerApi/handler.go

@@ -8,7 +8,7 @@ import (
 
 	_ "github.com/lib/pq"
 
-	shyftdb "github.com/ethereum/go-ethereum/shyftdb"
+	"github.com/ethereum/go-ethereum/shyftdb"
 	"github.com/gorilla/mux"
 )
 
@@ -48,6 +48,7 @@ func GetAllTransactions(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 

cmd/evm/runner.go

@@ -37,7 +37,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
-	cli "gopkg.in/urfave/cli.v1"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var runCommand = cli.Command{

cmd/geth/chaincmd.go

@@ -168,7 +168,7 @@ func initGenesis(ctx *cli.Context) error {
 		if err != nil {
 			utils.Fatalf("Failed to open database: %v", err)
 		}
-		_, hash, err := core.SetupGenesisBlock(chaindb, genesis)
+		_, hash, err := core.SetupGenesisBlock(chaindb, genesis, nil)
 		if err != nil {
 			utils.Fatalf("Failed to write genesis block: %v", err)
 		}

cmd/utils/flags.go

@@ -1219,7 +1219,7 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
 	var err error
 	chainDb = MakeChainDatabase(ctx, stack)
 
-	config, _, err := core.SetupGenesisBlock(chainDb, MakeGenesis(ctx))
+	config, _, err := core.SetupGenesisBlock(chainDb, MakeGenesis(ctx), nil)
 	if err != nil {
 		Fatalf("%v", err)
 	}

core/genesis.go

@@ -25,6 +25,7 @@ import (
 	"math/big"
 	"strings"
 
+	_ "github.com/lib/pq"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
@@ -34,6 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
+	"database/sql"
 )
 
 //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go
@@ -136,6 +138,36 @@ func (e *GenesisMismatchError) Error() string {
 	return fmt.Sprintf("database already contains an incompatible genesis block (have %x, new %x)", e.Stored[:8], e.New[:8])
 }
 
+//WriteShyftGen writes the genesis block to Shyft db
+//@NOTE:SHYFT
+func WriteShyftGen(sqldb *sql.DB, gen *Genesis) {
+	if sqldb == nil {
+		log.Info("Initializing Shyft Postgres DB")
+		connStr := "user=postgres dbname=shyftdb sslmode=disable"
+		blockExplorerDb, _ := sql.Open("postgres", connStr)
+		sqldb = blockExplorerDb
+	}
+
+	for k := range gen.Alloc {
+		addr := k.String()
+		var response string
+		sqlExistsStatement := `SELECT balance from accounts WHERE addr = ($1)`
+		err := sqldb.QueryRow(sqlExistsStatement, addr).Scan(&response)
+	switch {
+	case err == sql.ErrNoRows:
+		for k, v := range gen.Alloc {
+			addr := k.String()
+
+			sqlStatement := `INSERT INTO accounts(addr, balance) VALUES(($1), ($2)) RETURNING addr`
+			insertErr := sqldb.QueryRow(sqlStatement, addr, v.Balance.String()).Scan(&addr)
+			if insertErr != nil {
+				panic(insertErr)
+			}
+		}
+	default:
+		log.Info("Found Genesis Block")
+}}}
+
 // SetupGenesisBlock writes or updates the genesis block in db.
 // The block that will be used is:
 //
@@ -149,7 +181,7 @@ func (e *GenesisMismatchError) Error() string {
 // error is a *params.ConfigCompatError and the new, unwritten config is returned.
 //
 // The returned chain configuration is never nil.
-func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig, common.Hash, error) {
+func SetupGenesisBlock(db ethdb.Database, genesis *Genesis, sqldb *sql.DB) (*params.ChainConfig, common.Hash, error) {
 	if genesis != nil && genesis.Config == nil {
 		return params.AllEthashProtocolChanges, common.Hash{}, errGenesisNoConfig
 	}
@@ -162,6 +194,8 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig
 			genesis = DefaultGenesisBlock()
 		} else {
 			log.Info("Writing custom genesis block")
+			//@NOTE:SHYFT WRITE TO DB
+			WriteShyftGen(sqldb, genesis)
 		}
 		block, err := genesis.Commit(db)
 		return genesis.Config, block.Hash(), err
@@ -218,7 +252,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 (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
@@ -343,7 +376,6 @@ func DefaultRinkebyGenesisBlock() *Genesis {
 		Alloc:      decodePrealloc(rinkebyAllocData),
 	}
 }
-
 // DeveloperGenesisBlock returns the 'geth --dev' genesis block. Note, this must
 // be seeded with the
 func DeveloperGenesisBlock(period uint64, faucet common.Address) *Genesis {

core/genesis_test.go

@@ -62,7 +62,7 @@ func TestSetupGenesis(t *testing.T) {
 		{
 			name: "genesis without ChainConfig",
 			fn: func(db ethdb.Database) (*params.ChainConfig, common.Hash, error) {
-				return SetupGenesisBlock(db, new(Genesis))
+				return SetupGenesisBlock(db, new(Genesis), nil)
 			},
 			wantErr:    errGenesisNoConfig,
 			wantConfig: params.AllEthashProtocolChanges,
@@ -70,7 +70,7 @@ func TestSetupGenesis(t *testing.T) {
 		{
 			name: "no block in DB, genesis == nil",
 			fn: func(db ethdb.Database) (*params.ChainConfig, common.Hash, error) {
-				return SetupGenesisBlock(db, nil)
+				return SetupGenesisBlock(db, nil, nil)
 			},
 			wantHash:   params.MainnetGenesisHash,
 			wantConfig: params.MainnetChainConfig,
@@ -79,7 +79,7 @@ func TestSetupGenesis(t *testing.T) {
 			name: "mainnet block in DB, genesis == nil",
 			fn: func(db ethdb.Database) (*params.ChainConfig, common.Hash, error) {
 				DefaultGenesisBlock().MustCommit(db)
-				return SetupGenesisBlock(db, nil)
+				return SetupGenesisBlock(db, nil, nil)
 			},
 			wantHash:   params.MainnetGenesisHash,
 			wantConfig: params.MainnetChainConfig,
@@ -88,7 +88,7 @@ func TestSetupGenesis(t *testing.T) {
 			name: "custom block in DB, genesis == nil",
 			fn: func(db ethdb.Database) (*params.ChainConfig, common.Hash, error) {
 				customg.MustCommit(db)
-				return SetupGenesisBlock(db, nil)
+				return SetupGenesisBlock(db, nil, nil)
 			},
 			wantHash:   customghash,
 			wantConfig: customg.Config,
@@ -97,7 +97,7 @@ func TestSetupGenesis(t *testing.T) {
 			name: "custom block in DB, genesis == testnet",
 			fn: func(db ethdb.Database) (*params.ChainConfig, common.Hash, error) {
 				customg.MustCommit(db)
-				return SetupGenesisBlock(db, DefaultTestnetGenesisBlock())
+				return SetupGenesisBlock(db, DefaultTestnetGenesisBlock(), nil)
 			},
 			wantErr:    &GenesisMismatchError{Stored: customghash, New: params.TestnetGenesisHash},
 			wantHash:   params.TestnetGenesisHash,
@@ -107,7 +107,7 @@ func TestSetupGenesis(t *testing.T) {
 			name: "compatible config in DB",
 			fn: func(db ethdb.Database) (*params.ChainConfig, common.Hash, error) {
 				oldcustomg.MustCommit(db)
-				return SetupGenesisBlock(db, &customg)
+				return SetupGenesisBlock(db, &customg, nil)
 			},
 			wantHash:   customghash,
 			wantConfig: customg.Config,
@@ -126,7 +126,7 @@ func TestSetupGenesis(t *testing.T) {
 				bc.InsertChain(blocks)
 				bc.CurrentBlock()
 				// This should return a compatibility error.
-				return SetupGenesisBlock(db, &customg)
+				return SetupGenesisBlock(db, &customg, nil)
 			},
 			wantHash:   customghash,
 			wantConfig: customg.Config,

eth/backend.go

@@ -125,7 +125,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 		return nil, err
 	}
 	stopDbUpgrade := upgradeDeduplicateData(chainDb)
-	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis)
+	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis, blockExplorerDb)
 	if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
 		return nil, genesisErr
 	}

les/backend.go

@@ -84,7 +84,7 @@ func New(ctx *node.ServiceContext, config *eth.Config) (*LightEthereum, error) {
 	if err != nil {
 		return nil, err
 	}
-	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis)
+	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis, nil)
 	if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat {
 		return nil, genesisErr
 	}

shyftdb/shyft_database_util.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/big"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 
+
 	"database/sql"
 
 	"log"
@@ -87,15 +87,15 @@ type SendAndReceive struct {
 func WriteBlock(sqldb *sql.DB, block *types.Block) error {
 	coinbase := block.Header().Coinbase.String()
 	number := block.Header().Number.String()
-
 	sqlStatement := `INSERT INTO blocks(hash, coinbase, number) VALUES(($1), ($2), ($3)) RETURNING number`
 	qerr := sqldb.QueryRow(sqlStatement, block.Header().Hash().Hex(), coinbase, number).Scan(&number)
 	if qerr != nil {
 		panic(qerr)
 	}
 
-	if block.Transactions().Len() > 0 {
+	if block.Transactions().Len() > 0 && block.Transactions()[0].To() != nil {
 		for _, tx := range block.Transactions() {
+			//WriteMinerRewards(sqldb, block)
 			WriteTransactions(sqldb, tx, block.Header().Hash())
 			WriteFromBalance(sqldb, tx)
 		}
@@ -161,7 +161,6 @@ func WriteFromBalance(sqldb *sql.DB, tx *types.Transaction) error {
 	err := sqldb.QueryRow(sqlExistsStatement, toAddr).Scan(&response)
 	switch {
 	case err == sql.ErrNoRows:
-		fmt.Println("No rows error :)")
 
 		sqlStatement := `INSERT INTO accounts(addr, balance) VALUES(($1), ($2)) RETURNING addr`
 		insertErr := sqldb.QueryRow(sqlStatement, toAddr, amount).Scan(&toAddr)
@@ -233,20 +232,34 @@ func WriteBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, s
 	return sendAndReceiveData, balanceReceiver, balanceSender
 }
 
+//func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
+//	var totalGas big.Int
+//	//var txs []string
+//
+//	fmt.Println("this is BLOCK.UNCLE", block.Uncles())
+//	fmt.Println("this is BLOCK UNCLE HASH", block.UncleHash().String())
+//	fmt.Println("this is BLOCK.TRANSACTIONS", block.Transactions())
+//	fmt.Println("this is BLOCK TOTAL GAS", block.GasUsed())
+//
+//	for _, tx := range block.Transactions() {
+//		totalGas.Add(&totalGas, new(big.Int).Mul(tx.GasPrice(), new(big.Int).SetUint64(tx.Gas())))
+//		}
+//}
+
 // @NOTE: This function is extremely complex and requires heavy testing and knowdlege of edge cases:
 // uncle blocks, account balance updates based on reorgs, diverges that get dropped.
 // Reason for this is because the accounts are not deterministic like the block and tx hashes.
 // @TODO: Calculate reward if there are uncles
 // @TODO: Calculate mining reward (most likely retrieve higher up in the operations)
 // @TODO: Calculate reorg
-// func WriteMinerReward(db *leveldb.DB, block *types.Block) {
+//func WriteMinerReward(db *leveldb.DB, block *types.Block) {
 //	var totalGas *big.Int
 //	var txs []string
 //	key := append([]byte("acc-")[:], block.Coinbase().Hash().Bytes()[:]...)
 //	for _, tx := range block.Transactions() {
 //		totalGas.Add(totalGas, new(big.Int).Mul(tx.GasPrice(), new(big.Int).SetUint64(tx.Gas())))
 //	}
-// 	retrievedData, err := db.Get(key, nil)
+////	retrievedData, err := db.Get(key, nil)
 //	if err != nil {
 //		// Assume time this account has had a tx
 //		// Balacne is exclusively minerreward + total gas from the block b/c no prior evm activity
@@ -289,7 +302,9 @@ func WriteBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, s
 //			log.Crit("Could not update miner account data", "err", err)
 //		}
 //	}
-// }
+//}
+
+
 
 ///////////
 // Getters
@@ -477,7 +492,7 @@ func GetAllAccounts(sqldb *sql.DB) string {
 	}
 
 	defer accs.Close()
-	////
+
 	for accs.Next() {
 		var addr string
 		var balance string

simulations/sendTransactions.js

@@ -2,28 +2,28 @@ var firstAccount = web3.eth.accounts[0]
 var secondAccount = web3.eth.accounts[1] 
 var thirdAccount = web3.eth.accounts[2]
 
-for (var i = 0; i < 10; i++) {
+for (var i = 0; i < 1; i++) {
   console.log('\t\t' + (i + 1) + ' - Transactions')
     web3.eth.sendTransaction({
-        from: web3.eth.accounts[2],
+        from: web3.eth.accounts[1],
-        to: web3.eth.accounts[0],
+        to: web3.eth.accounts[2],
         value: 5,
         gas: 50000,
         gasPrice: 20
     });
-    web3.eth.sendTransaction({
+    // web3.eth.sendTransaction({
-        from: web3.eth.accounts[1],
+    //     from: web3.eth.accounts[1],
-        to: web3.eth.accounts[2],
+    //     to: web3.eth.accounts[2],
-        value: 291,
+    //     value: 291,
-        gas: 50000,
+    //     gas: 50000,
-        gasPrice: 20
+    //     gasPrice: 20
-    });
+    // });
-
+    //
-    web3.eth.sendTransaction({
+    // web3.eth.sendTransaction({
-        from: web3.eth.accounts[0],
+    //     from: web3.eth.accounts[0],
-        to: web3.eth.accounts[1],
+    //     to: web3.eth.accounts[1],
-        value: 53039,
+    //     value: 53039,
-        gas: 50000,
+    //     gas: 50000,
-        gasPrice: 20
+    //     gasPrice: 20
-    });
+    // });
 }

startShyftGeth.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-./build/bin/geth --config config.toml --nat=none --mine --minerthreads 4 --targetgaslimit 80000000 --unlock "0x43EC6d0942f7fAeF069F7F63D0384a27f529B062,0x9e602164C5826ebb5A6B68E4AFD9Cd466043dc4A,0x5Bd738164C61FB50eb12E227846CbaeF2dE965Aa,0xC04eE4131895F1d0C294D508AF65D94060AA42BB,0x07D899C4aC0c1725C35C5f816e60273B33a964F7" --password ./unlockPasswords.txt
+./build/bin/geth --config config.toml --ws --wsaddr="0.0.0.0" --wsorigins "*" --nat=none --mine --minerthreads 4 --targetgaslimit 80000000 --unlock "0x43EC6d0942f7fAeF069F7F63D0384a27f529B062,0x9e602164C5826ebb5A6B68E4AFD9Cd466043dc4A,0x5Bd738164C61FB50eb12E227846CbaeF2dE965Aa,0xC04eE4131895F1d0C294D508AF65D94060AA42BB,0x07D899C4aC0c1725C35C5f816e60273B33a964F7" --password ./unlockPasswords.txt

vendor/vendor.json

@@ -417,6 +417,10 @@
 			"revision": "ed27b6fd65218132ee50cd95f38474a3d8a2cd12",
 			"revisionTime": "2016-06-18T19:32:21Z"
 		},
+		{
+			"path": "github.com/shyft/shyft_go-ethereum/core",
+			"revision": ""
+		},
 		{
 			"checksumSHA1": "mGbTYZ8dHVTiPTTJu3ktp+84pPI=",
 			"path": "github.com/stretchr/testify/assert",