aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethtest/main.go16
-rw-r--r--cmd/evm/main.go2
-rw-r--r--cmd/geth/contracts.go6
-rw-r--r--cmd/geth/js.go1
-rw-r--r--cmd/geth/main.go5
-rw-r--r--cmd/mist/assets/examples/coin.html9
-rw-r--r--cmd/utils/flags.go3
7 files changed, 26 insertions, 16 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go
index 952ba1bd6..3c5b2cedf 100644
--- a/cmd/ethtest/main.go
+++ b/cmd/ethtest/main.go
@@ -176,23 +176,23 @@ func RunVmTest(r io.Reader) (failed int) {
failed = 1
} else {
for i, log := range test.Logs {
- if common.HexToAddress(log.AddressF) != logs[i].Address() {
- helper.Log.Infof("'%s' log address failed. Expected %v got %x", name, log.AddressF, logs[i].Address())
+ if common.HexToAddress(log.AddressF) != logs[i].Address {
+ helper.Log.Infof("'%s' log address failed. Expected %v got %x", name, log.AddressF, logs[i].Address)
failed = 1
}
- if !bytes.Equal(logs[i].Data(), helper.FromHex(log.DataF)) {
- helper.Log.Infof("'%s' log data failed. Expected %v got %x", name, log.DataF, logs[i].Data())
+ if !bytes.Equal(logs[i].Data, helper.FromHex(log.DataF)) {
+ helper.Log.Infof("'%s' log data failed. Expected %v got %x", name, log.DataF, logs[i].Data)
failed = 1
}
- if len(log.TopicsF) != len(logs[i].Topics()) {
- helper.Log.Infof("'%s' log topics length failed. Expected %d got %d", name, len(log.TopicsF), logs[i].Topics())
+ if len(log.TopicsF) != len(logs[i].Topics) {
+ helper.Log.Infof("'%s' log topics length failed. Expected %d got %d", name, len(log.TopicsF), logs[i].Topics)
failed = 1
} else {
for j, topic := range log.TopicsF {
- if common.HexToHash(topic) != logs[i].Topics()[j] {
- helper.Log.Infof("'%s' log topic[%d] failed. Expected %v got %x", name, j, topic, logs[i].Topics()[j])
+ if common.HexToHash(topic) != logs[i].Topics[j] {
+ helper.Log.Infof("'%s' log topic[%d] failed. Expected %v got %x", name, j, topic, logs[i].Topics[j])
failed = 1
}
}
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 5eb753fa8..561f1a943 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -133,7 +133,7 @@ func (self *VMEnv) GetHash(n uint64) common.Hash {
}
return common.Hash{}
}
-func (self *VMEnv) AddLog(log state.Log) {
+func (self *VMEnv) AddLog(log *state.Log) {
self.state.AddLog(log)
}
func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
diff --git a/cmd/geth/contracts.go b/cmd/geth/contracts.go
new file mode 100644
index 000000000..1f27838d1
--- /dev/null
+++ b/cmd/geth/contracts.go
@@ -0,0 +1,6 @@
+package main
+
+var (
+ globalRegistrar = `var GlobalRegistrar = web3.eth.contract([{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"name","outputs":[{"name":"o_name","type":"bytes32"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"content","outputs":[{"name":"","type":"bytes32"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"addr","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"subRegistrar","outputs":[{"name":"o_subRegistrar","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_newOwner","type":"address"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_registrar","type":"address"}],"name":"setSubRegistrar","outputs":[],"type":"function"},{"constant":false,"inputs":[],"name":"Registrar","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_a","type":"address"},{"name":"_primary","type":"bool"}],"name":"setAddress","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_content","type":"bytes32"}],"name":"setContent","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"disown","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"register","outputs":[{"name":"","type":"address"}],"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"}],"name":"Changed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"addr","type":"address"}],"name":"PrimaryChanged","type":"event"}]);`
+ globalRegistrarAddr = "0xc6d9d2cd449a754c494264e1809c50e34d64562b"
+)
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 59a8469fa..0061f20cf 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -136,6 +136,7 @@ var net = web3.net;
utils.Fatalf("Error setting namespaces: %v", err)
}
+ js.re.Eval(globalRegistrar + "registrar = new GlobalRegistrar(\"" + globalRegistrarAddr + "\");")
}
func (self *jsre) ConfirmTransaction(tx *types.Transaction) bool {
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 9437f8eb4..4853a16fc 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -43,7 +43,7 @@ import (
const (
ClientIdentifier = "Geth"
- Version = "0.9.7"
+ Version = "0.9.8"
)
var app = utils.NewApp(Version, "the go-ethereum command line interface")
@@ -149,8 +149,7 @@ password to file or expose in any other way.
Imports an unencrypted private key from <keyfile> and creates a new account.
Prints the address.
-The keyfile is assumed to contain an unencrypted private key in canonical EC
-raw bytes format.
+The keyfile is assumed to contain an unencrypted private key in hexadecimal format.
The account is saved in encrypted format, you are prompted for a passphrase.
diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html
index a734e144f..e78f2d73f 100644
--- a/cmd/mist/assets/examples/coin.html
+++ b/cmd/mist/assets/examples/coin.html
@@ -72,19 +72,22 @@
// deploy if not exist
if(address === null) {
var code = "0x60056013565b61014f8061003a6000396000f35b620f42406000600033600160a060020a0316815260200190815260200160002081905550560060e060020a600035048063d0679d3414610020578063e3d670d71461003457005b61002e600435602435610049565b60006000f35b61003f600435610129565b8060005260206000f35b806000600033600160a060020a03168152602001908152602001600020541061007157610076565b610125565b806000600033600160a060020a03168152602001908152602001600020908154039081905550806000600084600160a060020a031681526020019081526020016000209081540190819055508033600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660006000a38082600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660006000a35b5050565b60006000600083600160a060020a0316815260200190815260200160002054905091905056";
- address = web3.eth.sendTransaction({from: eth.coinbase, data: code, gas: "1000000"});
+ address = web3.eth.sendTransaction({from: eth.accounts[0], data: code, gas: "1000000"});
localStorage.setItem("address", address);
}
document.querySelector("#contract_addr").innerHTML = address;
var Contract = web3.eth.contract(desc);
contract = new Contract(address);
- contract.Changed({from: eth.accounts[0]}).watch(function() {
+ var filter = contract.Changed({from: eth.accounts[0]})
+ filter.watch(function(logs) {
+ console.log(logs);
refresh();
});
+window.filter = filter;
function refresh() {
- document.querySelector("#balance").innerHTML = contract.call({from:eth.coinbase}).balance(eth.coinbase);
+ document.querySelector("#balance").innerHTML = contract.balance(eth.coinbase);
}
function transact() {
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index bfd1ab990..3ad06653e 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -231,7 +231,8 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
// Set verbosity on glog
glog.SetV(ctx.GlobalInt(LogLevelFlag.Name))
// Set the log type
- glog.SetToStderr(ctx.GlobalBool(LogToStdErrFlag.Name))
+ //glog.SetToStderr(ctx.GlobalBool(LogToStdErrFlag.Name))
+ glog.SetToStderr(true)
// Set the log dir
glog.SetLogDir(ctx.GlobalString(LogFileFlag.Name))
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 00:15:39 +0800