fix wasm

Author: dr-bonez

package-lock.json

@@ -14,7 +14,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.8.2",
     "@fortawesome/react-fontawesome": "^0.1.4",
     "bignumber.js": "^8.1.1",
-    "borker-rs": "^0.1.6",
+    "borker-rs-browser": "^0.1.12",
     "crypto-js": "^3.1.9-1",
     "idb-keyval": "^3.2.0",
     "lighthouse": "^5.0.0",
@@ -25,7 +25,7 @@
     "react-dom": "^16.8.6",
     "react-modal": "^3.8.1",
     "react-router-dom": "^4.3.1",
-    "react-scripts": "2.1.1",
+    "react-scripts": "3.0.1",
     "react-sidebar": "^3.0.2",
     "react-tabs": "^3.0.0",
     "request": "^2.88.0",
@@ -61,7 +61,7 @@
     "@types/react-tabs": "^2.3.1",
     "@types/request-promise": "^4.1.43",
     "node-sass": "^4.12.0",
-    "react-app-rewired": "^1.6.2",
+    "react-app-rewired": "^2.1.3",
     "typescript": "^3.4.5"
   }
 }

package.json

@@ -2,7 +2,7 @@ import React from 'react'
 import { withAuthContext, AuthProps } from '../../../contexts/auth-context'
 import BigNumber from 'bignumber.js'
 import WebService, { ConstructRequest } from '../../../web-service'
-import { JsWallet } from 'borker-rs'
+import { JsWallet } from 'borker-rs-browser'
 import * as CryptoJS from 'crypto-js'
 import * as Storage from 'idb-keyval'
 import '../../../App.scss'
