Skip to content

Commit 0cfd5cd

Browse files
pabloruiz55pabloruiz55
authored
Merge pull request #289 from vpanwar821/development-1.5.1
Blacklist transfer manager contract
2 parents 0e5078c + b59b79e commit 0cfd5cd

16 files changed

+2164
-138
lines changed

‎CLI/commands/common/permissions_list.js‎

Lines changed: 47 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,30 +68,54 @@ function getPermissionList() {
6868
setAllowPrimaryIssuance: "ADMIN",
6969
changeHolderPercentage: "ADMIN"
7070
},
71-
LockupVolumeRestrictionTM: {
72-
addLockup: "ADMIN",
73-
addLockUpMulti: "ADMIN",
74-
removeLockUp: "ADMIN",
75-
modifyLockUp: "ADMIN"
71+
VolumeRestrictionTM: {
72+
changeExemptWalletList: "ADMIN",
73+
addIndividualRestriction: "ADMIN",
74+
addIndividualRestrictionMulti: "ADMIN",
75+
addGlobalRestriction: "ADMIN",
76+
addDailyGlobalRestriction: "ADMIN",
77+
removeIndividualRestriction: "ADMIN",
78+
removeIndividualRestrictionMulti: "ADMIN",
79+
removeGlobalRestriction: "ADMIN",
80+
removeDailyGlobalRestriction: "ADMIN",
81+
modifyIndividualRestriction: "ADMIN",
82+
modifyIndividualRestrictionMulti: "ADMIN",
83+
modifyGlobalRestriction: "ADMIN",
84+
modifyDailyGlobalRestriction: "ADMIN"
7685
},
77-
SingleTradeVolumeRestrictionTM: {
78-
setAllowPrimaryIssuance: "ADMIN",
79-
changeTransferLimitToPercentage: "ADMIN",
80-
changeTransferLimitToTokens: "ADMIN",
81-
changeGlobalLimitInTokens: "ADMIN",
82-
changeGlobalLimitInPercentage: "ADMIN",
83-
addExemptWallet: "ADMIN",
84-
removeExemptWallet: "ADMIN",
85-
addExemptWalletMulti: "ADMIN",
86-
removeExemptWalletMulti: "ADMIN",
87-
setTransferLimitInTokens: "ADMIN",
88-
setTransferLimitInPercentage: "ADMIN",
89-
removeTransferLimitInPercentage: "ADMIN",
90-
removeTransferLimitInTokens: "ADMIN",
91-
setTransferLimitInTokensMulti: "ADMIN",
92-
setTransferLimitInPercentageMulti: "ADMIN",
93-
removeTransferLimitInTokensMulti: "ADMIN",
94-
removeTransferLimitInPercentageMulti: "ADMIN"
86+
BlacklistTransferManager: {
87+
addBlacklistType: "ADMIN",
88+
addBlacklistTypeMulti: "ADMIN",
89+
modifyBlacklistType: "ADMIN",
90+
modifyBlacklistTypeMulti: "ADMIN",
91+
deleteBlacklistType: "ADMIN",
92+
deleteBlacklistTypeMulti: "ADMIN",
93+
addInvestorToBlacklist: "ADMIN",
94+
addInvestorToBlacklistMulti: "ADMIN",
95+
addMultiInvestorToBlacklistMulti: "ADMIN",
96+
addInvestorToNewBlacklist: "ADMIN",
97+
deleteInvestorFromAllBlacklist: "ADMIN",
98+
deleteInvestorFromAllBlacklistMulti: "ADMIN",
99+
deleteInvestorFromBlacklist: "ADMIN",
100+
deleteMultiInvestorsFromBlacklistMulti: "ADMIN",
101+
},
102+
VestingEscrowWallet: {
103+
changeTreasuryWallet: "ONLY_OWNER",
104+
depositTokens: "ADMIN",
105+
sendToTreasury: "ADMIN",
106+
pushAvailableTokens: "ADMIN",
107+
addTemplate: "ADMIN",
108+
removeTemplate: "ADMIN",
109+
addSchedule: "ADMIN",
110+
addScheduleFromTemplate: "ADMIN",
111+
modifySchedule: "ADMIN",
112+
revokeSchedule: "ADMIN",
113+
revokeAllSchedules: "ADMIN",
114+
pushAvailableTokensMulti: "ADMIN",
115+
addScheduleMulti: "ADMIN",
116+
addScheduleFromTemplateMulti: "ADMIN",
117+
revokeSchedulesMulti: "ADMIN",
118+
modifyScheduleMulti: "ADMIN"
95119
}
96120
}
97121
}

