git.iko.soy/bridge
on master help sign in
Merge branch 'master' into ui-improvements
6898488Chris Johnson
package-lock.json+274−68
compare with master
unifiedsplit
@@ -2008,6 +2008,11 @@
2008 "web3": "1.0.0-beta.33"
2008 "web3": "1.0.0-beta.33"
2009 },
2009 },
2010 "dependencies": {
2010 "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+ },
2011 "web3": {
2016 "web3": {
2012 "version": "1.0.0-beta.33",
2017 "version": "1.0.0-beta.33",
2013 "resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.33.tgz",
2018 "resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.33.tgz",
@@ -2020,6 +2025,22 @@
2020 "web3-net": "1.0.0-beta.33",
2025 "web3-net": "1.0.0-beta.33",
2021 "web3-shh": "1.0.0-beta.33",
2026 "web3-shh": "1.0.0-beta.33",
2022 "web3-utils": "1.0.0-beta.33"
2027 "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+ }
2023 }
2044 }
2024 }
2045 }
2025 }
2046 }
@@ -2632,7 +2653,7 @@
2632 },
2653 },
2633 "bl": {
2654 "bl": {
2634 "version": "1.2.2",
2655 "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",
2636 "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
2657 "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
2637 "requires": {
2658 "requires": {
2638 "readable-stream": "^2.3.5",
2659 "readable-stream": "^2.3.5",
@@ -4333,12 +4354,12 @@
4333 "dependencies": {
4354 "dependencies": {
4334 "file-type": {
4355 "file-type": {
4335 "version": "3.9.0",
4356 "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",
4337 "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
4358 "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
4338 },
4359 },
4339 "get-stream": {
4360 "get-stream": {
4340 "version": "2.3.1",
4361 "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",
4342 "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
4363 "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
4343 "requires": {
4364 "requires": {
4344 "object-assign": "^4.0.1",
4365 "object-assign": "^4.0.1",
@@ -15750,7 +15771,7 @@
15750 },
15771 },
15751 "query-string": {
15772 "query-string": {
15752 "version": "5.1.1",
15773 "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",
15754 "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
15775 "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
15755 "requires": {
15776 "requires": {
15756 "decode-uri-component": "^0.2.0",
15777 "decode-uri-component": "^0.2.0",
@@ -17351,7 +17372,7 @@
17351 },
17372 },
17352 "scrypt.js": {
17373 "scrypt.js": {
17353 "version": "0.2.0",
17374 "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",
17355 "integrity": "sha1-r40UZbcemZARC+38WTuUeeA6ito=",
17376 "integrity": "sha1-r40UZbcemZARC+38WTuUeeA6ito=",
17356 "requires": {
17377 "requires": {
17357 "scrypt": "^6.0.2",
17378 "scrypt": "^6.0.2",
@@ -17391,7 +17412,7 @@
17391 "dependencies": {
17412 "dependencies": {
17392 "commander": {
17413 "commander": {
17393 "version": "2.8.1",
17414 "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",
17395 "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
17416 "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
17396 "requires": {
17417 "requires": {
17397 "graceful-readlink": ">= 1.0.0"
17418 "graceful-readlink": ">= 1.0.0"
@@ -17651,7 +17672,7 @@
17651 "dependencies": {
17672 "dependencies": {
17652 "nan": {
17673 "nan": {
17653 "version": "2.10.0",
17674 "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",
17655 "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
17676 "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
17656 }
17677 }
17657 }
17678 }
@@ -18492,7 +18513,7 @@
18492 },
18513 },
18493 "tar": {
18514 "tar": {
18494 "version": "2.2.1",
18515 "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",
18496 "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
18517 "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
18497 "requires": {
18518 "requires": {
18498 "block-stream": "*",
18519 "block-stream": "*",
@@ -18528,7 +18549,7 @@
18528 "dependencies": {
18549 "dependencies": {
18529 "bluebird": {
18550 "bluebird": {
18530 "version": "2.11.0",
18551 "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",
18532 "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE="
18553 "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE="
18533 }
18554 }
18534 }
18555 }
@@ -19097,7 +19118,7 @@
19097 },
19118 },
19098 "underscore": {
19119 "underscore": {
19099 "version": "1.8.3",
19120 "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",
19101 "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
19122 "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
19102 },
19123 },
19103 "unicode-canonical-property-names-ecmascript": {
19124 "unicode-canonical-property-names-ecmascript": {
@@ -19362,7 +19383,7 @@
19362 },
19383 },
19363 "utf8": {
19384 "utf8": {
19364 "version": "2.1.1",
19385 "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",
19366 "integrity": "sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g="
19387 "integrity": "sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g="
19367 },
19388 },
19368 "util": {
19389 "util": {
@@ -19797,35 +19818,6 @@
19797 "web3-utils": "1.0.0-beta.52"
19818 "web3-utils": "1.0.0-beta.52"
19798 }
19819 }
19799 },
19820 },
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− },
19829 "yallist": {
19821 "yallist": {
19830 "version": "3.0.3",
19822 "version": "3.0.3",
19831 "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
19823 "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
@@ -19852,6 +19844,27 @@
19852 "web3-core-method": "1.0.0-beta.33",
19844 "web3-core-method": "1.0.0-beta.33",
19853 "web3-core-requestmanager": "1.0.0-beta.33",
19845 "web3-core-requestmanager": "1.0.0-beta.33",
19854 "web3-utils": "1.0.0-beta.33"
19846 "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+ }
19855 }
19868 }
19856 },
19869 },
19857 "web3-core-helpers": {
19870 "web3-core-helpers": {
@@ -19862,6 +19875,27 @@
19862 "underscore": "1.8.3",
19875 "underscore": "1.8.3",
19863 "web3-eth-iban": "1.0.0-beta.33",
19876 "web3-eth-iban": "1.0.0-beta.33",
19864 "web3-utils": "1.0.0-beta.33"
19877 "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+ }
19865 }
19899 }
19866 },
19900 },
19867 "web3-core-method": {
19901 "web3-core-method": {
@@ -19874,6 +19908,27 @@
19874 "web3-core-promievent": "1.0.0-beta.33",
19908 "web3-core-promievent": "1.0.0-beta.33",
19875 "web3-core-subscriptions": "1.0.0-beta.33",
19909 "web3-core-subscriptions": "1.0.0-beta.33",
19876 "web3-utils": "1.0.0-beta.33"
19910 "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+ }
19877 }
19932 }
19878 },
19933 },
19879 "web3-core-promievent": {
19934 "web3-core-promievent": {
@@ -19924,6 +19979,27 @@
19924 "web3-eth-personal": "1.0.0-beta.33",
19979 "web3-eth-personal": "1.0.0-beta.33",
19925 "web3-net": "1.0.0-beta.33",
19980 "web3-net": "1.0.0-beta.33",
19926 "web3-utils": "1.0.0-beta.33"
19981 "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+ }
19927 }
20003 }
19928 },
20004 },
19929 "web3-eth-abi": {
20005 "web3-eth-abi": {
@@ -19941,6 +20017,20 @@
19941 "version": "4.11.6",
20017 "version": "4.11.6",
19942 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20018 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
19943 "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20019 "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+ }
19944 }
20034 }
19945 }
20035 }
19946 },
20036 },
@@ -19975,6 +20065,41 @@
19975 "version": "2.0.1",
20065 "version": "2.0.1",
19976 "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
20066 "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
19977 "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w="
20067 "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+ }
19978 }
20103 }
19979 }
20104 }
19980 },
20105 },
@@ -19991,6 +20116,27 @@
19991 "web3-core-subscriptions": "1.0.0-beta.33",
20116 "web3-core-subscriptions": "1.0.0-beta.33",
19992 "web3-eth-abi": "1.0.0-beta.33",
20117 "web3-eth-abi": "1.0.0-beta.33",
19993 "web3-utils": "1.0.0-beta.33"
20118 "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+ }
19994 }
20140 }
19995 },
20141 },
19996 "web3-eth-ens": {
20142 "web3-eth-ens": {
@@ -20152,23 +20298,6 @@
20152 "web3-providers": "1.0.0-beta.52",
20298 "web3-providers": "1.0.0-beta.52",
20153 "web3-utils": "1.0.0-beta.52"
20299 "web3-utils": "1.0.0-beta.52"
20154 }
20300 }
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− }
20172 }
20301 }
20173 }
20302 }
20174 },
20303 },
@@ -20185,6 +20314,20 @@
20185 "version": "4.11.6",
20314 "version": "4.11.6",
20186 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20315 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20187 "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20316 "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+ }
20188 }
20331 }
20189 }
20332 }
20190 },
20333 },
@@ -20198,6 +20341,27 @@
20198 "web3-core-method": "1.0.0-beta.33",
20341 "web3-core-method": "1.0.0-beta.33",
20199 "web3-net": "1.0.0-beta.33",
20342 "web3-net": "1.0.0-beta.33",
20200 "web3-utils": "1.0.0-beta.33"
20343 "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+ }
20201 }
20365 }
20202 },
20366 },
20203 "web3-net": {
20367 "web3-net": {
@@ -20208,6 +20372,27 @@
20208 "web3-core": "1.0.0-beta.33",
20372 "web3-core": "1.0.0-beta.33",
20209 "web3-core-method": "1.0.0-beta.33",
20373 "web3-core-method": "1.0.0-beta.33",
20210 "web3-utils": "1.0.0-beta.33"
20374 "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+ }
20211 }
20396 }
20212 },
20397 },
20213 "web3-providers": {
20398 "web3-providers": {
@@ -20296,23 +20481,44 @@
20296 }
20481 }
20297 },
20482 },
20298 "web3-utils": {
20483 "web3-utils": {
20299− "version": "1.0.0-beta.33",
20484+ "version": "1.0.0-beta.52",
20300− "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20485+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.52.tgz",
20301− "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20486+ "integrity": "sha512-WdHyzPcZu/sOnNrkcOZT20QEX9FhwD9OJJXENojQNvMK2a1xo3n8JWBcC2gzAGwsa0Aah6z2B3Xwa1P//8FaoA==",
20302 "requires": {
20487 "requires": {
20488+ "@babel/runtime": "^7.3.1",
20303− "bn.js": "4.11.6",
20489+ "@types/bn.js": "^4.11.4",
20490+ "@types/node": "^10.12.18",
20491+ "bn.js": "4.11.8",
20304− "eth-lib": "0.1.27",
20492+ "eth-lib": "0.2.8",
20305− "ethjs-unit": "0.1.6",
20493+ "ethjs-unit": "^0.1.6",
20494+ "lodash": "^4.17.11",
20306 "number-to-bn": "1.7.0",
20495 "number-to-bn": "1.7.0",
20307 "randomhex": "0.1.5",
20496 "randomhex": "0.1.5",
20308− "underscore": "1.8.3",
20309 "utf8": "2.1.1"
20497 "utf8": "2.1.1"
20310 },
20498 },
20311 "dependencies": {
20499 "dependencies": {
20312− "bn.js": {
20500+ "@babel/runtime": {
20313− "version": "4.11.6",
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",
20314− "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20510+ "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
20315− "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
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=="
20316 }
20522 }
20317 }
20523 }
20318 },
20524 },
package.json+4−3
@@ -14,9 +14,10 @@
14 "node": "11.0.0"
14 "node": "11.0.0"
15 },
15 },
16 "dependencies": {
16 "dependencies": {
17− "azimuth-js": "^0.10.0",
18 "@ledgerhq/hw-app-eth": "^4.35.0",
17 "@ledgerhq/hw-app-eth": "^4.35.0",
19 "@ledgerhq/hw-transport-u2f": "^4.35.0",
18 "@ledgerhq/hw-transport-u2f": "^4.35.0",
19+ "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer",
20+ "azimuth-js": "^0.10.0",
20 "azimuth-solidity": "1.0.2",
21 "azimuth-solidity": "1.0.2",
21 "babel-polyfill": "^6.26.0",
22 "babel-polyfill": "^6.26.0",
22 "bip32": "^1.0.2",
23 "bip32": "^1.0.2",
@@ -34,7 +35,6 @@
34 "keythereum": "^1.0.4",
35 "keythereum": "^1.0.4",
35 "lodash": "^4.17.11",
36 "lodash": "^4.17.11",
36 "more-entropy": "^0.0.7",
37 "more-entropy": "^0.0.7",
37− "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer",
38 "prop-types": "^15.6.2",
38 "prop-types": "^15.6.2",
39 "react": "^16.6.0",
39 "react": "^16.6.0",
40 "react-dom": "^16.6.0",
40 "react-dom": "^16.6.0",
@@ -45,7 +45,8 @@
45 "trezor-connect": "^7.0.1",
45 "trezor-connect": "^7.0.1",
46 "urbit-key-generation": "0.12.1",
46 "urbit-key-generation": "0.12.1",
47 "urbit-ob": "^3.1.0",
47 "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"
49 },
50 },
50 "scripts": {
51 "scripts": {
51 "start": "react-scripts start",
52 "start": "react-scripts start",
src/bridge/components/StatelessTransaction.js+4−2
@@ -28,9 +28,9 @@ class StatelessTransaction extends React.Component {
28 gasLimit: '600000',
28 gasLimit: '600000',
29 showGasDetails: false,
29 showGasDetails: false,
30 userApproval: false,
30 userApproval: false,
31− chainId: '',
31+ chainId: '1',
32 customChain: false,
32 customChain: false,
33− nonce: '',
33+ nonce: '0',
34 stx: Nothing(),
34 stx: Nothing(),
35 txn: Nothing(),
35 txn: Nothing(),
36 txError: Nothing()
36 txError: Nothing()
@@ -120,6 +120,8 @@ class StatelessTransaction extends React.Component {
120 chainId
120 chainId
121 })
121 })
122 }
122 }
123+
124+ this.clearStx()
123 }
125 }
124
126
125 setUserApproval(){
127 setUserApproval(){
src/bridge/lib/txn.js+1−5
@@ -3,6 +3,7 @@ import { Just } from 'folktale/maybe'
3import { Ok, Error } from 'folktale/result'
3import { Ok, Error } from 'folktale/result'
4import Tx from 'ethereumjs-tx'
4import Tx from 'ethereumjs-tx'
5import Web3 from 'web3'
5import Web3 from 'web3'
6+import { toWei, fromWei, toHex } from 'web3-utils'
6
7
7import { BRIDGE_ERROR } from '../lib/error'
8import { BRIDGE_ERROR } from '../lib/error'
8import { NETWORK_NAMES } from '../lib/network'
9import { NETWORK_NAMES } from '../lib/network'
@@ -182,11 +183,6 @@ const getTxnInfo = async (web3, addr) => {
182 }
183 }
183}
184}
184
185
185−const dummy = new Web3()
186−const toHex = dummy.utils.toHex
187−const toWei = dummy.utils.toWei
188−const fromWei = dummy.utils.fromWei
189−
190const canDecodePatp = p => {
186const canDecodePatp = p => {
191 try {
187 try {
192 ob.patp2dec(p)
188 ob.patp2dec(p)
src/bridge/views/Network.js+4−1
@@ -70,7 +70,10 @@ class Network extends React.Component {
70 // We may want to offer the ability to select a target network for
70 // We may want to offer the ability to select a target network for
71 // transactions when offline.
71 // transactions when offline.
72
72
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")
73− const web3 = new Web3()
76+ const web3 = new Web3(provider)
74
77
75 const target =
78 const target =
76 process.env.NODE_ENV === 'development'
79 process.env.NODE_ENV === 'development'