Skip to content

2.2.0 merge into 3.0.0 - #473

Merged
adamdossa merged 324 commits into
dev-3.0.0from
2.2.0-merge-into-3.0.0
Dec 14, 2018
Merged

2.2.0 merge into 3.0.0#473
adamdossa merged 324 commits into
dev-3.0.0from
2.2.0-merge-into-3.0.0

Conversation

@adamdossa

Copy link
Copy Markdown
Contributor

No description provided.

pabloruiz55and others added 21 commits December 10, 2018 10:11
[CLI] Some improvements
- Fixed timetravel
change the type of proxy deployment for USDTieredSTO
Added support for indivisible tokens in capped STO
* Fixed rounding off errors
* Increased tolerance
* Reduced tolerance to zero
* Comment updated
* Tolerance set to 2
# Conflicts:
#	CHANGELOG.md
#	contracts/modules/Checkpoint/ERC20DividendCheckpointFactory.sol
#	contracts/modules/Checkpoint/EtherDividendCheckpointFactory.sol
#	contracts/modules/Module.sol
#	contracts/modules/STO/ISTO.sol
#	contracts/modules/STO/ProxyFactory/USDTieredSTOProxyFactory.sol
#	contracts/modules/STO/USDTieredSTO.sol
#	contracts/modules/STO/USDTieredSTOFactory.sol
#	contracts/modules/TransferManager/GeneralTransferManagerFactory.sol
#	migrations/2_deploy_contracts.js
#	package.json
#	test/b_capped_sto.js
#	test/helpers/createInstances.js
#	test/l_percentage_transfer_manager.js
#	test/u_module_registry_proxy.js
#	test/x_single_trade_volume_restriction.js
@adamdossaadamdossa changed the title [WIP] 2.2.0 merge into 3.0.02.2.0 merge into 3.0.0Dec 14, 2018
@adamdossa
adamdossa requested review from maxsam4 and pabloruiz55 and removed request for pabloruiz55December 14, 2018 14:22
@adamdossa

Copy link
Copy Markdown
ContributorAuthor

@maxsam4 Please review USDTieredSTO contracts.

Sign up for freeto 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.

10 participants

@adamdossa@maxsam4@pabloruiz55@VictorVicente@CPSTL@SatyamSB@F-OBrien@shuffledex@satyamakgec@comeonbuddy