poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Process transactions

This commit is contained in:
obscuren 2014-02-03 02:01:31 +01:00
parent ec883db3b1
commit 5e36e3ccc7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev_console.go
View File

@ -144,11 +144,15 @@ func (i *Console) ParseInput(input string) bool {
case "encode": case "encode":
fmt.Printf("%q\n", ethutil.Encode(tokens[1])) fmt.Printf("%q\n", ethutil.Encode(tokens[1]))
case "tx": case "tx":
recipient, _ := hex.DecodeString(tokens[1]) recipient, err := hex.DecodeString(tokens[1])
tx := ethchain.NewTransaction(recipient, ethutil.Big(tokens[2]), []string{""}) if err != nil {
fmt.Printf("%x\n", tx.Hash()) fmt.Println("recipient err:", err)
} else {
tx := ethchain.NewTransaction(recipient, ethutil.Big(tokens[2]), []string{""})
fmt.Printf("%x\n", tx.Hash())
i.ethereum.TxPool.QueueTransaction(tx)
}
i.ethereum.TxPool.QueueTransaction(tx)
case "gettx": case "gettx":
addr, _ := hex.DecodeString(tokens[1]) addr, _ := hex.DecodeString(tokens[1])
data, _ := ethutil.Config.Db.Get(addr) data, _ := ethutil.Config.Db.Get(addr)

12
ethereum.go
View File

@ -7,6 +7,7 @@ import (
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/ethchain-go" "github.com/ethereum/ethchain-go"
"github.com/ethereum/ethutil-go" "github.com/ethereum/ethutil-go"
"github.com/ethereum/ethwire-go"
"log" "log"
"os" "os"
"os/signal" "os/signal"
@ -88,16 +89,11 @@ func main() {
// Create a new block which we're going to mine // Create a new block which we're going to mine
block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs) block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs)
// Apply all transactions to the block // Apply all transactions to the block
ethereum.BlockManager.ApplyTransactions(block) ethereum.BlockManager.ApplyTransactions(block, block.Transactions())
// Search the nonce // Search the nonce
block.Nonce = pow.Search(block) block.Nonce = pow.Search(block)
// Process the block and verify ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.RlpValue().Value})
err := ethereum.BlockManager.ProcessBlock(block) log.Println("\n+++++++ MINED BLK +++++++\n", block.String())
if err != nil {
log.Println(err)
} else {
log.Println("\n+++++++ MINED BLK +++++++\n", block.String())
}
} }
}() }()
} }