Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit ec856ac

Browse files
committed
fix: 🐛 update abi-wrapper version
import artifacts, utilities and types from abi-wrappers
1 parent d11a1aa commit ec856ac

25 files changed

+1971
-2053
lines changed

package.json

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,14 @@
7878
"webpack-merge": "^4.2.1"
7979
},
8080
"dependencies": {
81-
"@0x/assert": "^2.0.9",
82-
"@0x/json-schemas": "^3.0.9",
83-
"@0x/subproviders": "^4.0.5",
84-
"@0x/types": "^2.2.2",
85-
"@0x/typescript-typings": "^4.2.2",
86-
"@0x/utils": "^4.3.1",
87-
"@0x/web3-wrapper": "^6.0.5",
88-
"@polymathnetwork/abi-wrappers": "3.0.0-beta.1",
89-
"@polymathnetwork/contract-artifacts": "3.0.0-beta.3",
90-
"ethereum-types": "^2.1.2",
81+
"@0x/assert": "^2.1.0",
82+
"@0x/json-schemas": "^3.0.11",
83+
"@0x/subproviders": "^4.1.1",
84+
"@0x/types": "^2.4.0",
85+
"@0x/typescript-typings": "^4.2.3",
86+
"@polymathnetwork/abi-wrappers": "3.0.0-beta.4",
9187
"ethereumjs-blockstream": "6.0.0",
9288
"ethereumjs-util": "^6.1.0",
93-
"ethers": "^4.0.27",
9489
"js-sha3": "^0.8.0",
9590
"lodash": "^4.17.5",
9691
"moment": "^2.24.0",

src/contract_wrappers/modules/checkpoint/erc20_dividend_checkpoint_wrapper.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ import {
1010
ERC20DividendCheckpointSetWithholdingEventArgs,
1111
ERC20DividendCheckpointSetWithholdingFixedEventArgs,
1212
ERC20DetailedContract,
13+
BigNumber,
14+
ContractAbi,
15+
LogWithDecodedArgs,
16+
TxData,
17+
Web3Wrapper,
18+
ERC20DividendCheckpoint,
1319
} from '@polymathnetwork/abi-wrappers';
14-
import { ERC20DividendCheckpoint } from '@polymathnetwork/contract-artifacts';
15-
import { TxData, Web3Wrapper } from '@0x/web3-wrapper';
16-
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
17-
import { BigNumber } from '@0x/utils';
1820
import { schemas } from '@0x/json-schemas';
1921
import assert from '../../../utils/assert';
2022
import DividendCheckpointWrapper from './dividend_checkpoint_wrapper';

src/contract_wrappers/modules/checkpoint/ether_dividend_checkpoint_wrapper.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ import {
1414
EtherDividendCheckpointUpdateDividendDatesEventArgs,
1515
EtherDividendCheckpointPauseEventArgs,
1616
EtherDividendCheckpointUnpauseEventArgs,
17+
EtherDividendCheckpoint,
18+
Web3Wrapper,
19+
ContractAbi,
20+
LogWithDecodedArgs,
21+
BigNumber,
1722
} from '@polymathnetwork/abi-wrappers';
18-
import { EtherDividendCheckpoint } from '@polymathnetwork/contract-artifacts';
19-
import { Web3Wrapper } from '@0x/web3-wrapper';
20-
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
21-
import { BigNumber } from '@0x/utils';
2223
import { schemas } from '@0x/json-schemas';
2324
import assert from '../../../utils/assert';
2425
import DividendCheckpointWrapper from './dividend_checkpoint_wrapper';

src/contract_wrappers/modules/module_factory_wrapper.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import {
55
ModuleFactoryOwnershipTransferredEventArgs,
66
ModuleFactoryGenerateModuleFromFactoryEventArgs,
77
ModuleFactoryChangeSTVersionBoundEventArgs,
8+
BigNumber,
9+
ModuleFactory,
10+
Web3Wrapper,
11+
ContractAbi,
12+
LogWithDecodedArgs,
813
} from '@polymathnetwork/abi-wrappers';
9-
import { BigNumber } from '@0x/utils';
10-
import { ModuleFactory } from '@polymathnetwork/contract-artifacts';
11-
import { Web3Wrapper } from '@0x/web3-wrapper';
12-
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
1314
import { schemas } from '@0x/json-schemas';
1415
import assert from '../../utils/assert';
1516
import ContractWrapper from '../contract_wrapper';

src/contract_wrappers/modules/module_wrapper.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
import { Module } from '@polymathnetwork/contract-artifacts';
2-
import { Web3Wrapper } from '@0x/web3-wrapper';
3-
import { ContractAbi, TxData } from 'ethereum-types';
4-
import { BigNumber } from '@0x/utils';
51
import {
62
ISecurityTokenContract,
73
ModuleFactoryContract,
84
PolyTokenContract,
95
ERC20DetailedContract,
6+
Module,
7+
Web3Wrapper,
8+
ContractAbi,
9+
TxData,
10+
BigNumber,
1011
} from '@polymathnetwork/abi-wrappers';
1112
import ContractWrapper from '../contract_wrapper';
1213
import ContractFactory from '../../factories/contractFactory';
1314
import { TxParams, GenericModuleContract, GetLogs, Subscribe } from '../../types';
1415
import { stringToBytes32 } from '../../utils/convert';
1516
import functionsUtils from '../../utils/functions_utils';
16-
import assert from '../../utils/assert';
1717

1818
interface TakeFeeParams extends TxParams {
1919
amount: BigNumber;

src/contract_wrappers/modules/permission_manager/general_permission_manager_wrapper.ts

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import {
44
GeneralPermissionManagerEvents,
55
GeneralPermissionManagerChangePermissionEventArgs,
66
GeneralPermissionManagerAddDelegateEventArgs,
7+
GeneralPermissionManager,
8+
Web3Wrapper,
9+
ContractAbi,
10+
LogWithDecodedArgs,
711
} from '@polymathnetwork/abi-wrappers';
8-
import { GeneralPermissionManager } from '@polymathnetwork/contract-artifacts';
9-
import { Web3Wrapper } from '@0x/web3-wrapper';
10-
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
1112
import * as _ from 'lodash';
1213
import { schemas } from '@0x/json-schemas';
1314
import assert from '../../../utils/assert';
@@ -161,7 +162,7 @@ export default class GeneralPermissionManagerWrapper extends ModuleWrapper {
161162
assert.assert(await this.isCallerAllowed(params.txData, Perm.Admin), 'Caller is not allowed');
162163
assert.isNonZeroETHAddressHex('delegate', params.delegate);
163164
assert.assert(params.details.length > 0, '0 value not allowed');
164-
assert.assert(!await (await this.contract).checkDelegate.callAsync(params.delegate), 'Already present');
165+
assert.assert(!(await (await this.contract).checkDelegate.callAsync(params.delegate)), 'Already present');
165166
return (await this.contract).addDelegate.sendTransactionAsync(
166167
params.delegate,
167168
stringToBytes32(params.details),
@@ -231,16 +232,13 @@ export default class GeneralPermissionManagerWrapper extends ModuleWrapper {
231232
return value[0];
232233
}); // [module1: [[module1, perm1], [module1, perm2]], ...]
233234
const typedResult: PermissonsPerModule[] = [];
234-
_.forEach(
235-
groupedResult,
236-
(value, key): void => {
237-
const permissonsPerModule: PermissonsPerModule = {
238-
module: key,
239-
permissions: value.map(pair => bytes32ToString(pair[1] as string)),
240-
};
241-
typedResult.push(permissonsPerModule);
242-
},
243-
);
235+
_.forEach(groupedResult, (value, key): void => {
236+
const permissonsPerModule: PermissonsPerModule = {
237+
module: key,
238+
permissions: value.map(pair => bytes32ToString(pair[1] as string)),
239+
};
240+
typedResult.push(permissonsPerModule);
241+
});
244242
return typedResult;
245243
};
246244

src/contract_wrappers/modules/sto/capped_sto_wrapper.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ import {
77
CappedSTOSetFundRaiseTypesEventArgs,
88
CappedSTOPauseEventArgs,
99
CappedSTOUnpauseEventArgs,
10+
CappedSTO,
11+
Web3Wrapper,
12+
ContractAbi,
13+
LogWithDecodedArgs,
14+
BigNumber,
1015
} from '@polymathnetwork/abi-wrappers';
11-
import { CappedSTO } from '@polymathnetwork/contract-artifacts';
12-
import { Web3Wrapper } from '@0x/web3-wrapper';
13-
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
14-
import { BigNumber } from '@0x/utils';
1516
import { schemas } from '@0x/json-schemas';
1617
import assert from '../../../utils/assert';
1718
import STOWrapper from './sto_wrapper';

src/contract_wrappers/modules/sto/usd_tiered_sto_wrapper.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ import {
1616
USDTieredSTOSetTreasuryWalletEventArgs,
1717
USDTieredSTOTokenPurchaseEventArgs,
1818
USDTieredSTOUnpauseEventArgs,
19+
USDTieredSTO,
20+
Web3Wrapper,
21+
BigNumber,
22+
ContractAbi,
23+
LogWithDecodedArgs,
1924
} from '@polymathnetwork/abi-wrappers';
20-
import { USDTieredSTO } from '@polymathnetwork/contract-artifacts';
21-
import { Web3Wrapper } from '@0x/web3-wrapper';
22-
import { BigNumber } from '@0x/utils';
23-
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
2425
import { schemas } from '@0x/json-schemas';
2526
import assert from '../../../utils/assert';
2627
import STOWrapper from './sto_wrapper';

src/contract_wrappers/modules/transfer_manager/count_transfer_manager_wrapper.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import {
55
CountTransferManagerModifyHolderCountEventArgs,
66
CountTransferManagerPauseEventArgs,
77
CountTransferManagerUnpauseEventArgs,
8+
CountTransferManager,
9+
Web3Wrapper,
10+
ContractAbi,
11+
LogWithDecodedArgs,
12+
BigNumber,
813
} from '@polymathnetwork/abi-wrappers';
9-
import { CountTransferManager } from '@polymathnetwork/contract-artifacts';
10-
import { Web3Wrapper } from '@0x/web3-wrapper';
11-
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
12-
import { BigNumber } from '@0x/utils';
1314
import { schemas } from '@0x/json-schemas';
1415
import assert from '../../../utils/assert';
1516
import ModuleWrapper from '../module_wrapper';

src/contract_wrappers/modules/transfer_manager/general_transfer_manager_wrapper.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import {
99
GeneralTransferManagerChangeDefaultsEventArgs,
1010
GeneralTransferManagerPauseEventArgs,
1111
GeneralTransferManagerUnpauseEventArgs,
12+
GeneralTransferManager,
13+
Web3Wrapper,
14+
ContractAbi,
15+
LogWithDecodedArgs,
16+
BigNumber,
1217
} from '@polymathnetwork/abi-wrappers';
13-
import { GeneralTransferManager } from '@polymathnetwork/contract-artifacts';
14-
import { Web3Wrapper } from '@0x/web3-wrapper';
15-
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
16-
import { BigNumber } from '@0x/utils';
1718
import { schemas } from '@0x/json-schemas';
1819
import assert from '../../../utils/assert';
1920
import ModuleWrapper from '../module_wrapper';

0 commit comments

Comments
 (0)