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

Merged develop with main branch. #431

Merged
merged 4 commits into from
Jan 5, 2022
Merged

Merged develop with main branch. #431

merged 4 commits into from
Jan 5, 2022

Conversation

ashish10677
Copy link
Member

@ashish10677 ashish10677 commented Jan 5, 2022

Conflicts resolved

ashish10677 and others added 4 commits November 26, 2021 13:09
* Update config.yml (#316)

Co-authored-by: Skanda Bhat <bhat.skanda.m@gmail.com>

* Additional tests (#317)

* Increment gasLimit while confirming block. (#320)

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Corrected GetNumberOfStakers() (#324)

* Fix issue of isElectedProposer. (#328)

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Exit the code if the stake is slashed to 0 (#334)

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Dispute blockId fix (#333)

* Added GetSortedProposedBlockIds
* Support for tests
* Modified tests
* Corrected activeAssetIds in tests

* Dispute influence id fix (#338)

* Added check for biggestInfluence

* Support for tests

* Additional tests

* only one dispute check

* Staker info (#314)

* StakerInfo command implemented.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Update README files.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Implement necessary mocks for tests.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Fix typo.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Add more tests.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Remove address from stakerInfo command.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Fix getEpoch method.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Fix tests.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Update README.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Increase coverage on propose.go. (#340)

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Added maximum gas limit while confirming block. (#335)

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Fix withdraw (#344)

* Added getUpdatedEpoch()

* Fetched updated epoch in for loop

* Sentry integrated to razor-go (#347)

* Initialized sentry to the project.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Run golangci-lint run.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Consolidated interfaces into utilsStruct  (#341)

* utilsStruct call methods
* consolidated interfaces into one
* compilation changes
* Modified functions with utilsStruct

* Resolve conflicts (#349)

* Update config.yml

* changed addresses to v0.1.76 (#318)

* Develop (#325)

* Update config.yml (#316)

* Additional tests (#317)

* Increment gasLimit while confirming block. (#320)

* Corrected GetNumberOfStakers() (#324)

Co-authored-by: Ashish Kumar Mishra <ashish10677@gmail.com>
Co-authored-by: Yashk767 <76935991+Yashk767@users.noreply.github.com>
Co-authored-by: Skanda Bhat <bhat.skanda.m@gmail.com>
Co-authored-by: OxHimanshu <61224737+OxHimanshu@users.noreply.github.com>

* Gas limit config (#343)

* Added gasLimit as a setConfig parameter.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Add code to increase gas limit by dynamic value.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Restrict gas limit to 21 million max.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Add Gas limit in config.sh

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Add tests for set config.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Update README

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Make default gas limit as 100%

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Apply gofmt.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Modify gas limit multiplier to be used as 2x, 3x, 1.5x, etc.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Update README.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Fix tests.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* modified tests with more realistic values (#351)

* Added tests for math.go (#353)

* ConvertToNumber coverage

* Moved AssignAmountInWei() to cmd-utils.go

* Additional tests

Added a nil testcase

minor changes

* requested change

* fix: added jq pkg and updated build script in dockerfile. (#362)

Co-authored-by: Shrikant Upadhyay <shrikant@thetreedots.com>

* Removed max gas limit from confirm block. (#359)

* Removed max gas limit from confirm block.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Fix tests.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Reduce calculations in handle dispute. (#364)

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Update contract addresses. (#374)

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Remove unnecessary import

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Fix tests.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Test unstake (#350)

* Seperated InitialiseUnstake()

* modified functions with  utilsStruct

* seperate executeUnstake()

* Added support for tests

* Added tests for unstake

* Added a UnstakeInput struct

* requested changes

* Mocked Sleep function

* Modified AutoWithdraw function

* Added tests for AutoWithdraw

* feat: Adding docker-compose.yml (#365)

* feat: Adding docker-compose.yml

* feat: configured docker-compose and readme

* feat: updated readme for docker compose

* fix: updated readme and added support for silicon based MAC

* fix: Updated README for silicon based MAC

Signed-off-by: Shrikant Upadhyay <shrikant1997upadhyay@gmail.com>

Co-authored-by: Shrikant Upadhyay <shrikant@thetreedots.com>

* Timeout duration reduced from 120 to 30 secs. (#366)

* Timeout duration reduced from 120 to 30 secs.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

* Block completion timeout made a constant value.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>

Co-authored-by: Skanda Bhat <bhat.skanda.m@gmail.com>
Co-authored-by: Yashk767 <76935991+Yashk767@users.noreply.github.com>
Co-authored-by: OxHimanshu <61224737+OxHimanshu@users.noreply.github.com>
Co-authored-by: Shrikant upadhyay <shrikant1997upadhyay@gmail.com>
Co-authored-by: Shrikant Upadhyay <shrikant@thetreedots.com>
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@SkandaBhat SkandaBhat merged commit b094cd2 into razor-network:develop Jan 5, 2022
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.

None yet

4 participants