From 0d376a839cac0f6bfe48487a4dc594fecd316f3f Mon Sep 17 00:00:00 2001 From: Makoto Date: Wed, 6 Nov 2019 10:36:04 +0000 Subject: [PATCH 1/3] Use WithConfig if resolver.eth exists --- src/registrar.js | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/registrar.js b/src/registrar.js index d7fb35c..b1dee62 100644 --- a/src/registrar.js +++ b/src/registrar.js @@ -421,8 +421,14 @@ const makeCommitment = async (name, owner, secret = '') => { const { permanentRegistrarController } = await getPermanentRegistrarController() - - return permanentRegistrarController.makeCommitment(name, owner, secret) + const account = await getAccount() + const { ENS } = await getENS() + const resolverAddr = await ENS.resolver(getNamehash('resolver.eth')) + if(parseInt(resolverAddr, 16) === 0){ + return permanentRegistrarController.makeCommitment(name, owner, secret) + }else{ + return permanentRegistrarController.makeCommitmentWithConfig(name, owner, secret, resolverAddr, account) + } } const commit = async (label, secret = '') => { @@ -442,13 +448,27 @@ const register = async (label, duration, secret) => { const account = await getAccount() const price = await getRentPrice(label, duration) - return permanentRegistrarController.register( - label, - account, - duration, - secret, - { value: price } - ) + const { ENS } = await getENS() + const resolverAddr = await ENS.resolver(getNamehash('resolver.eth')) + if(parseInt(resolverAddr, 16) === 0){ + return permanentRegistrarController.register( + label, + account, + duration, + secret, + { value: price } + ) + }else{ + return permanentRegistrarController.registerWithConfig ( + label, + account, + duration, + secret, + resolverAddr, + account, + { value: price } + ) + } } const renew = async (label, duration) => { From 1b8e2403eed9a7a701a289fd85df2a4d49f04c34 Mon Sep 17 00:00:00 2001 From: Makoto Date: Wed, 6 Nov 2019 16:51:18 +0000 Subject: [PATCH 2/3] Upgrade mock and ethregistrar --- package.json | 4 ++-- yarn.lock | 49 +++++++++++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 8c48109..b77af89 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@babel/plugin-transform-runtime": "^7.4.4", "@babel/plugin-transform-spread": "^7.2.2", "@babel/preset-env": "^7.4.4", - "@ensdomains/mock": "^1.0.16", + "@ensdomains/mock": "^1.0.18", "babel-eslint": "^9.0.0", "babel-jest": "^23.6.0", "babel-jest-assertions": "^0.1.0", @@ -48,7 +48,7 @@ "@ensdomains/dnsregistrar": "^0.3.9", "@ensdomains/ens": "^0.3.5", "@ensdomains/ens-022": "npm:@ensdomains/ens@0.2.2", - "@ensdomains/ethregistrar": "^1.2.2", + "@ensdomains/ethregistrar": "^1.2.9", "@ensdomains/resolver": "0.1.12", "@ethvault/iframe-provider": "0.1.9", "base58check": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 988bc61..e7f089b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -740,6 +740,11 @@ rskjs-util "^1.0.3" safe-buffer "^5.2.0" +"@ensdomains/buffer@0.0.10": + version "0.0.10" + resolved "https://registry.yarnpkg.com/@ensdomains/buffer/-/buffer-0.0.10.tgz#3b9f8b6a34c6160ae8a8cb8f0f033aa35c1a9970" + integrity sha512-EOFqiWnN36EyyBAgHFTsabFcFICUALt41SiDm/4pAw4V36R4lD4wHcnZcqCYki9m1fMaeWGHrdqxmrMa8iiSTQ== + "@ensdomains/buffer@0.0.6": version "0.0.6" resolved "https://registry.yarnpkg.com/@ensdomains/buffer/-/buffer-0.0.6.tgz#d44616ca44afe19fde84601ca84db7b6e6715365" @@ -838,7 +843,7 @@ testrpc "0.0.1" web3-utils "^1.0.0-beta.31" -"@ensdomains/ens@^0.3.0", "@ensdomains/ens@^0.3.10": +"@ensdomains/ens@^0.3.0", "@ensdomains/ens@^0.3.10", "@ensdomains/ens@^0.3.6": version "0.3.11" resolved "https://registry.yarnpkg.com/@ensdomains/ens/-/ens-0.3.11.tgz#3001c76687b2ee36523a234e520ee3b0b6800b89" integrity sha512-XqOWQYqdjZTZQA7vAJty9Bdw5er+K0KGLTkrMDBXuJj5yNSf2oM4cj+dW6RATA4Bwz5cBCH2mjA8EsOxa+8eDA== @@ -851,19 +856,6 @@ testrpc "0.0.1" web3-utils "^1.0.0-beta.31" -"@ensdomains/ens@^0.3.4": - version "0.3.5" - resolved "https://registry.yarnpkg.com/@ensdomains/ens/-/ens-0.3.5.tgz#5898765c17d893e8c67a28ceca8fc43b4583d5a5" - integrity sha512-cQP6+ZJopusGi0JdEavRKfgQ9DkNwpoZzvSQ6gwv6GLrxGK6GDFfVpYz1VSzib6WPwTFskKXIDHfd/SvnNhJBg== - dependencies: - bluebird "^3.5.2" - eth-ens-namehash "^1.0.2" - ethereumjs-testrpc "^6.0.3" - ganache-cli "^6.1.0" - solc "^0.4.20" - testrpc "0.0.1" - web3-utils "^1.0.0-beta.31" - "@ensdomains/ens@^0.3.5": version "0.3.9" resolved "https://registry.yarnpkg.com/@ensdomains/ens/-/ens-0.3.9.tgz#8dd305473cb31a89b0c72c18344c2a2b6aaaea8d" @@ -877,12 +869,16 @@ testrpc "0.0.1" web3-utils "^1.0.0-beta.31" -"@ensdomains/ethregistrar@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@ensdomains/ethregistrar/-/ethregistrar-1.2.2.tgz#4b770cad47a805cf0629d255cfcd5998d7b704e2" - integrity sha512-F0XH1jGqy0M1k5YNlkOz+ZUSIMxiijsRvS59WJrsQiMa2fUcSX+snB/lZBpkoZTd0xu5bwDYlKlVHmzGxmYArg== +"@ensdomains/ethregistrar@^1.2.9": + version "1.2.9" + resolved "https://registry.yarnpkg.com/@ensdomains/ethregistrar/-/ethregistrar-1.2.9.tgz#4b0c4bc6e4384eccd1016966104f9cdd0e85e8da" + integrity sha512-0cqP/WnrQfvYVneY4fOdi9z1s+mjCegG5L91a9JWDKeTmQxvmJRjpliUhp1tqxrWKQA8g8Rlecp/8puAB5KPHA== dependencies: - "@ensdomains/ens" "^0.3.4" + "@ensdomains/buffer" "0.0.10" + "@ensdomains/dnsregistrar" "^0.3.5" + "@ensdomains/dnssec-oracle" "^0.1.2" + "@ensdomains/ens" "^0.3.6" + "@ensdomains/resolver" "^0.1.13" bluebird "^3.5.3" eth-ens-namehash "^2.0.8" openzeppelin-solidity "2.1.3" @@ -890,10 +886,10 @@ truffle "^5.0.5" web3-utils "^1.0.0-beta.48" -"@ensdomains/mock@^1.0.16": - version "1.0.16" - resolved "https://registry.yarnpkg.com/@ensdomains/mock/-/mock-1.0.16.tgz#0d3f651af7faa8534ee9eb6d3a34f046f6b44786" - integrity sha512-+s3SGkTRS2q2C2O7iZjf5FMjJ5Z8/0WX76Q7bdH+4/G4awDrIaCXSLGiaS8KSS5EDLbr9Qng6DRxNtPnJKKxJA== +"@ensdomains/mock@^1.0.18": + version "1.0.18" + resolved "https://registry.yarnpkg.com/@ensdomains/mock/-/mock-1.0.18.tgz#936aa56abf719c39fcc58f9f792e0eace3368b88" + integrity sha512-xeO8o2W4ycNcSE1eOTCf3LL63pwGMpucddWztuz1wTDs456r4xSnSFMlqt4oRae2StNkCjpSeC+R2d4ulV9nNw== dependencies: "@0xproject/utils" "^2.0.2" "@babel/runtime" "^7.4.4" @@ -902,7 +898,7 @@ "@ensdomains/dnssec-oracle" "^0.1.2" "@ensdomains/ens" "^0.3.10" "@ensdomains/ens-022" "npm:@ensdomains/ens@0.2.2" - "@ensdomains/ethregistrar" "^1.2.2" + "@ensdomains/ethregistrar" "^1.2.9" "@ensdomains/resolver" "^0.1.11" cross-fetch "^3.0.2" eth-ens-namehash "^2.0.8" @@ -919,6 +915,11 @@ resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.1.11.tgz#7202f787622d80cfd9a177264b979cf2fdb16aa9" integrity sha512-mDSxoPj3E8ZvHHUjKL86b/sqo/aJOf+zWCs3d7nRt5tqOOh55L1HW0NrFSm54x7eEaYf/CozAiQbcRo61crW+g== +"@ensdomains/resolver@^0.1.13": + version "0.1.13" + resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.1.13.tgz#3a43df9f2d6f4e60c677adf60311805643aac781" + integrity sha512-VcMygGO/b0H4AXkN4CRAHw0CZd5XvTJW8YdIdZEmpJGs/O3eMzBzxpgJJ7UerD7U098rbBDSJmj0zjGudV0/aQ== + "@ethvault/iframe-provider@0.1.9": version "0.1.9" resolved "https://registry.yarnpkg.com/@ethvault/iframe-provider/-/iframe-provider-0.1.9.tgz#59d50733283bfa4a35632a47291986375cd6f4e8" From d928621da79b3f8f985bffbc99a1c8fdd872d453 Mon Sep 17 00:00:00 2001 From: Makoto Date: Wed, 6 Nov 2019 16:53:12 +0000 Subject: [PATCH 3/3] v1.1.32 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b77af89..cba4215 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ensdomains/ui", - "version": "1.1.31", + "version": "1.1.32", "description": "UI components and reusable code", "main": "src/index.js", "files": [