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

Commit 17d867f

Browse files
author
Victor Wiebe
committed
fix: quick fixes for the examples folders
examples needed moduleName changed, renamed some methods generalTM changes outstanding for whitelist issues
1 parent 56d76fd commit 17d867f

File tree

6 files changed

+45
-34
lines changed

6 files changed

+45
-34
lines changed

examples/addInvestorToWhitelist.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ window.addEventListener('load', async () => {
2121
const ticker = 'TEST';
2222
const tokenAddress = await polymathAPI.securityTokenRegistry.getSecurityTokenAddress(ticker);
2323
const TEST = await polymathAPI.tokenFactory.getSecurityTokenInstanceFromAddress(tokenAddress);
24-
const generalTMAddress = (await TEST.getModulesByName({ moduleName: ModuleName.generalTransferManager }))[0];
24+
const generalTMAddress = (await TEST.getModulesByName({ moduleName: ModuleName.GeneralTransferManager }))[0];
2525

2626
const generalTM = await polymathAPI.moduleFactory.getModuleInstance({
27-
name: ModuleName.generalTransferManager,
27+
name: ModuleName.GeneralTransferManager,
2828
address: generalTMAddress,
2929
});
3030

3131
await generalTM.subscribeAsync({
32-
eventName: GeneralTransferManagerEvents.ModifyWhitelist,
32+
eventName: GeneralTransferManagerEvents.ModifyKYCData,
3333
indexFilterValues: {},
3434
callback: async (error, log) => {
3535
if (error) {
@@ -40,12 +40,11 @@ window.addEventListener('load', async () => {
4040
},
4141
});
4242

43-
await generalTM.modifyWhitelist({
43+
await generalTM.modifyKYCData({
4444
investor: '0x72aF7849ffc7753B5ccEA5cb80F97e9Aeaf7d999',
4545
canSendAfter: new Date(),
4646
canReceiveAfter: new Date(),
4747
expiryTime: new Date(2020),
48-
canBuyFromSTO: true,
4948
txData: {
5049
from: await polymathAPI.getAccount(),
5150
},

examples/erc20Dividend.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ window.addEventListener('load', async () => {
6565
});
6666

6767
const moduleStringName = 'ERC20DividendCheckpoint';
68-
const moduleName = ModuleName.erc20DividendCheckpoint;
68+
const moduleName = ModuleName.ERC20DividendCheckpoint;
6969
const modules = await polymathAPI.moduleRegistry.getModulesByType({
7070
moduleType: ModuleType.Dividends,
7171
});
@@ -112,15 +112,15 @@ window.addEventListener('load', async () => {
112112

113113
// Get module for ether dividend checkpoint and address for module
114114
const erc20DividendAddress = (await tickerSecurityTokenInstance.getModulesByName({
115-
moduleName: ModuleName.erc20DividendCheckpoint,
115+
moduleName: ModuleName.ERC20DividendCheckpoint,
116116
}))[0];
117117

118118
const erc20DividendCheckpoint = await polymathAPI.moduleFactory.getModuleInstance({
119-
name: ModuleName.erc20DividendCheckpoint,
119+
name: ModuleName.ERC20DividendCheckpoint,
120120
address: erc20DividendAddress,
121121
});
122122
const erc20Dividend = (await tickerSecurityTokenInstance.getModulesByName({
123-
moduleName: ModuleName.erc20DividendCheckpoint,
123+
moduleName: ModuleName.ERC20DividendCheckpoint,
124124
}))[0];
125125

126126
await polymathAPI.polyToken.transfer({ to: erc20Dividend, value: new BigNumber(5) });

examples/etherDividend.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { BigNumber } from '@0x/utils';
22
import { RedundantSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
3-
import { Web3Wrapper } from '@0x/web3-wrapper';
4-
import { EtherDividendCheckpointEvents, ModuleFactoryContract } from '@polymathnetwork/abi-wrappers/lib/src';
3+
import { EtherDividendCheckpointEvents } from '@polymathnetwork/abi-wrappers/lib/src';
54
import { ApiConstructorParams, PolymathAPI } from '../src/PolymathAPI';
6-
import { bytes32ToString, valueToWei, weiToValue } from '../src/utils/convert';
7-
import { FULL_DECIMALS, ModuleName, ModuleType } from '../src';
5+
import { bytes32ToString } from '../src/utils/convert';
6+
import { ModuleName, ModuleType } from '../src';
87
import ModuleFactoryWrapper from '../src/contract_wrappers/modules/module_factory_wrapper';
98

109
// This file acts as a valid sandbox for adding a etherDividend module on an unlocked node (like ganache)
@@ -64,7 +63,7 @@ window.addEventListener('load', async () => {
6463
});
6564

6665
const moduleStringName = 'EtherDividendCheckpoint';
67-
const moduleName = ModuleName.etherDividendCheckpoint;
66+
const moduleName = ModuleName.EtherDividendCheckpoint;
6867
const modules = await polymathAPI.moduleRegistry.getModulesByType({
6968
moduleType: ModuleType.Dividends,
7069
});
@@ -110,11 +109,11 @@ window.addEventListener('load', async () => {
110109

111110
// Get module for ether dividend checkpoint and address for module
112111
const etherDividendAddress = (await tickerSecurityTokenInstance.getModulesByName({
113-
moduleName: ModuleName.etherDividendCheckpoint,
112+
moduleName: ModuleName.EtherDividendCheckpoint,
114113
}))[0];
115114
console.log(etherDividendAddress);
116115
const etherDividendCheckpoint = await polymathAPI.moduleFactory.getModuleInstance({
117-
name: ModuleName.etherDividendCheckpoint,
116+
name: ModuleName.EtherDividendCheckpoint,
118117
address: etherDividendAddress,
119118
});
120119

examples/generalPermissionManager.ts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { BigNumber } from '@0x/utils';
22
import { RedundantSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
3-
import { Web3Wrapper } from '@0x/web3-wrapper';
43
import { GeneralPermissionManagerEvents } from '@polymathnetwork/abi-wrappers';
54
import ModuleFactoryWrapper from '../src/contract_wrappers/modules/module_factory_wrapper';
65
import { ApiConstructorParams, PolymathAPI } from '../src/PolymathAPI';
7-
import { valueToWei, weiToValue, bytes32ToString } from '../src/utils/convert';
6+
import { bytes32ToString } from '../src/utils/convert';
87
import { ModuleName, ModuleType } from '../src';
98

109
// This file acts as a valid sandbox for adding a permission manager module on an unlocked node (like ganache)
@@ -69,7 +68,7 @@ window.addEventListener('load', async () => {
6968
});
7069

7170
const moduleStringName = 'GeneralPermissionManager';
72-
const moduleName = ModuleName.generalPermissionManager;
71+
const moduleName = ModuleName.GeneralPermissionManager;
7372

7473
const instances: Promise<ModuleFactoryWrapper>[] = [];
7574
modules.map(address => {
@@ -104,11 +103,11 @@ window.addEventListener('load', async () => {
104103
});
105104

106105
const generalPMAddress = (await tickerSecurityTokenInstance.getModulesByName({
107-
moduleName: ModuleName.generalPermissionManager,
106+
moduleName: ModuleName.GeneralPermissionManager,
108107
}))[0];
109108

110109
const generalPM = await polymathAPI.moduleFactory.getModuleInstance({
111-
name: ModuleName.generalPermissionManager,
110+
name: ModuleName.GeneralPermissionManager,
112111
address: generalPMAddress,
113112
});
114113

@@ -129,27 +128,35 @@ window.addEventListener('load', async () => {
129128
await generalPM.addDelegate({ delegate: myAddress, details: 'details' });
130129

131130
const generalTMAddress = (await tickerSecurityTokenInstance.getModulesByName({
132-
moduleName: ModuleName.generalTransferManager,
131+
moduleName: ModuleName.GeneralTransferManager,
133132
}))[0];
134133

135134
// Get all delegates
136-
await generalPM.changePermission({ valid: true, perm: 'FLAGS', delegate: myAddress, module: generalTMAddress });
135+
await generalPM.changePermission({ valid: true, perm: 'ADMIN', delegate: myAddress, module: generalTMAddress });
137136

138137
// Check delegate
139138
console.log('Delegate is added:');
140139
console.log(await generalPM.checkDelegate({ delegate: myAddress }));
141140
console.log('Delegate has flags perm added on general transfer manager:');
142141
console.log(await generalPM.checkPermission({ delegate: myAddress, module: generalTMAddress, permission: 'FLAGS' }));
143142

143+
144+
// Change allow all whitelist transfers: I_GeneralTransferManager.modifyTransferRequirementsMulti(
145+
// [0, 1, 2],
146+
// [false, false, false],
147+
// [false, false, false],
148+
// [false, false, false],
149+
// [false, false, false],
150+
// { from: token_owner }
144151
// Use FLAGS permission to allow all whitelist transfers, this validates that the user can use the
145152
const generalTM = await polymathAPI.moduleFactory.getModuleInstance({
146-
name: ModuleName.generalTransferManager,
153+
name: ModuleName.GeneralTransferManager,
147154
address: generalTMAddress,
148155
});
149156
await generalTM.changeAllowAllWhitelistTransfers({ allowAllWhitelistTransfers: true });
150157

151158
// Revoking Permission
152-
await generalPM.changePermission({ valid: false, perm: 'FLAGS', delegate: myAddress, module: generalTMAddress });
159+
await generalPM.changePermission({ valid: false, perm: 'ADMIN', delegate: myAddress, module: generalTMAddress });
153160

154161
console.log('Delegate perm has been revoked. Check permission result: ');
155162
console.log(await generalPM.checkPermission({ delegate: myAddress, module: generalTMAddress, permission: 'FLAGS' }));

examples/generalTransferManager.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { BigNumber } from '@0x/utils';
22
import { RedundantSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
3-
import { Web3Wrapper } from '@0x/web3-wrapper';
43
import { GeneralTransferManagerEvents } from '@polymathnetwork/abi-wrappers/lib/src';
54
import { ApiConstructorParams, PolymathAPI } from '../src/PolymathAPI';
6-
import { valueToWei, weiToValue } from '../src/utils/convert';
75
import { ModuleName } from '../src';
86

97
// This file acts as a valid sandbox for using a general transfer manager module on an unlocked node (like ganache)
@@ -67,12 +65,12 @@ window.addEventListener('load', async () => {
6765

6866
// Get General TM Address
6967
const generalTMAddress = (await tickerSecurityTokenInstance.getModulesByName({
70-
moduleName: ModuleName.generalTransferManager,
68+
moduleName: ModuleName.GeneralTransferManager,
7169
}))[0];
7270

7371
// Get general TM module instance
7472
const generalTM = await polymathAPI.moduleFactory.getModuleInstance({
75-
name: ModuleName.generalTransferManager,
73+
name: ModuleName.GeneralTransferManager,
7674
address: generalTMAddress,
7775
});
7876

@@ -89,6 +87,14 @@ window.addEventListener('load', async () => {
8987
}
9088
},
9189
});
90+
91+
// Change allow all whitelist transfers: I_GeneralTransferManager.modifyTransferRequirementsMulti(
92+
// [0, 1, 2],
93+
// [false, false, false],
94+
// [false, false, false],
95+
// [false, false, false],
96+
// [false, false, false],
97+
// { from: token_owner }
9298
await generalTM.changeAllowAllTransfers({ allowAllTransfers: true });
9399
const randomBeneficiary1 = '0x3444444444444444444444444444444444444444';
94100
const randomBeneficiary2 = '0x5544444444444444444444444444444444444444';
@@ -103,15 +109,14 @@ window.addEventListener('load', async () => {
103109
await generalTM.changeAllowAllTransfers({ allowAllTransfers: false });
104110

105111
// Add whitelist special users
106-
await generalTM.modifyWhitelistMulti({
112+
await generalTM.modify({
107113
investors: [randomBeneficiary1, randomBeneficiary2, myAddress],
108114
canBuyFromSTO: [true, true, true],
109115
canReceiveAfters: [new Date(2018, 1), new Date(2018, 1), new Date(2018, 1)],
110116
canSendAfters: [new Date(), new Date(), new Date(2018, 2)],
111117
expiryTimes: [new Date(2035, 1), new Date(2035, 1), new Date(2035, 1)],
112118
});
113119

114-
// Change allow all whitelist transfers
115120
await generalTM.changeAllowAllWhitelistTransfers({ allowAllWhitelistTransfers: true });
116121

117122
// Verify we can make transfers

examples/mintTokenToInvestor.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ window.addEventListener('load', async () => {
2626
const generalTMAddress = (await TEST.getModulesByName({ moduleName: ModuleName.generalTransferManager }))[0];
2727

2828
const generalTM = await polymathAPI.moduleFactory.getModuleInstance({
29-
name: ModuleName.generalTransferManager,
29+
name: ModuleName.GeneralTransferManager,
3030
address: generalTMAddress,
3131
});
3232

@@ -36,7 +36,7 @@ window.addEventListener('load', async () => {
3636
});
3737

3838
await TEST.subscribeAsync({
39-
eventName: SecurityTokenEvents.Minted,
39+
eventName: SecurityTokenEvents.Issued,
4040
indexFilterValues: {},
4141
callback: async (error, log) => {
4242
if (error) {
@@ -48,9 +48,10 @@ window.addEventListener('load', async () => {
4848
});
4949

5050
if (found) {
51-
await TEST.mint({
51+
await TEST.issue({
5252
investor: investorAddress,
5353
value: new BigNumber(100),
54+
data: '',
5455
txData: {
5556
from: '<sto owner>'.toLowerCase(),
5657
},

0 commit comments

Comments
 (0)