aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-01-31 06:50:15 +0800
committerobscuren <geffobscura@gmail.com>2014-01-31 06:50:15 +0800
commite28632b997b4097fb6f899067ead02b90d9b887b (patch)
tree5f551ab82f5e1721314cdaf019b90835906a1dec
parent8f16b6650709b4b5c48bb4c473793b23be557bbc (diff)
downloaddexon-e28632b997b4097fb6f899067ead02b90d9b887b.tar.gz
dexon-e28632b997b4097fb6f899067ead02b90d9b887b.tar.zst
dexon-e28632b997b4097fb6f899067ead02b90d9b887b.zip
Mine?
-rw-r--r--dev_console.go4
-rw-r--r--ethereum.go46
2 files changed, 29 insertions, 21 deletions
diff --git a/dev_console.go b/dev_console.go
index 106c372f2..39176eeba 100644
--- a/dev_console.go
+++ b/dev_console.go
@@ -124,8 +124,8 @@ func (i *Console) ParseInput(input string) bool {
ethutil.BigPow(2, 36), // diff
ethutil.Big(tokens[2]))) // nonce
case "decode":
- d, _ := ethutil.Decode([]byte(tokens[1]), 0)
- fmt.Printf("%q\n", d)
+ value := ethutil.NewRlpDecoder([]byte(tokens[1]))
+ fmt.Println(value)
case "getaddr":
encoded, _ := hex.DecodeString(tokens[1])
d := i.ethereum.BlockManager.BlockChain().CurrentBlock.State().Get(string(encoded))
diff --git a/ethereum.go b/ethereum.go
index 2ffb6c929..810c30f49 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -8,7 +8,6 @@ import (
"github.com/ethereum/ethutil-go"
_ "github.com/ethereum/ethwire-go"
"log"
- "math/big"
"os"
"os/signal"
"path"
@@ -89,26 +88,35 @@ func main() {
// Fake block mining. It broadcasts a new block every 5 seconds
go func() {
- for {
-
- time.Sleep(blockTime * time.Second)
+ pow := &ethchain.EasyPow{}
+ for {
txs := ethereum.TxPool.Flush()
-
- block := ethchain.CreateBlock(
- ethereum.BlockManager.BlockChain().CurrentBlock.State().Root,
- ethereum.BlockManager.BlockChain().LastBlockHash,
- "123",
- big.NewInt(1),
- big.NewInt(1),
- "",
- txs)
- err := ethereum.BlockManager.ProcessBlockWithState(block, block.State())
- if err != nil {
- log.Println(err)
- } else {
- //log.Println("\n+++++++ MINED BLK +++++++\n", block.String())
- }
+ block := ethereum.BlockManager.BlockChain().NewBlock("82c3b0b72cf62f1a9ce97c64da8072efa28225d8", txs)
+
+ nonce := pow.Search(block)
+ block.Nonce = nonce
+
+ log.Println("nonce found:", nonce)
+ /*
+ time.Sleep(blockTime * time.Second)
+
+
+ block := ethchain.CreateBlock(
+ ethereum.BlockManager.BlockChain().CurrentBlock.State().Root,
+ ethereum.BlockManager.BlockChain().LastBlockHash,
+ "123",
+ big.NewInt(1),
+ big.NewInt(1),
+ "",
+ txs)
+ err := ethereum.BlockManager.ProcessBlockWithState(block, block.State())
+ if err != nil {
+ log.Println(err)
+ } else {
+ //log.Println("\n+++++++ MINED BLK +++++++\n", block.String())
+ }
+ */
}
}()
}