git.iko.soy/bridge
on master help sign in
WIP un-compiling new PaperRenderer integration
82ad0d7Fang
package-lock.json+58−85
compare with master
unifiedsplit
@@ -2167,32 +2167,33 @@
2167 "integrity": "sha512-uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg==",
2167 "integrity": "sha512-uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg==",
2168 "dev": true
2168 "dev": true
2169 },
2169 },
2170− "PaperCollateralRenderer": {
2170+ "PaperRenderer": {
2171− "version": "github:urbit/PaperCollateralRenderer#8478aaf397e12769171b7b14332c47e4457e1d46",
2171+ "version": "github:urbit/PaperRenderer#4a5dd07e3ff2d225d6a955ef6a2ed822c7369422",
2172− "from": "github:urbit/PaperCollateralRenderer#rc-immediate",
2172+ "from": "github:urbit/PaperRenderer#rc-2.0",
2173 "requires": {
2173 "requires": {
2174− "babel-polyfill": "^6.26.0",
2175− "dotenv": "^8.0.0",
2176− "flat": "^4.1.0",
2177− "lodash": "^4.17.10",
2174+ "lodash.get": "^4.4.2",
2178− "qr-image": "^3.2.0",
2175+ "prop-types": "^15.7.2",
2179− "urbit-ob": "^1.4.4",
2180− "urbit-sigil-js": "^1.3.5"
2176+ "urbit-sigil-js": "^1.3.7"
2181 },
2177 },
2182 "dependencies": {
2178 "dependencies": {
2183− "dotenv": {
2179+ "prop-types": {
2184− "version": "8.0.0",
2180+ "version": "15.7.2",
2185− "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.0.0.tgz",
2181+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
2186− "integrity": "sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg=="
2182+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
2183+ "requires": {
2184+ "loose-envify": "^1.4.0",
2185+ "object-assign": "^4.1.1",
2186+ "react-is": "^16.8.1"
2187+ }
2187 },
2188 },
2188− "urbit-ob": {
2189+ "urbit-sigil-js": {
2189− "version": "1.4.4",
2190+ "version": "1.3.7",
2190− "resolved": "https://registry.npmjs.org/urbit-ob/-/urbit-ob-1.4.4.tgz",
2191+ "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.7.tgz",
2191− "integrity": "sha512-vWacJsymaUjEXjoibAWE996x9SjlYi+2EIjzh+0chAMwu69wG+6+ChMmBr0jliz20LGvIEgAazCtJURwAeYkhQ==",
2192+ "integrity": "sha512-s/4sBpzSRX22r39FvNkpaMkt3xI6FJBj79Dp7FtYGR90es4ZLWNY3eA8QVrjHL+pcj4RyX56O62mXrRQ83ZsoQ==",
2192 "requires": {
2193 "requires": {
2193− "babel-plugin-lodash": "^3.3.4",
2194+ "react": "^16.8.6",
2194− "bn.js": "^4.11.8",
2195+ "svgson": "^4.0.0",
2195− "rollup-plugin-uglify-es": "0.0.1"
2196+ "transformation-matrix": "^1.14.0"
2196 }
2197 }
2197 }
2198 }
2198 }
2199 }
@@ -2888,18 +2889,6 @@
2888 "@types/babel__traverse": "^7.0.6"
2889 "@types/babel__traverse": "^7.0.6"
2889 }
2890 }
2890 },
2891 },
2891− "babel-plugin-lodash": {
2892− "version": "3.3.4",
2893− "resolved": "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz",
2894− "integrity": "sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg==",
2895− "requires": {
2896− "@babel/helper-module-imports": "^7.0.0-beta.49",
2897− "@babel/types": "^7.0.0-beta.49",
2898− "glob": "^7.1.1",
2899− "lodash": "^4.17.10",
2900− "require-package-name": "^2.0.1"
2901− }
2902− },
2903 "babel-plugin-macros": {
2892 "babel-plugin-macros": {
2904 "version": "2.5.1",
2893 "version": "2.5.1",
2905 "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.5.1.tgz",
2894 "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.5.1.tgz",
@@ -7008,14 +6997,6 @@
7008 "pinkie-promise": "^2.0.0"
6997 "pinkie-promise": "^2.0.0"
7009 }
6998 }
7010 },
6999 },
7011− "flat": {
7012− "version": "4.1.0",
7013− "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
7014− "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
7015− "requires": {
7016− "is-buffer": "~2.0.3"
7017− }
7018− },
7019 "flat-cache": {
7000 "flat-cache": {
7020 "version": "2.0.1",
7001 "version": "2.0.1",
7021 "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
7002 "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
@@ -11526,6 +11507,11 @@
11526 "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
11507 "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
11527 "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
11508 "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
11528 },
11509 },
11510+ "lodash.get": {
11511+ "version": "4.4.2",
11512+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
11513+ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
11514+ },
11529 "lodash.memoize": {
11515 "lodash.memoize": {
11530 "version": "4.1.2",
11516 "version": "4.1.2",
11531 "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
11517 "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -14223,11 +14209,6 @@
14223 "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
14209 "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
14224 "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
14210 "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
14225 },
14211 },
14226− "qr-image": {
14227− "version": "3.2.0",
14228− "resolved": "https://registry.npmjs.org/qr-image/-/qr-image-3.2.0.tgz",
14229− "integrity": "sha1-n6gpW+rlDEoUnPn5CaHbRkqGcug="
14230− },
14231 "qs": {
14212 "qs": {
14232 "version": "6.5.2",
14213 "version": "6.5.2",
14233 "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
14214 "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@@ -15019,11 +15000,6 @@
15019 "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
15000 "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
15020 "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
15001 "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
15021 },
15002 },
15022− "require-package-name": {
15023− "version": "2.0.1",
15024− "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz",
15025− "integrity": "sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk="
15026− },
15027 "requireindex": {
15003 "requireindex": {
15028 "version": "1.2.0",
15004 "version": "1.2.0",
15029 "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
15005 "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
@@ -15114,34 +15090,6 @@
15114 "safe-buffer": "^5.1.1"
15090 "safe-buffer": "^5.1.1"
15115 }
15091 }
15116 },
15092 },
15117− "rollup-plugin-uglify-es": {
15118− "version": "0.0.1",
15119− "resolved": "https://registry.npmjs.org/rollup-plugin-uglify-es/-/rollup-plugin-uglify-es-0.0.1.tgz",
15120− "integrity": "sha1-5FZE8raFpZq9uTY0ByB6A6e1qbc=",
15121− "requires": {
15122− "uglify-es": "3.0.3"
15123− },
15124− "dependencies": {
15125− "commander": {
15126− "version": "2.9.0",
15127− "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
15128− "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
15129− "requires": {
15130− "graceful-readlink": ">= 1.0.0"
15131− }
15132− },
15133− "uglify-es": {
15134− "version": "3.0.3",
15135− "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.0.3.tgz",
15136− "integrity": "sha1-Y8yEqpRos0lzpIh3h8ZMAaiodXY=",
15137− "requires": {
15138− "commander": "~2.9.0",
15139− "source-map": "~0.5.1",
15140− "uglify-to-browserify": "~1.0.0"
15141− }
15142− }
15143− }
15144− },
15145 "rsvp": {
15093 "rsvp": {
15146 "version": "4.8.5",
15094 "version": "4.8.5",
15147 "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
15095 "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
@@ -17389,12 +17337,6 @@
17389 }
17337 }
17390 }
17338 }
17391 },
17339 },
17392− "uglify-to-browserify": {
17393− "version": "1.0.2",
17394− "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
17395− "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
17396− "optional": true
17397− },
17398 "ultron": {
17340 "ultron": {
17399 "version": "1.1.1",
17341 "version": "1.1.1",
17400 "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
17342 "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -17614,6 +17556,37 @@
17614 "lodash": "^4.17.11"
17556 "lodash": "^4.17.11"
17615 }
17557 }
17616 },
17558 },
17559+ "urbit-paper-renderer": {
17560+ "version": "github:urbit/PaperRenderer#4a5dd07e3ff2d225d6a955ef6a2ed822c7369422",
17561+ "from": "github:urbit/PaperRenderer#rc-2.0",
17562+ "requires": {
17563+ "lodash.get": "^4.4.2",
17564+ "prop-types": "^15.7.2",
17565+ "urbit-sigil-js": "^1.3.7"
17566+ },
17567+ "dependencies": {
17568+ "prop-types": {
17569+ "version": "15.7.2",
17570+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
17571+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
17572+ "requires": {
17573+ "loose-envify": "^1.4.0",
17574+ "object-assign": "^4.1.1",
17575+ "react-is": "^16.8.1"
17576+ }
17577+ },
17578+ "urbit-sigil-js": {
17579+ "version": "1.3.7",
17580+ "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.7.tgz",
17581+ "integrity": "sha512-s/4sBpzSRX22r39FvNkpaMkt3xI6FJBj79Dp7FtYGR90es4ZLWNY3eA8QVrjHL+pcj4RyX56O62mXrRQ83ZsoQ==",
17582+ "requires": {
17583+ "react": "^16.8.6",
17584+ "svgson": "^4.0.0",
17585+ "transformation-matrix": "^1.14.0"
17586+ }
17587+ }
17588+ }
17589+ },
17617 "urbit-sigil-js": {
17590 "urbit-sigil-js": {
17618 "version": "1.3.5",
17591 "version": "1.3.5",
17619 "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.5.tgz",
17592 "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.5.tgz",
package.json+2−1
@@ -18,7 +18,7 @@
18 "@ledgerhq/hw-app-eth": "^4.61.0",
18 "@ledgerhq/hw-app-eth": "^4.61.0",
19 "@ledgerhq/hw-transport-u2f": "^4.61.0",
19 "@ledgerhq/hw-transport-u2f": "^4.61.0",
20 "@welldone-software/why-did-you-render": "^3.2.3",
20 "@welldone-software/why-did-you-render": "^3.2.3",
21− "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer#rc-immediate",
21+ "PaperRenderer": "github:urbit/PaperRenderer#rc-2.0",
22 "async-retry": "^1.2.3",
22 "async-retry": "^1.2.3",
23 "azimuth-js": "^0.15.1",
23 "azimuth-js": "^0.15.1",
24 "azimuth-solidity": "^1.2.0",
24 "azimuth-solidity": "^1.2.0",
@@ -51,6 +51,7 @@
51 "trezor-connect": "^7.0.1",
51 "trezor-connect": "^7.0.1",
52 "urbit-key-generation": "^0.16.0",
52 "urbit-key-generation": "^0.16.0",
53 "urbit-ob": "^4.0.1",
53 "urbit-ob": "^4.0.1",
54+ "urbit-paper-renderer": "github:urbit/PaperRenderer#rc-2.0",
54 "urbit-sigil-js": "^1.3.5",
55 "urbit-sigil-js": "^1.3.5",
55 "web3": "1.0.0-beta.54",
56 "web3": "1.0.0-beta.54",
56 "web3-utils": "^1.0.0-beta.52"
57 "web3-utils": "^1.0.0-beta.52"
src/components/PaperBuilder.jsnew file+14
@@ -0,0 +1,14 @@
1+import React from 'react';
2+import PaperRenderer from 'urbit-paper-renderer';
3+
4+export default function PaperBuilder({ point, wallet, callback, ...props }) {
5+ return (
6+ <PaperRenderer
7+ wallet={[wallet]}
8+ callback={callback}
9+ className="super-hidden"
10+ show={false}
11+ debug={false}
12+ />
13+ );
14+}
src/components/PaperRenderer.jsdeleted−13
@@ -1,13 +0,0 @@
1−import React from 'react';
2−import PaperCollateralRenderer from 'PaperCollateralRenderer';
3−
4−export default function PaperRenderer({ point, wallet, callback, ...props }) {
5− return (
6− <PaperCollateralRenderer
7− wallet={{ [point]: wallet }}
8− callback={callback}
9− className="super-hidden"
10− mode="REGISTRATION"
11− />
12− );
13−}
src/views/Activate/PassportDownload.js+2−2
@@ -7,7 +7,7 @@ import { downloadWallet } from 'lib/invite';
7import { useLocalRouter } from 'lib/LocalRouter';
7import { useLocalRouter } from 'lib/LocalRouter';
8
8
9import { DownloadButton, ForwardButton } from 'components/Buttons';
9import { DownloadButton, ForwardButton } from 'components/Buttons';
10−import PaperRenderer from 'components/PaperRenderer';
10+import PaperBuilder from 'components/PaperBuilder';
11
11
12import { useActivateFlow } from './ActivateFlow';
12import { useActivateFlow } from './ActivateFlow';
13import PassportView from './PassportView';
13import PassportView from './PassportView';
@@ -77,7 +77,7 @@ export default function PassportDownload({ className }) {
77 </Grid.Item>
77 </Grid.Item>
78 </Grid>
78 </Grid>
79 </PassportView>
79 </PassportView>
80− <PaperRenderer
80+ <PaperBuilder
81 point={pointAsString}
81 point={pointAsString}
82 wallet={wallet}
82 wallet={wallet}
83 callback={data => setPaper(Just(data))}
83 callback={data => setPaper(Just(data))}
src/views/Admin/AdminRedownload.js+2−2
@@ -5,7 +5,7 @@ import * as need from 'lib/need';
5import { usePointCursor } from 'store/pointCursor';
5import { usePointCursor } from 'store/pointCursor';
6
6
7import { DownloadButton, RestartButton } from 'components/Buttons';
7import { DownloadButton, RestartButton } from 'components/Buttons';
8−import PaperRenderer from 'components/PaperRenderer';
8+import PaperBuilder from 'components/PaperBuilder';
9
9
10import { downloadWallet } from 'lib/invite';
10import { downloadWallet } from 'lib/invite';
11
11
@@ -60,7 +60,7 @@ export default function AdminRedownload() {
60 </Grid.Item>
60 </Grid.Item>
61 )}
61 )}
62 </Grid>
62 </Grid>
63− <PaperRenderer
63+ <PaperBuilder
64 point={point}
64 point={point}
65 wallet={_urbitWallet}
65 wallet={_urbitWallet}
66 callback={paper => {
66 callback={paper => {
src/views/Admin/Reticket/ReticketConfirm.js+2−2
@@ -11,7 +11,7 @@ import { useLocalRouter } from 'lib/LocalRouter';
11import { isDevelopment } from 'lib/flags';
11import { isDevelopment } from 'lib/flags';
12
12
13import { ForwardButton } from 'components/Buttons';
13import { ForwardButton } from 'components/Buttons';
14−import PaperRenderer from 'components/PaperRenderer';
14+import PaperBuilder from 'components/PaperBuilder';
15import WarningBox from 'components/WarningBox';
15import WarningBox from 'components/WarningBox';
16import { blinkIf } from 'components/Blinky';
16import { blinkIf } from 'components/Blinky';
17import useCurrentPointName from 'lib/useCurrentPointName';
17import useCurrentPointName from 'lib/useCurrentPointName';
@@ -54,7 +54,7 @@ export default function ReticketConfirm({ newWallet, setNewWallet }) {
54 const paperRenderer = generatedWallet.matchWith({
54 const paperRenderer = generatedWallet.matchWith({
55 Nothing: () => null,
55 Nothing: () => null,
56 Just: ({ value: wallet }) => (
56 Just: ({ value: wallet }) => (
57− <PaperRenderer
57+ <PaperBuilder
58 point={point}
58 point={point}
59 wallet={wallet}
59 wallet={wallet}
60 callback={paper => {
60 callback={paper => {