Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.

Commit 13812d9

Browse files
Adam0000Adam0000
committed
Remove @0xproject/web3-wrapper dependency.
1 parent 11aa482 commit 13812d9

21 files changed

+119
-180
lines changed

‎package-lock.json‎

Lines changed: 3 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"mnemonic": "age drama cover door helmet mechanic wine lesson vote inflict will keep"
6060
},
6161
"dependencies": {
62-
"@0xproject/web3-wrapper": "0.1.2",
62+
"babel-runtime": "^6.26.0",
6363
"truffle-contract": "3.0.1",
6464
"uuid": "3.1.0",
6565
"web3": "0.20.1"

‎src/contract_wrappers/Compliance.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import BigNumber from 'bignumber.js';
44
import Web3 from 'web3';
5-
import { Web3Wrapper } from '@0xproject/web3-wrapper';
65

76
import ContractWrapper from './ContractWrapper';
87
import Template from './Template';
@@ -25,10 +24,10 @@ export default class Compliance extends ContractWrapper {
2524
* @hideconstructor
2625
*/
2726
constructor(
28-
web3Wrapper: Web3Wrapper,
27+
web3: Web3,
2928
deployedAddress?: string,
3029
) {
31-
super(web3Wrapper, complianceArtifact, deployedAddress);
30+
super(web3, complianceArtifact, deployedAddress);
3231
}
3332

3433
/**
@@ -131,7 +130,7 @@ export default class Compliance extends ContractWrapper {
131130
* @return The template instance
132131
*/
133132
async getTemplateFromAddress(address: string): Promise<Template> {
134-
const template = new Template(this._web3Wrapper, address);
133+
const template = new Template(this._web3, address);
135134
await template.initialize();
136135
return template;
137136
}

‎src/contract_wrappers/ContractWrapper.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import contract from 'truffle-contract';
44
import uuid from 'uuid/v4';
5-
import { Web3Wrapper } from '@0xproject/web3-wrapper';
5+
import Web3 from 'web3';
66

77
import type {
88
BlockRange,
@@ -16,7 +16,7 @@ import type {
1616
* ContractWrapper is the base class for all contract wrappers in this library.
1717
*/
1818
export default class ContractWrapper {
19-
_web3Wrapper: Web3Wrapper;
19+
_web3: Web3;
2020

2121
_contractTemplate: any;
2222
_contractAddress: ?string;
@@ -32,14 +32,14 @@ export default class ContractWrapper {
3232
* @hideconstructor
3333
*/
3434
constructor(
35-
web3Wrapper: Web3Wrapper,
35+
web3: Web3,
3636
artifact: any,
3737
deployedAddress?: string,
3838
) {
39-
this._web3Wrapper = web3Wrapper;
39+
this._web3 = web3;
4040

4141
this._contractTemplate = contract(artifact);
42-
this._contractTemplate.setProvider(web3Wrapper.getCurrentProvider());
42+
this._contractTemplate.setProvider(web3.currentProvider);
4343
this._contractAddress = deployedAddress;
4444

4545
this._filters = {};

‎src/contract_wrappers/Customers.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import BigNumber from 'bignumber.js';
44
import Web3 from 'web3';
5-
import { Web3Wrapper } from '@0xproject/web3-wrapper';
65

76
import ContractWrapper from './ContractWrapper';
87
import customersContract from '../artifacts/Customers.json';
@@ -36,11 +35,11 @@ export default class Customers extends ContractWrapper {
3635
* @hideconstructor
3736
*/
3837
constructor(
39-
web3Wrapper: Web3Wrapper,
38+
web3: Web3,
4039
polyToken: PolyToken,
4140
deployedAddress?: string,
4241
) {
43-
super(web3Wrapper, customersContract, deployedAddress);
42+
super(web3, customersContract, deployedAddress);
4443

4544
this.polyToken = polyToken;
4645
}

‎src/contract_wrappers/PolyToken.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// @flow
22

33
import BigNumber from 'bignumber.js';
4-
import { Web3Wrapper } from '@0xproject/web3-wrapper';
54

65
import ContractWrapper from './ContractWrapper';
76
import polyTokenArtifact from '../artifacts/PolyTokenMock.json';
@@ -20,8 +19,8 @@ export default class PolyToken extends ContractWrapper {
2019
/**
2120
* @hideconstructor
2221
*/
23-
constructor(web3Wrapper: Web3Wrapper, deployedAddress?: string) {
24-
super(web3Wrapper, polyTokenArtifact, deployedAddress);
22+
constructor(web3: Web3, deployedAddress?: string) {
23+
super(web3, polyTokenArtifact, deployedAddress);
2524
}
2625

2726
/**

‎src/contract_wrappers/STOContract.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
// @flow
22

33
import BigNumber from 'bignumber.js';
4-
import { Web3Wrapper } from '@0xproject/web3-wrapper';
4+
import Web3 from 'web3';
5+
56
import {
67
EventCallback,
78
IndexedFilterValues,
89
STOContractEventArgs,
910
} from '../types';
10-
1111
import ContractWrapper from './ContractWrapper';
12-
1312
import securityTokenOfferingArtifact from '../artifacts/STOContract.json';
1413

1514
/*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 {
2019
* @hideconstructor
2120
*/
2221
constructor(
23-
web3Wrapper: Web3Wrapper,
22+
web3: Web3,
2423
polyToken: string,
2524
owner: string,
2625
deployedAddress: string,
2726
) {
28-
super(web3Wrapper, securityTokenOfferingArtifact, deployedAddress);
27+
super(web3, securityTokenOfferingArtifact, deployedAddress);
2928

3029
this.POLY = polyToken;
3130
this.owner = owner;

‎src/contract_wrappers/SecurityToken.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @flow
22

33
import BigNumber from 'bignumber.js';
4-
import { Web3Wrapper } from '@0xproject/web3-wrapper';
4+
import Web3 from 'web3';
55

66
import ContractWrapper from './ContractWrapper';
77
import Compliance from './Compliance';
@@ -36,10 +36,10 @@ export default class SecurityToken extends ContractWrapper {
3636
* @hideconstructor
3737
*/
3838
constructor(
39-
web3Wrapper: Web3Wrapper,
39+
web3: Web3,
4040
deployedAddress: string,
4141
) {
42-
super(web3Wrapper, securityTokenArtifact, deployedAddress);
42+
super(web3, securityTokenArtifact, deployedAddress);
4343
}
4444

4545
/**

‎src/contract_wrappers/SecurityTokenRegistrar.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @flow
22

3-
import { Web3Wrapper } from '@0xproject/web3-wrapper';
43
import { BigNumber } from 'bignumber.js';
4+
import Web3 from 'web3';
55

66
import ContractWrapper from './ContractWrapper';
77
import SecurityToken from './SecurityToken';
@@ -23,10 +23,10 @@ export default class SecurityTokenRegistrar extends ContractWrapper {
2323
* @hideconstructor
2424
*/
2525
constructor(
26-
web3Wrapper: Web3Wrapper,
26+
web3: Web3,
2727
deployedAddress?: string,
2828
) {
29-
super(web3Wrapper, securityTokenRegistrarArtifact, deployedAddress);
29+
super(web3, securityTokenRegistrarArtifact, deployedAddress);
3030
}
3131

3232
/**
@@ -144,7 +144,7 @@ export default class SecurityTokenRegistrar extends ContractWrapper {
144144
* @return The security token instance
145145
*/
146146
async getSecurityTokenByAddress(address: string): Promise<SecurityToken> {
147-
const securityToken = new SecurityToken(this._web3Wrapper, address);
147+
const securityToken = new SecurityToken(this._web3, address);
148148
await securityToken.initialize();
149149
return securityToken;
150150
}

‎src/contract_wrappers/Template.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// @flow
22

33
import BigNumber from 'bignumber.js';
4-
import { Web3Wrapper } from '@0xproject/web3-wrapper';
54
import Web3 from 'web3';
65

76
import ContractWrapper from './ContractWrapper';
@@ -15,8 +14,8 @@ export default class Template extends ContractWrapper {
1514
/**
1615
* @hideconstructor
1716
*/
18-
constructor(web3Wrapper: Web3Wrapper, deployedAddress: string) {
19-
super(web3Wrapper, templateArtifact, deployedAddress);
17+
constructor(web3: Web3, deployedAddress: string) {
18+
super(web3, templateArtifact, deployedAddress);
2019
}
2120

2221
/**

0 commit comments

Comments
 (0)