diff options
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/contracts.go | 6 | ||||
| -rw-r--r-- | cmd/geth/js.go | 1 | ||||
| -rw-r--r-- | cmd/geth/main.go | 5 |
3 files changed, 9 insertions, 3 deletions
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. |