gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

contracts/ens: implement public resolver changes

Browse Source
This commit is contained in:
Elad Nachmias
2019-02-20 16:00:50 +07:00
parent 0a4176dcb5
commit 600ade0efe
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/ens/ens.go
View File

@ -17,6 +17,7 @@
package ens package ens
//go:generate abigen --sol contract/ENS.sol --pkg contract --out contract/ens.go //go:generate abigen --sol contract/ENS.sol --pkg contract --out contract/ens.go
//go:generate abigen --sol contract/ENSRegistry.sol --exc contract/ENS.sol:ENS --pkg contract --out contract/ensregistry.go
//go:generate abigen --sol contract/FIFSRegistrar.sol --exc contract/ENS.sol:ENS --pkg contract --out contract/fifsregistrar.go //go:generate abigen --sol contract/FIFSRegistrar.sol --exc contract/ENS.sol:ENS --pkg contract --out contract/fifsregistrar.go
//go:generate abigen --sol contract/PublicResolver.sol --exc contract/ENS.sol:ENS --pkg contract --out contract/publicresolver.go //go:generate abigen --sol contract/PublicResolver.sol --exc contract/ENS.sol:ENS --pkg contract --out contract/publicresolver.go
@ -60,7 +61,7 @@ func NewENS(transactOpts *bind.TransactOpts, contractAddr common.Address, contra
// DeployENS deploys an instance of the ENS nameservice, with a 'first-in, first-served' root registrar. // DeployENS deploys an instance of the ENS nameservice, with a 'first-in, first-served' root registrar.
func DeployENS(transactOpts *bind.TransactOpts, contractBackend bind.ContractBackend) (common.Address, *ENS, error) { func DeployENS(transactOpts *bind.TransactOpts, contractBackend bind.ContractBackend) (common.Address, *ENS, error) {
// Deploy the ENS registry // Deploy the ENS registry
ensAddr, _, _, err := contract.DeployENS(transactOpts, contractBackend) ensAddr, _, _, err := contract.DeployENSRegistry(transactOpts, contractBackend)
if err != nil { if err != nil {
return ensAddr, nil, err return ensAddr, nil, err
} }
@ -133,6 +134,7 @@ func (ens *ENS) Resolve(name string) (common.Hash, error) {
if err != nil { if err != nil {
return common.Hash{}, err return common.Hash{}, err
} }
ret, err := resolver.Contenthash(node) ret, err := resolver.Contenthash(node)
if err != nil { if err != nil {
return common.Hash{}, err return common.Hash{}, err
@ -181,8 +183,8 @@ func (ens *ENS) Register(name string) (*types.Transaction, error) {
} }
// SetContentHash sets the content hash associated with a name. Only works if the caller // SetContentHash sets the content hash associated with a name. Only works if the caller
// owns the name, and the associated resolver implements a `setContent` function. // owns the name, and the associated resolver implements a `setContenthash` function.
func (ens *ENS) SetContentHash(name string, hash common.Hash) (*types.Transaction, error) { func (ens *ENS) SetContentHash(name string, hash []byte) (*types.Transaction, error) {
node := EnsNode(name) node := EnsNode(name)
resolver, err := ens.getResolver(node) resolver, err := ens.getResolver(node)

4
contracts/ens/ens_test.go
View File

@ -63,7 +63,7 @@ func TestENS(t *testing.T) {
contractBackend.Commit() contractBackend.Commit()
// Set the content hash for the name. // Set the content hash for the name.
if _, err = ens.SetContentHash(name, hash); err != nil { if _, err = ens.SetContentHash(name, hash.Bytes()); err != nil {
t.Fatalf("can't set content hash: %v", err) t.Fatalf("can't set content hash: %v", err)
} }
contractBackend.Commit() contractBackend.Commit()
@ -88,7 +88,7 @@ func TestENS(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("expected no error, got %v", err) t.Fatalf("expected no error, got %v", err)
} }
if vhost != hash { if testAddr != recoveredAddr {
t.Fatalf("resolve error, expected %v, got %v", testAddr.Hex(), recoveredAddr.Hex()) t.Fatalf("resolve error, expected %v, got %v", testAddr.Hex(), recoveredAddr.Hex())
} }
} }