git.iko.soy/bridge
on master help sign in
Merge pull request #151 from urbit/mino-send-invites
899620eFang
package-lock.json+74−181
compare with master
unifiedsplit
@@ -1,6 +1,6 @@
1{
1{
2 "name": "bridge",
2 "name": "bridge",
3− "version": "1.4.0",
3+ "version": "1.4.1",
4 "lockfileVersion": 1,
4 "lockfileVersion": 1,
5 "requires": true,
5 "requires": true,
6 "dependencies": {
6 "dependencies": {
@@ -1036,28 +1036,6 @@
1036 "loader-utils": "^1.1.0"
1036 "loader-utils": "^1.1.0"
1037 }
1037 }
1038 },
1038 },
1039− "@trust/keyto": {
1040− "version": "0.3.4",
1041− "resolved": "https://registry.npmjs.org/@trust/keyto/-/keyto-0.3.4.tgz",
1042− "integrity": "sha512-OAqKvuSEPIu2zCnIHzBthvGnV8nKmpv7cBlRMngLzJZzZI9CanyuSfnEI1xC4sH4TwqA0XJR7Mb0oX4bwymXIw==",
1043− "requires": {
1044− "asn1.js": "^4.9.1",
1045− "base64url": "^3.0.0",
1046− "elliptic": "^6.4.0"
1047− }
1048− },
1049− "@trust/webcrypto": {
1050− "version": "0.9.2",
1051− "resolved": "https://registry.npmjs.org/@trust/webcrypto/-/webcrypto-0.9.2.tgz",
1052− "integrity": "sha512-5iMAVcGYKhqLJGjefB1nzuQSqUJTru0nG4CytpBT/GGp1Piz/MVnj2jORdYf4JBYzggCIa8WZUr2rchP2Ngn/w==",
1053− "requires": {
1054− "@trust/keyto": "^0.3.4",
1055− "base64url": "^3.0.0",
1056− "elliptic": "^6.4.0",
1057− "node-rsa": "^0.4.0",
1058− "text-encoding": "^0.6.1"
1059− }
1060− },
1061 "@types/bn.js": {
1039 "@types/bn.js": {
1062 "version": "4.11.5",
1040 "version": "4.11.5",
1063 "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.5.tgz",
1041 "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.5.tgz",
@@ -1994,40 +1972,18 @@
1994 }
1972 }
1995 },
1973 },
1996 "azimuth-js": {
1974 "azimuth-js": {
1997− "version": "0.13.2",
1975+ "version": "0.14.2",
1998− "resolved": "https://registry.npmjs.org/azimuth-js/-/azimuth-js-0.13.2.tgz",
1976+ "resolved": "https://registry.npmjs.org/azimuth-js/-/azimuth-js-0.14.2.tgz",
1999− "integrity": "sha512-DiteSHZTqst5Ikf5yoOetnU7MIE/El5JIuO9FjyaQHWPYA8ECB4XUaZJCl4VfScnAzzP1YCnORXz/mtVn2D9ng==",
1977+ "integrity": "sha512-54CJ8K0dheso9U1sBWCHkMvUj7/EIEDGc/UH1HU2uenEkSQpx9Ic4jHq9H6W8baew//PEH4ldYnFFVfsd4Gi4Q==",
2000 "requires": {
1978 "requires": {
2001− "azimuth-solidity": "1.1.0",
1979+ "azimuth-solidity": "1.2.0",
2002 "ethereumjs-util": "^5.2.0"
1980 "ethereumjs-util": "^5.2.0"
2003−<<<<<<< HEAD
2004−=======
2005− },
2006− "dependencies": {
2007− "azimuth-solidity": {
2008− "version": "1.1.0",
2009− "resolved": "https://registry.npmjs.org/azimuth-solidity/-/azimuth-solidity-1.1.0.tgz",
2010− "integrity": "sha512-YhVWKql1ZZ9Zae96nYA7QLwQlTzGspkNOErq170sl/UJwncQbvAyibSv+heMaS18n4soPDiRSpa1vHFoGoIX1A==",
2011− "requires": {
2012− "babel-polyfill": "^6.26.0",
2013− "babel-register": "^6.26.0",
2014− "openzeppelin-solidity": "1.12.0",
2015− "truffle": "4.1.11"
2016− },
2017− "dependencies": {
2018− "openzeppelin-solidity": {
2019− "version": "1.12.0",
2020− "bundled": true
2021− }
2022− }
2023− }
2024−>>>>>>> master
2025 }
1981 }
2026 },
1982 },
2027 "azimuth-solidity": {
1983 "azimuth-solidity": {
2028− "version": "1.1.0",
1984+ "version": "1.2.0",
2029− "resolved": "https://registry.npmjs.org/azimuth-solidity/-/azimuth-solidity-1.1.0.tgz",
1985+ "resolved": "https://registry.npmjs.org/azimuth-solidity/-/azimuth-solidity-1.2.0.tgz",
2030− "integrity": "sha512-YhVWKql1ZZ9Zae96nYA7QLwQlTzGspkNOErq170sl/UJwncQbvAyibSv+heMaS18n4soPDiRSpa1vHFoGoIX1A==",
1986+ "integrity": "sha512-5k50PJtJAXqZFFb0BWH6CxYGfodLNnG9VVJtjAnTxrLl8tO4qQSYWSb1nf39Q0MLT4e+rrUf5JIubZXKckmA3g==",
2031 "requires": {
1987 "requires": {
2032 "babel-polyfill": "^6.26.0",
1988 "babel-polyfill": "^6.26.0",
2033 "babel-register": "^6.26.0",
1989 "babel-register": "^6.26.0",
@@ -2041,22 +1997,6 @@
2041 }
1997 }
2042 }
1998 }
2043 },
1999 },
2044− "b64-lite": {
2045− "version": "1.3.1",
2046− "resolved": "https://registry.npmjs.org/b64-lite/-/b64-lite-1.3.1.tgz",
2047− "integrity": "sha512-A3n/YWszeQeUeKKy+XRfsDW/s/+1cvD110HYA4uXtkNswNLd1MxrNblYt2lgKisUS3UfPPTaXhvFegD+l4YuOA==",
2048− "requires": {
2049− "base-64": "^0.1.0"
2050− }
2051− },
2052− "b64u-lite": {
2053− "version": "1.0.1",
2054− "resolved": "https://registry.npmjs.org/b64u-lite/-/b64u-lite-1.0.1.tgz",
2055− "integrity": "sha512-4E6rqyrCnrAdzayWUS8XwFC/vRTBbmR7fgqb/IuHXRM2z63VH/tNxtzDWZhgCXCORTiwy2mIhCtmHyc9TMBj7Q==",
2056− "requires": {
2057− "b64-lite": "^1.1.1"
2058− }
2059− },
2060 "babel-code-frame": {
2000 "babel-code-frame": {
2061 "version": "6.26.0",
2001 "version": "6.26.0",
2062 "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
2002 "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -2528,11 +2468,6 @@
2528 }
2468 }
2529 }
2469 }
2530 },
2470 },
2531− "base-64": {
2532− "version": "0.1.0",
2533− "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
2534− "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
2535− },
2536 "base-x": {
2471 "base-x": {
2537 "version": "3.0.5",
2472 "version": "3.0.5",
2538 "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.5.tgz",
2473 "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.5.tgz",
@@ -2546,11 +2481,6 @@
2546 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
2481 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
2547 "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
2482 "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
2548 },
2483 },
2549− "base64url": {
2550− "version": "3.0.1",
2551− "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
2552− "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
2553− },
2554 "batch": {
2484 "batch": {
2555 "version": "0.6.1",
2485 "version": "0.6.1",
2556 "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
2486 "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -2692,9 +2622,9 @@
2692 "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
2622 "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
2693 },
2623 },
2694 "bootstrap": {
2624 "bootstrap": {
2695− "version": "4.1.3",
2625+ "version": "4.3.1",
2696− "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz",
2626+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
2697− "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w=="
2627+ "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
2698 },
2628 },
2699 "boxen": {
2629 "boxen": {
2700 "version": "1.3.0",
2630 "version": "1.3.0",
@@ -8864,21 +8794,6 @@
8864 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
8794 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
8865 "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
8795 "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
8866 },
8796 },
8867− "isomorphic-webcrypto": {
8868− "version": "1.6.1",
8869− "resolved": "https://registry.npmjs.org/isomorphic-webcrypto/-/isomorphic-webcrypto-1.6.1.tgz",
8870− "integrity": "sha512-ji9vrOdGIQaBguhOg6JZXL+TL8VIEIja/dtcvJ6HtVBX9WygJF6XXjp8+bkZA4EHW3s1mqbG4DIGHBy2FFmOfA==",
8871− "requires": {
8872− "@trust/webcrypto": "^0.9.2",
8873− "b64-lite": "^1.3.1",
8874− "b64u-lite": "^1.0.1",
8875− "mitt": "^1.1.3",
8876− "msrcrypto": "^1.5.1",
8877− "react-native-securerandom": "^0.1.1",
8878− "str2buf": "^1.3.0",
8879− "webcrypto-shim": "^0.1.4"
8880− }
8881− },
8882 "isstream": {
8797 "isstream": {
8883 "version": "0.1.2",
8798 "version": "0.1.2",
8884 "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
8799 "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -10061,6 +9976,11 @@
10061 "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz",
9976 "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz",
10062 "integrity": "sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow=="
9977 "integrity": "sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow=="
10063 },
9978 },
9979+ "js-sha256": {
9980+ "version": "0.9.0",
9981+ "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
9982+ "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
9983+ },
10064 "js-sha3": {
9984 "js-sha3": {
10065 "version": "0.6.1",
9985 "version": "0.6.1",
10066 "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.6.1.tgz",
9986 "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.6.1.tgz",
@@ -10823,11 +10743,6 @@
10823 }
10743 }
10824 }
10744 }
10825 },
10745 },
10826− "mitt": {
10827− "version": "1.1.3",
10828− "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.1.3.tgz",
10829− "integrity": "sha512-mUDCnVNsAi+eD6qA0HkRkwYczbLHJ49z17BGe2PYRhZL4wpZUFZGJHU7/5tmvohoma+Hdn0Vh/oJTiPEmgSruA=="
10830− },
10831 "mixin-deep": {
10746 "mixin-deep": {
10832 "version": "1.3.1",
10747 "version": "1.3.1",
10833 "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
10748 "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
@@ -10945,11 +10860,6 @@
10945 "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
10860 "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
10946 "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
10861 "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
10947 },
10862 },
10948− "msrcrypto": {
10949− "version": "1.5.3",
10950− "resolved": "https://registry.npmjs.org/msrcrypto/-/msrcrypto-1.5.3.tgz",
10951− "integrity": "sha512-dEgu9OAAsknOoV3WEMZVyax46JeLqa81D/bHryo02qT3j16b+3a/f2AdKBAIlPDMtc7/ZWtpNNhdxq+csjQBAg=="
10952− },
10953 "multicast-dns": {
10863 "multicast-dns": {
10954 "version": "6.2.3",
10864 "version": "6.2.3",
10955 "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
10865 "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
@@ -11128,21 +11038,6 @@
11128 "semver": "^5.3.0"
11038 "semver": "^5.3.0"
11129 }
11039 }
11130 },
11040 },
11131− "node-rsa": {
11132− "version": "0.4.2",
11133− "resolved": "http://registry.npmjs.org/node-rsa/-/node-rsa-0.4.2.tgz",
11134− "integrity": "sha1-1jkXKewWqDDtWjgEKzFX0tXXJTA=",
11135− "requires": {
11136− "asn1": "0.2.3"
11137− },
11138− "dependencies": {
11139− "asn1": {
11140− "version": "0.2.3",
11141− "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
11142− "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
11143− }
11144− }
11145− },
11146 "normalize-package-data": {
11041 "normalize-package-data": {
11147 "version": "2.4.0",
11042 "version": "2.4.0",
11148 "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
11043 "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
@@ -16036,15 +15931,6 @@
16036 "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.1.tgz",
15931 "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.1.tgz",
16037 "integrity": "sha512-gJcOyak5ri9mzhpFObSAkCqNNBCVZE8LaR/mX37agULgSL0dobgX11NVSIetvNzhHMkr6CIqV0xiutvvcjBtkw=="
15932 "integrity": "sha512-gJcOyak5ri9mzhpFObSAkCqNNBCVZE8LaR/mX37agULgSL0dobgX11NVSIetvNzhHMkr6CIqV0xiutvvcjBtkw=="
16038 },
15933 },
16039− "react-native-securerandom": {
16040− "version": "0.1.1",
16041− "resolved": "https://registry.npmjs.org/react-native-securerandom/-/react-native-securerandom-0.1.1.tgz",
16042− "integrity": "sha1-8TBiOkEsM4sK+t7bwgTFy7i/IHA=",
16043− "optional": true,
16044− "requires": {
16045− "base64-js": "*"
16046− }
16047− },
16048 "react-router": {
15934 "react-router": {
16049 "version": "4.3.1",
15935 "version": "4.3.1",
16050 "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz",
15936 "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz",
@@ -18043,11 +17929,6 @@
18043 "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
17929 "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
18044 "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
17930 "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
18045 },
17931 },
18046− "str2buf": {
18047− "version": "1.3.0",
18048− "resolved": "https://registry.npmjs.org/str2buf/-/str2buf-1.3.0.tgz",
18049− "integrity": "sha512-xIBmHIUHYZDP4HyoXGHYNVmxlXLXDrtFHYT0eV6IOdEj3VO9ccaF1Ejl9Oq8iFjITllpT8FhaXb4KsNmw+3EuA=="
18050− },
18051 "stream-browserify": {
17932 "stream-browserify": {
18052 "version": "2.0.1",
17933 "version": "2.0.1",
18053 "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
17934 "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
@@ -18618,11 +18499,6 @@
18618 "require-main-filename": "^1.0.1"
18499 "require-main-filename": "^1.0.1"
18619 }
18500 }
18620 },
18501 },
18621− "text-encoding": {
18622− "version": "0.6.4",
18623− "resolved": "http://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
18624− "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk="
18625− },
18626 "text-table": {
18502 "text-table": {
18627 "version": "0.2.0",
18503 "version": "0.2.0",
18628 "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
18504 "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -18849,9 +18725,9 @@
18849 }
18725 }
18850 },
18726 },
18851 "tweetnacl": {
18727 "tweetnacl": {
18852− "version": "1.0.0",
18728+ "version": "1.0.1",
18853− "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.0.tgz",
18729+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz",
18854− "integrity": "sha1-cT2LgY2kIGh0C/aDhtBHnmb8ins="
18730+ "integrity": "sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A=="
18855 },
18731 },
18856 "type-check": {
18732 "type-check": {
18857 "version": "0.3.2",
18733 "version": "0.3.2",
@@ -19188,18 +19064,29 @@
19188 "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
19064 "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
19189 },
19065 },
19190 "urbit-key-generation": {
19066 "urbit-key-generation": {
19191− "version": "0.12.1",
19067+ "version": "0.16.0",
19192− "resolved": "https://registry.npmjs.org/urbit-key-generation/-/urbit-key-generation-0.12.1.tgz",
19068+ "resolved": "https://registry.npmjs.org/urbit-key-generation/-/urbit-key-generation-0.16.0.tgz",
19193− "integrity": "sha512-3/TvWwQjFiYEIS7G7Ffbuj5XbcPCMVXD56sjnPRveZlGbI9B2cv5kwGSGkC8oNAFhp1xkZP6RdrddCealPCTng==",
19069+ "integrity": "sha512-3nwiIb2OGg0KdT/k+iJGjJJ5hUjPt64gmUu6wbDkLCfPLAn0xMN0FqaBd9mEc0niqWH1z6v0iJR4N7Vv0xMPVg==",
19194 "requires": {
19070 "requires": {
19195 "argon2-wasm": "^0.9.0",
19071 "argon2-wasm": "^0.9.0",
19196 "bip32": "^1.0.2",
19072 "bip32": "^1.0.2",
19197 "bip39": "^2.5.0",
19073 "bip39": "^2.5.0",
19198− "isomorphic-webcrypto": "^1.6.0",
19074+ "js-sha256": "^0.9.0",
19199 "keccak": "^1.4.0",
19075 "keccak": "^1.4.0",
19200 "secp256k1": "^3.5.2",
19076 "secp256k1": "^3.5.2",
19201 "tweetnacl": "^1.0.0",
19077 "tweetnacl": "^1.0.0",
19202− "urbit-ob": "^3.0.1"
19078+ "urbit-ob": "^4.0.0"
19079+ },
19080+ "dependencies": {
19081+ "urbit-ob": {
19082+ "version": "4.0.0",
19083+ "resolved": "https://registry.npmjs.org/urbit-ob/-/urbit-ob-4.0.0.tgz",
19084+ "integrity": "sha512-FsVQx4h2Kuu+ZqUOmAUDAQFlw9r1R+B6r9Bu9TnyNDOraLUlojBw5wG5ONbWiK0g7sgeQkQ3rMVyXqiv41Vrpg==",
19085+ "requires": {
19086+ "bn.js": "^4.11.8",
19087+ "lodash": "^4.17.11"
19088+ }
19089+ }
19203 }
19090 }
19204 },
19091 },
19205 "urbit-ob": {
19092 "urbit-ob": {
@@ -20161,7 +20048,6 @@
20161 "resolved": "https://registry.npmjs.org/web3-providers/-/web3-providers-1.0.0-beta.54.tgz",
20048 "resolved": "https://registry.npmjs.org/web3-providers/-/web3-providers-1.0.0-beta.54.tgz",
20162 "integrity": "sha512-P55MQHkfU2VLt3t+3IbqRUVwOziLOMiXxKulVYXzTu9M8p9aogl1tvPjKXpRUGygCY3LsWTpt/UlJR8Aaia+CQ==",
20049 "integrity": "sha512-P55MQHkfU2VLt3t+3IbqRUVwOziLOMiXxKulVYXzTu9M8p9aogl1tvPjKXpRUGygCY3LsWTpt/UlJR8Aaia+CQ==",
20163 "requires": {
20050 "requires": {
20164−<<<<<<< HEAD
20165 "@babel/runtime": "^7.3.1",
20051 "@babel/runtime": "^7.3.1",
20166 "@types/node": "^10.12.18",
20052 "@types/node": "^10.12.18",
20167 "eventemitter3": "3.1.0",
20053 "eventemitter3": "3.1.0",
@@ -20172,42 +20058,54 @@
20172 },
20058 },
20173 "dependencies": {
20059 "dependencies": {
20174 "@babel/runtime": {
20060 "@babel/runtime": {
20175− "version": "7.4.4",
20061+ "version": "7.4.5",
20176− "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz",
20062+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
20177− "integrity": "sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==",
20063+ "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
20178 "requires": {
20064 "requires": {
20179 "regenerator-runtime": "^0.13.2"
20065 "regenerator-runtime": "^0.13.2"
20180 }
20066 }
20181 },
20067 },
20068+ "bn.js": {
20069+ "version": "4.11.6",
20070+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
20071+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
20072+ },
20182 "regenerator-runtime": {
20073 "regenerator-runtime": {
20183 "version": "0.13.2",
20074 "version": "0.13.2",
20184 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
20075 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
20185 "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
20076 "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
20077+ },
20078+ "web3-core-helpers": {
20079+ "version": "1.0.0-beta.33",
20080+ "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.33.tgz",
20081+ "integrity": "sha1-Kvcz5QTbBefDZIwdrPV3sOwV3EM=",
20082+ "requires": {
20083+ "web3-eth-iban": "1.0.0-beta.33",
20084+ "web3-utils": "1.0.0-beta.33"
20085+ }
20086+ },
20087+ "web3-eth-iban": {
20088+ "version": "1.0.0-beta.33",
20089+ "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.33.tgz",
20090+ "integrity": "sha1-HXPQxSiKRWWxdUp1tfs+oLd6Uy8=",
20091+ "requires": {
20092+ "bn.js": "4.11.6",
20093+ "web3-utils": "1.0.0-beta.33"
20094+ }
20095+ },
20096+ "web3-utils": {
20097+ "version": "1.0.0-beta.33",
20098+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.33.tgz",
20099+ "integrity": "sha1-4JG3mU8JtxSwGYpAV9OtLrjL4jg=",
20100+ "requires": {
20101+ "bn.js": "4.11.6",
20102+ "eth-lib": "0.1.27",
20103+ "ethjs-unit": "0.1.6",
20104+ "number-to-bn": "1.7.0",
20105+ "randomhex": "0.1.5",
20106+ "utf8": "2.1.1"
20107+ }
20186 }
20108 }
20187−=======
20188− "web3-core-helpers": "1.0.0-beta.33",
20189− "xhr2": "0.1.4"
20190− }
20191− },
20192− "web3-providers-ipc": {
20193− "version": "1.0.0-beta.33",
20194− "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.33.tgz",
20195− "integrity": "sha1-Twrcmv6dEsBm5L5cPFNvUHPLB8Y=",
20196− "requires": {
20197− "oboe": "2.1.3",
20198− "underscore": "1.8.3",
20199− "web3-core-helpers": "1.0.0-beta.33"
20200− }
20201− },
20202− "web3-providers-ws": {
20203− "version": "1.0.0-beta.33",
20204− "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.33.tgz",
20205− "integrity": "sha1-j93qQuGbvyUh7IeVRkV6Yjqdye8=",
20206− "requires": {
20207− "underscore": "1.8.3",
20208− "web3-core-helpers": "1.0.0-beta.33",
20209− "websocket": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible"
20210−>>>>>>> master
20211 }
20109 }
20212 },
20110 },
20213 "web3-shh": {
20111 "web3-shh": {
@@ -20309,11 +20207,6 @@
20309 }
20207 }
20310 }
20208 }
20311 },
20209 },
20312− "webcrypto-shim": {
20313− "version": "0.1.4",
20314− "resolved": "https://registry.npmjs.org/webcrypto-shim/-/webcrypto-shim-0.1.4.tgz",
20315− "integrity": "sha512-I2lnL+K2oPNE9ryVHwo42oDnt8XQ9E1KKMGCmcT7OXaAKPmUeCi/G0nUgLR6M6Ztj05ZCxLMGf5bXNaSo+wURg=="
20316− },
20317 "webidl-conversions": {
20210 "webidl-conversions": {
20318 "version": "4.0.2",
20211 "version": "4.0.2",
20319 "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
20212 "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
package.json+4−4
@@ -17,13 +17,13 @@
17 "@ledgerhq/hw-app-eth": "^4.35.0",
17 "@ledgerhq/hw-app-eth": "^4.35.0",
18 "@ledgerhq/hw-transport-u2f": "^4.35.0",
18 "@ledgerhq/hw-transport-u2f": "^4.35.0",
19 "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer",
19 "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer",
20− "azimuth-js": "^0.13.2",
20+ "azimuth-js": "^0.14.0",
21− "azimuth-solidity": "^1.1.0",
21+ "azimuth-solidity": "^1.2.0",
22 "babel-polyfill": "^6.26.0",
22 "babel-polyfill": "^6.26.0",
23 "bip32": "^1.0.2",
23 "bip32": "^1.0.2",
24 "bip39": "^2.5.0",
24 "bip39": "^2.5.0",
25 "bn.js": "^4.11.8",
25 "bn.js": "^4.11.8",
26− "bootstrap": "^4.1.3",
26+ "bootstrap": "^4.3.1",
27 "classnames": "^2.2.6",
27 "classnames": "^2.2.6",
28 "ethereum-blockies-base64": "^1.0.2",
28 "ethereum-blockies-base64": "^1.0.2",
29 "ethereumjs-tx": "^1.3.7",
29 "ethereumjs-tx": "^1.3.7",
@@ -43,7 +43,7 @@
43 "secp256k1": "^3.5.2",
43 "secp256k1": "^3.5.2",
44 "sigil-js": "github:urbit/sigil-js#f7f29c5",
44 "sigil-js": "github:urbit/sigil-js#f7f29c5",
45 "trezor-connect": "^7.0.1",
45 "trezor-connect": "^7.0.1",
46− "urbit-key-generation": "0.12.1",
46+ "urbit-key-generation": "^0.16.0",
47 "urbit-ob": "^3.1.0",
47 "urbit-ob": "^3.1.0",
48 "web3": "1.0.0-beta.54",
48 "web3": "1.0.0-beta.54",
49 "web3-utils": "^1.0.0-beta.52"
49 "web3-utils": "^1.0.0-beta.52"
src/bridge/Bridge.js+16−2
@@ -12,7 +12,12 @@ import { Container, Row, Col } from './components/Base'
12
12
13import { ROUTE_NAMES, router } from './lib/router'
13import { ROUTE_NAMES, router } from './lib/router'
14import { NETWORK_NAMES } from './lib/network'
14import { NETWORK_NAMES } from './lib/network'
15+import {
16+ WALLET_NAMES,
17+ DEFAULT_HD_PATH,
15−import { WALLET_NAMES, DEFAULT_HD_PATH, walletFromMnemonic } from './lib/wallet'
18+ walletFromMnemonic,
19+ addressFromSecp256k1Public
20+} from './lib/wallet'
16import { BRIDGE_ERROR } from './lib/error'
21import { BRIDGE_ERROR } from './lib/error'
17
22
18const initWeb3 = (networkType) => {
23const initWeb3 = (networkType) => {
@@ -212,7 +217,11 @@ class Bridge extends React.Component {
212 }
217 }
213
218
214 setWallet(wallet) {
219 setWallet(wallet) {
220+ wallet.map(wal => {
221+ wal.address = wal.address || addressFromSecp256k1Public(wal.publicKey);
222+ return wal;
223+ });
215− this.setState({ wallet })
224+ this.setState({ wallet });
216 }
225 }
217
226
218 setWalletHdPath(walletHdPath) {
227 setWalletHdPath(walletHdPath) {
@@ -229,6 +238,10 @@ class Bridge extends React.Component {
229 DEFAULT_HD_PATH,
238 DEFAULT_HD_PATH,
230 urbitWallet.value.meta.passphrase
239 urbitWallet.value.meta.passphrase
231 );
240 );
241+ wallet.map(wal => {
242+ wal.address = urbitWallet.value.ownership.keys.address;
243+ return wal;
244+ });
232 }
245 }
233 this.setState({ urbitWallet, wallet })
246 this.setState({ urbitWallet, wallet })
234 }
247 }
@@ -342,6 +355,7 @@ class Bridge extends React.Component {
342 networkRevisionCache={ networkRevisionCache }
355 networkRevisionCache={ networkRevisionCache }
343 setNetworkSeedCache= { this.setNetworkSeedCache }
356 setNetworkSeedCache= { this.setNetworkSeedCache }
344 // txn
357 // txn
358+ onSent={ this.setTxnHashCursor }
345 setTxnHashCursor={ this.setTxnHashCursor }
359 setTxnHashCursor={ this.setTxnHashCursor }
346 txnHashCursor={ txnHashCursor }
360 txnHashCursor={ txnHashCursor }
347 setTxnConfirmations={ this.setTxnConfirmations }
361 setTxnConfirmations={ this.setTxnConfirmations }
src/bridge/components/StatelessTransaction.js+15−38
@@ -1,6 +1,7 @@
1import { Nothing, Just } from 'folktale/maybe'
1import { Nothing, Just } from 'folktale/maybe'
2import { Ok } from 'folktale/result'
2import { Ok } from 'folktale/result'
3import React from 'react'
3import React from 'react'
4+import * as need from '../lib/need'
4
5
5import { Code, H3 } from './Base'
6import { Code, H3 } from './Base'
6import { Button } from './Base'
7import { Button } from './Base'
@@ -8,14 +9,12 @@ import { CheckboxButton, Input, InnerLabel,
8 InnerLabelDropdown } from './Base'
9 InnerLabelDropdown } from './Base'
9import { Warning } from '../components/Base'
10import { Warning } from '../components/Base'
10
11
11−import { addressFromSecp256k1Public } from '../lib/wallet'
12import { BRIDGE_ERROR } from '../lib/error'
12import { BRIDGE_ERROR } from '../lib/error'
13import { ROUTE_NAMES } from '../lib/router'
13import { ROUTE_NAMES } from '../lib/router'
14import * as tank from '../lib/tank'
14import * as tank from '../lib/tank'
15
15
16import {
16import {
17 sendSignedTransaction,
17 sendSignedTransaction,
18− waitForTransactionConfirm,
19 fromWei,
18 fromWei,
20 toWei,
19 toWei,
21 hexify,
20 hexify,
@@ -66,12 +65,7 @@ class StatelessTransaction extends React.Component {
66 componentDidMount() {
65 componentDidMount() {
67 const { props } = this
66 const { props } = this
68
67
69− const addr = props.wallet.matchWith({
68+ const addr = need.address(props);
70− Just: wal => addressFromSecp256k1Public(wal.value.publicKey),
71− Nothing: () => {
72− throw BRIDGE_ERROR.MISSING_WALLET
73− }
74− })
75
69
76 props.web3.matchWith({
70 props.web3.matchWith({
77 Nothing: () => {},
71 Nothing: () => {},
@@ -195,7 +189,7 @@ class StatelessTransaction extends React.Component {
195 try {
189 try {
196 this.setState({ txStatus: SUBMISSION_STATES.PREPARING });
190 this.setState({ txStatus: SUBMISSION_STATES.PREPARING });
197 const res = await props.beforeSend(stx);
191 const res = await props.beforeSend(stx);
198− if (res === false) throw 'beforeSend disallowed sending';
192+ if (res === false) throw new Error('beforeSend disallowed sending');
199 } catch (e) {
193 } catch (e) {
200 console.log('beforeSend error', e);
194 console.log('beforeSend error', e);
201 this.setState({
195 this.setState({
@@ -211,21 +205,15 @@ class StatelessTransaction extends React.Component {
211 const rawTx = hexify(stx.serialize());
205 const rawTx = hexify(stx.serialize());
212 const cost = (state.gasLimit * toWei(state.gasPrice, 'gwei'));
206 const cost = (state.gasLimit * toWei(state.gasPrice, 'gwei'));
213
207
214− //TODO need a lib function or something for address=, it's everywhere
215− const address = props.wallet.matchWith({
208+ const address = need.address(props);
216− Just: wal => addressFromSecp256k1Public(wal.value.publicKey),
217− Nothing: () => {
218− throw BRIDGE_ERROR.MISSING_WALLET
219− }
220− });
221 let balance = await web3.eth.getBalance(address);
209 let balance = await web3.eth.getBalance(address);
222 let hasBalance = (balance >= cost);
210 let hasBalance = (balance >= cost);
223
211
224 let usedTank = false;
212 let usedTank = false;
225 // if we need to, try and fund the transaction
213 // if we need to, try and fund the transaction
226 if (!hasBalance) {
214 if (!hasBalance) {
227− hasBalance = await this.ensureFundsFor(web3, address, cost, [rawTx]);
215+ usedTank = await this.ensureFundsFor(web3, address, cost, [rawTx]);
228− usedTank = hasBalance;
216+ hasBalance = usedTank;
229 }
217 }
230
218
231 // if we still don't have sufficient balance, fail and tell the user
219 // if we still don't have sufficient balance, fail and tell the user
@@ -268,26 +256,15 @@ class StatelessTransaction extends React.Component {
268 }
256 }
269 }
257 }
270
258
271− //TODO partially copied from InviteTransactions, try to move into tank lib
259+ // uses the gas tank to ensure funds, but if we have to ask the user
260+ // for funding, just resolve instead of waiting
261+ // returns true if the gas tank was used, false otherwise
272− async ensureFundsFor(web3, address, cost, signedTxs) {
262+ ensureFundsFor(web3, address, cost, signedTxs) {
273− let balance = await web3.eth.getBalance(address);
263+ return new Promise((resolve, reject) => {
274− if (cost > balance) {
264+ tank.ensureFundsFor(web3, null, address, cost, signedTxs,
275− try {
276−
277− const res = await tank.fundTransactions(signedTxs);
278− if (!res.success) {
279− return false;
265+ () => { resolve(false); })
280− } else {
266+ .then(res => { resolve(res); });
281− await waitForTransactionConfirm(web3, res.txHash);
267+ });
282− return true;
283− }
284−
285− } catch (e) {
286− return false;
287− }
288− } else {
289− return true;
290− }
291 }
268 }
292
269
293 getChainTitle(chainId) {
270 getChainTitle(chainId) {
src/bridge/lib/invite.js+32−168
@@ -1,32 +1,18 @@
1−import lodash from 'lodash'
2import { Just, Nothing } from 'folktale/maybe'
1import { Just, Nothing } from 'folktale/maybe'
3import Tx from 'ethereumjs-tx'
2import Tx from 'ethereumjs-tx'
4
3
5import * as azimuth from 'azimuth-js'
4import * as azimuth from 'azimuth-js'
6−import * as more from 'more-entropy'
7−import * as ob from 'urbit-ob'
8import * as kg from '../../../node_modules/urbit-key-generation/dist/index'
5import * as kg from '../../../node_modules/urbit-key-generation/dist/index'
6+import * as wg from '../../walletgen/lib/lib.js'
9import * as tank from './tank'
7import * as tank from './tank'
10−import { MIN_STAR, MIN_PLANET, SEED_ENTROPY_BITS,
11− GALAXY_ENTROPY_BITS, STAR_ENTROPY_BITS, PLANET_ENTROPY_BITS,
12− } from '../../walletgen/lib/constants'
13
8
14import JSZip from 'jszip'
9import JSZip from 'jszip'
15import saveAs from 'file-saver'
10import saveAs from 'file-saver'
16
11
17−import {
12+import { sendSignedTransaction } from './txn'
18− waitForTransactionConfirm,
19− isTransactionConfirmed
20−} from './txn'
21−import { BRIDGE_ERROR } from './error'
13+import { BRIDGE_ERROR } from '../lib/error'
22import { attemptSeedDerivation } from './keys'
14import { attemptSeedDerivation } from './keys'
23−import {
24− addressFromSecp256k1Public,
25− addHexPrefix,
15+import { addHexPrefix, WALLET_NAMES } from './wallet'
26− WALLET_NAMES
27−} from './wallet'
28−
29−const SEED_LENGTH_BYTES = SEED_ENTROPY_BITS / 8
30
16
31const INVITE_STAGES = {
17const INVITE_STAGES = {
32 INVITE_LOGIN: "invite login",
18 INVITE_LOGIN: "invite login",
@@ -79,58 +65,9 @@ const TRANSACTION_STATES = {
79 },
65 },
80}
66}
81
67
82−//TODO should be moved to lib/walletgen
83async function generateWallet(point) {
68async function generateWallet(point) {
84− const makeTicket = point => {
69+ const ticket = await wg.makeTicket(point);
85−
86− const bits = point < MIN_STAR
87− ? GALAXY_ENTROPY_BITS
88− : point < MIN_PLANET
89− ? STAR_ENTROPY_BITS
90− : PLANET_ENTROPY_BITS
91−
92− const bytes = bits / 8
93− const some = new Uint8Array(bytes)
94− window.crypto.getRandomValues(some)
95−
96− const gen = new more.Generator()
97−
98− return new Promise((resolve, reject) => {
99− gen.generate(bits, result => {
100− const chunked = lodash.chunk(result, 2)
101− const desired = chunked.slice(0, bytes) // only take required entropy
102− const more = lodash.flatMap(desired, arr => arr[0] ^ arr[1])
103− const entropy = lodash.zipWith(some, more, (x, y) => x ^ y)
104− const buf = Buffer.from(entropy)
105− const patq = ob.hex2patq(buf.toString('hex'))
106− resolve(patq)
107− reject('Entropy generation failed')
108− })
109− })
110− }
111−
112− const genWallet = async (point, ticket, cb) => {
113−
114− const config = {
115− ticket: ticket,
116− seedSize: SEED_LENGTH_BYTES,
117− ship: point,
118− password: '',
119− revisions: {},
120− boot: false //TODO should this generate networking keys here already?
121− };
122−
123− const wallet = await kg.generateWallet(config);
70+ const wallet = await wg.generateWallet(point, ticket);
124−
125− // This is here to notify the anyone who opens console because the thread
126− // hangs, blocking UI updates so this cannot be doen in the UI
127− console.log('Generating Wallet for point address: ', point);
128−
129− return wallet;
130− }
131−
132− const ticket = await makeTicket(point);
133− const wallet = await genWallet(point, ticket);
134 return wallet;
71 return wallet;
135}
72}
136
73
@@ -169,6 +106,13 @@ async function startTransactions(args) {
169 let { realPointM, web3M, contractsM,
106 let { realPointM, web3M, contractsM,
170 inviteWalletM, realWalletM, setUrbitWallet, updateProgress } = args
107 inviteWalletM, realWalletM, setUrbitWallet, updateProgress } = args
171
108
109+ const askForFunding = (address, amount, current) => {
110+ updateProgress({
111+ type: "notify",
112+ value: `Please make sure ${address} has at least ${amount} wei, we'll continue once that's true. Current balance: ${current}. Waiting`
113+ });
114+ }
115+
172 if (Nothing.hasInstance(web3M)) {
116 if (Nothing.hasInstance(web3M)) {
173 throw BRIDGE_ERROR.MISSING_WEB3;
117 throw BRIDGE_ERROR.MISSING_WEB3;
174 }
118 }
@@ -196,7 +140,7 @@ async function startTransactions(args) {
196 }
140 }
197 const point = realPointM.value;
141 const point = realPointM.value;
198
142
199− const inviteAddress = addressFromSecp256k1Public(inviteWallet.publicKey);
143+ const inviteAddress = inviteWallet.address;
200 console.log('working as', inviteAddress);
144 console.log('working as', inviteAddress);
201
145
202 // transfer from invite wallet to new wallet
146 // transfer from invite wallet to new wallet
@@ -217,7 +161,13 @@ async function startTransactions(args) {
217 let rawTransferStx = '0x'+transferStx.serialize().toString('hex');
161 let rawTransferStx = '0x'+transferStx.serialize().toString('hex');
218
162
219 const transferCost = transferTx.gas * transferTx.gasPrice;
163 const transferCost = transferTx.gas * transferTx.gasPrice;
164+ updateProgress({
165+ type: "progress",
166+ value: TRANSACTION_STATES.FUNDING_INVITE
167+ });
168+ let usedTank = await tank.ensureFundsFor(
220− await ensureFundsFor(web3, point, inviteAddress, transferCost, [rawTransferStx], updateProgress, true);
169+ web3, point, inviteAddress, transferCost, [rawTransferStx], askForFunding
170+ );
221
171
222 updateProgress({
172 updateProgress({
223 type: "progress",
173 type: "progress",
@@ -225,7 +175,7 @@ async function startTransactions(args) {
225 });
175 });
226
176
227 // send transaction
177 // send transaction
228− await sendAndAwaitConfirm(web3, [rawTransferStx]);
178+ await sendAndAwaitConfirm(web3, [rawTransferStx], usedTank);
229
179
230 //
180 //
231 // we're gonna be operating as the new wallet from here on out, so change
181 // we're gonna be operating as the new wallet from here on out, so change
@@ -281,14 +231,20 @@ async function startTransactions(args) {
281 return '0x'+stx.serialize().toString('hex');
231 return '0x'+stx.serialize().toString('hex');
282 });
232 });
283
233
234+ updateProgress({
235+ type: "progress",
236+ value: TRANSACTION_STATES.FUNDING_RECIPIENT
237+ });
238+ usedTank = await tank.ensureFundsFor(
284− await ensureFundsFor(web3, point, newAddress, totalCost, rawStxs, updateProgress, false);
239+ web3, point, newAddress, totalCost, rawStxs, askForFunding
240+ );
285
241
286 updateProgress({
242 updateProgress({
287 type: "progress",
243 type: "progress",
288 value: TRANSACTION_STATES.CONFIGURING
244 value: TRANSACTION_STATES.CONFIGURING
289 });
245 });
290
246
291− await sendAndAwaitConfirm(web3, rawStxs);
247+ await sendAndAwaitConfirm(web3, rawStxs, usedTank);
292
248
293 updateProgress({
249 updateProgress({
294 type: "progress",
250 type: "progress",
@@ -328,106 +284,14 @@ async function startTransactions(args) {
328 setUrbitWallet(Just(realWallet));
284 setUrbitWallet(Just(realWallet));
329}
285}
330
286
331−async function ensureFundsFor(web3, point, address, cost, signedTxs, updateProgress, firstTx) {
332− let fundingState = firstTx? TRANSACTION_STATES.FUNDING_INVITE : TRANSACTION_STATES.FUNDING_RECIPIENT
333−
334− updateProgress({
335− type: "progress",
336− value: fundingState
337− });
338−
339− let balance = await web3.eth.getBalance(address);
340−
341− if (cost > balance) {
342−
343− try {
344−
345− const fundsRemaining = await tank.remainingTransactions(point);
346− if (fundsRemaining < signedTxs.length) {
347− throw new Error('request invalid');
348− }
349−
350− const res = await tank.fundTransactions(signedTxs);
351− if (!res.success) {
352− throw new Error('request rejected');
353− } else {
354− await waitForTransactionConfirm(web3, res.txHash);
355− let newBalance = await web3.eth.getBalance(address);
356− console.log('funds have confirmed', balance >= cost, balance, newBalance);
357− }
358−
359− } catch (e) {
360−
361− console.log('funding failed', e);
362− await waitForBalance(web3, address, cost, updateProgress);
363−
364− }
365−
366− } else {
367− console.log('already have sufficient funds');
368− }
369−}
370−
371−// resolves when address has at least minBalance
372−//
373−async function waitForBalance(web3, address, minBalance, updateProgress) {
374− console.log('awaiting balance', address, minBalance);
375− return new Promise((resolve, reject) => {
376− let oldBalance = null;
377− const checkForBalance = async () => {
378− const balance = await web3.eth.getBalance(address);
379− if (balance >= minBalance) {
380− resolve();
381− } else {
382− if (balance !== oldBalance) {
383− askForFunding(address, minBalance, balance, updateProgress);
384− }
385− setTimeout(checkForBalance, 13000);
386− }
387− };
388− checkForBalance();
389− });
390−}
391−
392−async function sendAndAwaitConfirm(web3, signedTxs) {
287+async function sendAndAwaitConfirm(web3, signedTxs, usedTank) {
393 await Promise.all(signedTxs.map(tx => {
288 await Promise.all(signedTxs.map(tx => {
394− console.log('sending...');
395 return new Promise((resolve, reject) => {
289 return new Promise((resolve, reject) => {
396− web3.eth.sendSignedTransaction(tx).then(res => {
290+ sendSignedTransaction(web3, tx, usedTank, resolve);
397− console.log('sent, now waiting for confirm!', res.transactionHash);
398− waitForTransactionConfirm(web3, res.transactionHash)
399− .then(resolve);
400− }).catch(async err => {
401− // if there's an error, check if it's because the transaction was
402− // already confirmed prior to sending.
403− // this is really only the case in local dev environments.
404− const txHash = web3.utils.keccak256(tx);
405− console.log(err.message);
406− if (err.message.slice(0,54) ===
407− "Returned error: the tx doesn't have the correct nonce.") {
408− console.log('nonce error, awaiting confirm', err.message.slice(55));
409− //TODO max wait time before assume failure?
410− let res = await waitForTransactionConfirm(web3, txHash);
411− if (res) resolve();
412− else reject(new Error('Unexpected tx failure'));
413− } else {
414− const confirmed = await isTransactionConfirmed(web3, txHash);
415− console.log('error, but maybe confirmed:', confirmed);
416− if (confirmed) resolve();
417− else reject(err);
418− }
419− });
420 });
291 });
421 }));
292 }));
422}
293}
423
294
424−function askForFunding(address, amount, current, updateProgress) {
425− updateProgress({
426− type: "notify",
427− value: `Please make sure ${address} has at least ${amount} wei, we'll continue once that's true. Current balance: ${current}. Waiting`
428− });
429−}
430−
431export {
295export {
432 generateWallet,
296 generateWallet,
433 downloadWallet,
297 downloadWallet,
src/bridge/lib/inviteMail.js+20−4
@@ -4,22 +4,38 @@
4// https://stackoverflow.com/a/53011185/1334324
4// https://stackoverflow.com/a/53011185/1334324
5const baseUrl = 'https://localhost:3002'
5const baseUrl = 'https://localhost:3002'
6
6
7−function sendMail(recipient, ticket) {
7+function sendRequest(where, what) {
8 return new Promise((resolve, reject) => {
8 return new Promise((resolve, reject) => {
9− fetch(baseUrl + '/send-ticket', {
9+ fetch(baseUrl + where, {
10 method: 'POST',
10 method: 'POST',
11 cache: 'no-cache',
11 cache: 'no-cache',
12 headers: {
12 headers: {
13 'Content-Type': 'application/json'
13 'Content-Type': 'application/json'
14 },
14 },
15− body: JSON.stringify({recipient,ticket}),
15+ body: JSON.stringify(what)
16+ })
17+ .then(response => {
18+ if (response.ok) {
19+ resolve(response.json());
20+ } else {
21+ reject(response);
22+ }
16 })
23 })
17− .then(response => resolve(response.ok))
18 .catch(reject);
24 .catch(reject);
19 });
25 });
20}
26}
21
27
28+async function hasReceived(recipient) {
29+ const res = await sendRequest('/has-received', {recipient});
30+ return res.hasReceived;
31+}
32+
33+function sendMail(recipient, ticket, tx) {
34+ return sendRequest('/send-ticket', { recipient, ticket, tx });
35+}
36+
22export {
37export {
38+ hasReceived,
23 sendMail
39 sendMail
24}
40}
25
41
src/bridge/lib/keys.js+5−19
@@ -1,5 +1,6 @@
1import BN from 'bn.js'
1import BN from 'bn.js'
2import Maybe from 'folktale/maybe'
2import Maybe from 'folktale/maybe'
3+import * as need from '../lib/need'
3
4
4import * as noun from '../nockjs/noun'
5import * as noun from '../nockjs/noun'
5import * as serial from '../nockjs/serial'
6import * as serial from '../nockjs/serial'
@@ -7,7 +8,6 @@ import * as kg from '../../../node_modules/urbit-key-generation/dist/index'
7
8
8import { BRIDGE_ERROR } from './error'
9import { BRIDGE_ERROR } from './error'
9import {
10import {
10− addressFromSecp256k1Public,
11 WALLET_NAMES,
11 WALLET_NAMES,
12 eqAddr
12 eqAddr
13 } from './wallet'
13 } from './wallet'
@@ -63,24 +63,15 @@ const genKey = (networkSeed, point, revision) => {
63// 'next' refers to setting the next set of keys
63// 'next' refers to setting the next set of keys
64// if false, we use revision - 1
64// if false, we use revision - 1
65const attemptSeedDerivation = async (next, args) => {
65const attemptSeedDerivation = async (next, args) => {
66− const { walletType, wallet, pointCursor, pointCache } = args
66+ const { walletType } = args
67 const { urbitWallet, authMnemonic } = args
67 const { urbitWallet, authMnemonic } = args
68
68
69 // NB (jtobin):
69 // NB (jtobin):
70 //
70 //
71 // following code is intentionally verbose for sake of clarity
71 // following code is intentionally verbose for sake of clarity
72
72
73− const point = pointCursor.matchWith({
73+ const point = need.pointCursor(args);
74− Just: pt => pt.value,
75− Nothing: _ => {
76− throw BRIDGE_ERROR.MISSING_POINT
77− }
78− })
79−
80− const pointDetails =
74+ const pointDetails = need.fromPointCache(args, point);
81− point in pointCache
82− ? pointCache[point]
83− : (() => { throw BRIDGE_ERROR.MISSING_POINT })()
84
75
85 const revision =
76 const revision =
86 next === true
77 next === true
@@ -104,12 +95,7 @@ const attemptSeedDerivation = async (next, args) => {
104
95
105 } else if (walletType === WALLET_NAMES.MNEMONIC) {
96 } else if (walletType === WALLET_NAMES.MNEMONIC) {
106
97
107− const walProxy = wallet.matchWith({
98+ const walProxy = need.address(args);
108− Just: wal => addressFromSecp256k1Public(wal.value.publicKey),
109− Nothing: _ => {
110− throw BRIDGE_ERROR.MISSING_WALLET
111− }
112− })
113
99
114 const mnemonic = authMnemonic.matchWith({
100 const mnemonic = authMnemonic.matchWith({
115 Just: mnem => mnem.value,
101 Just: mnem => mnem.value,
src/bridge/lib/need.jsnew file+62
@@ -0,0 +1,62 @@
1+// need.js: +need but worse
2+//
3+// generally, pass the props object into these functions
4+
5+import { BRIDGE_ERROR } from '../lib/error'
6+
7+function web3(obj) {
8+ return ('web3' in obj === false)
9+ ? (() => { throw BRIDGE_ERROR.MISSING_WEB3 })()
10+ : obj.web3.matchWith({
11+ Nothing: () => { throw BRIDGE_ERROR.MISSING_WEB3 },
12+ Just: w => w.value
13+ });
14+}
15+
16+function contracts(obj) {
17+ return ('contracts' in obj === false)
18+ ? (() => { throw BRIDGE_ERROR.MISSING_CONTRACTS })()
19+ : obj.contracts.matchWith({
20+ Nothing: () => { throw BRIDGE_ERROR.MISSING_CONTRACTS },
21+ Just: c => c.value
22+ });
23+}
24+
25+function wallet(obj) {
26+ return ('wallet' in obj === false)
27+ ? (() => { throw BRIDGE_ERROR.MISSING_WALLET })()
28+ : obj.wallet.matchWith({
29+ Nothing: () => { throw BRIDGE_ERROR.MISSING_WALLET },
30+ Just: w => w.value
31+ });
32+}
33+
34+function address(obj) {
35+ return wallet(obj).address;
36+}
37+
38+function pointCursor(obj) {
39+ return ('pointCursor' in obj === false)
40+ ? (() => { throw BRIDGE_ERROR.MISSING_POINT })()
41+ : obj.pointCursor.matchWith({
42+ Nothing: () => { throw BRIDGE_ERROR.MISSING_POINT },
43+ Just: p => p.value
44+ });
45+}
46+
47+function fromPointCache(obj, point) {
48+ return ('pointCache' in obj === false)
49+ ? (() => { throw BRIDGE_ERROR.MISSING_POINT })()
50+ : point in obj.pointCache
51+ ? obj.pointCache[point]
52+ : (() => { throw BRIDGE_ERROR.MISSING_POINT })()
53+}
54+
55+export {
56+ web3,
57+ contracts,
58+ wallet,
59+ address,
60+ pointCursor,
61+ fromPointCache
62+}
src/bridge/lib/router.js+5−10
@@ -1,4 +1,5 @@
1import * as ob from 'urbit-ob'
1import * as ob from 'urbit-ob'
2+import * as need from '../lib/need'
2
3
3import React from 'react';
4import React from 'react';
4
5
@@ -35,9 +36,8 @@ import Ticket from '../views/Ticket'
35import Transfer from '../views/Transfer'
36import Transfer from '../views/Transfer'
36import Wallet from '../views/Wallet'
37import Wallet from '../views/Wallet'
37
38
38−import { addressFromSecp256k1Public, EthereumWallet } from './wallet'
39+import { EthereumWallet } from './wallet'
39import { renderNetworkType } from './network'
40import { renderNetworkType } from './network'
40−import { BRIDGE_ERROR } from './error'
41
41
42const ROUTE_NAMES = {
42const ROUTE_NAMES = {
43 DEFAULT: Symbol('DEFAULT'),
43 DEFAULT: Symbol('DEFAULT'),
@@ -111,7 +111,7 @@ const createRoutes = () => {
111const ROUTES = createRoutes()
111const ROUTES = createRoutes()
112
112
113const renderRoute = (props, route) => {
113const renderRoute = (props, route) => {
114− const { wallet, networkType, pointCursor } = props
114+ const { wallet, networkType } = props
115 return (
115 return (
116 route === ROUTE_NAMES.LANDING
116 route === ROUTE_NAMES.LANDING
117 ? 'Bridge'
117 ? 'Bridge'
@@ -137,7 +137,7 @@ const renderRoute = (props, route) => {
137 Just: (wal) =>
137 Just: (wal) =>
138 wal.value instanceof EthereumWallet
138 wal.value instanceof EthereumWallet
139 ? (<span className="text-mono">{wal.value.address}</span>)
139 ? (<span className="text-mono">{wal.value.address}</span>)
140− : (<span className="text-mono">{addressFromSecp256k1Public(wal.value.publicKey)}</span>)
140+ : (<span className="text-mono">{wal.value.address}</span>)
141 })
141 })
142
142
143 : route === ROUTE_NAMES.MNEMONIC
143 : route === ROUTE_NAMES.MNEMONIC
@@ -168,12 +168,7 @@ const renderRoute = (props, route) => {
168 ? 'View'
168 ? 'View'
169
169
170 : route === ROUTE_NAMES.SHIP
170 : route === ROUTE_NAMES.SHIP
171− ? pointCursor.matchWith({
171+ ? ob.patp(need.pointCursor(props))
172− Just: (cursor) => ob.patp(cursor.value),
173− Nothing: () => {
174− throw BRIDGE_ERROR.MISSING_POINT
175− }
176− })
177
172
178 : route === ROUTE_NAMES.SET_TRANSFER_PROXY
173 : route === ROUTE_NAMES.SET_TRANSFER_PROXY
179 || route === ROUTE_NAMES.SET_MANAGEMENT_PROXY
174 || route === ROUTE_NAMES.SET_MANAGEMENT_PROXY
src/bridge/lib/tank.js+81−1
@@ -1,3 +1,7 @@
1+// /lib/tank: functions for funding transactions
2+
3+import { waitForTransactionConfirm } from './txn'
4+
1//NOTE if accessing this in a localhost configuration fails with "CORS request
5//NOTE if accessing this in a localhost configuration fails with "CORS request
2// did not succeed", you might need to visit localhost:3001 or whatever
6// did not succeed", you might need to visit localhost:3001 or whatever
3// explicitly and tell your browser that's safe to access.
7// explicitly and tell your browser that's safe to access.
@@ -34,8 +38,84 @@ const fundTransactions = signedTxs => {
34 return sendRequest('/request', {txs:signedTxs});
38 return sendRequest('/request', {txs:signedTxs});
35};
39};
36
40
41+// resolves when address has at least cost balance
42+// returns true if gas tank was used, false otherwise
43+// askForFunding: callback that takes (address, requiredBalance, currentBalance)
44+// and tells the user to get that address the required balance
45+// gotFunding: optional callback that stops telling the user to go get funding
46+const ensureFundsFor = async (web3, point, address, cost, signedTxs,
47+ askForFunding, gotFunding) => {
48+ let balance = await web3.eth.getBalance(address);
49+
50+ if (cost > balance) {
51+
52+ try {
53+
54+ if (point !== null) {
55+ const fundsRemaining = await remainingTransactions(point);
56+ if (fundsRemaining < signedTxs.length) {
57+ throw new Error('tank: request invalid');
58+ }
59+ } else {
60+ console.log('tank: skipping remaining-funds check');
61+ //TODO if we can't always (easily) provide a point, and the
62+ // fundTransactions call is gonna fail anyway, should we maybe
63+ // just not bother doing this check in the first place?
64+ }
65+
66+ const res = await fundTransactions(signedTxs);
67+ if (!res.success) {
68+ throw new Error('tank: request rejected');
69+ } else {
70+ await waitForTransactionConfirm(web3, res.txHash);
71+ let newBalance = await web3.eth.getBalance(address);
72+ console.log('tank: funds have confirmed', balance >= cost, balance, newBalance);
73+ return true;
74+ }
75+
76+ } catch (e) {
77+
78+ console.log('tank: funding failed', e);
79+ await waitForBalance(web3, address, cost, askForFunding, gotFunding);
80+
81+ }
82+
83+ } else {
84+ console.log('tank: already have sufficient funds');
85+ }
86+ return false;
87+};
88+
89+// resolves when address has at least minBalance
90+//
91+//TODO should maybe do a "we got it" callback also, so clients can hide msg?
92+async function waitForBalance(web3, address, minBalance,
93+ askForFunding, gotFunding) {
94+ console.log('tank: awaiting balance', address, minBalance);
95+ return new Promise((resolve, reject) => {
96+ let oldBalance = null;
97+ const checkForBalance = async () => {
98+ const balance = await web3.eth.getBalance(address);
99+ if (balance >= minBalance) {
100+ // if we ever asked for funding, retract that request now
101+ if (gotFunding && (oldBalance !== null)) {
102+ gotFunding();
103+ }
104+ resolve();
105+ } else {
106+ if (balance !== oldBalance) {
107+ askForFunding(address, minBalance, balance);
108+ }
109+ setTimeout(checkForBalance, 13000);
110+ }
111+ };
112+ checkForBalance();
113+ });
114+}
115+
37export {
116export {
38 remainingTransactions,
117 remainingTransactions,
39− fundTransactions
118+ fundTransactions,
119+ ensureFundsFor
40}
120}
41
121
src/bridge/lib/txn.js+8−3
@@ -1,6 +1,5 @@
1import * as ob from 'urbit-ob'
1import * as ob from 'urbit-ob'
2import { Just } from 'folktale/maybe'
2import { Just } from 'folktale/maybe'
3−import { Ok, Error } from 'folktale/result'
4import Tx from 'ethereumjs-tx'
3import Tx from 'ethereumjs-tx'
5import { toWei, fromWei, toHex } from 'web3-utils'
4import { toWei, fromWei, toHex } from 'web3-utils'
6
5
@@ -134,7 +133,8 @@ const signTransaction = async config => {
134 stx.sign(sec)
133 stx.sign(sec)
135 }
134 }
136
135
137− setStx(Just(stx))
136+ setStx(Just(stx));
137+ return stx;
138}
138}
139
139
140const sendSignedTransaction = (web3, stx, doubtNonceError, confirmationCb) => {
140const sendSignedTransaction = (web3, stx, doubtNonceError, confirmationCb) => {
@@ -152,6 +152,10 @@ const sendSignedTransaction = (web3, stx, doubtNonceError, confirmationCb) => {
152 .on('transactionHash', hash => {
152 .on('transactionHash', hash => {
153 resolve(hash);
153 resolve(hash);
154 })
154 })
155+ //TODO do we also reach this if network is slow? web3 only tries a set
156+ // amount of times... should we instead do waitForTransactionConfirm
157+ // in on-transactionHash? we don't care (much) about additional
158+ // confirms anyway.
155 .on('confirmation', (confirmationNum, txn) => {
159 .on('confirmation', (confirmationNum, txn) => {
156 confirmationCb(txn.transactionHash, confirmationNum + 1);
160 confirmationCb(txn.transactionHash, confirmationNum + 1);
157 resolve(txn.transactionHash);
161 resolve(txn.transactionHash);
@@ -160,8 +164,9 @@ const sendSignedTransaction = (web3, stx, doubtNonceError, confirmationCb) => {
160 // if there's a nonce error, but we used the gas tank, it's likely
164 // if there's a nonce error, but we used the gas tank, it's likely
161 // that it's because the tank already submitted our transaction.
165 // that it's because the tank already submitted our transaction.
162 // we just wait for first confirmation here.
166 // we just wait for first confirmation here.
167+ console.log('sent and got error', err);
163 if (doubtNonceError &&
168 if (doubtNonceError &&
164− err.message.includes("the tx doesn't have the correct nonce.")) {
169+ (err.message || '').includes("the tx doesn't have the correct nonce.")) {
165 console.log('nonce error, likely from gas tank submission, ignoring');
170 console.log('nonce error, likely from gas tank submission, ignoring');
166 const txHash = web3.utils.keccak256(rawTx);
171 const txHash = web3.utils.keccak256(rawTx);
167 //TODO can we do does-exists check first?
172 //TODO can we do does-exists check first?
src/bridge/lib/wallet.js+17−5
@@ -89,7 +89,7 @@ const eqAddr = (addr0, addr1) =>
89 toChecksumAddress(addr0) === toChecksumAddress(addr1)
89 toChecksumAddress(addr0) === toChecksumAddress(addr1)
90
90
91const urbitWalletFromTicket = async (ticket, point, passphrase) => {
91const urbitWalletFromTicket = async (ticket, point, passphrase) => {
92− if (typeof point === 'string') {
92+ if (typeof point === 'string') { //TODO why not in kg?
93 point = ob.patp2dec(point);
93 point = ob.patp2dec(point);
94 }
94 }
95 let uhdw = await kg.generateWallet({
95 let uhdw = await kg.generateWallet({
@@ -97,12 +97,21 @@ const urbitWalletFromTicket = async (ticket, point, passphrase) => {
97 ship: point,
97 ship: point,
98 passphrase: passphrase
98 passphrase: passphrase
99 });
99 });
100− //TODO remove after keygen-js#61 gets released
101− uhdw.meta.ship = point;
102− uhdw.meta.passphrase = passphrase;
103 return uhdw;
100 return uhdw;
104}
101}
105
102
103+
104+const ownershipWalletFromTicket = async (ticket, point, passphrase) => {
105+ if (typeof point === 'string') { //TODO why not in kg?
106+ point = ob.patp2dec(point);
107+ }
108+ return await kg.generateOwnershipWallet({
109+ ticket,
110+ ship: point,
111+ passphrase
112+ })
113+}
114+
106const walletFromMnemonic = (mnemonic, hdpath, passphrase) => {
115const walletFromMnemonic = (mnemonic, hdpath, passphrase) => {
107 const seed =
116 const seed =
108 bip39.validateMnemonic(mnemonic)
117 bip39.validateMnemonic(mnemonic)
@@ -113,7 +122,9 @@ const walletFromMnemonic = (mnemonic, hdpath, passphrase) => {
113 let wal
122 let wal
114 try {
123 try {
115 const hd = bip32.fromSeed(sd)
124 const hd = bip32.fromSeed(sd)
116− wal = Maybe.Just(hd.derivePath(path))
125+ wal = hd.derivePath(path);
126+ wal.address = addressFromSecp256k1Public(wal.publicKey);
127+ wal = Maybe.Just(wal);
117 } catch (_) {
128 } catch (_) {
118 wal = Maybe.Nothing()
129 wal = Maybe.Nothing()
119 }
130 }
@@ -135,6 +146,7 @@ export {
135 addressFromSecp256k1Public,
146 addressFromSecp256k1Public,
136 eqAddr,
147 eqAddr,
137 urbitWalletFromTicket,
148 urbitWalletFromTicket,
149+ ownershipWalletFromTicket,
138 walletFromMnemonic,
150 walletFromMnemonic,
139 addHexPrefix,
151 addHexPrefix,
140 EthereumWallet
152 EthereumWallet
src/bridge/views/AcceptTransfer.js+7−36
@@ -4,29 +4,19 @@ import { Row, Col, H1, P } from '../components/Base'
4import { InnerLabel, AddressInput, ShowBlockie, Anchor } from '../components/Base'
4import { InnerLabel, AddressInput, ShowBlockie, Anchor } from '../components/Base'
5import * as azimuth from 'azimuth-js'
5import * as azimuth from 'azimuth-js'
6import * as ob from 'urbit-ob'
6import * as ob from 'urbit-ob'
7+import * as need from '../lib/need'
7
8
8import StatelessTransaction from '../components/StatelessTransaction'
9import StatelessTransaction from '../components/StatelessTransaction'
9−import { BRIDGE_ERROR } from '../lib/error'
10import { NETWORK_NAMES } from '../lib/network'
10import { NETWORK_NAMES } from '../lib/network'
11−import { isValidAddress, addressFromSecp256k1Public } from '../lib/wallet'
11+import { isValidAddress } from '../lib/wallet'
12
12
13class AcceptTransfer extends React.Component {
13class AcceptTransfer extends React.Component {
14 constructor(props) {
14 constructor(props) {
15 super(props)
15 super(props)
16
16
17− const receivingAddress = props.wallet.matchWith({
17+ const receivingAddress = need.address(props);
18− Just: (wal) => addressFromSecp256k1Public(wal.value.publicKey),
19− Nothing: () => {
20− throw BRIDGE_ERROR.MISSING_WALLET
21− }
22− })
23
18
24− const incomingPoint = props.pointCursor.matchWith({
19+ const incomingPoint = need.pointCursor(props);
25− Just: (shp) => shp.value,
26− Nothing: () => {
27− throw BRIDGE_ERROR.MISSING_POINT
28− }
29− })
30
20
31 this.state = {
21 this.state = {
32 receivingAddress: receivingAddress,
22 receivingAddress: receivingAddress,
@@ -46,19 +36,9 @@ class AcceptTransfer extends React.Component {
46 createUnsignedTxn() {
36 createUnsignedTxn() {
47 const { state, props } = this
37 const { state, props } = this
48
38
49− const validContracts = props.contracts.matchWith({
39+ const validContracts = need.contracts(props);
50− Just: (cs) => cs.value,
51− Nothing: () => {
52− throw BRIDGE_ERROR.MISSING_CONTRACTS
53− }
54− })
55
40
56− const validPoint = props.pointCursor.matchWith({
41+ const validPoint = need.pointCursor(props); //TODO state.incomingPoint ?
57− Just: (shp) => shp.value,
58− Nothing: () => {
59− throw BRIDGE_ERROR.MISSING_POINT
60− }
61− })
62
42
63 return Just(azimuth.ecliptic.transferPoint(
43 return Just(azimuth.ecliptic.transferPoint(
64 validContracts,
44 validContracts,
@@ -117,16 +97,7 @@ class AcceptTransfer extends React.Component {
117
97
118 <StatelessTransaction
98 <StatelessTransaction
119 // Upper scope
99 // Upper scope
120− web3={props.web3}
100+ {...props}
121− contracts={props.contracts}
122− wallet={props.wallet}
123− walletType={props.walletType}
124− walletHdPath={props.walletHdPath}
125− networkType={props.networkType}
126− onSent={props.setTxnHashCursor}
127− setTxnConfirmations={props.setTxnConfirmations}
128− popRoute={props.popRoute}
129− pushRoute={props.pushRoute}
130 // Other
101 // Other
131 canGenerate={ canGenerate }
102 canGenerate={ canGenerate }
132 createUnsignedTxn={this.createUnsignedTxn}
103 createUnsignedTxn={this.createUnsignedTxn}
src/bridge/views/CancelTransfer.js+5−29
@@ -3,21 +3,16 @@ import React from 'react'
3import { Row, Col, H1, P } from '../components/Base'
3import { Row, Col, H1, P } from '../components/Base'
4import * as azimuth from 'azimuth-js'
4import * as azimuth from 'azimuth-js'
5import * as ob from 'urbit-ob'
5import * as ob from 'urbit-ob'
6+import * as need from '../lib/need'
6
7
7import StatelessTransaction from '../components/StatelessTransaction'
8import StatelessTransaction from '../components/StatelessTransaction'
8−import { BRIDGE_ERROR } from '../lib/error'
9import { ETH_ZERO_ADDR } from '../lib/wallet'
9import { ETH_ZERO_ADDR } from '../lib/wallet'
10
10
11class CancelTransfer extends React.Component {
11class CancelTransfer extends React.Component {
12 constructor(props) {
12 constructor(props) {
13 super(props)
13 super(props)
14
14
15− const pointInTransfer = props.pointCursor.matchWith({
15+ const pointInTransfer = need.pointCursor(props);
16− Just: (pt) => pt.value,
17− Nothing: () => {
18− throw BRIDGE_ERROR.MISSING_POINT
19− }
20− })
21
16
22 this.state = {
17 this.state = {
23 proxyAddress: '',
18 proxyAddress: '',
@@ -30,19 +25,9 @@ class CancelTransfer extends React.Component {
30 createUnsignedTxn() {
25 createUnsignedTxn() {
31 const { props } = this
26 const { props } = this
32
27
33− const validContracts = props.contracts.matchWith({
28+ const validContracts = need.contracts(props);
34− Just: (cs) => cs.value,
35− Nothing: () => {
36− throw BRIDGE_ERROR.MISSING_CONTRACTS
37− }
38− })
39
29
40− const validPoint = props.pointCursor.matchWith({
30+ const validPoint = need.pointCursor(props); //TODO this.state.pointInTransfer ?
41− Just: (pt) => pt.value,
42− Nothing: () => {
43− throw BRIDGE_ERROR.MISSING_POINT
44− }
45− })
46
31
47 const txn = azimuth.ecliptic.setTransferProxy(
32 const txn = azimuth.ecliptic.setTransferProxy(
48 validContracts,
33 validContracts,
@@ -80,16 +65,7 @@ class CancelTransfer extends React.Component {
80 </P>
65 </P>
81 <StatelessTransaction
66 <StatelessTransaction
82 // Upper scope
67 // Upper scope
83− web3={props.web3}
68+ {...props}
84− contracts={props.contracts}
85− wallet={props.wallet}
86− walletType={props.walletType}
87− walletHdPath={props.walletHdPath}
88− networkType={props.networkType}
89− onSent={props.setTxnHashCursor}
90− setTxnConfirmations={props.setTxnConfirmations}
91− popRoute={props.popRoute}
92− pushRoute={props.pushRoute}
93 // Other
69 // Other
94 canGenerate={ canGenerate }
70 canGenerate={ canGenerate }
95 createUnsignedTxn={this.createUnsignedTxn} />
71 createUnsignedTxn={this.createUnsignedTxn} />
src/bridge/views/CreateGalaxy.js+5−30
@@ -2,18 +2,17 @@ import React from 'react'
2import Maybe from 'folktale/maybe'
2import Maybe from 'folktale/maybe'
3import * as azimuth from 'azimuth-js'
3import * as azimuth from 'azimuth-js'
4import * as ob from 'urbit-ob'
4import * as ob from 'urbit-ob'
5+import * as need from '../lib/need'
5
6
6import { Button, } from '../components/Base'
7import { Button, } from '../components/Base'
7import { Row, Col, H1, P, Anchor } from '../components/Base'
8import { Row, Col, H1, P, Anchor } from '../components/Base'
8import { InnerLabel, GalaxyInput, AddressInput, ValidatedSigil, ShowBlockie } from '../components/Base'
9import { InnerLabel, GalaxyInput, AddressInput, ValidatedSigil, ShowBlockie } from '../components/Base'
9import StatelessTransaction from '../components/StatelessTransaction'
10import StatelessTransaction from '../components/StatelessTransaction'
10
11
11−import { BRIDGE_ERROR } from '../lib/error'
12import { NETWORK_NAMES } from '../lib/network'
12import { NETWORK_NAMES } from '../lib/network'
13import { canDecodePatp } from '../lib/txn'
13import { canDecodePatp } from '../lib/txn'
14
14
15import {
15import {
16− addressFromSecp256k1Public,
17 ETH_ZERO_ADDR,
16 ETH_ZERO_ADDR,
18 isValidAddress,
17 isValidAddress,
19 eqAddr
18 eqAddr
@@ -42,12 +41,7 @@ class CreateGalaxy extends React.Component {
42 constructor(props) {
41 constructor(props) {
43 super(props)
42 super(props)
44
43
45− const galaxyOwner = props.wallet.matchWith({
44+ const galaxyOwner = need.address(props);
46− Just: (wal) => addressFromSecp256k1Public(wal.value.publicKey),
47− Nothing: () => {
48− throw BRIDGE_ERROR.MISSING_WALLET
49− }
50− })
51
45
52 this.state = {
46 this.state = {
53 galaxyOwner: galaxyOwner,
47 galaxyOwner: galaxyOwner,
@@ -79,12 +73,7 @@ class CreateGalaxy extends React.Component {
79 if (canDecodePatp(state.galaxyName) === false) return Maybe.Nothing()
73 if (canDecodePatp(state.galaxyName) === false) return Maybe.Nothing()
80 if (isValidGalaxy(state.galaxyName) === false) return Maybe.Nothing()
74 if (isValidGalaxy(state.galaxyName) === false) return Maybe.Nothing()
81
75
82− const validContracts = props.contracts.matchWith({
76+ const validContracts = need.contracts(props);
83− Just: (cs) => cs.value,
84− Nothing: () => {
85− throw BRIDGE_ERROR.MISSING_CONTRACTS
86− }
87− })
88
77
89 const galaxyDec = parseInt(ob.patp2dec(state.galaxyName), 10)
78 const galaxyDec = parseInt(ob.patp2dec(state.galaxyName), 10)
90
79
@@ -105,12 +94,7 @@ class CreateGalaxy extends React.Component {
105 return
94 return
106 }
95 }
107
96
108− const validContracts = props.contracts.matchWith({
97+ const validContracts = need.contracts(props);
109− Just: (cs) => cs.value,
110− Nothing: () => {
111− throw BRIDGE_ERROR.MISSING_CONTRACTS
112− }
113− })
114
98
115 const galaxyDec = ob.patp2dec(state.galaxyName)
99 const galaxyDec = ob.patp2dec(state.galaxyName)
116
100
@@ -205,16 +189,7 @@ class CreateGalaxy extends React.Component {
205
189
206 <StatelessTransaction
190 <StatelessTransaction
207 // Upper scope
191 // Upper scope
208− web3={props.web3}
192+ {...props}
209− contracts={props.contracts}
210− wallet={props.wallet}
211− walletType={props.walletType}
212− walletHdPath={props.walletHdPath}
213− networkType={props.networkType}
214− onSent={props.setTxnHashCursor}
215− setTxnConfirmations={props.setTxnConfirmations}
216− popRoute={props.popRoute}
217− pushRoute={props.pushRoute}
218 // Other
193 // Other
219 ref={this.statelessRef}
194 ref={this.statelessRef}
220 canGenerate={canGenerate}
195 canGenerate={canGenerate}
src/bridge/views/GenKeyfile.js+4−15
@@ -1,5 +1,6 @@
1import React from 'react'
1import React from 'react'
2import Maybe from 'folktale/maybe'
2import Maybe from 'folktale/maybe'
3+import * as need from '../lib/need'
3
4
4import { Button } from '../components/Base'
5import { Button } from '../components/Base'
5import { Row, Col, H1, P } from '../components/Base'
6import { Row, Col, H1, P } from '../components/Base'
@@ -9,7 +10,6 @@ import * as kg from '../../../node_modules/urbit-key-generation/dist/index'
9import saveAs from 'file-saver'
10import saveAs from 'file-saver'
10
11
11import { attemptSeedDerivation, genKey } from '../lib/keys'
12import { attemptSeedDerivation, genKey } from '../lib/keys'
12−import { BRIDGE_ERROR } from '../lib/error'
13import {
13import {
14 addHexPrefix
14 addHexPrefix
15 } from '../lib/wallet'
15 } from '../lib/wallet'
@@ -25,20 +25,9 @@ class GenKeyfile extends React.Component {
25 }
25 }
26
26
27 getPointDetails() {
27 getPointDetails() {
28− const { pointCache } = this.props
29− const { pointCursor } = this.props
28+ const point = need.pointCursor(this.props);
30−
29+
31− const point = pointCursor.matchWith({
30+ const pointDetails = need.fromPointCache(this.props, point);
32− Just: (pt) => pt.value,
33− Nothing: () => {
34− throw BRIDGE_ERROR.MISSING_POINT
35− }
36− })
37−
38− const pointDetails =
39− point in pointCache
40− ? pointCache[point]
41− : (() => { throw BRIDGE_ERROR.MISSING_POINT })()
42
31
43 // in case we did SetKeys earlier this session, make sure to generate the
32 // in case we did SetKeys earlier this session, make sure to generate the
44 // newer keyfile, rather than the one that will expire soon
33 // newer keyfile, rather than the one that will expire soon
src/bridge/views/InviteTicket.js+9−13
@@ -3,11 +3,12 @@ import React from 'react'
3import { InnerLabel, Warning, TicketInput,
3import { InnerLabel, Warning, TicketInput,
4 VerifyTicketInput, Button, Row, Col, Passport } from '../components/Base'
4 VerifyTicketInput, Button, Row, Col, Passport } from '../components/Base'
5import * as azimuth from 'azimuth-js'
5import * as azimuth from 'azimuth-js'
6+import * as need from '../lib/need'
6
7
7import { randomPatq } from '../lib/lib'
8import { randomPatq } from '../lib/lib'
8import { ROUTE_NAMES } from '../lib/router'
9import { ROUTE_NAMES } from '../lib/router'
9−import { DEFAULT_HD_PATH, urbitWalletFromTicket,
10+import { DEFAULT_HD_PATH, ownershipWalletFromTicket,
10− walletFromMnemonic, addressFromSecp256k1Public } from '../lib/wallet'
11+ walletFromMnemonic } from '../lib/wallet'
11import { BRIDGE_ERROR } from '../lib/error'
12import { BRIDGE_ERROR } from '../lib/error'
12import { INVITE_STAGES, WALLET_STATES, TRANSACTION_STATES } from '../lib/invite'
13import { INVITE_STAGES, WALLET_STATES, TRANSACTION_STATES } from '../lib/invite'
13import { generateWallet, startTransactions } from '../lib/invite'
14import { generateWallet, startTransactions } from '../lib/invite'
@@ -71,12 +72,12 @@ class InviteTicket extends React.Component {
71 });
72 });
72
73
73 //NOTE ~zod because tmp wallet
74 //NOTE ~zod because tmp wallet
74− const uhdw = await urbitWalletFromTicket(inviteTicket, '~zod');
75+ const ownership = await ownershipWalletFromTicket(inviteTicket, 0);
75− const mnemonic = uhdw.ownership.seed;
76+ const mnemonic = ownership.seed;
77+ //TODO isn't all this accessible in the ownership object?
76 const inviteWallet = walletFromMnemonic(
78 const inviteWallet = walletFromMnemonic(
77 mnemonic,
79 mnemonic,
78− DEFAULT_HD_PATH,
80+ DEFAULT_HD_PATH
79− uhdw.meta.passphrase
80 ).matchWith({
81 ).matchWith({
81 Just: w => w.value,
82 Just: w => w.value,
82 Nothing: () => {
83 Nothing: () => {
@@ -84,14 +85,9 @@ class InviteTicket extends React.Component {
84 }
85 }
85 });
86 });
86
87
87− const addr = addressFromSecp256k1Public(inviteWallet.publicKey);
88+ const addr = inviteWallet.address;
88
89
89− const ctrcs = this.props.contracts.matchWith({
90+ const ctrcs = need.contracts(this.props);
90− Just: ctrcs => ctrcs.value,
91− Nothing: () => {
92− throw BRIDGE_ERROR.MISSING_CONTRACTS
93− }
94− })
95
91
96 const incoming = await azimuth.azimuth.getTransferringFor(ctrcs, addr)
92 const incoming = await azimuth.azimuth.getTransferringFor(ctrcs, addr)
97
93
src/bridge/views/InvitesManage.js+11−27
@@ -2,8 +2,8 @@ import { Just, Nothing } from 'folktale/maybe'
2import React from 'react'
2import React from 'react'
3import * as ob from 'urbit-ob'
3import * as ob from 'urbit-ob'
4import * as azimuth from 'azimuth-js'
4import * as azimuth from 'azimuth-js'
5+import * as need from '../lib/need'
5
6
6−import { BRIDGE_ERROR } from '../lib/error'
7import { Row, Col, Warning, Input,
7import { Row, Col, Warning, Input,
8 PointInput, InnerLabel, ValidatedSigil } from '../components/Base'
8 PointInput, InnerLabel, ValidatedSigil } from '../components/Base'
9import StatelessTransaction from '../components/StatelessTransaction'
9import StatelessTransaction from '../components/StatelessTransaction'
@@ -32,18 +32,8 @@ class InvitesManage extends React.Component {
32 }
32 }
33
33
34 componentDidMount() {
34 componentDidMount() {
35− this.point = this.props.pointCursor.matchWith({
35+ this.point = need.pointCursor(this.props);
36− Just: (pt) => parseInt(pt.value, 10),
37− Nothing: () => {
38− throw BRIDGE_ERROR.MISSING_POINT
39− }
40− });
41− this.contracts = this.props.contracts.matchWith({
36+ this.contracts = need.contracts(this.props);
42− Just: cs => cs.value,
43− Nothing: _ => {
44− throw BRIDGE_ERROR.MISSING_CONTRACTS
45− }
46− });
47
37
48 azimuth.azimuth.isSpawnProxy(
38 azimuth.azimuth.isSpawnProxy(
49 this.contracts,
39 this.contracts,
@@ -86,7 +76,7 @@ class InvitesManage extends React.Component {
86 } else {
76 } else {
87 azimuth.delegatedSending.getPool(this.contracts, who)
77 azimuth.delegatedSending.getPool(this.contracts, who)
88 .then(pool => {
78 .then(pool => {
89− azimuth.delegatedSending.invitesInPool(this.contracts, pool)
79+ azimuth.delegatedSending.invitesInPool(this.contracts, pool, this.point)
90 .then(size => {
80 .then(size => {
91 this.updatePoolSize(who, size);
81 this.updatePoolSize(who, size);
92 });
82 });
@@ -96,11 +86,13 @@ class InvitesManage extends React.Component {
96 }
86 }
97
87
98 updatePoolSize(who, size) {
88 updatePoolSize(who, size) {
99− this.state.cachedPoolSizes[who] = size;
89+ const cache = this.state.cachedPoolSizes;
90+ cache[who] = size;
91+ this.setState({ cachedPoolSizes: cache });
100 const target = this.state.targetPlanet;
92 const target = this.state.targetPlanet;
101 const match = Just.hasInstance(target) ? (who === target.value) : false;
93 const match = Just.hasInstance(target) ? (who === target.value) : false;
102 if (match) {
94 if (match) {
103− this.setState({currentPoolSize:Just(size)});
95+ this.setState({ currentPoolSize: Just(size) });
104 }
96 }
105 }
97 }
106
98
@@ -111,6 +103,7 @@ class InvitesManage extends React.Component {
111 createUnsignedTxn() {
103 createUnsignedTxn() {
112 return Just(azimuth.delegatedSending.setPoolSize(
104 return Just(azimuth.delegatedSending.setPoolSize(
113 this.contracts,
105 this.contracts,
106+ this.point,
114 this.state.targetPlanet.value,
107 this.state.targetPlanet.value,
115 this.state.targetPoolSize
108 this.state.targetPoolSize
116 ))
109 ))
@@ -134,7 +127,7 @@ class InvitesManage extends React.Component {
134 }
127 }
135
128
136 let poolSizeText = this.state.currentPoolSize.matchWith({
129 let poolSizeText = this.state.currentPoolSize.matchWith({
137− Just: ps => `(currently ${ps.toString()})`,
130+ Just: ps => `(currently ${ps.value})`,
138 Nothing: _ => ''
131 Nothing: _ => ''
139 });
132 });
140
133
@@ -170,16 +163,7 @@ class InvitesManage extends React.Component {
170
163
171 <StatelessTransaction
164 <StatelessTransaction
172 // Upper scope
165 // Upper scope
173− web3={this.props.web3}
174− contracts={this.props.contracts}
175− wallet={this.props.wallet}
176− walletType={this.props.walletType}
177− walletHdPath={this.props.walletHdPath}
178− networkType={this.props.networkType}
179− onSent={this.props.setTxnHashCursor}
180− setTxnConfirmations={this.props.setTxnConfirmations}
181− popRoute={this.props.popRoute}
182− pushRoute={this.props.pushRoute}
166+ {...this.props}
183 // Other
167 // Other
184 canGenerate={this.state.canGenerate}
168 canGenerate={this.state.canGenerate}
185 createUnsignedTxn={this.createUnsignedTxn}
169 createUnsignedTxn={this.createUnsignedTxn}
src/bridge/views/InvitesSend.js+381−120
@@ -1,16 +1,45 @@
1import { Just, Nothing } from 'folktale/maybe'
1import { Just, Nothing } from 'folktale/maybe'
2import React from 'react'
2import React from 'react'
3−import * as ob from 'urbit-ob'
4import * as azimuth from 'azimuth-js'
3import * as azimuth from 'azimuth-js'
4+import * as need from '../lib/need'
5
5
6−import { BRIDGE_ERROR } from '../lib/error'
7−import { sendMail } from '../lib/inviteMail'
6+import { hasReceived, sendMail } from '../lib/inviteMail'
8−import { Row, Col, Input, InnerLabel } from '../components/Base'
7+import { Row, Col, Button, Input, H3, Warning } from '../components/Base'
9−import StatelessTransaction from '../components/StatelessTransaction'
10
8
11// for wallet generation
9// for wallet generation
12import * as wg from '../../walletgen/lib/lib'
10import * as wg from '../../walletgen/lib/lib'
13
11
12+// for transaction generation and signing
13+import {
14+ signTransaction,
15+ sendSignedTransaction,
16+ waitForTransactionConfirm,
17+ hexify,
18+ fromWei,
19+ toWei
20+} from '../lib/txn'
21+import * as tank from '../lib/tank'
22+
23+const GAS_PRICE_GWEI = 20; // we pay the premium for faster ux
24+const GAS_LIMIT = 350000;
25+const INVITE_COST = toWei((GAS_PRICE_GWEI * GAS_LIMIT).toString(), 'gwei');
26+
27+const STATUS = {
28+ INPUT: 'Generate invites',
29+ GENERATING: 'Generating invites',
30+ CAN_SEND: 'Send invites',
31+ FUNDING: 'Funding invites',
32+ SENDING: 'Sending invites',
33+ DONE: 'Done',
34+ FAIL: 'Some failed'
35+}
36+
37+const EMAIL_STATUS = {
38+ BUSY: '⋯',
39+ DONE: '✔',
40+ FAIL: '×'
41+}
42+
14class InvitesSend extends React.Component {
43class InvitesSend extends React.Component {
15
44
16 constructor(props) {
45 constructor(props) {
@@ -18,47 +47,39 @@ class InvitesSend extends React.Component {
18
47
19 this.state = {
48 this.state = {
20 invitesAvailable: Nothing(),
49 invitesAvailable: Nothing(),
21− fromPool: Nothing(),
50+ invited: Nothing(),
22− haveInvited: Nothing(),
51+ targets: [{ email: '', hasReceived: Nothing(), status: Nothing() }],
52+ status: STATUS.INPUT,
23− randomPlanet: Nothing(),
53+ errors: Nothing(),
24− inviteWallet: Nothing(),
54+ //
25− targetEmail: ''
55+ fundingMessage: Nothing(),
56+ wipInvites: []
26 }
57 }
27
58
28 this.findInvited = this.findInvited.bind(this);
59 this.findInvited = this.findInvited.bind(this);
29− this.findRandomPlanet = this.findRandomPlanet.bind(this);
60+ this.generateInvites = this.generateInvites.bind(this);
30− this.generateWallet = this.generateWallet.bind(this);
61+ this.sendInvites = this.sendInvites.bind(this);
31− this.canGenerate = this.canGenerate.bind(this);
62+ this.canSend = this.canSend.bind(this);
63+ this.addError = this.addError.bind(this);
32 this.handleEmailInput = this.handleEmailInput.bind(this);
64 this.handleEmailInput = this.handleEmailInput.bind(this);
33− this.txnConfirmation = this.txnConfirmation.bind(this);
65+ this.addTarget = this.addTarget.bind(this);
34− this.createUnsignedTxn = this.createUnsignedTxn.bind(this);
66+ this.removeTarget = this.removeTarget.bind(this);
67+ this.setEmailStatus = this.setEmailStatus.bind(this);
68+ this.askForFunding = this.askForFunding.bind(this);
35 }
69 }
36
70
37 componentDidMount() {
71 componentDidMount() {
38− this.point = this.props.pointCursor.matchWith({
72+ this.point = parseInt(need.pointCursor(this.props), 10);
39− Just: (pt) => parseInt(pt.value, 10),
73+ this.address = need.address(this.props);
40− Nothing: () => {
41− throw BRIDGE_ERROR.MISSING_POINT
42− }
43− });
44− this.contracts = this.props.contracts.matchWith({
74+ this.contracts = need.contracts(this.props);
45− Just: cs => cs.value,
75+ this.web3 = need.web3(this.props);
46− Nothing: _ => {
47− throw BRIDGE_ERROR.MISSING_CONTRACTS
48− }
49− });
50
76
51− azimuth.delegatedSending.getPool(this.contracts, this.point)
77+ console.log(azimuth.delegatedSending);
78+ azimuth.delegatedSending.getTotalUsableInvites(this.contracts, this.point)
52− .then(pool => {
79+ .then(count => {
53− this.setState({fromPool: Just(pool)});
54− azimuth.delegatedSending.invitesInPool(this.contracts, pool)
55− .then(count => {
56− this.setState({invitesAvailable: Just(count)});
80+ this.setState({invitesAvailable: Just(count)});
57− });
58 });
81 });
59 this.findInvited();
82 this.findInvited();
60− this.findRandomPlanet();
61− this.generateWallet();
62 }
83 }
63
84
64 componentDidUpdate(prevProps) {
85 componentDidUpdate(prevProps) {
@@ -76,127 +97,367 @@ class InvitesSend extends React.Component {
76 return res;
97 return res;
77 });
98 });
78 invited = await Promise.all(invited);
99 invited = await Promise.all(invited);
100+ const total = invited.length;
101+ const accepted = invited.filter(i => i.active).length;
79− this.setState({haveInvited: Just(invited)});
102+ this.setState({invited: Just({total, accepted})});
80 }
103 }
81
104
82− async findRandomPlanet() {
105+ async getTemporaryWallet() {
83− let res = Nothing();
106+ const ticket = await wg.makeTicket(0x10000); // planet-sized ticket
84− const kids = await azimuth.azimuth.getUnspawnedChildren(
107+ const owner = await wg.generateOwnershipWallet(0, ticket);
108+ return {ticket, owner: owner.keys.address};
109+ }
110+
111+ async generateInvites() {
112+ this.setState({ status: STATUS.GENERATING });
113+
114+ const web3 = this.web3;
115+ const targets = this.state.targets;
116+ const planets = await azimuth.delegatedSending.getPlanetsToSend(
85− this.contracts,
117+ this.contracts, this.point, targets.length
86− azimuth.azimuth.getPrefix(this.point)
87 );
118 );
88− if (kids.length > 0) {
119+
89− const i = Math.floor(Math.random() * kids.length);
120+ // account for the race condition where invites got used up while we were
90− res = Just(Number(kids[i]));
121+ // composing our target list
122+ if (planets.length < targets.length) {
123+ this.addError('Can currently only send '+planets.length+' invites!');
124+ return;
91 }
125 }
92− this.setState({randomPlanet: res});
126+
93− return res;
127+ const nonce = await web3.eth.getTransactionCount(this.address);
128+ const chainId = await web3.eth.net.getId();
129+
130+ // create invite wallets and transactions
131+ let invites = []; // { email, ticket, signedTx, rawTx }
132+ for (let i = 0; i < targets.length; i++) {
133+ console.log('generating email', i, targets[i].email);
134+ this.setEmailStatus(i, EMAIL_STATUS.BUSY);
135+
136+ const email = targets[i].email;
137+ const wallet = await this.getTemporaryWallet();
138+
139+ let inviteTx = azimuth.delegatedSending.sendPoint(
140+ this.contracts, this.point, planets[i], wallet.owner
141+ );
142+ const signedTx = await signTransaction({
143+ ...this.props,
144+ txn: Just(inviteTx),
145+ gasPrice: GAS_PRICE_GWEI.toString(),
146+ gasLimit: GAS_LIMIT.toString(),
147+ nonce: nonce + i,
148+ chainId: chainId,
149+ setStx: () => {}
150+ });
151+ const rawTx = hexify(signedTx.serialize());
152+
153+ invites.push({email, ticket: wallet.ticket, signedTx, rawTx });
154+ this.setEmailStatus(i, EMAIL_STATUS.DONE);
155+ }
156+
157+ this.setState({ wipInvites: invites, status: STATUS.CAN_SEND });
94 }
158 }
95
159
96− async generateWallet() {
160+ async sendInvites() {
97− const ticket = await wg.makeTicket(0x10000); // planet-sized ticket
161+ const invites = this.state.wipInvites;
98− const wallet = await wg.generateWallet(0, ticket, false);
162+ const web3 = this.web3;
163+
164+ //TODO invite status isn't changing/re-rendering... why?
99− this.setState({inviteWallet:
165+ this.setState({
100− Just({ticket, owner:wallet.ownership.keys.address})
166+ status: STATUS.FUNDING,
167+ invites: invites.map(i => { return {...i, status: Nothing()}; })
101 });
168 });
169+
170+ const tankWasUsed = await tank.ensureFundsFor(
171+ web3, this.point, this.address,
172+ (INVITE_COST * invites.length),
173+ invites.map(i => i.rawTx), this.askForFunding,
174+ () => { this.setState({ fundingMessage: Nothing() }); }
175+ );
176+
177+ this.setState({ status: STATUS.SENDING });
178+
179+ //TODO nasty loop, probably move into lib... but so many callbacks!
180+ let promises = [];
181+ for (let i = 0; i < invites.length; i++) {
182+ const invite = invites[i];
183+
184+ // send transaction. if it fails, inform the user and skip to next
185+ let txHash;
186+ try {
187+ txHash = await sendSignedTransaction(
188+ web3, Just(invite.signedTx), tankWasUsed, ()=>{}
189+ );
190+ } catch(err) {
191+ console.error('invite tx sending failed', err);
192+ this.addError('Invite transaction not sent for ' + invite.email);
193+ this.setEmailStatus(i, EMAIL_STATUS.FAIL);
194+ continue;
195+ };
196+
197+ // ask the email sender to send this. we can do this prior to tx confirm,
198+ // because the sender service waits for confirm & success for us.
199+ // if this fails, inform the user and skip to next
200+ try {
201+ const mailSuccess = await sendMail(
202+ invite.email, invite.ticket, invite.rawTx
203+ );
204+ if (!mailSuccess) throw new Error();
205+ this.setEmailStatus(i, EMAIL_STATUS.DONE);
206+ } catch(e) {
207+ console.log('email send failed');
208+ //NOTE this assumes that the transaction succeeds, but we don't know
209+ // that for a fact yet...
210+ this.addError(
211+ 'Invite email failed to send for ' + invite.email +
212+ '. Please give them this ticket: ' + invite.ticket
213+ );
214+ this.setEmailStatus(i, EMAIL_STATUS.FAIL);
215+ continue;
216+ }
217+
218+ // update status on transaction confirm, but don't block on it
219+ promises.push(
220+ waitForTransactionConfirm(web3, txHash)
221+ .then(success => {
222+ if (success) {
223+ this.setEmailStatus(i, EMAIL_STATUS.DONE);
224+ } else {
225+ console.log('invite tx rejected');
226+ this.addError('Invite transaction failed for ' + invite.email);
227+ this.setEmailStatus(i, EMAIL_STATUS.FAIL);
228+ }
229+ return success;
230+ })
231+ );
232+
233+ }
234+
235+ const txStatus = await Promise.all(promises);
236+ if (txStatus.every(e => e)) {
237+ this.setState({ status: STATUS.DONE });
238+ } else {
239+ this.setState({ status: STATUS.FAIL });
240+ }
102 }
241 }
103
242
104− handleEmailInput(email) {
243+ setEmailStatus(i, status) {
105− //TODO simple .*@.*\..* email validation
244+ const targets = this.state.targets;
245+ targets[i].status = Just(status);
106− this.setState({ targetEmail: email });
246+ this.setState({ targets });
107 }
247 }
108
248
109− canGenerate() {
249+ addError(error) {
110− //TODO and canSend()
111− let res = this.state.invitesAvailable.matchWith({
250+ const newError = this.state.errors.matchWith({
112− Nothing: () => false,
251+ Nothing: () => [error],
113− Just: invites => ((invites.value > 0)
252+ Just: errs => { errs.value.push(error); return errs.value; }
114− && Just.hasInstance(this.state.randomPlanet)
115− && Just.hasInstance(this.state.inviteWallet))
116 });
253 });
117− return res;
254+ this.setState({ errors: Just(newError) });
118 }
255 }
119
256
120− createUnsignedTxn() {
257+ askForFunding(address, minBalance, balance) {
121− const txn = azimuth.delegatedSending.sendPoint(
258+ this.setState({ fundingMessage: Just(
122− this.contracts,
259+ `Please make sure ${address} has at least ${fromWei(minBalance)} ETH,` +
123− this.point,
260+ `we'll continue once that's true. Current balance: ${fromWei(balance)}.` +
124− this.state.randomPlanet.value,
261+ `Waiting...`
125− this.state.inviteWallet.value.owner
262+ ) });
126− );
127− return Just(txn)
128 }
263 }
129
264
130− //TODO find a better way of making the user wait for submission success
265+ handleEmailInput(i, email) {
131− // and email sending, so that we can catch failure cases and can
266+ let targets = this.state.targets;
132− // always fall back to retrying or "please send them this"
267+ targets[i].email = email;
133− txnConfirmation(txHash, confirmations) {
268+
134− this.props.setTxnConfirmations(txHash, confirmations);
269+ // if it's a valid address, check if it has received an invite before
135− if (confirmations === 1) {
270+ if (email.match(/.*@.*\...+/)) {
136− sendMail(this.state.targetEmail, this.state.inviteWallet.value.ticket)
271+ hasReceived(email)
137− .then(console.log);
272+ .then(res => {
273+ targets[i].hasReceived = Just(res);
274+ this.setState({ targets });
275+ });
276+ } else {
277+ targets[i].hasReceived = Nothing();
138 }
278 }
279+
280+ this.setState({ targets });
281+ }
282+
283+ canSend() {
284+ const targets = this.state.targets;
285+
286+ // may not have duplicate targets
287+ if ((new Set(targets.map(t => t.email))).size !== targets.length)
288+ return false;
289+
290+ // none may have received invites already
291+ for (let i = 0; i < targets.length; i++) {
292+ const target = targets[i];
293+ const res = target.hasReceived.matchWith({
294+ Nothing: () => true,
295+ Just: has => has.value
296+ });
297+ if (res) return false;
298+ }
299+
300+ return this.state.invitesAvailable.matchWith({
301+ Nothing: () => false,
302+ Just: invites => (invites.value > 0)
303+ });
304+ }
305+
306+ addTarget() {
307+ let targets = this.state.targets;
308+ targets.push({ email: '', hasReceived: Nothing(), status: Nothing() });
309+ this.setState({ targets });
310+ }
311+
312+ removeTarget() {
313+ let targets = this.state.targets;
314+ targets.length = targets.length - 1;
315+ this.setState({ targets });
139 }
316 }
140
317
141 render() {
318 render() {
319+
320+ const dif = (this.state.status === STATUS.DONE)
321+ ? this.state.targets.length
322+ : null;
323+
142− const inviteStatus = this.state.invitesAvailable.matchWith({
324+ const invitesAvailable = this.state.invitesAvailable.matchWith({
143 Nothing: () => 'Loading...',
325 Nothing: () => 'Loading...',
144 Just: (invites) => {
326 Just: (invites) => {
145− let res = `${invites.value} invites available`;
327+ const dia = dif ? `(-${dif})` : '';
146− return res + this.state.fromPool.matchWith({
328+ return `You currently have ${invites.value}${dia} invitations left.`;
147− Nothing: () => '',
148− Just: (pool) => (pool.value === this.point)
149− ? ''
150− : ` (from ${ob.patp(pool.value)})`
151− });
152 }
329 }
153 });
330 });
154
331
332+ const invitesSent = this.state.invited.matchWith({
333+ Nothing: () => (<>{'Loading...'}</>),
334+ Just: (invited) => {
335+ const dit = dif ? `(+${dif})` : '';
336+ return (<>
337+ {'Out of the '}
338+ {invited.value.total + dit}
339+ {' invites you sent, '}
340+ {invited.value.accepted}
341+ {' have been accepted.'}
342+ </>);
343+ }
344+ });
155
345
156− const inviteList = this.state.haveInvited.matchWith({
346+ const error = this.state.errors.matchWith({
157− Nothing: () => (<li>{'Loading...'}</li>),
347+ Nothing: () => null,
158− Just: (invited) => invited.value.map(i => {
348+ Just: (errors) => (<Warning className={'mt-8'}>
159− return (<li>
349+ <H3 style={{marginTop: 0, paddingTop: 0}}>
160− <span class="invitee">{ob.patp(i.point)}</span>:
350+ { 'Something went wrong!' }
161− <span class="status">{i.active ? 'accepted' : 'pending'}</span>
351+ </H3>
162− </li>);
352+ { errors.value.map(err => (<p>{err}</p>)) }
163− })
353+ </Warning>)
164 });
354 });
165
355
356+ const fundingMessage = this.state.fundingMessage.matchWith({
357+ Nothing: () => null,
358+ Just: msg => (<Warning className={'mt-8'}>{msg.value}</Warning>)
359+ });
360+
361+ let inputs;
362+ if (this.state.status === STATUS.DONE) {
363+ //TODO proper clickable router thing
364+ inputs = '<- Back to Home';
365+ } else {
366+
367+ const inputDisabled = (this.state.status !== STATUS.INPUT);
368+
369+ const lessButton = (
370+ <Button
371+ prop-size={'s narrow'}
372+ className={'mt-8'}
373+ disabled={inputDisabled || this.state.targets.length === 1}
374+ onClick={this.removeTarget}
375+ >
376+ { '-' }
377+ </Button>
378+ );
379+
380+ const moreButton = (
381+ <Button
382+ prop-size={'s narrow'}
383+ className={'mt-8'}
384+ disabled={
385+ inputDisabled ||
386+ this.state.invitesAvailable.matchWith({
387+ Nothing: () => true,
388+ Just: (inv) => (inv.value <= this.state.targets.length)
389+ })
390+ }
391+ onClick={this.addTarget}
392+ >
393+ { '+' }
394+ </Button>
395+ );
396+
397+ let targetInputs = [];
398+ for (let i = 0; i < this.state.targets.length; i++) {
399+ const target = this.state.targets[i];
400+ let progress = target.status.matchWith({
401+ Nothing: () => '',
402+ Just: status => status.value
403+ });
404+ targetInputs.push(<>
405+ <Input
406+ value={ target.email }
407+ onChange={ (value) => { this.handleEmailInput(i, value); } }
408+ placeholder={'Email address'}
409+ disabled={ inputDisabled }>
410+ </Input>
411+ {
412+ target.hasReceived.matchWith({
413+ Nothing: () => null,
414+ Just: (has) => has.value ? <span>{'×'}</span> : <span>{'°'}</span>
415+ })
416+ }
417+ { progress }
418+ </>);
419+ }
420+
421+ const submitButton = (
422+ <Button
423+ prop-size={'xl wide'}
424+ className={'mt-8'}
425+ disabled={ (inputDisabled && (this.state.status !== STATUS.CAN_SEND))
426+ || !this.canSend() }
427+ onClick={ () => {
428+ if (this.state.status === STATUS.INPUT)
429+ this.generateInvites();
430+ if (this.state.status === STATUS.CAN_SEND)
431+ this.sendInvites();
432+ }}
433+ >
434+ { this.state.status }
435+ </Button>
436+ );
437+
438+ inputs = (<>
439+ { lessButton }
440+ { moreButton }
441+ { targetInputs }
442+ { submitButton }
443+ </>);
444+ }
445+
166 return (
446 return (
167 <Row>
447 <Row>
168 <Col>
448 <Col>
169
449
170 <p>{ 'send invites here, for planets' }</p>
450 <p>{ 'send invites here, for planets' }</p>
171
451
172− <p>{ inviteStatus }</p>
452+ <p>{ invitesAvailable }</p>
173
453
174− <ul>{ inviteList }</ul>
454+ <ul>{ invitesSent }</ul>
175
455
176− <Input
456+ { error }
177− value={ this.state.targetEmail }
457+
178− onChange={ this.handleEmailInput }>
458+ { fundingMessage }
179− <InnerLabel>
180− { 'Recipient email' }
181− </InnerLabel>
182− </Input>
183
459
184− <StatelessTransaction
460+ { inputs }
185− // Upper scope
186− web3={this.props.web3}
187− contracts={this.props.contracts}
188− wallet={this.props.wallet}
189− walletType={this.props.walletType}
190− walletHdPath={this.props.walletHdPath}
191− networkType={this.props.networkType}
192− setTxnConfirmations={this.txnConfirmation}
193− onSent={this.props.setTxnHashCursor}
194− popRoute={this.props.popRoute}
195− pushRoute={this.props.pushRoute}
196− // Other
197− canGenerate={this.canGenerate()}
198− createUnsignedTxn={this.createUnsignedTxn}
199− ref={this.statelessRef} />
200
461
201 </Col>
462 </Col>
202 </Row>
463 </Row>
src/bridge/views/IssueChild.js+11−40
@@ -2,23 +2,21 @@ import { Just, Nothing } from 'folktale/maybe'
2import React from 'react'
2import React from 'react'
3import { azimuth, ecliptic } from 'azimuth-js'
3import { azimuth, ecliptic } from 'azimuth-js'
4import * as ob from 'urbit-ob'
4import * as ob from 'urbit-ob'
5+import * as need from '../lib/need'
5
6
7+import {
6−import { Row, Col, H1, P, Anchor } from '../components/Base'
8+ Row, Col, H1, P, Anchor,
7−import { Button, ShowBlockie, ValidatedSigil } from '../components/Base'
9+ ShowBlockie, ValidatedSigil,
8−import { PointInput, AddressInput, InnerLabel } from '../components/Base'
10+ PointInput, AddressInput, InnerLabel
11+} from '../components/Base'
9
12
10import StatelessTransaction from '../components/StatelessTransaction'
13import StatelessTransaction from '../components/StatelessTransaction'
11
14
12import { NETWORK_NAMES } from '../lib/network'
15import { NETWORK_NAMES } from '../lib/network'
13−import { BRIDGE_ERROR } from '../lib/error'
14import { getSpawnCandidate } from '../lib/child'
16import { getSpawnCandidate } from '../lib/child'
15import { canDecodePatp } from '../lib/txn'
17import { canDecodePatp } from '../lib/txn'
16
18
17−import {
18− ETH_ZERO_ADDR,
19− isValidAddress,
19+import { isValidAddress } from '../lib/wallet'
20− eqAddr
21−} from '../lib/wallet'
22
20
23const setFind = (set, pred) => {
21const setFind = (set, pred) => {
24 for (const e of set) {
22 for (const e of set) {
@@ -33,12 +31,7 @@ class IssueChild extends React.Component {
33 constructor(props) {
31 constructor(props) {
34 super(props)
32 super(props)
35
33
36− const issuingPoint = props.pointCursor.matchWith({
34+ const issuingPoint = parseInt(need.pointCursor(props), 10);
37− Just: (pt) => parseInt(pt.value, 10),
38− Nothing: () => {
39− throw BRIDGE_ERROR.MISSING_POINT
40− }
41− })
42
35
43 const getCandidate = () => ob.patp(getSpawnCandidate(issuingPoint))
36 const getCandidate = () => ob.patp(getSpawnCandidate(issuingPoint))
44
37
@@ -71,17 +64,9 @@ class IssueChild extends React.Component {
71 }
64 }
72
65
73 componentWillMount() {
66 componentWillMount() {
74−
75− const { contracts } = this.props
76 const { issuingPoint } = this.state
67 const { issuingPoint } = this.state
77
68
78−
79− const validContracts = contracts.matchWith({
69+ const validContracts = need.contracts(this.props);
80− Just: cs => cs.value,
81− Nothing: _ => {
82− throw BRIDGE_ERROR.MISSING_CONTRACTS
83− }
84− })
85
70
86 azimuth.getUnspawnedChildren(validContracts, issuingPoint).then(ps => this.setState({ validChildren: new Set(ps.map(ob.patp)) }))
71 azimuth.getUnspawnedChildren(validContracts, issuingPoint).then(ps => this.setState({ validChildren: new Set(ps.map(ob.patp)) }))
87 }
72 }
@@ -112,12 +97,7 @@ class IssueChild extends React.Component {
112 if (state.isAvailable === false) return Nothing()
97 if (state.isAvailable === false) return Nothing()
113 if (canDecodePatp(state.desiredPoint) === false) return Nothing()
98 if (canDecodePatp(state.desiredPoint) === false) return Nothing()
114
99
115− const validContracts = props.contracts.matchWith({
100+ const validContracts = need.contracts(props);
116− Just: (cs) => cs.value,
117− Nothing: () => {
118− throw BRIDGE_ERROR.MISSING_CONTRACTS
119− }
120− })
121
101
122 const pointDec = ob.patp2dec(state.desiredPoint)
102 const pointDec = ob.patp2dec(state.desiredPoint)
123
103
@@ -260,16 +240,7 @@ class IssueChild extends React.Component {
260
240
261 <StatelessTransaction
241 <StatelessTransaction
262 // Upper scope
242 // Upper scope
263− web3={props.web3}
243+ {...props}
264− contracts={props.contracts}
265− wallet={props.wallet}
266− walletType={props.walletType}
267− walletHdPath={props.walletHdPath}
268− networkType={props.networkType}
269− onSent={props.setTxnHashCursor}
270− setTxnConfirmations={props.setTxnConfirmations}
271− popRoute={props.popRoute}
272− pushRoute={props.pushRoute}
273 // Other
244 // Other
274 canGenerate={canGenerate}
245 canGenerate={canGenerate}
275 createUnsignedTxn={this.createUnsignedTxn}
246 createUnsignedTxn={this.createUnsignedTxn}
src/bridge/views/Point.js+9−26
@@ -3,12 +3,12 @@ import React from 'react'
3import { pour } from 'sigil-js'
3import { pour } from 'sigil-js'
4import * as ob from 'urbit-ob'
4import * as ob from 'urbit-ob'
5import * as azimuth from 'azimuth-js'
5import * as azimuth from 'azimuth-js'
6+import * as need from '../lib/need'
6
7
7import PointList from '../components/PointList'
8import PointList from '../components/PointList'
8import ReactSVGComponents from '../components/ReactSVGComponents'
9import ReactSVGComponents from '../components/ReactSVGComponents'
9import KeysAndMetadata from './Point/KeysAndMetadata'
10import KeysAndMetadata from './Point/KeysAndMetadata'
10import Actions from './Point/Actions'
11import Actions from './Point/Actions'
11−import { BRIDGE_ERROR } from '../lib/error'
12import { Row, Col, H1, H3 } from '../components/Base'
12import { Row, Col, H1, H3 } from '../components/Base'
13
13
14
14
@@ -18,7 +18,8 @@ class Point extends React.Component {
18 super(props)
18 super(props)
19
19
20 this.state = {
20 this.state = {
21− spawned: []
21+ spawned: [],
22+ invites: Nothing()
22 }
23 }
23 }
24 }
24
25
@@ -50,9 +51,8 @@ class Point extends React.Component {
50 pointCursor.chain(point => {
51 pointCursor.chain(point => {
51 azimuth.azimuth.getPoint(ctrcs, point)
52 azimuth.azimuth.getPoint(ctrcs, point)
52 .then(details => addToPointCache({ [point]: details }));
53 .then(details => addToPointCache({ [point]: details }));
53− const prefix = azimuth.azimuth.getPrefix(point);
54+ azimuth.delegatedSending.getTotalUsableInvites(ctrcs, point)
54− azimuth.azimuth.getPoint(ctrcs, prefix)
55+ .then(count => this.setState({ invites: Just(count) }));
55− .then(details => addToPointCache({ [prefix]: details }));
56 this.updateSpawned(ctrcs, point);
56 this.updateSpawned(ctrcs, point);
57 })));
57 })));
58 }
58 }
@@ -73,35 +73,19 @@ class Point extends React.Component {
73 render() {
73 render() {
74
74
75 const {
75 const {
76− web3, popRoute, pushRoute, wallet, contracts,
76+ web3, popRoute, pushRoute, wallet,
77− setPointCursor, pointCursor, pointCache
77+ setPointCursor, pointCache
78 } = this.props;
78 } = this.props;
79
79
80 const { spawned } = this.state
80 const { spawned } = this.state
81
81
82−
83− const point = pointCursor.matchWith({
82+ const point = need.pointCursor(this.props);
84− Just: (cursor) => cursor.value,
85− Nothing: () => {
86− throw BRIDGE_ERROR.MISSING_POINT
87− }
88− })
89
83
90 const pointDetails =
84 const pointDetails =
91 point in pointCache
85 point in pointCache
92 ? Just(pointCache[point])
86 ? Just(pointCache[point])
93 : Nothing()
87 : Nothing()
94
88
95− const prefix = azimuth.azimuth.getPrefix(point);
96− const prefixDetails =
97− prefix in pointCache
98− ? Just(pointCache[prefix])
99− : Nothing();
100− const delegatedSending = contracts.matchWith({
101− Nothing: () => '0x',
102− Just: (c) => c.value.delegatedSending.address
103− })
104−
105 const name = ob.patp(point)
89 const name = ob.patp(point)
106
90
107 const sigil = pour({
91 const sigil = pour({
@@ -147,10 +131,9 @@ class Point extends React.Component {
147 pushRoute={ pushRoute }
131 pushRoute={ pushRoute }
148 online={ online }
132 online={ online }
149 wallet={ wallet }
133 wallet={ wallet }
150− delegatedSending={ delegatedSending }
151 point={ point }
134 point={ point }
152 pointDetails={ pointDetails }
135 pointDetails={ pointDetails }
153− prefixDetails={ prefixDetails } />
136+ invites={ this.state.invites } />
154 : null
137 : null
155 }
138 }
156
139
src/bridge/views/Point/Actions.js+19−19
@@ -1,11 +1,10 @@
1import React from 'react'
1import React from 'react'
2+import * as need from '../../lib/need'
2import {
3import {
3 ETH_ZERO_ADDR,
4 ETH_ZERO_ADDR,
4 CURVE_ZERO_ADDR,
5 CURVE_ZERO_ADDR,
5− addressFromSecp256k1Public,
6 eqAddr
6 eqAddr
7} from '../../lib/wallet'
7} from '../../lib/wallet'
8−import { BRIDGE_ERROR } from '../../lib/error'
9import { Row, Col, H2, P } from '../../components/Base'
8import { Row, Col, H2, P } from '../../components/Base'
10import { Button } from '../../components/Base'
9import { Button } from '../../components/Base'
11import { ROUTE_NAMES } from '../../lib/router'
10import { ROUTE_NAMES } from '../../lib/router'
@@ -18,16 +17,11 @@ const isStar = point =>
18
17
19const Actions = (props) => {
18const Actions = (props) => {
20 const {
19 const {
21− pushRoute, online, wallet, delegatedSending,
20+ pushRoute, online,
22− point, pointDetails, prefixDetails
21+ point, pointDetails, invites
23 } = props
22 } = props
24
23
25− const addr = wallet.matchWith({
24+ const addr = need.address(props);
26− Just: (wal) => addressFromSecp256k1Public(wal.value.publicKey),
27− Nothing: () => {
28− throw BRIDGE_ERROR.MISSING_WALLET
29− }
30− })
31
25
32 const isOwner = pointDetails.matchWith({
26 const isOwner = pointDetails.matchWith({
33 Nothing: _ => false,
27 Nothing: _ => false,
@@ -64,10 +58,10 @@ const Actions = (props) => {
64 }
58 }
65 })
59 })
66
60
67− const prefixHasDelegatedSending =
61+ const hasInvites =
68− prefixDetails.matchWith({
62+ invites.matchWith({
69 Nothing: () => false,
63 Nothing: () => false,
70− Just: (details) => eqAddr(details.value.spawnProxy, delegatedSending)
64+ Just: (count) => (count.value > 0)
71 });
65 });
72
66
73 const planet = isPlanet(point)
67 const planet = isPlanet(point)
@@ -119,23 +113,29 @@ const Actions = (props) => {
119 }
113 }
120 })
114 })
121
115
122− let invites = null;
116+ let inviteAction = null;
123 if (planet) {
117 if (planet) {
124− invites = (
118+ inviteAction = (
125 <Button
119 <Button
126− disabled={(!isActiveOwner || !online || !prefixHasDelegatedSending)}
120+ disabled={(!isActiveOwner || !online || !hasInvites)}
127 prop-size={'sm'}
121 prop-size={'sm'}
128 prop-type={'link'}
122 prop-type={'link'}
129 onClick={ () => {
123 onClick={ () => {
130 pushRoute(ROUTE_NAMES.INVITES_SEND);
124 pushRoute(ROUTE_NAMES.INVITES_SEND);
131 }}
125 }}
132 >
126 >
133− { 'Send invites' }
127+ { 'Send invites (' }
128+ { invites.matchWith({
129+ Nothing: () => '?',
130+ Just: (count) => count.value
131+ })
132+ }
133+ { ')' }
134 </Button>
134 </Button>
135 );
135 );
136 }
136 }
137 if (star) {
137 if (star) {
138− invites = (
138+ inviteAction = (
139 <Button
139 <Button
140 disabled={(!(isActiveOwner && canIssueChild) || !online)}
140 disabled={(!(isActiveOwner && canIssueChild) || !online)}
141 prop-size={'sm'}
141 prop-size={'sm'}
@@ -254,7 +254,7 @@ const Actions = (props) => {
254 </Col>
254 </Col>
255 <Col className={'flex flex-column items-start col-md-4'}>
255 <Col className={'flex flex-column items-start col-md-4'}>
256
256
257− { invites }
257+ { inviteAction }
258
258
259 </Col>
259 </Col>
260 </Row>
260 </Row>
src/bridge/views/Points.js+1−3
@@ -8,7 +8,6 @@ import { NETWORK_NAMES } from '../lib/network'
8import { ROUTE_NAMES } from '../lib/router'
8import { ROUTE_NAMES } from '../lib/router'
9import {
9import {
10 ETH_ZERO_ADDR,
10 ETH_ZERO_ADDR,
11− addressFromSecp256k1Public,
12 eqAddr
11 eqAddr
13 } from '../lib/wallet'
12 } from '../lib/wallet'
14
13
@@ -42,8 +41,7 @@ class Points extends React.Component {
42 web3.chain(_ =>
41 web3.chain(_ =>
43 contracts.chain(ctrcs =>
42 contracts.chain(ctrcs =>
44 wallet.chain(async wal => {
43 wallet.chain(async wal => {
45− const pub = wal.publicKey
44+ const addr = wal.address
46− const addr = addressFromSecp256k1Public(pub)
47
45
48 const points =
46 const points =
49 await azimuth.azimuth.getOwnedPoints(ctrcs, addr)
47 await azimuth.azimuth.getOwnedPoints(ctrcs, addr)
src/bridge/views/PrivateKey.js+1−3
@@ -7,8 +7,6 @@ import { Row, Col, H1 } from '../components/Base'
7import { ROUTE_NAMES } from '../lib/router'
7import { ROUTE_NAMES } from '../lib/router'
8import { EthereumWallet } from '../lib/wallet'
8import { EthereumWallet } from '../lib/wallet'
9
9
10−const secre = /[0-9A-Fa-f]{64}/g
11−
12class PrivateKey extends React.Component {
10class PrivateKey extends React.Component {
13
11
14 constructor(props) {
12 constructor(props) {
@@ -28,7 +26,7 @@ class PrivateKey extends React.Component {
28
26
29 constructWallet(privateKey) {
27 constructWallet(privateKey) {
30 const { setWallet } = this.props
28 const { setWallet } = this.props
31− if (secre.test(privateKey) === true) {
29+ if (/^[0-9A-Fa-f]{64}$/g.test(privateKey) === true) {
32 const sec = Buffer.from(privateKey, 'hex')
30 const sec = Buffer.from(privateKey, 'hex')
33 const wallet = new EthereumWallet(sec)
31 const wallet = new EthereumWallet(sec)
34 setWallet(Maybe.Just(wallet))
32 setWallet(Maybe.Just(wallet))
src/bridge/views/SentTransaction.js+3−5
@@ -1,5 +1,6 @@
1import Maybe from 'folktale/maybe'
1import Maybe from 'folktale/maybe'
2import React from 'react'
2import React from 'react'
3+import * as need from '../lib/need'
3import { Row, Col, H1, H3, P, Warning, Anchor } from '../components/Base'
4import { Row, Col, H1, H3, P, Warning, Anchor } from '../components/Base'
4import { Button } from '../components/Base'
5import { Button } from '../components/Base'
5
6
@@ -122,15 +123,12 @@ const Failure = (props) =>
122 </Row>
123 </Row>
123
124
124const SentTransaction = (props) => {
125const SentTransaction = (props) => {
125− const { web3, txnHashCursor, networkType, popRoute, pushRoute, txnConfirmations} = props
126+ const { txnHashCursor, networkType, popRoute, pushRoute, txnConfirmations} = props
126 const { setPointCursor, pointCursor } = props
127 const { setPointCursor, pointCursor } = props
127
128
128 const promptKeyfile = props.routeData && props.routeData.promptKeyfile
129 const promptKeyfile = props.routeData && props.routeData.promptKeyfile
129
130
130− const w3 = web3.matchWith({
131+ const w3 = need.web3(props);
131− Nothing: _ => { throw BRIDGE_ERROR.MISSING_WEB3 },
132− Just: res => res.value
133− })
134
132
135 const result = txnHashCursor.matchWith({
133 const result = txnHashCursor.matchWith({
136 Nothing: _ => { throw BRIDGE_ERROR.MISSING_TXN },
134 Nothing: _ => { throw BRIDGE_ERROR.MISSING_TXN },
src/bridge/views/SetKeys.js+9−44
@@ -2,29 +2,21 @@ import React from 'react'
2import Maybe from 'folktale/maybe'
2import Maybe from 'folktale/maybe'
3import * as azimuth from 'azimuth-js'
3import * as azimuth from 'azimuth-js'
4import * as ob from 'urbit-ob'
4import * as ob from 'urbit-ob'
5+import * as need from '../lib/need'
5import { Row, Col, H1, P, Warning, CheckboxButton } from '../components/Base'
6import { Row, Col, H1, P, Warning, CheckboxButton } from '../components/Base'
6
7
7import StatelessTransaction from '../components/StatelessTransaction'
8import StatelessTransaction from '../components/StatelessTransaction'
8−import { BRIDGE_ERROR } from '../lib/error'
9import { attemptSeedDerivation } from '../lib/keys'
9import { attemptSeedDerivation } from '../lib/keys'
10
10
11import * as kg from '../../../node_modules/urbit-key-generation/dist/index'
11import * as kg from '../../../node_modules/urbit-key-generation/dist/index'
12
12
13−import {
14− addressFromSecp256k1Public,
15− addHexPrefix
16−} from '../lib/wallet'
13+import { addHexPrefix } from '../lib/wallet'
17
14
18class SetKeys extends React.Component {
15class SetKeys extends React.Component {
19 constructor(props) {
16 constructor(props) {
20 super(props)
17 super(props)
21
18
22− const point = props.pointCursor.matchWith({
19+ const point = need.pointCursor(props);
23− Just: (shp) => shp.value,
24− Nothing: () => {
25− throw BRIDGE_ERROR.MISSING_POINT
26− }
27− })
28
20
29 this.state = {
21 this.state = {
30 auth: '',
22 auth: '',
@@ -51,12 +43,7 @@ class SetKeys extends React.Component {
51
43
52 this.deriveSeed()
44 this.deriveSeed()
53
45
54− const addr = props.wallet.matchWith({
46+ const addr = need.address(props);
55− Just: wal => addressFromSecp256k1Public(wal.value.publicKey),
56− Nothing: () => {
57− throw BRIDGE_ERROR.MISSING_WALLET
58− }
59− })
60
47
61 this.determineManagementSeed(props.contracts.value, addr)
48 this.determineManagementSeed(props.contracts.value, addr)
62 }
49 }
@@ -101,19 +88,9 @@ class SetKeys extends React.Component {
101 createUnsignedTxn() {
88 createUnsignedTxn() {
102 const { state, props } = this
89 const { state, props } = this
103
90
104− const validContracts = props.contracts.matchWith({
91+ const validContracts = need.contracts(props);
105− Just: (cs) => cs.value,
106− Nothing: () => {
107− throw BRIDGE_ERROR.MISSING_CONTRACTS
108− }
109− })
110
92
111− const validPoint = props.pointCursor.matchWith({
93+ const validPoint = need.pointCursor(props);
112− Just: (shp) => shp.value,
113− Nothing: () => {
114− throw BRIDGE_ERROR.MISSING_POINT
115− }
116− })
117
94
118 const hexRegExp = /[0-9A-Fa-f]{64}/g
95 const hexRegExp = /[0-9A-Fa-f]{64}/g
119
96
@@ -146,10 +123,7 @@ class SetKeys extends React.Component {
146 state.networkSeed.length === 64
123 state.networkSeed.length === 64
147 && state.networkSeed.length === 64
124 && state.networkSeed.length === 64
148
125
149− const pointDetails =
126+ const pointDetails = need.fromPointCache(props, state.point);
150− state.point in props.pointCache
151− ? props.pointCache[state.point]
152− : (() => { throw BRIDGE_ERROR.MISSING_POINT })()
153
127
154 return (
128 return (
155 <Row>
129 <Row>
@@ -175,7 +149,7 @@ class SetKeys extends React.Component {
175 </Warning>
149 </Warning>
176 }
150 }
177
151
178− { pointDetails.keyRevisionNumber === '0'
152+ { pointDetails.keyRevisionNumber === 0
179 ? <Warning>
153 ? <Warning>
180 <h3 className={'mb-2'}>{'Warning'}</h3>
154 <h3 className={'mb-2'}>{'Warning'}</h3>
181 {
155 {
@@ -196,16 +170,7 @@ class SetKeys extends React.Component {
196
170
197 <StatelessTransaction
171 <StatelessTransaction
198 // Upper scope
172 // Upper scope
199− web3={props.web3}
173+ {...props}
200− contracts={props.contracts}
201− wallet={props.wallet}
202− walletType={props.walletType}
203− walletHdPath={props.walletHdPath}
204− networkType={props.networkType}
205− onSent={props.setTxnHashCursor}
206− setTxnConfirmations={props.setTxnConfirmations}
207− popRoute={props.popRoute}
208− pushRoute={props.pushRoute}
209 // Tx
174 // Tx
210 canGenerate={ canGenerate }
175 canGenerate={ canGenerate }
211 createUnsignedTxn={this.createUnsignedTxn}
176 createUnsignedTxn={this.createUnsignedTxn}
src/bridge/views/SetProxy.js+5−29
@@ -1,12 +1,12 @@
1import Maybe from 'folktale/maybe'
1import Maybe from 'folktale/maybe'
2import React from 'react'
2import React from 'react'
3+import * as need from '../lib/need'
3import * as azimuth from 'azimuth-js'
4import * as azimuth from 'azimuth-js'
4import { Row, Col, H1, P, InnerLabel, ShowBlockie, Anchor, HorizontalSelector } from '../components/Base'
5import { Row, Col, H1, P, InnerLabel, ShowBlockie, Anchor, HorizontalSelector } from '../components/Base'
5import { AddressInput } from '../components/Base'
6import { AddressInput } from '../components/Base'
6import * as ob from 'urbit-ob'
7import * as ob from 'urbit-ob'
7
8
8import { PROXY_TYPE, renderProxyType } from '../lib/proxy'
9import { PROXY_TYPE, renderProxyType } from '../lib/proxy'
9−import { BRIDGE_ERROR } from '../lib/error'
10
10
11import { NETWORK_NAMES } from '../lib/network'
11import { NETWORK_NAMES } from '../lib/network'
12
12
@@ -36,12 +36,7 @@ class SetProxy extends React.Component {
36 constructor(props) {
36 constructor(props) {
37 super(props)
37 super(props)
38
38
39− const issuingPoint = props.pointCursor.matchWith({
39+ const issuingPoint = need.pointCursor(props);
40− Just: (shp) => shp.value,
41− Nothing: () => {
42− throw BRIDGE_ERROR.MISSING_POINT
43− }
44− })
45
40
46 this.state = {
41 this.state = {
47 proxyAddress: '',
42 proxyAddress: '',
@@ -72,19 +67,9 @@ class SetProxy extends React.Component {
72 createUnsignedTxn(proxyAddress) {
67 createUnsignedTxn(proxyAddress) {
73 const { state, props } = this
68 const { state, props } = this
74
69
75− const validContracts = props.contracts.matchWith({
70+ const validContracts = need.contracts(props);
76− Just: (cs) => cs.value,
77− Nothing: () => {
78− throw BRIDGE_ERROR.MISSING_CONTRACTS
79− }
80− })
81
71
82− const validPoint = props.pointCursor.matchWith({
72+ const validPoint = need.pointCursor(props);
83− Just: (shp) => shp.value,
84− Nothing: () => {
85− throw BRIDGE_ERROR.MISSING_POINT
86− }
87− })
88
73
89 const txArgs = [
74 const txArgs = [
90 validContracts,
75 validContracts,
@@ -184,16 +169,7 @@ class SetProxy extends React.Component {
184
169
185 <StatelessTransaction
170 <StatelessTransaction
186 // Upper scope
171 // Upper scope
187− web3={props.web3}
172+ {...props}
188− contracts={props.contracts}
189− wallet={props.wallet}
190− walletType={props.walletType}
191− walletHdPath={props.walletHdPath}
192− networkType={props.networkType}
193− onSent={props.setTxnHashCursor}
194− setTxnConfirmations={props.setTxnConfirmations}
195− popRoute={props.popRoute}
196− pushRoute={props.pushRoute}
197 // Other
173 // Other
198 ref={this.statelessRef}
174 ref={this.statelessRef}
199 createUnsignedTxn={this.createUnsignedTxn}
175 createUnsignedTxn={this.createUnsignedTxn}
src/bridge/views/Transfer.js+5−29
@@ -2,12 +2,12 @@ import Maybe from 'folktale/maybe'
2import React from 'react'
2import React from 'react'
3import * as azimuth from 'azimuth-js'
3import * as azimuth from 'azimuth-js'
4import * as ob from 'urbit-ob'
4import * as ob from 'urbit-ob'
5+import * as need from '../lib/need'
5
6
6import { Row, Col, H1, InnerLabel, ShowBlockie, P, Anchor } from '../components/Base'
7import { Row, Col, H1, InnerLabel, ShowBlockie, P, Anchor } from '../components/Base'
7import { AddressInput } from '../components/Base'
8import { AddressInput } from '../components/Base'
8import StatelessTransaction from '../components/StatelessTransaction'
9import StatelessTransaction from '../components/StatelessTransaction'
9
10
10−import { BRIDGE_ERROR } from '../lib/error'
11import { NETWORK_NAMES } from '../lib/network'
11import { NETWORK_NAMES } from '../lib/network'
12
12
13import {
13import {
@@ -18,12 +18,7 @@ class Transfer extends React.Component {
18 constructor(props) {
18 constructor(props) {
19 super(props)
19 super(props)
20
20
21− const issuingPoint = props.pointCursor.matchWith({
21+ const issuingPoint = need.pointCursor(props);
22− Just: (pt) => pt.value,
23− Nothing: () => {
24− throw BRIDGE_ERROR.MISSING_POINT
25− }
26− })
27
22
28 this.state = {
23 this.state = {
29 receivingAddress: '',
24 receivingAddress: '',
@@ -49,19 +44,9 @@ class Transfer extends React.Component {
49 createUnsignedTxn() {
44 createUnsignedTxn() {
50 const { state, props } = this
45 const { state, props } = this
51
46
52− const validContracts = props.contracts.matchWith({
47+ const validContracts = need.contracts(props);
53− Just: (cs) => cs.value,
54− Nothing: () => {
55− throw BRIDGE_ERROR.MISSING_CONTRACTS
56− }
57− })
58
48
59− const validPoint = props.pointCursor.matchWith({
49+ const validPoint = need.pointCursor(props);
60− Just: (shp) => shp.value,
61− Nothing: () => {
62− throw BRIDGE_ERROR.MISSING_POINTs
63− }
64− })
65
50
66 const txn = azimuth.ecliptic.setTransferProxy(
51 const txn = azimuth.ecliptic.setTransferProxy(
67 validContracts,
52 validContracts,
@@ -125,16 +110,7 @@ class Transfer extends React.Component {
125
110
126 <StatelessTransaction
111 <StatelessTransaction
127 // Upper scope
112 // Upper scope
128− web3={props.web3}
113+ {...props}
129− contracts={props.contracts}
130− wallet={props.wallet}
131− walletType={props.walletType}
132− walletHdPath={props.walletHdPath}
133− networkType={props.networkType}
134− onSent={props.setTxnHashCursor}
135− setTxnConfirmations={props.setTxnConfirmations}
136− popRoute={props.popRoute}
137− pushRoute={props.pushRoute}
138 // Checks
114 // Checks
139 userApproval={state.userApproval}
115 userApproval={state.userApproval}
140 canGenerate={ canGenerate }
116 canGenerate={ canGenerate }
src/walletgen/lib/lib.js+7−2
@@ -53,13 +53,17 @@ const generateWallet = async (point, ticket, boot) => {
53
53
54 const wallet = await kg.generateWallet(config);
54 const wallet = await kg.generateWallet(config);
55
55
56− // This is here to notify the anyone who opens console because the thread
56+ // This is here to notify anyone who opens console because the thread
57− // hangs, blocking UI updates so this cannot be doen in the UI
57+ // hangs, blocking UI updates so this cannot be done in the UI
58 console.log('Generating Wallet for point address: ', point);
58 console.log('Generating Wallet for point address: ', point);
59
59
60 return wallet;
60 return wallet;
61}
61}
62
62
63+// returns a promise
64+const generateOwnershipWallet = (ship, ticket) =>
65+ kg.generateOwnershipWallet({ ship, ticket });
66+
63const seq = num => Array.from(Array(num), (_, i) => i)
67const seq = num => Array.from(Array(num), (_, i) => i)
64
68
65const compose = (...fs) => fs.reduceRight((pF, nF) => (...args) => nF(pF(...args)), v => v)
69const compose = (...fs) => fs.reduceRight((pF, nF) => (...args) => nF(pF(...args)), v => v)
@@ -67,6 +71,7 @@ const compose = (...fs) => fs.reduceRight((pF, nF) => (...args) => nF(pF(...args
67export {
71export {
68 makeTicket,
72 makeTicket,
69 generateWallet,
73 generateWallet,
74+ generateOwnershipWallet,
70 compose,
75 compose,
71 seq,
76 seq,
72}
77}