‎CLI/commands/helpers/contract_abis.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ let cappedSTOABI;
88
let usdTieredSTOABI;
99
let generalTransferManagerABI;
1010
let manualApprovalTransferManagerABI;
11+
let blacklistTransferManagerABI;
1112
let countTransferManagerABI;
1213
let percentageTransferManagerABI;
1314
let volumeRestrictionTMABI;
@@ -37,6 +38,7 @@ try {
3738
manualApprovalTransferManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/ManualApprovalTransferManager.json`).toString()).abi;
3839
countTransferManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/CountTransferManager.json`).toString()).abi;
3940
percentageTransferManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/PercentageTransferManager.json`).toString()).abi;
41+
blacklistTransferManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/BlacklistTransferManager.json`).toString()).abi;
4042
volumeRestrictionTMABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/VolumeRestrictionTM.json`).toString()).abi;
4143
generalPermissionManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/GeneralPermissionManager.json`).toString()).abi;
4244
polyTokenABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/PolyTokenFaucet.json`).toString()).abi;
@@ -86,6 +88,9 @@ module.exports = {
8688
manualApprovalTransferManager: function () {
8789
return manualApprovalTransferManagerABI;
8890
},
91+
blacklistTransferManager: function () {
92+
return blacklistTransferManagerABI;
93+
},
8994
countTransferManager: function () {
9095
return countTransferManagerABI;
9196
},

‎CLI/commands/sto_manager.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ async function changeAccreditedInBatch(currentSTO) {
871871
let [investorArray, isAccreditedArray] = common.transposeBatches(batches);
872872
for (let batch = 0; batch < batches.length; batch++) {
873873
console.log(`Batch ${batch + 1} - Attempting to change accredited accounts:\n\n`, investorArray[batch], '\n');
874-
let action = await currentSTO.methods.changeAccredited(investorArray[batch], isAccreditedArray[batch]);
874+
let action = currentSTO.methods.changeAccredited(investorArray[batch], isAccreditedArray[batch]);
875875
let receipt = await common.sendTransaction(action);
876876
console.log(chalk.green('Change accredited transaction was successful.'));
877877
console.log(`${receipt.gasUsed} gas used. Spent: ${web3.utils.fromWei((new web3.utils.BN(receipt.gasUsed)).mul(new web3.utils.BN(defaultGasPrice)))} ETH`);
@@ -899,7 +899,7 @@ async function changeNonAccreditedLimitsInBatch(currentSTO) {
899899
let [investorArray, limitArray] = common.transposeBatches(batches);
900900
for (let batch = 0; batch < batches.length; batch++) {
901901
console.log(`Batch ${batch + 1} - Attempting to change non accredited limit to accounts:\n\n`, investorArray[batch], '\n');
902-
let action = await currentSTO.methods.changeNonAccreditedLimit(investorArray[batch], limitArray[batch]);
902+
let action = currentSTO.methods.changeNonAccreditedLimit(investorArray[batch], limitArray[batch]);
903903
let receipt = await common.sendTransaction(action);
904904
console.log(chalk.green('Change non accredited limits transaction was successful.'));
905905
console.log(`${receipt.gasUsed} gas used. Spent: ${web3.utils.fromWei((new web3.utils.BN(receipt.gasUsed)).mul(new web3.utils.BN(defaultGasPrice)))} ETH`);

‎CLI/commands/token_manager.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ async function multiMint(_csvFilePath, _batchSize) {
388388
for (let batch = 0; batch < batches.length; batch++) {
389389
console.log(`Batch ${batch + 1} - Attempting to mint tokens to accounts: \n\n`, investorArray[batch], '\n');
390390
amountArray[batch] = amountArray[batch].map(a => web3.utils.toWei(a.toString()));
391-
let action = await securityToken.methods.mintMulti(investorArray[batch], amountArray[batch]);
391+
let action = securityToken.methods.mintMulti(investorArray[batch], amountArray[batch]);
392392
let receipt = await common.sendTransaction(action);
393393
console.log(chalk.green('Multi mint transaction was successful.'));
394394
console.log(`${receipt.gasUsed} gas used.Spent: ${web3.utils.fromWei((new web3.utils.BN(receipt.gasUsed)).mul(new web3.utils.BN(defaultGasPrice)))} ETH`);

0 commit comments

Comments
 (0)