Web3 update 1.0.0-beta35 -> 1.2.0

index.d.ts

@@ -1,10 +1,10 @@
 declare module drizzle {
   export class Drizzle {
-    constructor(options: any, store: any);
+    constructor(options: any, store?: any);
 
-    addContract(contractConfig: any, ...args: any[]): void;
+    addContract(contractConfig: any, events?: any[]): void;
 
-    deleteContract(contractName: any): void;
+    deleteContract(contractName: string): void;
 
     findContractByAddress(address: any): any;
 

package.json

@@ -30,30 +30,30 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@babel/runtime": "^7.4.4",
-    "deepmerge": "^3.2.0",
+    "@babel/runtime": "^7.5.5",
+    "deepmerge": "^4.0.0",
     "eth-block-tracker-es5": "^2.3.2",
     "is-plain-object": "^2.0.4",
-    "redux": "^4.0.1",
-    "redux-saga": "^0.16.0",
-    "web3": "1.0.0-beta.35"
+    "redux": "^4.0.4",
+    "redux-saga": "^1.0.5",
+    "web3": "^1.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+    "@babel/core": "^7.5.5",
+    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
     "@babel/plugin-transform-arrow-functions": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
-    "babel-loader": "^8.0.5",
-    "eslint": "^5.16.0",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-jest": "^22.5.1",
-    "ganache-core": "^2.5.5",
-    "jest": "^24.7.1",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "babel-loader": "^8.0.6",
+    "eslint": "^6.1.0",
+    "eslint-config-standard": "^13.0.1",
+    "eslint-plugin-jest": "^22.14.0",
+    "ganache-core": "^2.6.0",
+    "jest": "^24.8.0",
     "prettier-standard": "^9.1.1",
-    "standard": "^12.0.1",
-    "webpack": "^4.30.0",
-    "webpack-cli": "^3.3.1",
+    "standard": "^13.1.0",
+    "webpack": "^4.38.0",
+    "webpack-cli": "^3.3.6",
     "webpack-merge": "^4.2.1",
     "redux-mock-store": "^1.5.3"
   }

src/contracts/contractsSaga.js

@@ -111,7 +111,7 @@ function * callSendContractTx ({
     var finalArgTest = false
 
     if (typeof finalArg === 'object') {
-      var finalArgTest = yield call(isSendOrCallOptions, finalArg)
+      finalArgTest = yield call(isSendOrCallOptions, finalArg)
     }
 
     if (finalArgTest) {
@@ -169,7 +169,7 @@ function * callCallContractFn ({
     var finalArgTest = false
 
     if (typeof finalArg === 'object') {
-      var finalArgTest = yield call(isSendOrCallOptions, finalArg)
+      finalArgTest = yield call(isSendOrCallOptions, finalArg)
     }
 
     if (finalArgTest) {

src/drizzleStatus/drizzleStatusSaga.js

@@ -1,4 +1,4 @@
-import { call, put, select, takeLatest } from 'redux-saga/effects'
+import { call, put, takeLatest } from 'redux-saga/effects'
 
 // Initialization Functions
 import { initializeWeb3, getNetworkId } from '../web3/web3Saga'

src/web3/constants.js

@@ -1,6 +1,7 @@
 export const WEB3_INITIALIZING = 'WEB3_INITIALIZING'
 export const WEB3_INITIALIZED = 'WEB3_INITIALIZED'
 export const WEB3_FAILED = 'WEB3_FAILED'
+export const WEB3_ERROR = 'WEB3_ERROR'
 export const WEB3_USER_DENIED = 'WEB3_USER_DENIED'
 
 export const NETWORK_ID_FETCHED = 'NETWORK_ID_FETCHED'

src/web3/web3Saga.js

@@ -1,7 +1,6 @@
 import { call, put } from 'redux-saga/effects'
 import * as Action from './constants'
-
-var Web3 = require('web3')
+import Web3 from 'web3'
 
 /*
  * Initialization

test/web3.test.js

@@ -76,7 +76,7 @@ describe('Resolving Web3', () => {
       const result = await runSaga({
         dispatch: (action) => dispatched.push(action),
         getState: () => ({ state: 'test' })
-      }, initializeWeb3, { options: {} }).done
+      }, initializeWeb3, { options: {} }).toPromise()
 
       // result should be a proper web3 provider
       expect(result).toBeInstanceOf(require('web3'))
@@ -94,7 +94,7 @@ describe('Resolving Web3', () => {
         },
         initializeWeb3,
         { options: {} }
-      ).done
+      ).toPromise()
 
       // saga result should be undefined if an exception occurs
       expect(web3Result).toBe(undefined)
@@ -113,7 +113,7 @@ describe('Resolving Web3', () => {
       const result = await runSaga({
         dispatch: (action) => dispatched.push(action),
         getState: () => ({ state: 'test' })
-      }, initializeWeb3, { options: {} }).done
+      }, initializeWeb3, { options: {} }).toPromise()
 
       // saga result is undefined when exception is thrown
       expect(result).toBe(undefined)