Merge pull request #70 from PolymathNetwork/no-web3-wrapper

Remove @0xproject/web3-wrapper dependency (fix running the package in Node)

Author: davekay100

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "polymathjs",
   "author": "Polymath",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Tools for interacting with the Polymath platform",
   "main": "index.js",
   "scripts": {
@@ -59,7 +59,7 @@
     "mnemonic": "age drama cover door helmet mechanic wine lesson vote inflict will keep"
   },
   "dependencies": {
-    "@0xproject/web3-wrapper": "0.1.2",
+    "babel-runtime": "^6.26.0",
     "truffle-contract": "3.0.1",
     "uuid": "3.1.0",
     "web3": "0.20.1"

package.json

@@ -2,7 +2,6 @@
 
 import BigNumber from 'bignumber.js';
 import Web3 from 'web3';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
 
 import ContractWrapper from './ContractWrapper';
 import Template from './Template';
@@ -25,10 +24,10 @@ export default class Compliance extends ContractWrapper {
    * @hideconstructor
    */
   constructor(
-    web3Wrapper: Web3Wrapper,
+    web3: Web3,
     deployedAddress?: string,
   ) {
-    super(web3Wrapper, complianceArtifact, deployedAddress);
+    super(web3, complianceArtifact, deployedAddress);
   }
 
   /**
@@ -131,7 +130,7 @@ export default class Compliance extends ContractWrapper {
    * @return The template instance
    */
   async getTemplateFromAddress(address: string): Promise<Template> {
-    const template = new Template(this._web3Wrapper, address);
+    const template = new Template(this._web3, address);
     await template.initialize();
     return template;
   }

src/contract_wrappers/Compliance.js

@@ -2,7 +2,7 @@
 
 import contract from 'truffle-contract';
 import uuid from 'uuid/v4';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import Web3 from 'web3';
 
 import type {
   BlockRange,
@@ -16,7 +16,7 @@ import type {
  * ContractWrapper is the base class for all contract wrappers in this library.
  */
 export default class ContractWrapper {
-  _web3Wrapper: Web3Wrapper;
+  _web3: Web3;
 
   _contractTemplate: any;
   _contractAddress: ?string;
@@ -32,14 +32,14 @@ export default class ContractWrapper {
    * @hideconstructor
    */
   constructor(
-    web3Wrapper: Web3Wrapper,
+    web3: Web3,
     artifact: any,
     deployedAddress?: string,
   ) {
-    this._web3Wrapper = web3Wrapper;
+    this._web3 = web3;
 
     this._contractTemplate = contract(artifact);
-    this._contractTemplate.setProvider(web3Wrapper.getCurrentProvider());
+    this._contractTemplate.setProvider(web3.currentProvider);
     this._contractAddress = deployedAddress;
 
     this._filters = {};

src/contract_wrappers/ContractWrapper.js

@@ -2,7 +2,6 @@
 
 import BigNumber from 'bignumber.js';
 import Web3 from 'web3';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
 
 import ContractWrapper from './ContractWrapper';
 import customersContract from '../artifacts/Customers.json';
@@ -36,11 +35,11 @@ export default class Customers extends ContractWrapper {
    * @hideconstructor
    */
   constructor(
-    web3Wrapper: Web3Wrapper,
+    web3: Web3,
     polyToken: PolyToken,
     deployedAddress?: string,
   ) {
-    super(web3Wrapper, customersContract, deployedAddress);
+    super(web3, customersContract, deployedAddress);
 
     this.polyToken = polyToken;
   }

src/contract_wrappers/Customers.js

@@ -1,7 +1,6 @@
 // @flow
 
 import BigNumber from 'bignumber.js';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
 
 import ContractWrapper from './ContractWrapper';
 import polyTokenArtifact from '../artifacts/PolyTokenMock.json';
@@ -20,8 +19,8 @@ export default class PolyToken extends ContractWrapper {
   /**
    * @hideconstructor
    */
-  constructor(web3Wrapper: Web3Wrapper, deployedAddress?: string) {
-    super(web3Wrapper, polyTokenArtifact, deployedAddress);
+  constructor(web3: Web3, deployedAddress?: string) {
+    super(web3, polyTokenArtifact, deployedAddress);
   }
 
   /**

src/contract_wrappers/PolyToken.js

@@ -1,15 +1,14 @@
 // @flow
 
 import BigNumber from 'bignumber.js';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import Web3 from 'web3';
+
 import {
   EventCallback,
   IndexedFilterValues,
   STOContractEventArgs,
 } from '../types';
-
 import ContractWrapper from './ContractWrapper';
-
 import securityTokenOfferingArtifact from '../artifacts/STOContract.json';
 
 /*NOTE - KEEP ALL COMMENTS NORMAL, i.e. NO DOUBLE STAR. THIS FILE DOES NOT NEED TO BE PICKED UP BY DOCUMENTATION.js
@@ -20,12 +19,12 @@ export default class STOContract extends ContractWrapper {
    * @hideconstructor
    */
   constructor(
-    web3Wrapper: Web3Wrapper,
+    web3: Web3,
     polyToken: string,
     owner: string,
     deployedAddress: string,
   ) {
-    super(web3Wrapper, securityTokenOfferingArtifact, deployedAddress);
+    super(web3, securityTokenOfferingArtifact, deployedAddress);
 
     this.POLY = polyToken;
     this.owner = owner;

src/contract_wrappers/STOContract.js

@@ -1,7 +1,7 @@
 // @flow
 
 import BigNumber from 'bignumber.js';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import Web3 from 'web3';
 
 import ContractWrapper from './ContractWrapper';
 import Compliance from './Compliance';
@@ -36,10 +36,10 @@ export default class SecurityToken extends ContractWrapper {
    * @hideconstructor
    */
   constructor(
-    web3Wrapper: Web3Wrapper,
+    web3: Web3,
     deployedAddress: string,
   ) {
-    super(web3Wrapper, securityTokenArtifact, deployedAddress);
+    super(web3, securityTokenArtifact, deployedAddress);
   }
 
   /**

src/contract_wrappers/SecurityToken.js

@@ -1,7 +1,7 @@
 // @flow
 
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { BigNumber } from 'bignumber.js';
+import Web3 from 'web3';
 
 import ContractWrapper from './ContractWrapper';
 import SecurityToken from './SecurityToken';
@@ -23,10 +23,10 @@ export default class SecurityTokenRegistrar extends ContractWrapper {
    * @hideconstructor
    */
   constructor(
-    web3Wrapper: Web3Wrapper,
+    web3: Web3,
     deployedAddress?: string,
   ) {
-    super(web3Wrapper, securityTokenRegistrarArtifact, deployedAddress);
+    super(web3, securityTokenRegistrarArtifact, deployedAddress);
   }
 
   /**
@@ -144,7 +144,7 @@ export default class SecurityTokenRegistrar extends ContractWrapper {
    * @return The security token instance
    */
   async getSecurityTokenByAddress(address: string): Promise<SecurityToken> {
-    const securityToken = new SecurityToken(this._web3Wrapper, address);
+    const securityToken = new SecurityToken(this._web3, address);
     await securityToken.initialize();
     return securityToken;
   }

src/contract_wrappers/SecurityTokenRegistrar.js

@@ -1,7 +1,6 @@
 // @flow
 
 import BigNumber from 'bignumber.js';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import Web3 from 'web3';
 
 import ContractWrapper from './ContractWrapper';
@@ -15,8 +14,8 @@ export default class Template extends ContractWrapper {
   /**
    * @hideconstructor
    */
-  constructor(web3Wrapper: Web3Wrapper, deployedAddress: string) {
-    super(web3Wrapper, templateArtifact, deployedAddress);
+  constructor(web3: Web3, deployedAddress: string) {
+    super(web3, templateArtifact, deployedAddress);
   }
 
   /**