Merge pull request #66 from decent-bet/develop

Wallet 2.0.3

.nvmrc

@@ -1 +1 @@
-v8.11.3
+v10.13.0

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+"activationEvents": [
+    "workspaceContains:node_modules/.bin/jest",
+    "workspaceContains:node_modules/react-scripts-ts/node_modules/.bin/jest",
+    "onCommand:io.orta.jest.start"
+  ]
+}

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.0.3
+
+### Bug Fixes
+
+- DBET Balances changed to use RPC
+- Default wallet token version set to VET Token V3
+- Token version displayed in app bar
+- Etherscan.io balances using API Key (fixes rate limiting issues)
+- Removes infura for ETH balances
+
+## 2.0.2
+
+### Maintenance
+
+- Upgrade to Node 10
+- Upgrade to Electron 3
+- Upgrade to Material UI 3.3.2
+
 ## 2.0.1
 
 ### Bug Fixes

README.md

@@ -1,4 +1,6 @@
-# DBET Web/Desktop Wallet - v2.0.0 - Vechain / Ethereum Version
+# DBET Web/Desktop Wallet - Vechain / Ethereum Version
+
+### Latest Version 2.0.2
 
 Desktop wallet to interact with the Decent.bet token contract on 
 the Vechain / Ethereum mainnet. 
@@ -7,7 +9,7 @@ the Vechain / Ethereum mainnet.
 
 1. Enable CORS: `thor solo --on-demand --verbosity 9 --api-cors http://localhost:3100`
 2. Configure proper networks to use updated contracts
-3. Run with environment variable: ` export THOR_URL=http://localhost:8669;yarn start`
+3. Run with environment variable: ` export THOR_URL=http://localhost:8669;npm start`
 
 ## **Features**
 
@@ -20,9 +22,9 @@ the Vechain / Ethereum mainnet.
 Built initially with [Truffle Box](truffle-box.github.io) and [Electron](https://github.com/electron/electron), then migrated to use [react-scripts-ts](https://www.npmjs.com/package/react-scripts-ts). Uses [Ethers](https://github.com/ethers-io/ethers.js) for Wallet creation/verfication and parts of [Web3 1.0](https://github.com/ethereum/web3.js/tree/1.0) for account management.
 
 ## **Installation**
-1. Install [Yarn](https://yarnpkg.com/lang/en/docs/install/)
-2. Clone this repository
-3. Execute Yarn inside the repository: `yarn install`
+1. Clone this repository
+2. Install dependencies with `npm install`
+3. Rebuild scrypt `npm rebuild`
 
 ## **Development**
 
@@ -32,14 +34,14 @@ that you wouldn't have to migrate any contracts to your local network. For devel
 1. Run the webpack server for front-end hot reloading. 
 
     ```
-    yarn start
+    npm start
     ```
 
 2. To build the application for production/working with electron, use the build command. 
 A production build will be created in the build folder.
 
     ```
-    yarn run build
+    npm run build
     ```
 
 3. Deploy the build files using a simple express server and [pm2](https://github.com/Unitech/pm2)/[serve](https://github.com/zeit/serve) or
@@ -50,22 +52,22 @@ A production build will be created in the build folder.
 DBET Wallet uses [electron-builder](https://github.com/electron-userland/electron-builder) 
 to build and create installers across all operating systems.
 
-Make sure you run `yarn run build` and have the `build` folder in the wallet's root 
+Make sure you run `npm run build` and have the `build` folder in the wallet's root 
 directory. Once available, simply call: 
 
-- Windows `yarn dist:windows`
-- Linux `yarn dist:linux`
-- MacOs `yarn dist:mac`
-- All `yarn dist:all`
+- Windows `npm run dist:windows`
+- Linux `npm run dist:linux`
+- MacOs `npm run dist:mac`
+- All `npm run dist:all`
 
 ## **Relase**
 
 DBET Wallet uses GitHub releases.
 
-Make sure you run `yarn run build` and have the `build` folder in the wallet's root 
+Make sure you run `npm run build` and have the `build` folder in the wallet's root 
 directory. Once available, change the package.json version and call: 
 
-- `yarn realase`
+- `npm run release`
 
 A new release will be created on [releases](https://github.com/decent-bet/platform-wallet/releases).
 

electron-builder.beta.yml

@@ -1,3 +1,4 @@
+productName: DBET Wallet Beta
 extends: electron-builder.yml
 mac:
   icon: ./icon_beta.icns

electron-builder.yml

@@ -1,4 +1,5 @@
 generateUpdatesFilesForAllChannels: true
+buildDependenciesFromSource: true
 directories:
   output: dist
   buildResources: public
@@ -19,7 +20,7 @@ files:
   - '!scripts{/*}'
   - '!test{/*}'
 mac:
-  appId: bet.decent.mac
+  appId: bet.decent.wallet.mac
   icon: ./icon.icns
   category: public.app-category.finance
   type: distribution
@@ -37,13 +38,13 @@ dmg:
       type: link
       path: /Applications
 linux:
-  appId: bet.decent.linux
+  appId: bet.decent.wallet.linux
   icon: ./icons/
   target:
     - AppImage
   category: Finance
 win:
-  appId: bet.decent.windows
+  appId: bet.decent.wallet.windows
   icon: ./icon.ico
   target:
     - target: nsis