Merge pull request #1057 from urbit/t/deps-wc-1.8.0-ethtx-4.0.0-vite-3
txns: refactor for EIP1559 compatibility; also upgrade deps, remove dead code, fix race condition
commitafc3847be936381cfa53b276233d41a221f106a6
authortomholford <16504501+tomholford@users.noreply.github.com>
dateWed 26 Oct 2022, 14:04 (4 years ago)
parent31b50f35532fba
155 files changed+19118−34683
.env+1−2
@@ -1,2 +1 @@
1−REACT_APP_INFURA_ENDPOINT='2599df54929b47099bda360958d75aaf'
2−
1+VITE_INFURA_ENDPOINT='2599df54929b47099bda360958d75aaf'
.env.development+5−5
@@ -1,5 +1,5 @@
1−REACT_APP_DEV_MNEMONIC='benefit crew supreme gesture quantum web media hazard theory mercy wing kitten'
2−REACT_APP_DEV_GALAXY_TICKET='~wacfus-dabpex-danted-mosfep-pasrud-lavmer-nodtex-taslus-pactyp-milpub-pildeg-fornev-ralmed-dinfeb-fopbyr-sanbet-sovmyl-dozsut-mogsyx-mapwyc-sorrup-ricnec-marnys-lignex'
3−REACT_APP_ROPSTEN_KEY='b7d2af9f01534031ba773374f766ef65'
4−REACT_APP_HD_PATH="m/44'/60'/0'/0/0"
5−REACT_APP_STUB_LOCAL='false'
1+VITE_DEV_MNEMONIC='benefit crew supreme gesture quantum web media hazard theory mercy wing kitten'
2+VITE_DEV_GALAXY_TICKET='~wacfus-dabpex-danted-mosfep-pasrud-lavmer-nodtex-taslus-pactyp-milpub-pildeg-fornev-ralmed-dinfeb-fopbyr-sanbet-sovmyl-dozsut-mogsyx-mapwyc-sorrup-ricnec-marnys-lignex'
3+VITE_GOERLI_KEY='b7d2af9f01534031ba773374f766ef65'
4+VITE_HD_PATH="m/44'/60'/0'/0/0"
5+VITE_STUB_LOCAL='false'
.github/ISSUE_TEMPLATE/l2-bug-report.md+1−1
@@ -23,7 +23,7 @@ A clear and concise description of what you expected to happen.
2323If applicable, add screenshots to help explain your problem. If possible, please also copy and paste any errors that appear in your browser's dev console. Here are [Chrome's docs](https://developers.google.com/web/tools/chrome-devtools/open) for using this feature.
2424
2525**Ethereum network:**
26−Were you testing on Ropsten or mainnet?
26+Were you testing on Goerli or mainnet?
2727
2828**Desktop (please complete the following information):**
2929 - OS: [e.g. MacOS 10.15.3]
.nvmrc+1−1
@@ -1 +1 @@
1−16.14.0
1+16.18.0
DEVELOPMENT.md+5−5
@@ -65,9 +65,9 @@ of having to re-authenticate whenever you make a change or refresh the page):
6565
6666- The `.env.development` file contains environment variables that you can
6767 provide to the application when it's running in development. You can access
68− them via `process.env.REACT_APP_<whatever>`.
68+ them via `import.meta.env.VITE_<whatever>`.
6969
70−- Set `REACT_APP_STUB_LOCAL='true'` in `.env.development` to enabled stubbing of
70+- Set `VITE_STUB_LOCAL='true'` in `.env.development` to enabled stubbing of
7171 certain methods throughout the app.
7272
7373- The top of the Bridge component in `src/Bridge.js` can be tweaked for setting
@@ -119,9 +119,9 @@ Automated tests for critical user journeys are coming Soon™️. Until then, he
119119
120120"As a user, I can create a new invite"
121121
122−First, in `Bridge.js`, set the `INITIAL_NETWORK_TYPE` to Ropsten:
122+First, in `Bridge.js`, set the `INITIAL_NETWORK_TYPE` to Goerli:
123123```js
124−const INITIAL_NETWORK_TYPE = NETWORK_TYPES.ROPSTEN;
124+const INITIAL_NETWORK_TYPE = NETWORK_TYPES.GOERLI;
125125```
126126
127127Then, in `tank.js`, set the port to `3011`:
@@ -142,7 +142,7 @@ const baseUrl = 'https://gas-tank.urbit.org:3011';
1421423. Download the Passport file, then use the enclosed Master Ticket and ID to login to Bridge again
143143### Known Issues
144144
145−When testing the invite acceptance and login flow on Ropsten, some of the Azimuth API calls will fail (e.g., `getConditional`).
145+When testing the invite acceptance and login flow on Goerli, some of the Azimuth API calls will fail (e.g., `getConditional`).
146146
147147## Releases
148148
README.md+4−4
@@ -63,10 +63,10 @@ By default, Bridge uses Tlon's L2 Roller, but can also be configured to use your
6363For example:
6464
6565```sh
66−REACT_APP_ROLLER_HOST=my-personal-roller.net npm run pilot-mainnet
66+VITE_ROLLER_HOST=my-personal-roller.net npm run pilot-mainnet
6767```
6868
6969The following are configurable, and will otherwise fallback to the defaults in `constants`:
70−- `REACT_APP_ROLLER_HOST` - host
71−- `REACT_APP_ROLLER_PORT` - port
72−- `REACT_APP_ROLLER_TRANSPORT_TYPE` - transport type (e.g., `http` or `https`)
70+- `VITE_ROLLER_HOST` - host
71+- `VITE_ROLLER_PORT` - port
72+- `VITE_ROLLER_TRANSPORT_TYPE` - transport type (e.g., `http` or `https`)
globals.d.tsnew file+13
@@ -0,0 +1,13 @@
1+declare module "\*.svg" {
2+ import React = require("react");
3+ export const ReactComponent: React.FC<React.SVGProps<SVGSVGElement>>;
4+ const src: string;
5+ export default src;
6+}
7+
8+declare module "\*.png" {
9+ import React = require("react");
10+ export const ReactComponent: React.FC<React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>>>;
11+ const src: string;
12+ export default src;
13+}
public/index.html → index.htmlrenamed+8−2
@@ -7,8 +7,8 @@
77 content="width=device-width, initial-scale=1, shrink-to-fit=no"
88 />
99 <meta name="theme-color" content="#fff" />
10− <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
11− <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
10+ <link rel="manifest" href="/manifest.json" />
11+ <link rel="shortcut icon" href="/favicon.ico" />
1212
1313 <meta
1414 name="description"
@@ -51,9 +51,15 @@
5151 border: 0;
5252 }
5353 </style>
54+ <script type="module">
55+ import { Buffer } from "buffer";
56+ window.global = window;
57+ window.Buffer = Buffer;
58+ </script>
5459 </head>
5560 <body>
5661 <div id="root"></div>
62+ <script type="module" src="/src/index.tsx"></script>
5763 <!-- Force load all fonts -->
5864 <div
5965 aria-visibility="hidden"
package-lock.json+18522−31556
This diff is too big to show here.
package.json+36−26
This diff is too big to show here.
src/Bridge.tsx+7−7
This diff is too big to show here.
src/components/Accordion.js → src/components/Accordion.jsxrenamed
The content is the same.
src/components/AspectRatio.js → src/components/AspectRatio.jsxrenamed
The content is the same.
src/components/BarGraph.js → src/components/BarGraph.jsxrenamed
The content is the same.
src/components/Blinky.js → src/components/Blinky.jsxrenamed
The content is the same.
src/components/Buttons.js → src/components/Buttons.jsxrenamed
The content is the same.
src/components/Chip.js → src/components/Chip.jsxrenamed
The content is the same.
src/components/Crumbs.js → src/components/Crumbs.jsxrenamed
The content is the same.
src/components/DownloadKeyfileButton.js → src/components/DownloadKeyfileButton.jsxrenamed
The content is the same.
src/components/DownloadSigilButton.js → src/components/DownloadSigilButton.jsxrenamed
The content is the same.
src/components/Footer.js → src/components/Footer.jsxrenamed
The content is the same.
src/components/FooterButton.js → src/components/FooterButton.jsxrenamed
The content is the same.
src/components/Greeting.js → src/components/Greeting.jsxrenamed
The content is the same.
src/components/Header.js → src/components/Header.jsxrenamed
The content is the same.
src/components/Highlighted.js → src/components/Highlighted.jsxrenamed
The content is the same.
src/components/InlineEthereumTransaction.js → src/components/InlineEthereumTransaction.jsxrenamed+3−3
This diff is too big to show here.
src/components/InputSigil.js → src/components/InputSigil.jsxrenamed
The content is the same.
src/components/InviteSigilList.js → src/components/InviteSigilList.jsxrenamed
The content is the same.
src/components/L2/Dropdowns/FeeDropdown.tsx+24−10
This diff is too big to show here.
src/components/LoadingBar.js → src/components/LoadingBar.jsxrenamed
The content is the same.
src/components/LoginButton.js → src/components/LoginButton.jsxrenamed
The content is the same.
src/components/MaybeSigil.js → src/components/MaybeSigil.jsxrenamed
The content is the same.
src/components/MiniBackButton.js → src/components/MiniBackButton.jsxrenamed
The content is the same.
src/components/NavHeader.js → src/components/NavHeader.jsxrenamed
The content is the same.
src/components/NeedFundsNotice.js → src/components/NeedFundsNotice.jsxrenamed
The content is the same.
src/components/NetworkKeys.js → src/components/NetworkKeys.jsxrenamed
The content is the same.
src/components/NoticeBox.js → src/components/NoticeBox.jsxrenamed
The content is the same.
src/components/PaperBuilder.js → src/components/PaperBuilder.jsxrenamed
The content is the same.
src/components/Passport.js → src/components/Passport.jsxrenamed
The content is the same.
src/components/ProgressButton.js → src/components/ProgressButton.jsxrenamed
The content is the same.
src/components/Router.js → src/components/Router.jsxrenamed
The content is the same.
src/components/Sigil.js → src/components/Sigil.jsxrenamed
The content is the same.
src/components/Steps.js → src/components/Steps.jsxrenamed
The content is the same.
src/components/Tabs.js → src/components/Tabs.jsxrenamed
The content is the same.
src/components/UploadButton.js → src/components/UploadButton.jsxrenamed
The content is the same.
src/components/ViewHeader.js → src/components/ViewHeader.jsxrenamed
The content is the same.
src/components/WarningBox.js → src/components/WarningBox.jsxrenamed
The content is the same.
src/components/WithErrorBoundary.js → src/components/WithErrorBoundary.jsxrenamed
The content is the same.
src/components/copiable/CopiableAddress.js → src/components/copiable/CopiableAddress.jsxrenamed
The content is the same.
src/components/copiable/CopiableAddressWrap.js → src/components/copiable/CopiableAddressWrap.jsxrenamed
The content is the same.
src/components/copiable/CopiableWithTooltip.js → src/components/copiable/CopiableWithTooltip.jsxrenamed
The content is the same.
src/components/copiable/CopyButton.js → src/components/copiable/CopyButton.jsxrenamed
The content is the same.
src/form/ColorInput.js → src/form/ColorInput.jsxrenamed
The content is the same.
src/form/EmailChipInput.js → src/form/EmailChipInput.jsxrenamed
The content is the same.
src/form/FormError.js → src/form/FormError.jsxrenamed
The content is the same.
src/form/SubmitButton.js → src/form/SubmitButton.jsxrenamed
The content is the same.
src/form/UploadInput.js → src/form/UploadInput.jsxrenamed
The content is the same.
src/index.tsx+3−5
This diff is too big to show here.
src/indigo-react/components/AccessoryIcon.js → src/indigo-react/components/AccessoryIcon.jsxrenamed
The content is the same.
src/indigo-react/components/Button.js → src/indigo-react/components/Button.jsxrenamed
The content is the same.
src/indigo-react/components/CheckboxInput.js → src/indigo-react/components/CheckboxInput.jsxrenamed
The content is the same.
src/indigo-react/components/Flex.js → src/indigo-react/components/Flex.jsxrenamed
The content is the same.
src/indigo-react/components/Grid.js → src/indigo-react/components/Grid.jsxrenamed
The content is the same.
src/indigo-react/components/IconButton.js → src/indigo-react/components/IconButton.jsxrenamed
The content is the same.
src/indigo-react/components/IndigoApp.js → src/indigo-react/components/IndigoApp.jsxrenamed
The content is the same.
src/indigo-react/components/Input.js → src/indigo-react/components/Input.jsxrenamed
The content is the same.
src/indigo-react/components/LinkButton.js → src/indigo-react/components/LinkButton.jsxrenamed
The content is the same.
src/indigo-react/components/SelectInput.js → src/indigo-react/components/SelectInput.jsxrenamed
The content is the same.
src/indigo-react/components/ToggleInput.js → src/indigo-react/components/ToggleInput.jsxrenamed
The content is the same.
src/indigo-react/components/Typography.js → src/indigo-react/components/Typography.jsxrenamed
The content is the same.
src/lib/MediaQuery.js → src/lib/MediaQuery.jsxrenamed
The content is the same.
src/lib/WalletConnect.ts+6−5
This diff is too big to show here.
src/lib/authToken.ts+13−27
This diff is too big to show here.
src/lib/constants.ts+4−1
This diff is too big to show here.
src/lib/contracts.js+5−5
This diff is too big to show here.
src/lib/explorer.js+2−2
This diff is too big to show here.
src/lib/flags.js+7−7
This diff is too big to show here.
src/lib/getSuggestedGasPrice.js+79−43
This diff is too big to show here.
src/lib/inviteMail.js+2−2
This diff is too big to show here.
src/lib/keys.js+1−2
This diff is too big to show here.
src/lib/ledger.jsdeleted−42
This diff is too big to show here.
src/lib/metamask.ts+17−17
This diff is too big to show here.
src/lib/network.js+5−5
This diff is too big to show here.
src/lib/reticket.js+6−5
This diff is too big to show here.
src/lib/tank.js+2−2
This diff is too big to show here.
src/lib/trezor.tsdeleted−66
This diff is too big to show here.
src/lib/txn.ts+68−131
This diff is too big to show here.
src/lib/useEthereumTransaction.js+3−3
This diff is too big to show here.
src/lib/useGasPrice.js+18−16
This diff is too big to show here.
src/lib/useMailer.js+1−1
This diff is too big to show here.
src/lib/useRollerOptions.ts+5−5
This diff is too big to show here.
src/lib/utils/address.ts+2−2
This diff is too big to show here.
src/lib/walletgen.js → src/lib/walletgen.tsrenamed+18−16
This diff is too big to show here.
src/nockjs/TODOdeleted−42
This diff is too big to show here.
src/nockjs/bits.jsdeleted−333
This diff is too big to show here.
src/nockjs/compiler.jsdeleted−726
This diff is too big to show here.
src/nockjs/hamt.jsdeleted−137
This diff is too big to show here.
src/nockjs/list.jsdeleted−40
This diff is too big to show here.
src/nockjs/noun.jsdeleted−367
This diff is too big to show here.
src/nockjs/serial.jsdeleted−167
This diff is too big to show here.
src/nockjs/test/ack.jsdeleted−51
This diff is too big to show here.
src/nockjs/test/add.jsdeleted−40
This diff is too big to show here.
src/nockjs/test/bits.jsdeleted−15
This diff is too big to show here.
src/nockjs/test/decrement.jsdeleted−37
This diff is too big to show here.
src/nockjs/test/hamt.jsdeleted−16
This diff is too big to show here.
src/nockjs/test/noun.jsdeleted−88
This diff is too big to show here.
src/nockjs/test/serial.jsdeleted−22
This diff is too big to show here.
src/store/network.js → src/store/network.jsxrenamed+4−4
This diff is too big to show here.
src/store/online.js → src/store/online.jsxrenamed
The content is the same.
src/store/pointCache.jsdeleted−29
This diff is too big to show here.
src/store/pointCache.jsxnew file+54
This diff is too big to show here.
src/store/pointCursor.js → src/store/pointCursor.jsxrenamed+7−1
This diff is too big to show here.
src/store/starRelease.js → src/store/starRelease.jsxrenamed
The content is the same.
src/store/txnCursor.js → src/store/txnCursor.jsxrenamed
The content is the same.
src/store/wallet.js → src/store/wallet.jsxrenamed+34−2
This diff is too big to show here.
src/style/form-reset.scss+2−2
This diff is too big to show here.
src/views/AcceptLockup.js → src/views/AcceptLockup.jsxrenamed
The content is the same.
src/views/AcceptTransfer.tsx+1
This diff is too big to show here.
src/views/Activate.js → src/views/Activate.jsxrenamed+1−1
This diff is too big to show here.
src/views/Activate/ActivateCodeForm.tsx+1−1
This diff is too big to show here.
src/views/Activate/MasterKeyConfirm.tsx+1−1
This diff is too big to show here.
src/views/Activate/MasterKeyDownload.tsx+1−1
This diff is too big to show here.
src/views/Activate/MasterKeyReveal.tsx+1−1
This diff is too big to show here.
src/views/Activate/MasterKeyTransfer.tsx+1−1
This diff is too big to show here.
src/views/Activate/ActivateFlow.js → src/views/Activate/useActivateFlow.jsrenamed
The content is the same.
src/views/Activate/useFadeIn.ts+1−1
This diff is too big to show here.
src/views/Activate/withFadeable.tsx+1−1
This diff is too big to show here.
src/views/CreateGalaxy.js → src/views/CreateGalaxy.jsxrenamed
The content is the same.
src/views/Disclaimer.js → src/views/Disclaimer.jsxrenamed
The content is the same.
src/views/Login/Hardware.jsdeleted−52
This diff is too big to show here.
src/views/Login/Ledger.tsxdeleted−255
This diff is too big to show here.
src/views/Login/Metamask.js → src/views/Login/Metamask.jsxrenamed
The content is the same.
src/views/Login/Trezor.tsxdeleted−178
This diff is too big to show here.
src/views/Party/PartySetPoolSize.js → src/views/Party/PartySetPoolSize.jsxrenamed
The content is the same.
src/views/Point/Senate.js → src/views/Point/Senate.jsxrenamed
The content is the same.
src/views/Point/UrbitID.js → src/views/Point/UrbitID.jsxrenamed
The content is the same.
src/views/Point/UrbitOS.js → src/views/Point/UrbitOS.jsxrenamed
The content is the same.
src/views/Release/TransferForm.tsx+1−1
This diff is too big to show here.
src/views/Senate/Documents.js → src/views/Senate/Documents.jsxrenamed
The content is the same.
src/views/Senate/Upgrades.js → src/views/Senate/Upgrades.jsxrenamed
The content is the same.
src/views/UrbitID/DownloadKeys.js → src/views/UrbitID/DownloadKeys.jsxrenamed
The content is the same.
src/views/UrbitID/ResetKeys.js → src/views/UrbitID/ResetKeys.jsxrenamed
The content is the same.
src/views/UrbitID/ResetKeys/ResetConfirm.js → src/views/UrbitID/ResetKeys/ResetConfirm.jsxrenamed
The content is the same.
src/views/UrbitID/ResetKeys/ResetDownload.js → src/views/UrbitID/ResetKeys/ResetDownload.jsxrenamed
The content is the same.
src/views/UrbitID/ResetKeys/ResetVerify.js → src/views/UrbitID/ResetKeys/ResetVerify.jsxrenamed
The content is the same.
src/views/UrbitID/SetProxy.js → src/views/UrbitID/SetProxy.jsxrenamed
The content is the same.
src/views/UrbitID/SigilGenerator.js → src/views/UrbitID/SigilGenerator.jsxrenamed
The content is the same.
src/worker/custom.d.tsdeleted−11
This diff is too big to show here.
src/worker/index.ts+5−3
This diff is too big to show here.
src/worker/worker.ts+4−4
This diff is too big to show here.
truffle-config.js+3−7
This diff is too big to show here.
tsconfig.json+10−13
This diff is too big to show here.
vite-env.d.tsnew file+2
This diff is too big to show here.
vite.config.tsnew file+77
This diff is too big to show here.
window.d.tsnew file+9
This diff is too big to show here.