diff options
| author | Yung chieh Tsai <x01ep23i@hotmail.com> | 2018-05-29 19:29:12 +0800 |
|---|---|---|
| committer | Yung chieh Tsai <x01ep23i@hotmail.com> | 2018-05-29 19:29:12 +0800 |
| commit | 384cb126dd3cdf0d1dcf67525d7a390436ec6ea2 (patch) | |
| tree | 716362cbd76a32e9bb6d384e4c940d72f7f74dea | |
| parent | 829deacb57a23ec8027269c93cdef3f3735d1710 (diff) | |
| download | tangerine-wallet-browser-384cb126dd3cdf0d1dcf67525d7a390436ec6ea2.tar tangerine-wallet-browser-384cb126dd3cdf0d1dcf67525d7a390436ec6ea2.tar.gz tangerine-wallet-browser-384cb126dd3cdf0d1dcf67525d7a390436ec6ea2.tar.bz2 tangerine-wallet-browser-384cb126dd3cdf0d1dcf67525d7a390436ec6ea2.tar.lz tangerine-wallet-browser-384cb126dd3cdf0d1dcf67525d7a390436ec6ea2.tar.xz tangerine-wallet-browser-384cb126dd3cdf0d1dcf67525d7a390436ec6ea2.tar.zst tangerine-wallet-browser-384cb126dd3cdf0d1dcf67525d7a390436ec6ea2.zip | |
Update lib
| -rw-r--r-- | app/404.html | 26 | ||||
| -rw-r--r-- | app/scripts/lib/ipfsContent.js | 2 | ||||
| -rw-r--r-- | app/scripts/lib/resolver.js | 66 |
3 files changed, 71 insertions, 23 deletions
diff --git a/app/404.html b/app/404.html index 0dbab69a7..f66723ad6 100644 --- a/app/404.html +++ b/app/404.html @@ -17,12 +17,36 @@ width: 100%; height: 100%; } + .app{ + position: relative; + width: 100%; + height: auto; + overflow: hidden; + } img{ display: block; + width: 100%; + height: auto; + } + h2{ + display: block; + width: 100%; + overflow: hidden; + position: absolute; + bottom: 20%; + left: 0; + color: #1b243d; + text-align: center; + } + h2 > a{ + color: #1b243d; } </style> </head> <body> - <img src="./images/404.png" alt=""> + <div class="app"> + <img src="./images/404.png" alt=""> + <h2>Powered by <a href="https://www.portal.network/">Portal Network</a></h2> + </div> </body> </html>
\ No newline at end of file diff --git a/app/scripts/lib/ipfsContent.js b/app/scripts/lib/ipfsContent.js index 4d66745e9..bf04c854b 100644 --- a/app/scripts/lib/ipfsContent.js +++ b/app/scripts/lib/ipfsContent.js @@ -16,7 +16,7 @@ module.exports = function (provider) { clearTimeout(clearTime) let url = 'https://gateway.ipfs.io/ipfs/' + ipfsHash return fetch(url, { method: 'HEAD' }).then(response => response.status).then(statusCode => { - if (statusCode !== 200) return 'Local' + if (statusCode !== 200) return extension.tabs.update(tab.id, { url: '404.html' }) extension.tabs.update(tab.id, { url: url }) }) .catch(err => { diff --git a/app/scripts/lib/resolver.js b/app/scripts/lib/resolver.js index dec43c481..2bf9dac50 100644 --- a/app/scripts/lib/resolver.js +++ b/app/scripts/lib/resolver.js @@ -1,6 +1,5 @@ const namehash = require('eth-ens-namehash') const multihash = require('multihashes') -const REGISTRAR_ENS_MAIN_NET = '0x314159265dd8dbb310642f98f50c066173c1259b' const HttpProvider = require('ethjs-provider-http') const Eth = require('ethjs-query') const EthContract = require('ethjs-contract') @@ -8,32 +7,57 @@ const registrarAbi = require('./contracts/registrar') const resolverAbi = require('./contracts/resolver') function ens (name, provider) { - const eth = new Eth(new HttpProvider(provider.rpcTarget)) + const eth = new Eth(new HttpProvider(getProvider(provider.type))) const hash = namehash.hash(name) const contract = new EthContract(eth) - const Registrar = contract(registrarAbi).at(REGISTRAR_ENS_MAIN_NET) + const Registrar = contract(registrarAbi).at(getRegistrar(provider.type)) return new Promise((resolve, reject) => { - if (provider.type !== 'mainnet') reject('unsupport') - Registrar.resolver(hash).then((address) => { - if (address === '0x0000000000000000000000000000000000000000') { - reject(null) - } else { - const Resolver = contract(resolverAbi).at(address['0']) - return Resolver.content(hash) - } - }).then((contentHash) => { - if (contentHash['0'] === '0x0000000000000000000000000000000000000000000000000000000000000000') reject(null) - if (contentHash.ret !== '0x') { - const hex = contentHash['0'].substring(2) - const buf = multihash.fromHexString(hex) - resolve(multihash.toB58String(buf)) - } else { - reject(null) - } - }) + if (provider.type === 'mainnet' || provider.type === 'ropsten') { + Registrar.resolver(hash).then((address) => { + if (address === '0x0000000000000000000000000000000000000000') { + reject(null) + } else { + const Resolver = contract(resolverAbi).at(address['0']) + return Resolver.content(hash) + } + }).then((contentHash) => { + if (contentHash['0'] === '0x0000000000000000000000000000000000000000000000000000000000000000') reject(null) + if (contentHash.ret !== '0x') { + const hex = contentHash['0'].substring(2) + const buf = multihash.fromHexString(hex) + resolve(multihash.toB58String(multihash.encode(buf, 'sha2-256'))) + } else { + reject(null) + } + }) + } else { + return reject('unsupport') + } }) } +function getProvider (type) { + switch (type) { + case 'mainnet': + return 'https://mainnet.infura.io/' + case 'ropsten': + return 'https://ropsten.infura.io/' + default: + return 'http://localhost:3000/' + } +} + +function getRegistrar (type) { + switch (type) { + case 'mainnet': + return '0x314159265dd8dbb310642f98f50c066173c1259b' + case 'ropsten': + return '0x112234455c3a32fd11230c42e7bccd4a84e02010' + default: + return '0x0000000000000000000000000000000000000000' + } +} + module.exports.resolve = function (name, provider) { const path = name.split('.') const tld = path[path.length - 1] |