Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

483 484 fix #488

Merged
merged 6 commits into from
Dec 21, 2018
Merged

483 484 fix #488

merged 6 commits into from
Dec 21, 2018

Conversation

dev1644
Copy link
Contributor

@dev1644 dev1644 commented Dec 20, 2018

Please check if the PR fulfils these requirements

  • The commit message follows our Submission guidelines
  • Tests for the changes have been added (for bug fixes/features)
  • Docs have been added / updated (for bug fixes / features)

Removed the Redundant functions from eternal storage contract as mentioned in Issue #483, Converted Internal functions to public ones as mentioned in Issue #484 & there was a function named getArrayString, I have removed that function because it was returning Array of String, which is not possible as it isn't supported by Current ABIENCODER."

What kind of change does this PR introduce?

(Bug fix, feature, docs update, ...)
Removed the redundant functions and renamed newly added functions.

What is the current behavior?

(You can also link to an open issue here)
Issue #483
Issue #484

What is the new behavior?

(Define and describe any new functionality. Clarify if this is a feature change)

Does this PR introduce a breaking change?

(What changes might users need to make in their application due to this PR?)

Any Other information:

…ioned in Issue#483, Converted Internal functions to public ones as mentioned in PolymathNetwork#484 & there was a function named getArrayString, I have removed that function because it was returning Array of String, which is not possible as it isn't supported by Current ABIENCODER.
@maxsam4 maxsam4 changed the base branch from master to dev-2.1.0 December 20, 2018 14:50
contracts/storage/EternalStorage.sol Outdated Show resolved Hide resolved
dev1644 and others added 5 commits December 20, 2018 20:56
…ioned in Issue#483, Converted Internal functions to public ones as mentioned in PolymathNetwork#484 & there was a function named getArrayString, I have removed that function because it was returning Array of String, which is not possible as it isn't supported by Current ABIENCODER.
@coveralls
Copy link

Coverage Status

Coverage remained the same at 98.035% when pulling b1bb728 on dev1644:483-484-fix into 5b892a2 on PolymathNetwork:dev-2.1.0.

@adamdossa
Copy link
Contributor

Thanks @dev1644 - changes look good.

The only issue is that getArrayString can't be public until we can use the ABIencoderV2 in production. I'll add this as an issue to remind us to re-add this in the future when ABIencoderv2 is production ready.

@adamdossa adamdossa merged commit b29a42c into PolymathNetwork:dev-2.1.0 Dec 21, 2018
adamdossa added a commit that referenced this pull request Jan 28, 2019
* Updated changelog

* Changed currencyRaised to stableCoinsRaised

* MATM contract and test fixes

* minor fix

* CLI - LockupTM support

* individual balance for every stable coin listed

* CLI minor fixes

* recommended fixes

* Added code comments

* Removed uninitialized pointer

* CLI - Fixes for new contract changes

* Minor fix

* trying by adding some buffer in time travel

* [WIP] CLI advances

* modify function changes

* WIP

* CircleCI changes

* CircleCI changes

* CircleCI changes

* Badge

* Store test results

* Removed coverage from commit workflow

* CLI - WIP VolumeRestrictionTM support

* CLI - Removed STVR TM from CLI

* Added test reporter

* Addded artifact collection

* Added parallelism

* Comment

* Bumped parallelism to 3

* Coverage requires approval

* Bumped parallelism to 4

* Removed manual approval

* Combine travis and CircleCI

* env var changes

* comment

* Improve MATM to allow allowances and expiryTimes to be changed for existing approvals

* Refactoring and improvements

* CLI - Operations in batch for VRTM

* fuzz test for adding and removing modules

* finished module fuzz test