@@ -22,7 +22,7 @@ export interface CheckoutModalState {
 class CheckoutModal extends React.Component<CheckoutModalProps, CheckoutModalState> {
   public webService: WebService
 
-  constructor (props: CheckoutModalProps) {
+  constructor(props: CheckoutModalProps) {
     super(props)
     this.state = {
       fees: new BigNumber(0),
@@ -33,7 +33,7 @@ class CheckoutModal extends React.Component<CheckoutModalProps, CheckoutModalSta
     this.webService = new WebService()
   }
 
-  async componentDidMount () {
+  async componentDidMount() {
     const { txCount, parent } = this.props.data
 
     const fees = txCount ? new BigNumber(txCount).times(1) : new BigNumber(1)
@@ -59,15 +59,15 @@ class CheckoutModal extends React.Component<CheckoutModalProps, CheckoutModalSta
     const encrypted = await Storage.get<string>('wallet')
     const wallet = CryptoJS.AES.decrypt(encrypted, this.state.password)
 
-    const borkerLib = await import('borker-rs')
+    const borkerLib = await import('borker-rs-browser')
 
     // const rawTxs = new borkerLib.construct(this.props.data, utxos)
     const rawTxs = ['']
 
     this.webService.signAndBroadcastTx(rawTxs)
   }
 
-  render () {
+  render() {
     const { data } = this.props
     const { tip, totalCost, fees, password } = this.state
 

src/app/components/modals/checkout-modal/checkout-modal.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import * as CryptoJS from 'crypto-js'
-import { JsWallet } from 'borker-rs'
+import { JsWallet } from 'borker-rs-browser'
 import * as Storage from 'idb-keyval'
 import { withAppContext, AppProps } from '../../../contexts/app-context'
 import '../../../App.scss'
@@ -16,7 +16,7 @@ export interface EncryptModalState {
 
 class EncryptModal extends React.Component<EncryptModalProps, EncryptModalState> {
 
-  constructor (props: EncryptModalProps) {
+  constructor(props: EncryptModalProps) {
     super(props)
     this.state = {
       password: '',
@@ -27,7 +27,7 @@ class EncryptModal extends React.Component<EncryptModalProps, EncryptModalState>
     e.preventDefault()
     const { wallet } = this.props
 
-    const borkerLib = await import('borker-rs')
+    const borkerLib = await import('borker-rs-browser')
 
     const address = wallet.childAt([-44, -0, -0, 0, 0]).address(borkerLib.Network.Dogecoin)
     const encrypted = CryptoJS.AES.encrypt(new Buffer(wallet.toBuffer()).toString('hex'), this.state.password).toString()
@@ -44,7 +44,7 @@ class EncryptModal extends React.Component<EncryptModalProps, EncryptModalState>
     this.setState({ password: e.target.value })
   }
 
-  render () {
+  render() {
     const { password } = this.state
 
     return (

src/app/components/modals/encrypt-modal/encrypt-modal.tsx

@@ -62,7 +62,7 @@ class ProfileEditPage extends React.Component<ProfileEditProps, ProfileEditState
       <div className="page-content">
         <form onSubmit={(e) => { e.preventDefault(); this.props.toggleModal(modal) }} className="profile-edit-form">
           <label>Value</label>
-          <input type="text" value={name} maxLength={77} onChange={this.handleValueChange} />
+          <input type="text" value={"name"} maxLength={77} onChange={this.handleValueChange} />
           <input type="submit" value="Checkout" disabled={previousValue === value} />
         </form>
       </div>

src/app/pages/profile/profile-edit/profile-edit.tsx

@@ -1,12 +1,12 @@
 import React from 'react'
 import EncryptModal from '../../components/modals/encrypt-modal/encrypt-modal'
 import { withUnauthContext, UnauthProps } from '../../contexts/unauth-context'
-import { JsWallet } from 'borker-rs'
+import { JsWallet } from 'borker-rs-browser'
 import { sampleWords } from '../../../util/mocks'
 import '../../App.scss'
 import './wallet-create.scss'
 
-export interface WalletCreateProps extends UnauthProps {}
+export interface WalletCreateProps extends UnauthProps { }
 
 export interface WalletCreateState {
   wallet: JsWallet | null
@@ -18,14 +18,14 @@ class WalletCreatePage extends React.Component<WalletCreateProps, WalletCreateSt
     wallet: null as unknown as JsWallet,
   }
 
-  async componentDidMount () {
-    const borkerLib = await import('borker-rs')
+  async componentDidMount() {
+    const borkerLib = await import('borker-rs-browser')
     this.setState({
       wallet: new borkerLib.JsWallet(sampleWords),
     })
   }
 
-  render () {
+  render() {
     const { wallet } = this.state
 
     if (!wallet) {
@@ -36,7 +36,7 @@ class WalletCreatePage extends React.Component<WalletCreateProps, WalletCreateSt
       <EncryptModal wallet={wallet} />
     )
 
-    const words  = wallet.words()
+    const words = wallet.words()
 
     return wallet ? (
       <div className="page-content">
@@ -70,8 +70,8 @@ class WalletCreatePage extends React.Component<WalletCreateProps, WalletCreateSt
         </button>
       </div>
     ) : (
-      null
-    )
+        null
+      )
   }
 }
 

src/app/pages/wallet-create/wallet-create.tsx

@@ -1,12 +1,12 @@
 import React from 'react'
-import { JsWallet } from 'borker-rs'
+import { JsWallet } from 'borker-rs-browser'
 import { UnauthProps, withUnauthContext } from '../../contexts/unauth-context'
 import EncryptModal from '../../components/modals/encrypt-modal/encrypt-modal'
 import { sampleWords } from '../../../util/mocks'
 import '../../App.scss'
 import './wallet-restore.scss'
 
-export interface WalletRestoreProps extends UnauthProps {}
+export interface WalletRestoreProps extends UnauthProps { }
 
 export interface WalletRestoreState {
   mnemonic: string
@@ -31,7 +31,7 @@ class WalletRestorePage extends React.Component<WalletRestoreProps, WalletRestor
 
   genWallet = async (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     if (!this.state.wallet) {
-      const borkerLib = await import('borker-rs')
+      const borkerLib = await import('borker-rs-browser')
       const wallet = new borkerLib.JsWallet(sampleWords)
       await this.setState({ wallet })
     }
@@ -43,7 +43,7 @@ class WalletRestorePage extends React.Component<WalletRestoreProps, WalletRestor
     this.props.toggleModal(modal)
   }
 
-  render () {
+  render() {
     const { isMnemonicEntered, mnemonic } = this.state
 
     return (

src/app/pages/wallet-restore/wallet-restore.tsx

@@ -13,7 +13,12 @@
     "jsx": "preserve",
     "noImplicitAny": true,
     "esModuleInterop": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ]
   },
   "include": [
     "./src/**/*"