Merge branch 'dev' of github.com:ensdomains/ens-app

ensdomains · Apr 18, 2019 · 4400eb1 · 4400eb1
2 parents 5859cfa + da04156
commit 4400eb1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "@ensdomains/ens": "^0.3.3",
     "@ensdomains/ens-022": "npm:@ensdomains/[email protected]",
     "@ensdomains/ethregistrar": "^1.1.4",
-    "@ensdomains/resolver": "^0.1.1",
+    "@ensdomains/resolver": "^0.1.4",
     "apollo-cache-inmemory": "^1.2.9",
     "apollo-client": "^2.4.5",
     "apollo-link": "^1.2.2",

diff --git a/src/api/ens.js b/src/api/ens.js
@@ -3,23 +3,10 @@ import getWeb3, { getWeb3Read, getNetworkId } from './web3'
 import { hash, normalize } from 'eth-ens-namehash'
 import { abi as ensContract } from '@ensdomains/ens/build/contracts/ENS.json'
 import { abi as reverseRegistrarContract } from '@ensdomains/ens/build/contracts/ReverseRegistrar.json'
-import { abi as resolverContract } from '@ensdomains/resolver/build/contracts/PublicResolver.json'
-import { abi as oldResolverContract } from '@ensdomains/ens-022/build/contracts/PublicResolver.json'
+import { abi as resolverContract } from '@ensdomains/resolver/build/contracts/Resolver.json'
 import { abi as fifsRegistrarContract } from '@ensdomains/ens/build/contracts/FIFSRegistrar.json'
 import { abi as testRegistrarContract } from '@ensdomains/ens/build/contracts/TestRegistrar.json'
 
-oldResolverContract.forEach((old, i) => {
-  if (
-    !resolverContract
-      .map(n => {
-        return n.name
-      })
-      .includes(old.name)
-  ) {
-    resolverContract.push(old)
-  }
-})
-
 var contracts = {
   1: {
     registry: '0x314159265dd8dbb310642f98f50c066173c1259b'

diff --git a/src/api/registrar.js b/src/api/registrar.js
@@ -353,7 +353,7 @@ export const transferRegistrars = async label => {
   const web3 = await getWeb3()
   const hash = web3.utils.sha3(label)
   const tx = ethRegistrar.transferRegistrars(hash)
-  const gas = await tx.estimateGas()
+  const gas = await tx.estimateGas({from:account})
   return () =>
     tx.send({
       from: account,
@@ -367,7 +367,7 @@ export const releaseDeed = async label => {
   const web3 = await getWeb3()
   const hash = web3.utils.sha3(label)
   const tx = ethRegistrar.releaseDeed(hash)
-  const gas = await tx.estimateGas()
+  const gas = await tx.estimateGas({from:account})
   return () =>
     tx.send({
       from: account,

diff --git a/src/api/registry.js b/src/api/registry.js
@@ -164,7 +164,7 @@ export async function setContent(name, content) {
   const namehash = getNamehash(name)
   const resolverAddr = await getResolver(name)
   const { Resolver } = await getResolverContract(resolverAddr)
-  const gas = await Resolver.setContent(namehash, content).estimateGas()
+  const gas = await Resolver.setContent(namehash, content).estimateGas({from:account})
   return () =>
     Resolver.setContent(namehash, content).send({ from: account, gas })
 }
@@ -175,7 +175,7 @@ export async function setContenthash(name, content) {
   const resolverAddr = await getResolver(name)
   const { Resolver } = await getResolverContract(resolverAddr)
   const tx = Resolver.setContenthash(namehash, content)
-  const gas = await tx.estimateGas()
+  const gas = await tx.estimateGas({from:account})
   return () => tx.send({ from: account, gas: gas })
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -993,10 +993,10 @@
     truffle "^5.0.5"
     web3-utils "^1.0.0-beta.48"
 
-"@ensdomains/resolver@^0.1.1":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.1.3.tgz#e347031dc08f822d39364585e9f9ab2ac1147621"
-  integrity sha512-nYbvYDSdNBYznGRPMcV3lMJ36VTnNwDb0gpb31bjIeRjQXoYuizBmE3540uQ2fWwxIlM4viIEBrQh4u39iDbPw==
+"@ensdomains/resolver@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.1.4.tgz#5933b94d1b24521d08153a09c60a939f7cc9543b"
+  integrity sha512-hF4lm8tcao8WWowJEBihii53C3/wDDT2vz+1WKhAJLMKAKyBjz2DQTGuIJE0aPGzFKl8GFR6Be/OxqF6U9reGA==
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"