* Fix rounding off errors (#467)

* Fixed rounding off errors

* Increased tolerance

* Reduced tolerance to zero

* Comment updated

* Tolerance set to 2

* Minor CLI changes

* fix modify batch

* Increased no o/p timeout

* Improve menu string

* Triggering CircleCI

* CLI minor changes

* Add ability to see excluded addresses

* Updates

* Fixes

* Bump excluded limit to 150

* remove SRVTM

* Use investor list from checkpoint

* CLI - Script to generate tokens, whitelist investors and mint to them

* CLI - Explore account

* Update PolyTokenFaucet.sol

* Improved the natspec comments

* added VestingEscrowWalletLogic to output

* Track withheld at dividend granularity

* wip - issue with test not finishing

* removed redundant dependencies

* increased versions

* WIP-multiple transaction within 1 day with Individual and daily Restrictions

* updated yarn.lock

* Add balances & claim amounts to getters

* CLI - Flow change and updates for dividends_manager

* Updated test script

* Script updated

* fixed bug with the initial test

* Update test.sh

* Script updated

* coverage block gas limit increased

* ganache-cli 6.2.5

* Travis submit coverage

* added scenario 2 and 3

* fix input random number issue

* Add more test cases

* CLI Minor fixes

* 483 484 fix (#488)

* Removed the Redundant functions from eternal storage contract as mentioned in Issue#483, Converted Internal functions to public ones as mentioned in #484 & there was a function named getArrayString, I have removed that function because it was returning Array of String, which is not possible as it isn't supported by Current ABIENCODER.

* Removed the Redundant functions from eternal storage contract as mentioned in Issue#483, Converted Internal functions to public ones as mentioned in #484 & there was a function named getArrayString, I have removed that function because it was returning Array of String, which is not possible as it isn't supported by Current ABIENCODER.

* Add getCheckpointData

* CLI minor changes

* CLI typo fix

* bug fixes

* CLI updates

* finished test case 4

* repeat period count from the startTime

* WIP

* fixed functions getActiveApprovalsToUser and added getAllApprovals() both will return all approval details in multiple arrays as requested

* edited function description

* Bumped cappedSTO version

* MATM version bumped

* CLI update

* test case fixed

* Update j_manual_approval_transfer_manager.js

* WIP

* reinvent the test case

* Merge conflicts

* indexing the param (#500)

* Permissions update

* Removed redundant events

* dual truffle coverage

* VRTM coverage fix

* Added compile command

* Updated coverage script

* removed compile command

* Updated truffle config

* Pull accredited lists from USDSTO (#502)

* WIP

* Add getter

* Update changelog

* Remove commented code

* CLI - Show accredited data

* Update contracts/modules/STO/USDTieredSTOStorage.sol

Co-Authored-By: adamdossa <adam.dossa@gmail.com>

* Remove commented code

* add getRestrictedAddresses() function

* minor fix

* Fixed test file

* Add restrictions data to getRestrictedAddresses

* Remove commented code and better tests

* modified the getRestrictedAddress() function

* code cleanup

* CLI - Show restrictions table

* minor fix

* CLI - Update method name, updated csv dates

* Trigger TravisCI

* CLI - Changed names of restrictions

* Minor fix

* CLI - Percentage with decimals fix

* CLI - Changed names of restrictions

* add exempt list getter

* minor fix

* CLI - Added 'show exempted addresses'

* Small optimisation

* compilation errors

* compilation errors in modules

* compilation errors

* Move contracts to the respective folders (#510)

* move storage contracts to storage folder and migrate vesting to experimental

* BTM migrate to experimental

* move Lockup to experimental

* Small re-shuffling

* remove _ prefix from public functions

* removed polyToken from factories

* Fix comments (#519)

* Fix STR size

* fixed b_capped_sto.js

* capped_sto fix

* Remove duped test cases

* Fix erc20 test

* More fixes

* fixes for h_general_transfer_manager.js

* fixes for h_general_transfer_manager.js

* fixes for j_manual_approval_transfer_manager.js

* fixed n_security_token_registry.js

* h_general_transfer_manager.js -removed redundant block due to merge issue

* fixes for u_module_registry_proxy.js

* fixes for z_vesting_escrow_wallet.js

* fixes for z_vesting_escrow_wallet.js

* Dividend improvements (#526)

* Working

* Wallet change test case

* Fix ether dividend tests

* CLI - Update for wallet on dividends modules

* Add estimated tax / amounts to getter

* CLI - Update for dividends status data

* Fix MATM test case

* fixes for z_vesting_escrow_wallet.js

* Update

* Remove unnecessary import

* Clean up some imports

* Small size optimisation and migrate fix

* fixes for z_vesting_escrow_wallet.js

* fixes for z_vesting_escrow_wallet.js (finished)

* fixes for y_volume_restriction_tm.js

* fixes for y_volume_restriction_tm.js

* Some struct refactoring.

* Some more optimisations

* Some more optimisations

* Merge 2.1 fix

* More optimisations

* Remove comments

* Fixed imports in tests

* Some updates

* Some updates

* WIP fixes

* Some more updates

* Add temp.js

* Updates

* Updates

* Fixes

* Fixes

* Updates

* usdtsto optimization (#534)

* Initial optimization

* Tests fixed

* comments removed

* Make some functions external

* Updates

* More fixes

* Fix circle-ci

* Add more tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants