Compare commits
20 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0d89c1d212 | ||
|
818bc84591 | ||
|
b42c70be9c | ||
|
d35380c19e | ||
|
5f8911f7cb | ||
|
01b833146f | ||
|
b902de20c7 | ||
|
3f5b348451 | ||
|
941e0ba60a | ||
|
7f1a4c377c | ||
|
3ddaf56afd | ||
|
10e2c40b59 | ||
|
68f4a12a8b | ||
|
16bd88c10a | ||
|
d16d56d39f | ||
|
93e12250c7 | ||
|
f4551a7e9f | ||
|
563c035eb5 | ||
|
de1dfae717 | ||
|
4198969302 |
31
README.md
31
README.md
@@ -5,7 +5,7 @@ Ethereum
|
|||||||
|
|
||||||
Ethereum Go Client © 2014 Jeffrey Wilcke.
|
Ethereum Go Client © 2014 Jeffrey Wilcke.
|
||||||
|
|
||||||
Current state: Proof of Concept 5.0 RC7.
|
Current state: Proof of Concept 5.0 RC9.
|
||||||
|
|
||||||
For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).
|
For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).
|
||||||
|
|
||||||
@@ -26,28 +26,25 @@ General command line options
|
|||||||
====================
|
====================
|
||||||
|
|
||||||
```
|
```
|
||||||
-c Launch the developer console (node only)
|
Shared between ethereum and ethereal
|
||||||
-m Start mining blocks
|
-m Start mining blocks
|
||||||
-genaddr Generates a new address and private key (destructive action)
|
-genaddr Generates a new address and private key (destructive action)
|
||||||
-p Port on which the server will accept incomming connections (= 30303)
|
-p Port on which the server will accept incomming connections
|
||||||
-upnp Enable UPnP (= false)
|
-upnp Enable UPnP
|
||||||
-x Desired amount of peers (= 5)
|
-x Desired amount of peers
|
||||||
-h This help
|
|
||||||
-r Start JSON RPC
|
-r Start JSON RPC
|
||||||
-dir Data directory used to store configs and databases (=".ethereum")
|
-dir Data directory used to store configs and databases
|
||||||
-import Import a private key (hex)
|
-import Import a private key
|
||||||
```
|
-h This
|
||||||
|
|
||||||
Developer console commands
|
Ethereum only
|
||||||
==========================
|
ethereum [options] [filename]
|
||||||
|
-js Start the JavaScript REPL
|
||||||
|
filename Load the given file and interpret as JavaScript
|
||||||
|
|
||||||
|
Etheral only
|
||||||
|
-asset_path absolute path to GUI assets directory
|
||||||
```
|
```
|
||||||
addp <host>:<port> Connect to the given host
|
|
||||||
tx <addr> <amount> Send <amount> Wei to the specified <addr>
|
|
||||||
contract <value> <gasprice> Creates a new contract and launches the editor
|
|
||||||
```
|
|
||||||
|
|
||||||
See the "help" command for *developer* options.
|
|
||||||
|
|
||||||
Contribution
|
Contribution
|
||||||
============
|
============
|
||||||
|
@@ -67,6 +67,7 @@ ApplicationWindow {
|
|||||||
networkView.visible = false
|
networkView.visible = false
|
||||||
historyView.visible = false
|
historyView.visible = false
|
||||||
newTxView.visible = false
|
newTxView.visible = false
|
||||||
|
infoView.visible = false
|
||||||
view.visible = true
|
view.visible = true
|
||||||
//root.title = "Ethereal - " = view.title
|
//root.title = "Ethereal - " = view.title
|
||||||
}
|
}
|
||||||
@@ -84,7 +85,6 @@ ApplicationWindow {
|
|||||||
//color: "#D9DDE7"
|
//color: "#D9DDE7"
|
||||||
color: "#252525"
|
color: "#252525"
|
||||||
|
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
y: 50
|
y: 50
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
@@ -120,6 +120,17 @@ ApplicationWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Image {
|
||||||
|
source: ui.assetPath("net.png")
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
onClicked: {
|
||||||
|
setView(infoView)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,6 +154,7 @@ ApplicationWindow {
|
|||||||
TableView {
|
TableView {
|
||||||
id: txTableView
|
id: txTableView
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
TableViewColumn{ role: "inout" ; title: "" ; width: 40 }
|
||||||
TableViewColumn{ role: "value" ; title: "Value" ; width: 100 }
|
TableViewColumn{ role: "value" ; title: "Value" ; width: 100 }
|
||||||
TableViewColumn{ role: "address" ; title: "Address" ; width: 430 }
|
TableViewColumn{ role: "address" ; title: "Address" ; width: 430 }
|
||||||
TableViewColumn{ role: "contract" ; title: "Contract" ; width: 100 }
|
TableViewColumn{ role: "contract" ; title: "Contract" ; width: 100 }
|
||||||
@@ -217,6 +229,33 @@ ApplicationWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: infoView
|
||||||
|
property var title: "Information"
|
||||||
|
visible: false
|
||||||
|
color: "#00000000"
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
|
Label {
|
||||||
|
id: addressLabel
|
||||||
|
text: "Address"
|
||||||
|
anchors {
|
||||||
|
margins: 5
|
||||||
|
top: parent.top
|
||||||
|
left: parent.left
|
||||||
|
}
|
||||||
|
}
|
||||||
|
TextField {
|
||||||
|
anchors {
|
||||||
|
margins: 5
|
||||||
|
left: addressLabel.right
|
||||||
|
top: parent.top
|
||||||
|
}
|
||||||
|
text: pub.getKey().address
|
||||||
|
width: 500
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
signal addPlugin(string name)
|
signal addPlugin(string name)
|
||||||
Component {
|
Component {
|
||||||
@@ -365,7 +404,7 @@ ApplicationWindow {
|
|||||||
anchors.left: aboutIcon.right
|
anchors.left: aboutIcon.right
|
||||||
anchors.leftMargin: 10
|
anchors.leftMargin: 10
|
||||||
font.pointSize: 12
|
font.pointSize: 12
|
||||||
text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br><h3>Binary Distribution</h3>Jarrad Hope<br>"
|
text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -390,7 +429,6 @@ ApplicationWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
SplitView {
|
SplitView {
|
||||||
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
property var asmModel: ListModel {
|
property var asmModel: ListModel {
|
||||||
id: asmModel
|
id: asmModel
|
||||||
@@ -485,14 +523,14 @@ ApplicationWindow {
|
|||||||
walletValueLabel.text = value
|
walletValueLabel.text = value
|
||||||
}
|
}
|
||||||
|
|
||||||
function addTx(tx) {
|
function addTx(tx, inout) {
|
||||||
var isContract
|
var isContract
|
||||||
if (tx.contract == true){
|
if (tx.contract == true){
|
||||||
isContract = "Yes"
|
isContract = "Yes"
|
||||||
}else{
|
}else{
|
||||||
isContract = "No"
|
isContract = "No"
|
||||||
}
|
}
|
||||||
txModel.insert(0, {hash: tx.hash, address: tx.address, value: tx.value, contract: isContract})
|
txModel.insert(0, {inout: inout, hash: tx.hash, address: tx.address, value: tx.value, contract: isContract})
|
||||||
}
|
}
|
||||||
|
|
||||||
function addBlock(block) {
|
function addBlock(block) {
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
var jefcoinAddr = "739105c31705038744d190332e3a07c8fea8a9eb"
|
var jefcoinAddr = "fc0a9436890478bb9b1c6ed7455c2535366f4a99"
|
||||||
var mAddr = ""
|
var mAddr = ""
|
||||||
|
|
||||||
function createTransaction() {
|
function createTransaction() {
|
||||||
|
@@ -4,6 +4,7 @@ import (
|
|||||||
"flag"
|
"flag"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var Identifier string
|
||||||
var StartConsole bool
|
var StartConsole bool
|
||||||
var StartMining bool
|
var StartMining bool
|
||||||
var StartRpc bool
|
var StartRpc bool
|
||||||
@@ -21,6 +22,7 @@ var DataDir string
|
|||||||
var AssetPath string
|
var AssetPath string
|
||||||
|
|
||||||
func Init() {
|
func Init() {
|
||||||
|
flag.StringVar(&Identifier, "i", "", "Custom client identifier")
|
||||||
flag.BoolVar(&StartConsole, "c", false, "debug and testing console")
|
flag.BoolVar(&StartConsole, "c", false, "debug and testing console")
|
||||||
flag.BoolVar(&StartMining, "m", false, "start dagger mining")
|
flag.BoolVar(&StartMining, "m", false, "start dagger mining")
|
||||||
flag.BoolVar(&StartRpc, "r", false, "start rpc server")
|
flag.BoolVar(&StartRpc, "r", false, "start rpc server")
|
||||||
|
@@ -39,7 +39,7 @@ func main() {
|
|||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
|
||||||
ethchain.InitFees()
|
ethchain.InitFees()
|
||||||
ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd)
|
ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd, Identifier)
|
||||||
|
|
||||||
// Instantiated a eth stack
|
// Instantiated a eth stack
|
||||||
ethereum, err := eth.New(eth.CapDefault, UseUPnP)
|
ethereum, err := eth.New(eth.CapDefault, UseUPnP)
|
||||||
|
@@ -9,7 +9,6 @@ import (
|
|||||||
"github.com/ethereum/eth-go/ethpub"
|
"github.com/ethereum/eth-go/ethpub"
|
||||||
"github.com/ethereum/eth-go/ethutil"
|
"github.com/ethereum/eth-go/ethutil"
|
||||||
"github.com/go-qml/qml"
|
"github.com/go-qml/qml"
|
||||||
"github.com/obscuren/mutan"
|
|
||||||
"math/big"
|
"math/big"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
@@ -55,7 +54,7 @@ func New(ethereum *eth.Ethereum) *Gui {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (gui *Gui) Start(assetPath string) {
|
func (gui *Gui) Start(assetPath string) {
|
||||||
const version = "0.5.0 RC7"
|
const version = "0.5.0 RC9"
|
||||||
|
|
||||||
defer gui.txDb.Close()
|
defer gui.txDb.Close()
|
||||||
|
|
||||||
@@ -74,6 +73,7 @@ func (gui *Gui) Start(assetPath string) {
|
|||||||
|
|
||||||
// Expose the eth library and the ui library to QML
|
// Expose the eth library and the ui library to QML
|
||||||
context.SetVar("eth", gui)
|
context.SetVar("eth", gui)
|
||||||
|
context.SetVar("pub", gui.pub)
|
||||||
gui.uiLib = NewUiLib(gui.engine, gui.eth, assetPath)
|
gui.uiLib = NewUiLib(gui.engine, gui.eth, assetPath)
|
||||||
context.SetVar("ui", gui.uiLib)
|
context.SetVar("ui", gui.uiLib)
|
||||||
|
|
||||||
@@ -151,7 +151,15 @@ func (gui *Gui) readPreviousTransactions() {
|
|||||||
for it.Next() {
|
for it.Next() {
|
||||||
tx := ethchain.NewTransactionFromBytes(it.Value())
|
tx := ethchain.NewTransactionFromBytes(it.Value())
|
||||||
|
|
||||||
gui.win.Root().Call("addTx", ethpub.NewPTx(tx))
|
var inout string
|
||||||
|
if bytes.Compare(tx.Sender(), gui.addr) == 0 {
|
||||||
|
inout = "send"
|
||||||
|
} else {
|
||||||
|
inout = "recv"
|
||||||
|
}
|
||||||
|
|
||||||
|
gui.win.Root().Call("addTx", ethpub.NewPTx(tx), inout)
|
||||||
|
|
||||||
}
|
}
|
||||||
it.Release()
|
it.Release()
|
||||||
}
|
}
|
||||||
@@ -164,7 +172,7 @@ func (gui *Gui) setWalletValue(amount, unconfirmedFunds *big.Int) {
|
|||||||
var str string
|
var str string
|
||||||
if unconfirmedFunds != nil {
|
if unconfirmedFunds != nil {
|
||||||
pos := "+"
|
pos := "+"
|
||||||
if unconfirmedFunds.Cmp(big.NewInt(0)) >= 0 {
|
if unconfirmedFunds.Cmp(big.NewInt(0)) < 0 {
|
||||||
pos = "-"
|
pos = "-"
|
||||||
}
|
}
|
||||||
val := ethutil.CurrencyToString(new(big.Int).Abs(ethutil.BigCopy(unconfirmedFunds)))
|
val := ethutil.CurrencyToString(new(big.Int).Abs(ethutil.BigCopy(unconfirmedFunds)))
|
||||||
@@ -206,18 +214,13 @@ func (gui *Gui) update() {
|
|||||||
if txMsg.Event == "newTx:pre" {
|
if txMsg.Event == "newTx:pre" {
|
||||||
object := state.GetAccount(gui.addr)
|
object := state.GetAccount(gui.addr)
|
||||||
|
|
||||||
if bytes.Compare(tx.Sender(), gui.addr) == 0 && object.Nonce <= tx.Nonce {
|
if bytes.Compare(tx.Sender(), gui.addr) == 0 {
|
||||||
gui.win.Root().Call("addTx", ethpub.NewPTx(tx))
|
gui.win.Root().Call("addTx", ethpub.NewPTx(tx), "send")
|
||||||
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
|
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
|
||||||
|
|
||||||
/*
|
|
||||||
object.Nonce += 1
|
|
||||||
state.SetStateObject(object)
|
|
||||||
*/
|
|
||||||
|
|
||||||
unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
|
unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
|
||||||
} else if bytes.Compare(tx.Recipient, gui.addr) == 0 {
|
} else if bytes.Compare(tx.Recipient, gui.addr) == 0 {
|
||||||
gui.win.Root().Call("addTx", ethpub.NewPTx(tx))
|
gui.win.Root().Call("addTx", ethpub.NewPTx(tx), "recv")
|
||||||
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
|
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
|
||||||
|
|
||||||
unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
|
unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
|
||||||
@@ -234,7 +237,7 @@ func (gui *Gui) update() {
|
|||||||
|
|
||||||
gui.setWalletValue(object.Amount, nil)
|
gui.setWalletValue(object.Amount, nil)
|
||||||
|
|
||||||
state.SetStateObject(object)
|
state.UpdateStateObject(object)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -266,7 +269,5 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.
|
|||||||
func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
|
func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
|
||||||
keyPair := ethutil.GetKeyRing().Get(0)
|
keyPair := ethutil.GetKeyRing().Get(0)
|
||||||
|
|
||||||
mainInput, initInput := mutan.PreParse(data)
|
return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, data)
|
||||||
|
|
||||||
return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, initInput, mainInput)
|
|
||||||
}
|
}
|
||||||
|
@@ -135,7 +135,7 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string)
|
|||||||
for _, str := range dis {
|
for _, str := range dis {
|
||||||
ui.win.Root().Call("setAsm", str)
|
ui.win.Root().Call("setAsm", str)
|
||||||
}
|
}
|
||||||
callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), callerScript, nil)
|
callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), nil)
|
||||||
|
|
||||||
// Contract addr as test address
|
// Contract addr as test address
|
||||||
keyPair := ethutil.GetKeyRing().Get(0)
|
keyPair := ethutil.GetKeyRing().Get(0)
|
||||||
|
@@ -2,8 +2,11 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var Identifier string
|
||||||
var StartMining bool
|
var StartMining bool
|
||||||
var StartRpc bool
|
var StartRpc bool
|
||||||
var RpcPort int
|
var RpcPort int
|
||||||
@@ -23,6 +26,12 @@ var StartJsConsole bool
|
|||||||
var InputFile string
|
var InputFile string
|
||||||
|
|
||||||
func Init() {
|
func Init() {
|
||||||
|
flag.Usage = func() {
|
||||||
|
fmt.Fprintf(os.Stderr, "%s [options] [filename]:\n", os.Args[0])
|
||||||
|
flag.PrintDefaults()
|
||||||
|
}
|
||||||
|
|
||||||
|
flag.StringVar(&Identifier, "i", "", "custom client identifier")
|
||||||
flag.BoolVar(&StartMining, "m", false, "start dagger mining")
|
flag.BoolVar(&StartMining, "m", false, "start dagger mining")
|
||||||
flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits")
|
flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits")
|
||||||
flag.BoolVar(&StartRpc, "r", false, "start rpc server")
|
flag.BoolVar(&StartRpc, "r", false, "start rpc server")
|
||||||
@@ -38,7 +47,8 @@ func Init() {
|
|||||||
flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)")
|
flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)")
|
||||||
flag.IntVar(&MaxPeer, "x", 10, "maximum desired peers")
|
flag.IntVar(&MaxPeer, "x", 10, "maximum desired peers")
|
||||||
flag.BoolVar(&StartJsConsole, "js", false, "exp")
|
flag.BoolVar(&StartJsConsole, "js", false, "exp")
|
||||||
flag.StringVar(&InputFile, "e", "", "Run javascript file")
|
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
|
InputFile = flag.Arg(0)
|
||||||
}
|
}
|
||||||
|
@@ -52,12 +52,15 @@ func main() {
|
|||||||
var logSys *log.Logger
|
var logSys *log.Logger
|
||||||
flags := log.LstdFlags
|
flags := log.LstdFlags
|
||||||
|
|
||||||
|
var lt ethutil.LoggerType
|
||||||
if StartJsConsole || len(InputFile) > 0 {
|
if StartJsConsole || len(InputFile) > 0 {
|
||||||
ethutil.ReadConfig(DataDir, ethutil.LogFile)
|
lt = ethutil.LogFile
|
||||||
} else {
|
} else {
|
||||||
ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd)
|
lt = ethutil.LogFile | ethutil.LogStd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ethutil.ReadConfig(DataDir, lt, Identifier)
|
||||||
|
|
||||||
logger := ethutil.Config.Log
|
logger := ethutil.Config.Log
|
||||||
|
|
||||||
if LogFile != "" {
|
if LogFile != "" {
|
||||||
|
@@ -6,7 +6,11 @@ import (
|
|||||||
"github.com/ethereum/eth-go/ethchain"
|
"github.com/ethereum/eth-go/ethchain"
|
||||||
"github.com/ethereum/eth-go/ethpub"
|
"github.com/ethereum/eth-go/ethpub"
|
||||||
"github.com/ethereum/eth-go/ethutil"
|
"github.com/ethereum/eth-go/ethutil"
|
||||||
"github.com/robertkrimen/otto"
|
"github.com/ethereum/go-ethereum/utils"
|
||||||
|
"github.com/obscuren/otto"
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
)
|
)
|
||||||
|
|
||||||
type JSRE struct {
|
type JSRE struct {
|
||||||
@@ -53,6 +57,22 @@ func (self *JSRE) Run(code string) (otto.Value, error) {
|
|||||||
return self.vm.Run(code)
|
return self.vm.Run(code)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *JSRE) Require(file string) error {
|
||||||
|
if len(filepath.Ext(file)) == 0 {
|
||||||
|
file += ".js"
|
||||||
|
}
|
||||||
|
|
||||||
|
fh, err := os.Open(file)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
content, _ := ioutil.ReadAll(fh)
|
||||||
|
self.Run("exports = {};(function() {" + string(content) + "})();")
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (self *JSRE) Stop() {
|
func (self *JSRE) Stop() {
|
||||||
// Kill the main loop
|
// Kill the main loop
|
||||||
self.quitChan <- true
|
self.quitChan <- true
|
||||||
@@ -82,7 +102,10 @@ out:
|
|||||||
cb.Call(cb, val)
|
cb.Call(cb, val)
|
||||||
}
|
}
|
||||||
} else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok {
|
} else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok {
|
||||||
fmt.Println(storageObject)
|
for _, cb := range self.objectCb[ethutil.Hex(storageObject.StateAddress)+ethutil.Hex(storageObject.Address)] {
|
||||||
|
val, _ := self.vm.ToValue(ethpub.NewPStorageState(storageObject))
|
||||||
|
cb.Call(cb, val)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -91,24 +114,77 @@ out:
|
|||||||
func (self *JSRE) initStdFuncs() {
|
func (self *JSRE) initStdFuncs() {
|
||||||
t, _ := self.vm.Get("eth")
|
t, _ := self.vm.Get("eth")
|
||||||
eth := t.Object()
|
eth := t.Object()
|
||||||
eth.Set("watch", func(call otto.FunctionCall) otto.Value {
|
eth.Set("watch", self.watch)
|
||||||
addr, _ := call.Argument(0).ToString()
|
eth.Set("addPeer", self.addPeer)
|
||||||
cb := call.Argument(1)
|
eth.Set("require", self.require)
|
||||||
|
eth.Set("stopMining", self.stopMining)
|
||||||
|
eth.Set("startMining", self.startMining)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The following methods are natively implemented javascript functions
|
||||||
|
*/
|
||||||
|
|
||||||
|
func (self *JSRE) stopMining(call otto.FunctionCall) otto.Value {
|
||||||
|
v, _ := self.vm.ToValue(utils.StopMining(self.ethereum))
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *JSRE) startMining(call otto.FunctionCall) otto.Value {
|
||||||
|
v, _ := self.vm.ToValue(utils.StartMining(self.ethereum))
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|
||||||
|
// eth.watch
|
||||||
|
func (self *JSRE) watch(call otto.FunctionCall) otto.Value {
|
||||||
|
addr, _ := call.Argument(0).ToString()
|
||||||
|
var storageAddr string
|
||||||
|
var cb otto.Value
|
||||||
|
var storageCallback bool
|
||||||
|
if len(call.ArgumentList) > 2 {
|
||||||
|
storageCallback = true
|
||||||
|
storageAddr, _ = call.Argument(1).ToString()
|
||||||
|
cb = call.Argument(2)
|
||||||
|
} else {
|
||||||
|
cb = call.Argument(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if storageCallback {
|
||||||
|
self.objectCb[addr+storageAddr] = append(self.objectCb[addr+storageAddr], cb)
|
||||||
|
|
||||||
|
event := "storage:" + string(ethutil.FromHex(addr)) + ":" + string(ethutil.FromHex(storageAddr))
|
||||||
|
self.ethereum.Reactor().Subscribe(event, self.changeChan)
|
||||||
|
} else {
|
||||||
self.objectCb[addr] = append(self.objectCb[addr], cb)
|
self.objectCb[addr] = append(self.objectCb[addr], cb)
|
||||||
|
|
||||||
event := "object:" + string(ethutil.FromHex(addr))
|
event := "object:" + string(ethutil.FromHex(addr))
|
||||||
self.ethereum.Reactor().Subscribe(event, self.changeChan)
|
self.ethereum.Reactor().Subscribe(event, self.changeChan)
|
||||||
|
}
|
||||||
|
|
||||||
return otto.UndefinedValue()
|
return otto.UndefinedValue()
|
||||||
})
|
}
|
||||||
eth.Set("addPeer", func(call otto.FunctionCall) otto.Value {
|
|
||||||
host, err := call.Argument(0).ToString()
|
func (self *JSRE) addPeer(call otto.FunctionCall) otto.Value {
|
||||||
if err != nil {
|
host, err := call.Argument(0).ToString()
|
||||||
return otto.FalseValue()
|
if err != nil {
|
||||||
}
|
return otto.FalseValue()
|
||||||
self.ethereum.ConnectToPeer(host)
|
}
|
||||||
|
self.ethereum.ConnectToPeer(host)
|
||||||
return otto.TrueValue()
|
|
||||||
})
|
return otto.TrueValue()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *JSRE) require(call otto.FunctionCall) otto.Value {
|
||||||
|
file, err := call.Argument(0).ToString()
|
||||||
|
if err != nil {
|
||||||
|
return otto.UndefinedValue()
|
||||||
|
}
|
||||||
|
if err := self.Require(file); err != nil {
|
||||||
|
fmt.Println("err:", err)
|
||||||
|
return otto.UndefinedValue()
|
||||||
|
}
|
||||||
|
|
||||||
|
t, _ := self.vm.Get("exports")
|
||||||
|
|
||||||
|
return t
|
||||||
}
|
}
|
||||||
|
@@ -4,7 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"github.com/ethereum/eth-go"
|
"github.com/ethereum/eth-go"
|
||||||
"github.com/ethereum/eth-go/ethpub"
|
"github.com/ethereum/eth-go/ethpub"
|
||||||
"github.com/robertkrimen/otto"
|
"github.com/obscuren/otto"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Repl interface {
|
type Repl interface {
|
||||||
@@ -48,11 +48,24 @@ func (self *JSRepl) parseInput(code string) {
|
|||||||
|
|
||||||
// The JSEthereum object attempts to wrap the PEthereum object and returns
|
// The JSEthereum object attempts to wrap the PEthereum object and returns
|
||||||
// meaningful javascript objects
|
// meaningful javascript objects
|
||||||
|
type JSBlock struct {
|
||||||
|
*ethpub.PBlock
|
||||||
|
eth *JSEthereum
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *JSBlock) GetTransaction(hash string) otto.Value {
|
||||||
|
return self.eth.toVal(self.PBlock.GetTransaction(hash))
|
||||||
|
}
|
||||||
|
|
||||||
type JSEthereum struct {
|
type JSEthereum struct {
|
||||||
*ethpub.PEthereum
|
*ethpub.PEthereum
|
||||||
vm *otto.Otto
|
vm *otto.Otto
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *JSEthereum) GetBlock(hash string) otto.Value {
|
||||||
|
return self.toVal(&JSBlock{self.PEthereum.GetBlock(hash), self})
|
||||||
|
}
|
||||||
|
|
||||||
func (self *JSEthereum) GetKey() otto.Value {
|
func (self *JSEthereum) GetKey() otto.Value {
|
||||||
return self.toVal(self.PEthereum.GetKey())
|
return self.toVal(self.PEthereum.GetKey())
|
||||||
}
|
}
|
||||||
@@ -72,8 +85,8 @@ func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr,
|
|||||||
return self.toVal(r)
|
return self.toVal(r)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (self *JSEthereum) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr string) otto.Value {
|
func (self *JSEthereum) Create(key, valueStr, gasStr, gasPriceStr, scriptStr string) otto.Value {
|
||||||
r, err := self.PEthereum.Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr)
|
r, err := self.PEthereum.Create(key, valueStr, gasStr, gasPriceStr, scriptStr)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
|
@@ -1,18 +1,42 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
|
// #cgo darwin CFLAGS: -I/usr/local/opt/readline/include
|
||||||
|
// #cgo darwin LDFLAGS: -L/usr/local/opt/readline/lib
|
||||||
// #cgo LDFLAGS: -lreadline
|
// #cgo LDFLAGS: -lreadline
|
||||||
// #include <stdio.h>
|
// #include <stdio.h>
|
||||||
// #include <stdlib.h>
|
// #include <stdlib.h>
|
||||||
// #include <readline/readline.h>
|
// #include <readline/readline.h>
|
||||||
// #include <readline/history.h>
|
// #include <readline/history.h>
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/robertkrimen/otto"
|
"os"
|
||||||
|
"os/signal"
|
||||||
"strings"
|
"strings"
|
||||||
|
"syscall"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func initReadLine() {
|
||||||
|
C.rl_catch_sigwinch = 0
|
||||||
|
C.rl_catch_signals = 0
|
||||||
|
c := make(chan os.Signal, 1)
|
||||||
|
signal.Notify(c, syscall.SIGWINCH)
|
||||||
|
signal.Notify(c, os.Interrupt)
|
||||||
|
go func() {
|
||||||
|
for sig := range c {
|
||||||
|
switch sig {
|
||||||
|
case syscall.SIGWINCH:
|
||||||
|
C.rl_resize_terminal()
|
||||||
|
|
||||||
|
case os.Interrupt:
|
||||||
|
C.rl_cleanup_after_signal()
|
||||||
|
default:
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
func readLine(prompt *string) *string {
|
func readLine(prompt *string) *string {
|
||||||
var p *C.char
|
var p *C.char
|
||||||
|
|
||||||
@@ -60,6 +84,7 @@ func (self *JSRepl) setIndent() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (self *JSRepl) read() {
|
func (self *JSRepl) read() {
|
||||||
|
initReadLine()
|
||||||
L:
|
L:
|
||||||
for {
|
for {
|
||||||
switch result := readLine(&self.prompt); true {
|
switch result := readLine(&self.prompt); true {
|
||||||
@@ -77,7 +102,7 @@ L:
|
|||||||
break L
|
break L
|
||||||
}
|
}
|
||||||
|
|
||||||
addHistory(str) //allow user to recall this line
|
addHistory(str[:len(str)-1]) //allow user to recall this line
|
||||||
|
|
||||||
self.parseInput(str)
|
self.parseInput(str)
|
||||||
|
|
||||||
@@ -87,7 +112,10 @@ L:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (self *JSRepl) PrintValue(value otto.Value) {
|
func (self *JSRepl) PrintValue(v interface{}) {
|
||||||
method, _ := self.re.vm.Get("prettyPrint")
|
method, _ := self.re.vm.Get("prettyPrint")
|
||||||
method.Call(method, value)
|
v, err := self.re.vm.ToValue(v)
|
||||||
|
if err == nil {
|
||||||
|
method.Call(method, v)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
38
utils/cmd.go
38
utils/cmd.go
@@ -19,6 +19,8 @@ func DoRpc(ethereum *eth.Ethereum, RpcPort int) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var miner ethminer.Miner
|
||||||
|
|
||||||
func DoMining(ethereum *eth.Ethereum) {
|
func DoMining(ethereum *eth.Ethereum) {
|
||||||
// Set Mining status
|
// Set Mining status
|
||||||
ethereum.Mining = true
|
ethereum.Mining = true
|
||||||
@@ -31,17 +33,37 @@ func DoMining(ethereum *eth.Ethereum) {
|
|||||||
addr := keyPair.Address()
|
addr := keyPair.Address()
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
|
ethutil.Config.Log.Infoln("Miner started")
|
||||||
|
|
||||||
|
miner = ethminer.NewDefaultMiner(addr, ethereum)
|
||||||
|
|
||||||
// Give it some time to connect with peers
|
// Give it some time to connect with peers
|
||||||
time.Sleep(3 * time.Second)
|
time.Sleep(3 * time.Second)
|
||||||
|
|
||||||
/*
|
|
||||||
for ethereum.IsUpToDate() == false {
|
|
||||||
time.Sleep(5 * time.Second)
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
ethutil.Config.Log.Infoln("Miner started")
|
|
||||||
|
|
||||||
miner := ethminer.NewDefaultMiner(addr, ethereum)
|
|
||||||
miner.Start()
|
miner.Start()
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func StopMining(ethereum *eth.Ethereum) bool {
|
||||||
|
if ethereum.Mining {
|
||||||
|
miner.Stop()
|
||||||
|
|
||||||
|
ethutil.Config.Log.Infoln("Miner stopped")
|
||||||
|
|
||||||
|
ethereum.Mining = false
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func StartMining(ethereum *eth.Ethereum) bool {
|
||||||
|
if !ethereum.Mining {
|
||||||
|
DoMining(ethereum)
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user