Skip to content

Merge dev-2.1 and master #455

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 200 commits into from
Dec 6, 2018
Merged

Merge dev-2.1 and master #455

merged 200 commits into from
Dec 6, 2018

Conversation

maxsam4
Copy link
Contributor

@maxsam4 maxsam4 commented Dec 6, 2018

No description provided.

VictorVicente and others added 30 commits October 18, 2018 19:57
@VictorVicente
CLI transfer manager for GTM
5f80bad
@VictorVicente
CLI transfer manager for STVR TM
44c83b4
@VictorVicente
Merge branch 'development-1.5.0' into CLI-Transfer-Restrictions
4c52da8
@VictorVicente
Minor changes
f8d73b9
@VictorVicente
Dependencies fix for CLI
40d49a1
@VictorVicente
Merge branch 'development-1.5.0' into CLI-Transfer-Restrictions
023632a
@VictorVicente
STRV TM added to migration script
d7e97bb
@VictorVicente
STVR TM support
0ecec66
@VictorVicente
Merge branch 'development-1.5.0' into CLI-Transfer-Restrictions
e172fa0
@VictorVicente
Transfer is verified through ST function
aec6ec9
@shuffledex
Add support for createCheckpoint() from dividends modules
4f8899e
@shuffledex
advices from Victor
1f3b0f1
@VictorVicente
ST20Generator refactoring and clean up.
54775de
@VictorVicente
Merge branch 'development-1.5.0' into private/fede/cli/movingCreateCh…
7ccb7c3 
…eckpoint
@shuffledex
first draft
68bbead
@shuffledex
[WIP] changing all transaction methods calls
6c5a057
@shuffledex
[WIP] new ascii logo
9b3386e
@shuffledex
Merge branch 'dev-2.1.0' into private/fede/cli/movingCreateCheckpoint
7461e4a
@shuffledex
Merge branch 'dev-2.1.0' into private/fede/cli/sendTxRefactoring
79ec17f
@pabloruiz55
Changed PolyToken Kovan address
76af0ab
@shuffledex
[WIP] Moving constants to a single file
1f07bff
@shuffledex
[WIP] fund raise type
50eecf3
@shuffledex
[WIP] network name
e0dec6f
@VictorVicente
Merge branch 'dev-2.1.0' into private/fede/cli/movingCreateCheckpoint
31c87ad
@VictorVicente
Merge branch 'dev-2.1.0' into CLI-Transfer-Restrictions
694ba0f
@VictorVicente
Merge branch 'dev-2.1.0' into private/fede/cli/sendTxRefactoring
36b2a19
@VictorVicente
Merge pull request #383 from PolymathNetwork/private/fede/cli/movingC…
99b6e31 
…reateCheckpoint

