Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9274cde
remove all blocking functions
comeonbuddy Dec 3, 2018
9316ccc
Merge branch 'dev-2.1.0' into remove-blocking-MATM
satyamakgec Dec 4, 2018
c0cf9ae
remove fuzz test related to manual blocking
comeonbuddy Dec 5, 2018
9c508f3
Merge branch 'dev-2.1.0' into remove-blocking-MATM
satyamakgec Dec 5, 2018
d6e5490
Merge branch 'dev-2.1.0' into remove-blocking-MATM
pabloruiz55 Dec 5, 2018
762f7b0
Merge branch 'dev-2.1.0' into remove-blocking-MATM
VictorVicente Dec 8, 2018
c5e70c1
CLI - Removed blocking functions
VictorVicente Dec 8, 2018
b894a0c
Updated permission document
VictorVicente Dec 8, 2018
f03b5f7
finished MATM function changes
comeonbuddy Dec 9, 2018
d59e9b1
Merge branch 'remove-blocking-MATM' of https://github.com/PolymathNet…
comeonbuddy Dec 9, 2018
a59e50e
improve the function definitions
SatyamSB Dec 10, 2018
75a1bdd
Merge branch 'dev-2.1.0' into remove-blocking-MATM
satyamakgec Dec 10, 2018
5d7263a
add missing return statement
SatyamSB Dec 10, 2018
46c9cdd
minor fix
SatyamSB Dec 10, 2018
0369cf3
MATM contract and test fixes
SatyamSB Dec 11, 2018
4fefd85
Merge branch 'dev-2.1.0' into remove-blocking-MATM
satyamakgec Dec 11, 2018
552de1b
minor fix
SatyamSB Dec 11, 2018
4956441
[WIP] CLI advances
shuffledex Dec 12, 2018
5e2ec74
Improve MATM to allow allowances and expiryTimes to be changed for ex…
shuffledex Dec 13, 2018
c8832cb
Refactoring and improvements
shuffledex Dec 13, 2018
002951b
Minor CLI changes
VictorVicente Dec 14, 2018
a10e0c0
fix modify batch
shuffledex Dec 14, 2018
22b6d45
manual merge
shuffledex Dec 14, 2018
4d48187
Improve menu string
shuffledex Dec 14, 2018
b53d904
CLI minor changes
VictorVicente Dec 14, 2018
09e8e4e
Merge branch 'dev-2.1.0' into remove-blocking-MATM
VictorVicente Dec 14, 2018
5e99a3a
Merge branch 'dev-2.1.0' into remove-blocking-MATM
maxsam4 Dec 18, 2018
ba851bf
Merge branch 'dev-2.1.0' into remove-blocking-MATM
VictorVicente Dec 21, 2018
5c14bcb
CLI typo fix
VictorVicente Dec 21, 2018
6dcef1f
fixed functions getActiveApprovalsToUser and added getAllApprovals() …
comeonbuddy Jan 2, 2019
bb3cdef
edited function description
comeonbuddy Jan 2, 2019
cad4562
CLI update
VictorVicente Jan 2, 2019
8737567
Merge branch 'dev-2.1.0' into remove-blocking-MATM
maxsam4 Jan 2, 2019
ad29c1b
test case fixed
maxsam4 Jan 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ All notable changes to this project will be documented in this file.
* Removed `0x0` check for the `_from` address to `ManualApprovalTransferManager`. This allows for the Issuer/Transfer Agent to approve a one-off mint of tokens that otherwise would not be possible.
* Changed the version of `ManualApprovalTransferManagerFactory` from `1.0.0` to `2.1.0`.
* Deployed 2.0.1 `ManualApprovalTransferManagerFactory` to address 0x6af2afad53cb334e62b90ddbdcf3a086f654c298
* Add `getActiveApprovalsToUser()` function to access all the active approvals for a user whether user is in the `from` or in `to`.
* Add `getApprovalDetails()` to get the details of the approval corresponds to `_from` and `_to` address.
* Add feature to modify the details of the active approval using `modifyApproval()` & `modifyApprovalMulti()`.
* Add `addManualApprovalMulti()` and `revokeManualApprovalMulti()` batch function for adding and revoking the manual approval respectively.

## Dividends
* Changed the version of `ERC20DividendCheckpointFactory` & `EtherDividendCheckpointFactory` from `1.0.0` to `2.1.0`.
Expand Down
4 changes: 1 addition & 3 deletions CLI/commands/common/permissions_list.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ function getPermissionList() {
},
ManualApprovalTransferManager: {
addManualApproval: "TRANSFER_APPROVAL",
addManualBlocking: "TRANSFER_APPROVAL",
revokeManualApproval: "TRANSFER_APPROVAL",
revokeManualBlocking: "TRANSFER_APPROVAL"
},
PercentageTransferManager: {
modifyWhitelist: "WHITELIST",
Expand Down Expand Up @@ -99,7 +97,7 @@ function getPermissionList() {
}

module.exports = {
verifyPermission: function(contractName, functionName) {
verifyPermission: function (contractName, functionName) {
let list = getPermissionList();
try {
return list[contractName][functionName]
Expand Down
521 changes: 375 additions & 146 deletions CLI/commands/transfer_manager.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions CLI/data/Transfer/MATM/add_manualapproval_data.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0x1DDF4FDBB8eaDB5dD6EeC6edB1A91a0926940a33,10,12/12/2019,Lorem ipsum dolor sit amet
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0xB849AC17d881183800300A31f022d3fe4B82D457,20,12/12/2019,Consectetur adipiscing elit
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0xD122e1951cfb337D5CC8bc5aDECC0eb66ffb4B80,25,12/12/2019,Pellentesque ultrices eros
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0x1D9127821A244b64852E8Da431bb389B81710985,20,12/12/2019,Non eleifend ante tincidunt eget
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0x42dc79375E511Fb7Ee17fF50417141bAE5E5698E,10,12/12/2019,Sed ante arcu
5 changes: 5 additions & 0 deletions CLI/data/Transfer/MATM/modify_manualapproval_data.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0x1DDF4FDBB8eaDB5dD6EeC6edB1A91a0926940a33,12/12/2019,1,Lorem ipsum dolor sit amet,0
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0xB849AC17d881183800300A31f022d3fe4B82D457,12/12/2019,2,Consectetur adipiscing elit,0
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0xD122e1951cfb337D5CC8bc5aDECC0eb66ffb4B80,12/12/2019,3,Pellentesque ultrices eros,1
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0x1D9127821A244b64852E8Da431bb389B81710985,12/12/2019,4,Non eleifend ante tincidunt eget,2
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0x42dc79375E511Fb7Ee17fF50417141bAE5E5698E,12/12/2019,5,Sed ante arcu,1
2 changes: 2 additions & 0 deletions CLI/data/Transfer/MATM/revoke_manualapproval_data.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0x1DDF4FDBB8eaDB5dD6EeC6edB1A91a0926940a33
0x127b4F58A825Dfc6d4058AcdB7bB397d1F0411b5,0xB849AC17d881183800300A31f022d3fe4B82D457
Loading