git.iko.soy/bridge
on master help sign in
- Add web3-utils for utilities that don’t need a Web3 object

- Initialize Web3 with a dummy provider for offline mode

commit250f35d04efa797dbaa44f6f81876f70ec6164e4 authorChris Johnson <chris@cjohnson.io> dateThu 11 Apr 2019, 16:55 (8 years ago) parent7c95d19
4 files changed+283−77
compare with master
unifiedsplit
package-lock.json+274−68 package.json+4−3 src/bridge/lib/txn.js+1−5 src/bridge/views/Network.js+4−1
package-lock.json+274−68
@@ -2008,6 +2008,11 @@
20082008 "web3": "1.0.0-beta.33"
20092009 },
20102010 "dependencies": {
2011+ "bn.js": {
2012+ "version": "4.11.6",
2013+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
2014+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
2015+ },
20112016 "web3": {
20122017 "version": "1.0.0-beta.33",
20132018 "resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.33.tgz",
@@ -2020,6 +2025,22 @@
20202025 "web3-net": "1.0.0-beta.33",
20212026 "web3-shh": "1.0.0-beta.33",
20222027 "web3-utils": "1.0.0-beta.33"
2028+ },
2029+ "dependencies": {
2030+ "web3-utils": {
2031+ "version": "1.0.0-beta.33",
2032+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
2033+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
2034+ "requires": {
2035+ "bn.js": "4.11.6",
2036+ "eth-lib": "0.1.27",
2037+ "ethjs-unit": "0.1.6",
2038+ "number-to-bn": "1.7.0",
2039+ "randomhex": "0.1.5",
2040+ "underscore": "1.8.3",
2041+ "utf8": "2.1.1"
2042+ }
2043+ }
20232044 }
20242045 }
20252046 }
@@ -2632,7 +2653,7 @@
26322653 },
26332654 "bl": {
26342655 "version": "1.2.2",
2635− "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
2656+ "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
26362657 "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
26372658 "requires": {
26382659 "readable-stream": "^2.3.5",
@@ -4333,12 +4354,12 @@
43334354 "dependencies": {
43344355 "file-type": {
43354356 "version": "3.9.0",
4336− "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
4357+ "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
43374358 "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
43384359 },
43394360 "get-stream": {
43404361 "version": "2.3.1",
4341− "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
4362+ "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
43424363 "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
43434364 "requires": {
43444365 "object-assign": "^4.0.1",
@@ -15750,7 +15771,7 @@
1575015771 },
1575115772 "query-string": {
1575215773 "version": "5.1.1",
15753− "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
15774+ "resolved": "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
1575415775 "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
1575515776 "requires": {
1575615777 "decode-uri-component": "^0.2.0",
@@ -17351,7 +17372,7 @@
1735117372 },
1735217373 "scrypt.js": {
1735317374 "version": "0.2.0",
17354− "resolved": "https://registry.npmjs.org/scrypt.js/-/scrypt.js-0.2.0.tgz",
17375+ "resolved": "http://registry.npmjs.org/scrypt.js/-/scrypt.js-0.2.0.tgz",
1735517376 "integrity": "sha1-r40UZbcemZARC+38WTuUeeA6ito=",
1735617377 "requires": {
1735717378 "scrypt": "^6.0.2",
@@ -17391,7 +17412,7 @@
1739117412 "dependencies": {
1739217413 "commander": {
1739317414 "version": "2.8.1",
17394− "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
17415+ "resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
1739517416 "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
1739617417 "requires": {
1739717418 "graceful-readlink": ">= 1.0.0"
@@ -17651,7 +17672,7 @@
1765117672 "dependencies": {
1765217673 "nan": {
1765317674 "version": "2.10.0",
17654− "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
17675+ "resolved": "http://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
1765517676 "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
1765617677 }
1765717678 }
@@ -18492,7 +18513,7 @@
1849218513 },
1849318514 "tar": {
1849418515 "version": "2.2.1",
18495− "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
18516+ "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
1849618517 "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
1849718518 "requires": {
1849818519 "block-stream": "*",
@@ -18528,7 +18549,7 @@
1852818549 "dependencies": {
1852918550 "bluebird": {
1853018551 "version": "2.11.0",
18531− "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
18552+ "resolved": "http://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
1853218553 "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE="
1853318554 }
1853418555 }
@@ -19097,7 +19118,7 @@
1909719118 },
1909819119 "underscore": {
1909919120 "version": "1.8.3",
19100− "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
19121+ "resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
1910119122 "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
1910219123 },
1910319124 "unicode-canonical-property-names-ecmascript": {
@@ -19362,7 +19383,7 @@
1936219383 },
1936319384 "utf8": {
1936419385 "version": "2.1.1",
19365− "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz",
19386+ "resolved": "http://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz",
1936619387 "integrity": "sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g="
1936719388 },
1936819389 "util": {
@@ -19797,35 +19818,6 @@
1979719818 "web3-utils": "1.0.0-beta.52"
1979819819 }
1979919820 },
19800− "web3-utils": {
19801− "version": "1.0.0-beta.52",
19802− "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.52.tgz",
19803− "integrity": "sha512-WdHyzPcZu/sOnNrkcOZT20QEX9FhwD9OJJXENojQNvMK2a1xo3n8JWBcC2gzAGwsa0Aah6z2B3Xwa1P//8FaoA==",
19804− "requires": {
19805− "@babel/runtime": "^7.3.1",
19806− "@types/bn.js": "^4.11.4",
19807− "@types/node": "^10.12.18",
19808− "bn.js": "4.11.8",
19809− "eth-lib": "0.2.8",
19810− "ethjs-unit": "^0.1.6",
19811− "lodash": "^4.17.11",
19812− "number-to-bn": "1.7.0",
19813− "randomhex": "0.1.5",
19814− "utf8": "2.1.1"
19815− },
19816− "dependencies": {
19817− "eth-lib": {
19818− "version": "0.2.8",
19819− "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
19820− "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
19821− "requires": {
19822− "bn.js": "^4.11.6",
19823− "elliptic": "^6.4.0",
19824− "xhr-request-promise": "^0.1.2"
19825− }
19826− }
19827− }
19828− },
1982919821 "yallist": {
1983019822 "version": "3.0.3",
1983119823 "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
@@ -19852,6 +19844,27 @@
1985219844 "web3-core-method": "1.0.0-beta.33",
1985319845 "web3-core-requestmanager": "1.0.0-beta.33",
1985419846 "web3-utils": "1.0.0-beta.33"
19847+ },
19848+ "dependencies": {
19849+ "bn.js": {
19850+ "version": "4.11.6",
19851+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
19852+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
19853+ },
19854+ "web3-utils": {
19855+ "version": "1.0.0-beta.33",
19856+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
19857+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
19858+ "requires": {
19859+ "bn.js": "4.11.6",
19860+ "eth-lib": "0.1.27",
19861+ "ethjs-unit": "0.1.6",
19862+ "number-to-bn": "1.7.0",
19863+ "randomhex": "0.1.5",
19864+ "underscore": "1.8.3",
19865+ "utf8": "2.1.1"
19866+ }
19867+ }
1985519868 }
1985619869 },
1985719870 "web3-core-helpers": {
@@ -19862,6 +19875,27 @@
1986219875 "underscore": "1.8.3",
1986319876 "web3-eth-iban": "1.0.0-beta.33",
1986419877 "web3-utils": "1.0.0-beta.33"
19878+ },
19879+ "dependencies": {
19880+ "bn.js": {
19881+ "version": "4.11.6",
19882+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
19883+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
19884+ },
19885+ "web3-utils": {
19886+ "version": "1.0.0-beta.33",
19887+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
19888+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
19889+ "requires": {
19890+ "bn.js": "4.11.6",
19891+ "eth-lib": "0.1.27",
19892+ "ethjs-unit": "0.1.6",
19893+ "number-to-bn": "1.7.0",
19894+ "randomhex": "0.1.5",
19895+ "underscore": "1.8.3",
19896+ "utf8": "2.1.1"
19897+ }
19898+ }
1986519899 }
1986619900 },
1986719901 "web3-core-method": {
@@ -19874,6 +19908,27 @@
1987419908 "web3-core-promievent": "1.0.0-beta.33",
1987519909 "web3-core-subscriptions": "1.0.0-beta.33",
1987619910 "web3-utils": "1.0.0-beta.33"
19911+ },
19912+ "dependencies": {
19913+ "bn.js": {
19914+ "version": "4.11.6",
19915+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
19916+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
19917+ },
19918+ "web3-utils": {
19919+ "version": "1.0.0-beta.33",
19920+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
19921+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
19922+ "requires": {
19923+ "bn.js": "4.11.6",
19924+ "eth-lib": "0.1.27",
19925+ "ethjs-unit": "0.1.6",
19926+ "number-to-bn": "1.7.0",
19927+ "randomhex": "0.1.5",
19928+ "underscore": "1.8.3",
19929+ "utf8": "2.1.1"
19930+ }
19931+ }
1987719932 }
1987819933 },
1987919934 "web3-core-promievent": {
@@ -19924,6 +19979,27 @@
1992419979 "web3-eth-personal": "1.0.0-beta.33",
1992519980 "web3-net": "1.0.0-beta.33",
1992619981 "web3-utils": "1.0.0-beta.33"
19982+ },
19983+ "dependencies": {
19984+ "bn.js": {
19985+ "version": "4.11.6",
19986+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
19987+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
19988+ },
19989+ "web3-utils": {
19990+ "version": "1.0.0-beta.33",
19991+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
19992+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
19993+ "requires": {
19994+ "bn.js": "4.11.6",
19995+ "eth-lib": "0.1.27",
19996+ "ethjs-unit": "0.1.6",
19997+ "number-to-bn": "1.7.0",
19998+ "randomhex": "0.1.5",
19999+ "underscore": "1.8.3",
20000+ "utf8": "2.1.1"
20001+ }
20002+ }
1992720003 }
1992820004 },
1992920005 "web3-eth-abi": {
@@ -19941,6 +20017,20 @@
1994120017 "version": "4.11.6",
1994220018 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
1994320019 "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20020+ },
20021+ "web3-utils": {
20022+ "version": "1.0.0-beta.33",
20023+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20024+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20025+ "requires": {
20026+ "bn.js": "4.11.6",
20027+ "eth-lib": "0.1.27",
20028+ "ethjs-unit": "0.1.6",
20029+ "number-to-bn": "1.7.0",
20030+ "randomhex": "0.1.5",
20031+ "underscore": "1.8.3",
20032+ "utf8": "2.1.1"
20033+ }
1994420034 }
1994520035 }
1994620036 },
@@ -19975,6 +20065,41 @@
1997520065 "version": "2.0.1",
1997620066 "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
1997720067 "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w="
20068+ },
20069+ "web3-utils": {
20070+ "version": "1.0.0-beta.33",
20071+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20072+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20073+ "requires": {
20074+ "bn.js": "4.11.6",
20075+ "eth-lib": "0.1.27",
20076+ "ethjs-unit": "0.1.6",
20077+ "number-to-bn": "1.7.0",
20078+ "randomhex": "0.1.5",
20079+ "underscore": "1.8.3",
20080+ "utf8": "2.1.1"
20081+ },
20082+ "dependencies": {
20083+ "bn.js": {
20084+ "version": "4.11.6",
20085+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20086+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20087+ },
20088+ "eth-lib": {
20089+ "version": "0.1.27",
20090+ "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.27.tgz",
20091+ "integrity": "sha512-B8czsfkJYzn2UIEMwjc7Mbj+Cy72V+/OXH/tb44LV8jhrjizQJJ325xMOMyk3+ETa6r6oi0jsUY14+om8mQMWA==",
20092+ "requires": {
20093+ "bn.js": "^4.11.6",
20094+ "elliptic": "^6.4.0",
20095+ "keccakjs": "^0.2.1",
20096+ "nano-json-stream-parser": "^0.1.2",
20097+ "servify": "^0.1.12",
20098+ "ws": "^3.0.0",
20099+ "xhr-request-promise": "^0.1.2"
20100+ }
20101+ }
20102+ }
1997820103 }
1997920104 }
1998020105 },
@@ -19991,6 +20116,27 @@
1999120116 "web3-core-subscriptions": "1.0.0-beta.33",
1999220117 "web3-eth-abi": "1.0.0-beta.33",
1999320118 "web3-utils": "1.0.0-beta.33"
20119+ },
20120+ "dependencies": {
20121+ "bn.js": {
20122+ "version": "4.11.6",
20123+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20124+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20125+ },
20126+ "web3-utils": {
20127+ "version": "1.0.0-beta.33",
20128+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20129+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20130+ "requires": {
20131+ "bn.js": "4.11.6",
20132+ "eth-lib": "0.1.27",
20133+ "ethjs-unit": "0.1.6",
20134+ "number-to-bn": "1.7.0",
20135+ "randomhex": "0.1.5",
20136+ "underscore": "1.8.3",
20137+ "utf8": "2.1.1"
20138+ }
20139+ }
1999420140 }
1999520141 },
1999620142 "web3-eth-ens": {
@@ -20152,23 +20298,6 @@
2015220298 "web3-providers": "1.0.0-beta.52",
2015320299 "web3-utils": "1.0.0-beta.52"
2015420300 }
20155− },
20156− "web3-utils": {
20157− "version": "1.0.0-beta.52",
20158− "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.52.tgz",
20159− "integrity": "sha512-WdHyzPcZu/sOnNrkcOZT20QEX9FhwD9OJJXENojQNvMK2a1xo3n8JWBcC2gzAGwsa0Aah6z2B3Xwa1P//8FaoA==",
20160− "requires": {
20161− "@babel/runtime": "^7.3.1",
20162− "@types/bn.js": "^4.11.4",
20163− "@types/node": "^10.12.18",
20164− "bn.js": "4.11.8",
20165− "eth-lib": "0.2.8",
20166− "ethjs-unit": "^0.1.6",
20167− "lodash": "^4.17.11",
20168− "number-to-bn": "1.7.0",
20169− "randomhex": "0.1.5",
20170− "utf8": "2.1.1"
20171− }
2017220301 }
2017320302 }
2017420303 },
@@ -20185,6 +20314,20 @@
2018520314 "version": "4.11.6",
2018620315 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
2018720316 "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20317+ },
20318+ "web3-utils": {
20319+ "version": "1.0.0-beta.33",
20320+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20321+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20322+ "requires": {
20323+ "bn.js": "4.11.6",
20324+ "eth-lib": "0.1.27",
20325+ "ethjs-unit": "0.1.6",
20326+ "number-to-bn": "1.7.0",
20327+ "randomhex": "0.1.5",
20328+ "underscore": "1.8.3",
20329+ "utf8": "2.1.1"
20330+ }
2018820331 }
2018920332 }
2019020333 },
@@ -20198,6 +20341,27 @@
2019820341 "web3-core-method": "1.0.0-beta.33",
2019920342 "web3-net": "1.0.0-beta.33",
2020020343 "web3-utils": "1.0.0-beta.33"
20344+ },
20345+ "dependencies": {
20346+ "bn.js": {
20347+ "version": "4.11.6",
20348+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20349+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20350+ },
20351+ "web3-utils": {
20352+ "version": "1.0.0-beta.33",
20353+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20354+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20355+ "requires": {
20356+ "bn.js": "4.11.6",
20357+ "eth-lib": "0.1.27",
20358+ "ethjs-unit": "0.1.6",
20359+ "number-to-bn": "1.7.0",
20360+ "randomhex": "0.1.5",
20361+ "underscore": "1.8.3",
20362+ "utf8": "2.1.1"
20363+ }
20364+ }
2020120365 }
2020220366 },
2020320367 "web3-net": {
@@ -20208,6 +20372,27 @@
2020820372 "web3-core": "1.0.0-beta.33",
2020920373 "web3-core-method": "1.0.0-beta.33",
2021020374 "web3-utils": "1.0.0-beta.33"
20375+ },
20376+ "dependencies": {
20377+ "bn.js": {
20378+ "version": "4.11.6",
20379+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20380+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20381+ },
20382+ "web3-utils": {
20383+ "version": "1.0.0-beta.33",
20384+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20385+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20386+ "requires": {
20387+ "bn.js": "4.11.6",
20388+ "eth-lib": "0.1.27",
20389+ "ethjs-unit": "0.1.6",
20390+ "number-to-bn": "1.7.0",
20391+ "randomhex": "0.1.5",
20392+ "underscore": "1.8.3",
20393+ "utf8": "2.1.1"
20394+ }
20395+ }
2021120396 }
2021220397 },
2021320398 "web3-providers": {
@@ -20296,23 +20481,44 @@
2029620481 }
2029720482 },
2029820483 "web3-utils": {
20299− "version": "1.0.0-beta.33",
20300− "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20301− "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20484+ "version": "1.0.0-beta.52",
20485+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.52.tgz",
20486+ "integrity": "sha512-WdHyzPcZu/sOnNrkcOZT20QEX9FhwD9OJJXENojQNvMK2a1xo3n8JWBcC2gzAGwsa0Aah6z2B3Xwa1P//8FaoA==",
2030220487 "requires": {
20303− "bn.js": "4.11.6",
20304− "eth-lib": "0.1.27",
20305− "ethjs-unit": "0.1.6",
20488+ "@babel/runtime": "^7.3.1",
20489+ "@types/bn.js": "^4.11.4",
20490+ "@types/node": "^10.12.18",
20491+ "bn.js": "4.11.8",
20492+ "eth-lib": "0.2.8",
20493+ "ethjs-unit": "^0.1.6",
20494+ "lodash": "^4.17.11",
2030620495 "number-to-bn": "1.7.0",
2030720496 "randomhex": "0.1.5",
20308− "underscore": "1.8.3",
2030920497 "utf8": "2.1.1"
2031020498 },
2031120499 "dependencies": {
20312− "bn.js": {
20313− "version": "4.11.6",
20314− "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20315− "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20500+ "@babel/runtime": {
20501+ "version": "7.4.3",
20502+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
20503+ "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
20504+ "requires": {
20505+ "regenerator-runtime": "^0.13.2"
20506+ }
20507+ },
20508+ "eth-lib": {
20509+ "version": "0.2.8",
20510+ "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
20511+ "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==",
20512+ "requires": {
20513+ "bn.js": "^4.11.6",
20514+ "elliptic": "^6.4.0",
20515+ "xhr-request-promise": "^0.1.2"
20516+ }
20517+ },
20518+ "regenerator-runtime": {
20519+ "version": "0.13.2",
20520+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
20521+ "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
2031620522 }
2031720523 }
2031820524 },
package.json+4−3
@@ -14,9 +14,10 @@
1414 "node": "11.0.0"
1515 },
1616 "dependencies": {
17− "azimuth-js": "^0.10.0",
1817 "@ledgerhq/hw-app-eth": "^4.35.0",
1918 "@ledgerhq/hw-transport-u2f": "^4.35.0",
19+ "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer",
20+ "azimuth-js": "^0.10.0",
2021 "azimuth-solidity": "1.0.2",
2122 "babel-polyfill": "^6.26.0",
2223 "bip32": "^1.0.2",
@@ -34,7 +35,6 @@
3435 "keythereum": "^1.0.4",
3536 "lodash": "^4.17.11",
3637 "more-entropy": "^0.0.7",
37− "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer",
3838 "prop-types": "^15.6.2",
3939 "react": "^16.6.0",
4040 "react-dom": "^16.6.0",
@@ -45,7 +45,8 @@
4545 "trezor-connect": "^7.0.1",
4646 "urbit-key-generation": "0.12.1",
4747 "urbit-ob": "^3.1.0",
48− "web3": "1.0.0-beta.52"
48+ "web3": "1.0.0-beta.52",
49+ "web3-utils": "^1.0.0-beta.52"
4950 },
5051 "scripts": {
5152 "start": "react-scripts start",
src/bridge/lib/txn.js+1−5
@@ -3,6 +3,7 @@ import { Just } from 'folktale/maybe'
33import { Ok, Error } from 'folktale/result'
44import Tx from 'ethereumjs-tx'
55import Web3 from 'web3'
6+import { toWei, fromWei, toHex } from 'web3-utils'
67
78import { BRIDGE_ERROR } from '../lib/error'
89import { NETWORK_NAMES } from '../lib/network'
@@ -182,11 +183,6 @@ const getTxnInfo = async (web3, addr) => {
182183 }
183184}
184185
185−const dummy = new Web3()
186−const toHex = dummy.utils.toHex
187−const toWei = dummy.utils.toWei
188−const fromWei = dummy.utils.fromWei
189−
190186const canDecodePatp = p => {
191187 try {
192188 ob.patp2dec(p)
src/bridge/views/Network.js+4−1
@@ -70,7 +70,10 @@ class Network extends React.Component {
7070 // We may want to offer the ability to select a target network for
7171 // transactions when offline.
7272
73− const web3 = new Web3()
73+ // Note: localhost:3456 doesn't actually point to anything, we just need
74+ // a provider to initialize the Web3 object
75+ const provider = new Web3.providers.HttpProvider("http://localhost:3456")
76+ const web3 = new Web3(provider)
7477
7578 const target =
7679 process.env.NODE_ENV === 'development'