diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-09 23:59:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-09 23:59:05 +0800 |
| commit | b0f40beea6d62d48720726605329f743df8cc90c (patch) | |
| tree | dd08e55b160cb0d313495486014432ae4e2933f2 /cmd/geth | |
| parent | ab015959e1802964f2cd4efc432606415c9367e9 (diff) | |
| download | dexon-b0f40beea6d62d48720726605329f743df8cc90c.tar dexon-b0f40beea6d62d48720726605329f743df8cc90c.tar.gz dexon-b0f40beea6d62d48720726605329f743df8cc90c.tar.bz2 dexon-b0f40beea6d62d48720726605329f743df8cc90c.tar.lz dexon-b0f40beea6d62d48720726605329f743df8cc90c.tar.xz dexon-b0f40beea6d62d48720726605329f743df8cc90c.tar.zst dexon-b0f40beea6d62d48720726605329f743df8cc90c.zip | |
Added proper contract for registrar
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/contracts.go | 4 | ||||
| -rw-r--r-- | cmd/geth/js.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/geth/contracts.go b/cmd/geth/contracts.go index 74ac3113c..1f27838d1 100644 --- a/cmd/geth/contracts.go +++ b/cmd/geth/contracts.go @@ -1,6 +1,6 @@ package main var ( - registrar = `var Registrar = 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":"o_owner","type":"address"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"content","outputs":[{"name":"o_content","type":"bytes32"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"addr","outputs":[{"name":"o_address","type":"address"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"subRegistrar","outputs":[{"name":"o_subRegistrar","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"}]);` - registrarAddr = "0xc6d9d2cd449a754c494264e1809c50e34d64562b" + 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 ec3b7a7ae..4179740e4 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -136,7 +136,7 @@ var net = web3.net; utils.Fatalf("Error setting namespaces: %v", err) } - js.re.Eval(registrar + "registrar = new Registrar(" + registrarAddr + ");") + js.re.Eval(globalRegistrar + "registrar = new GlobalRegistrar(" + globalRegistrarAddr + ");") } func (self *jsre) ConfirmTransaction(tx *types.Transaction) bool { |