Add support for createCheckpoint() from dividends modules
@VictorVicente
Merge branch 'dev-2.1.0' into private/fede/cli/sendTxRefactoring
36dd6af
@VictorVicente
Merge branch 'dev-2.1.0' into CLI-Transfer-Restrictions
a12b897
@shuffledex
minor fixes
a8da518
satyamakgec and others added 22 commits November 30, 2018 12:16
@satyamakgec
Merge pull request #448 from PolymathNetwork/docs-solc-fix
b65ed28 
Fixed docs generation
@shuffledex
whitelist to transfer manager
8b964c5
@pabloruiz55
Merge branch 'dev-2.1.0' into cli-count-and-percentage-TM
8660a95
@VictorVicente
CSV parser
1ad53fc
@VictorVicente
Data folder reorganization
d0d5193
@VictorVicente
Refactoring and improvements
d47cc32
@VictorVicente
STO manager refactoring for batch operations
1fecc9a
@VictorVicente
Transfer manager refactoring for batches
dde9bf0
@VictorVicente
Fix
e425210
@VictorVicente
Multi mint in batches
ee54b6d
@comeonbuddy @adamdossa
Fuzz test permissions manager module (#395)
cb079cb 
* count transfer manager module fuzz testfinished

* fuzz test for general transfer manager

* fuzz tests updates

* permission manager fuzzer volumn restriction transfer manager

* mint token err

* minting issue

* fixing some testsing issuesss

* all done

* fixed cleaning up and commenting of the fuzz test codes

* fixed conflict and merged new development functions, deleted all code with STVRTM.

* get rid of test for STVTM

* adding back missing file

* get rid of STVR test

* Delete x_single_trade_volume_restriction.js

* deleted unused code :(
@VictorVicente
Merge pull request #451 from PolymathNetwork/cli-csv-refactoring
b4b8bd4 
[CLI] CSV refactoring
@VictorVicente
Merge branch 'dev-2.1.0' into private/fede/cli/moveMultiMint
2dca646
@VictorVicente
Merge pull request #446 from PolymathNetwork/private/fede/cli/moveMul…
c8a4f56 
…tiMint

[CLI] CSV refactoring and csv scripts are moved to their corresponding module script
@VictorVicente
Merge branch 'dev-2.1.0' into cli-count-and-percentage-TM
5bb8afc
@VictorVicente
modifyWhitelistMulti for PercentageTM
343b432
@VictorVicente
Merge branch 'dev-2.1.0' into cappedsto-price-fix
ce584c3
@pabloruiz55
Merge pull request #447 from PolymathNetwork/cli-count-and-percentage-TM
325d7a9 
[CLI] Add count and percentage tm
@pabloruiz55
Merge branch 'dev-2.1.0' into cappedsto-price-fix
ef5b5f9
@pabloruiz55
Merge pull request #440 from PolymathNetwork/cappedsto-price-fix
4fc9f24 
CappedSTO conversion rate fix
@adamdossa
Optimise GTM (#443)
3dba7bd 
* WIP

* WIP

* Fixes

* Update config

* Log gas for 50 txs

* WIP

* update

* Fix tests

* Fix typo

* Change onWhitelist logic

* Update changelog

* Update all test cases

* Add whitelist optimization

* Make Dividend modules proxies

* Updates

* minor cleanup

* make script dynamic

* Keep ABI constant

* Fixes

* Update change log

* Updates

* add require statement in factory constructors

* remove the test cases for the STVRTM

* Return investor data in getAllInvestorsData

* CLI changes according GTM optimizations

* Bump versions

* version changes

* Update CHANGELOG.md
@maxsam4
partial merge
ca3d6be
@maxsam4
Copy link
Contributor Author

maxsam4 commented Dec 6, 2018

@VictorVicente Pending merge conflicts are in the files

        both modified:   CLI/commands/ST20Generator.js
	both modified:   CLI/commands/common/common_functions.js
	both modified:   CLI/commands/common/global.js
	both modified:   CLI/commands/strMigrator.js
	both modified:   CLI/package.json
	both modified:   CLI/polymath-cli.js
	both modified:   CLI/yarn.lock
	both modified:   scripts/tokenInfo-v1.js

Please pull the branch dev-2.1.0-master and solve the merge conflicts manually in above files and push changes like normal commits.

@maxsam4 maxsam4 changed the title Dev 2.1.0 master [WIP] Merge dev-2.1 and master Dec 6, 2018
@VictorVicente
Copy link
Contributor

@maxsam4 Conflicts are safely merged.

@maxsam4 maxsam4 changed the title [WIP] Merge dev-2.1 and master Merge dev-2.1 and master Dec 6, 2018
@maxsam4 maxsam4 merged commit f9ff09a into master-dev-2.1 Dec 6, 2018
@VictorVicente VictorVicente deleted the dev-2.1.0-master branch January 11, 2019 14:01
@knanjukutty-polymath knanjukutty-polymath mentioned this pull request Apr 19, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@maxsam4 @VictorVicente @shuffledex @pabloruiz55 @SatyamSB @adamdossa @F-OBrien @satyamakgec @comeonbuddy