aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-02-09 05:07:17 +0800
committerobscuren <geffobscura@gmail.com>2014-02-09 05:07:17 +0800
commitf1ba1df16565614fdf04392463191f9c276270d4 (patch)
tree6a7dbdcb55601d64f0f929b5137af8825a66e6a3 /ethereum.go
parent827f341c97e9243b0c04a2fbde363b949bc3215d (diff)
downloaddexon-f1ba1df16565614fdf04392463191f9c276270d4.tar
dexon-f1ba1df16565614fdf04392463191f9c276270d4.tar.gz
dexon-f1ba1df16565614fdf04392463191f9c276270d4.tar.bz2
dexon-f1ba1df16565614fdf04392463191f9c276270d4.tar.lz
dexon-f1ba1df16565614fdf04392463191f9c276270d4.tar.xz
dexon-f1ba1df16565614fdf04392463191f9c276270d4.tar.zst
dexon-f1ba1df16565614fdf04392463191f9c276270d4.zip
Added key address and key generation
Diffstat (limited to 'ethereum.go')
-rw-r--r--ethereum.go62
1 files changed, 41 insertions, 21 deletions
diff --git a/ethereum.go b/ethereum.go
index 659134ffd..674f7d88c 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -2,12 +2,11 @@ package main
import (
"encoding/hex"
- "flag"
"fmt"
"github.com/ethereum/eth-go"
"github.com/ethereum/ethchain-go"
"github.com/ethereum/ethutil-go"
- _ "github.com/ethereum/ethwire-go"
+ "github.com/obscuren/secp256k1-go"
"log"
"os"
"os/signal"
@@ -16,22 +15,6 @@ import (
const Debug = true
-var StartConsole bool
-var StartMining bool
-var UseUPnP bool
-var OutboundPort string
-var ShowGenesis bool
-
-func Init() {
- flag.BoolVar(&StartConsole, "c", false, "debug and testing console")
- flag.BoolVar(&StartMining, "m", false, "start dagger mining")
- flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits")
- flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
- flag.StringVar(&OutboundPort, "port", "30303", "listening port")
-
- flag.Parse()
-}
-
// Register interrupt handlers so we can stop the ethereum
func RegisterInterupts(s *eth.Ethereum) {
// Buffered chan of one is enough
@@ -47,6 +30,17 @@ func RegisterInterupts(s *eth.Ethereum) {
}()
}
+func CreateKeyPair(force bool) {
+ data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
+ if len(data) == 0 || force {
+ log.Println("Generating new address and keypair")
+
+ pub, prv := secp256k1.GenerateKeyPair()
+
+ ethutil.Config.Db.Put([]byte("KeyRing"), prv)
+ }
+}
+
func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
Init()
@@ -57,10 +51,31 @@ func main() {
// Instantiated a eth stack
ethereum, err := eth.New(eth.CapDefault, UseUPnP)
if err != nil {
- log.Println(err)
+ log.Println("eth start err:", err)
return
}
+ if GenAddr {
+ fmt.Println("This action overwrites your old private key. Are you sure? (y/n)")
+
+ var r string
+ fmt.Scanln(&r)
+ for ; ; fmt.Scanln(&r) {
+ if r == "n" || r == "y" {
+ break
+ } else {
+ fmt.Println("Yes or no?", r)
+ }
+ }
+
+ if r == "y" {
+ CreateKeyPair(true)
+ }
+ os.Exit(0)
+ } else {
+ CreateKeyPair(false)
+ }
+
if ShowGenesis {
fmt.Println(ethereum.BlockManager.BlockChain().Genesis())
os.Exit(0)
@@ -68,6 +83,9 @@ func main() {
log.Printf("Starting Ethereum v%s\n", ethutil.Config.Ver)
+ // Set the max peers
+ ethereum.MaxPeers = MaxPeer
+
if StartConsole {
err := os.Mkdir(ethutil.Config.ExecPath, os.ModePerm)
// Error is OK if the error is ErrExist
@@ -97,14 +115,16 @@ func main() {
block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs)
// Apply all transactions to the block
ethereum.BlockManager.ApplyTransactions(block, block.Transactions())
+
+ ethereum.BlockManager.AccumelateRewards(block, block)
+
// Search the nonce
block.Nonce = pow.Search(block)
err := ethereum.BlockManager.ProcessBlock(block)
if err != nil {
log.Println(err)
} else {
- //ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.RlpValue().Value})
- log.Println("\n+++++++ MINED BLK +++++++\n", block.String())
+ log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockManager.BlockChain().CurrentBlock)
}
}
}()