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.

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

Merge to Main #433

Closed
wants to merge 55 commits into from
Closed

Merge to Main #433

wants to merge 55 commits into from

Conversation

ashish10677
Copy link
Member

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A
  • Test B

Test Configuration:

  • Contracts version:
  • Hardware:

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

ashish10677 and others added 30 commits November 8, 2021 14:30
@ashish10677 @SkandaBhat
Update config.yml (#316)
a51e9f0 
Co-authored-by: Skanda Bhat <bhat.skanda.m@gmail.com>
@Yashk767
Additional tests (#317)
770a127
@ashish10677
Increment gasLimit while confirming block. (#320)
1b792eb 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@Yashk767
Corrected GetNumberOfStakers() (#324)
406fcb0
@ashish10677
Fix issue of isElectedProposer. (#328)
b4e145b 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Exit the code if the stake is slashed to 0 (#334)
9f163a8 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@Yashk767
Dispute blockId fix (#333)
71cc8cc 
* Added GetSortedProposedBlockIds
* Support for tests
* Modified tests
* Corrected activeAssetIds in tests
@Yashk767
Dispute influence id fix (#338)
2cf2f6b 
* Added check for biggestInfluence

* Support for tests

* Additional tests

* only one dispute check
@ashish10677
Staker info (#314)
97d9e5d 
* 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>
@ashish10677
Increase coverage on propose.go. (#340)
d4bcf6c 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Added maximum gas limit while confirming block. (#335)
d23166f 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@Yashk767
Fix withdraw (#344)
3c40242 
* Added getUpdatedEpoch()

* Fetched updated epoch in for loop
@ashish10677
Sentry integrated to razor-go (#347)
819b1a3 
* 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>
@Yashk767
Consolidated interfaces into utilsStruct (#341)
6d6a625 
* utilsStruct call methods
* consolidated interfaces into one
* compilation changes
* Modified functions with utilsStruct
@ashish10677 @Yashk767
@SkandaBhat @OxHimanshu
Resolve conflicts (#349)
ec6b9f4 
* 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>
@SkandaBhat
Merge branch 'main' into develop
4a87267
@ashish10677
Gas limit config (#343)
a8d1f1a 
* 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>
@Yashk767
modified tests with more realistic values (#351)
83d4b57
@Yashk767
Added tests for math.go (#353)
1a6eb5a 
* ConvertToNumber coverage

* Moved AssignAmountInWei() to cmd-utils.go

* Additional tests

Added a nil testcase

minor changes

* requested change
@Shrikant1212 @Kaizoku-Shrikant
fix: added jq pkg and updated build script in dockerfile. (#362)
586dc7e 
Co-authored-by: Shrikant Upadhyay <shrikant@thetreedots.com>
@ashish10677
Removed max gas limit from confirm block. (#359)
dfdd4cc 
* 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>
@ashish10677
Reduce calculations in handle dispute. (#364)
d7d9d75 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Update contract addresses. (#374)
0f4e248 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Merge branch 'main' into develop
c3efccd 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Remove unnecessary import
e070cbf 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Fix tests.
163a275 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@Yashk767
Test unstake (#350)
ccac9b8 
* 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
@Shrikant1212 @Kaizoku-Shrikant
feat: Adding docker-compose.yml (#365)
49e127f 
* 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>
@ashish10677
Timeout duration reduced from 120 to 30 secs. (#366)
62248f5 
* 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>
@Yashk767
Test cmd-utils (#372)
da150ce 
* Modified functions with utilsStruct

* Compilation fixes

* modified AssignAmountInWei

* Compilation fixes

* Added tests for cmd-ttils

* Added tests for different states
ashish10677 and others added 25 commits December 1, 2021 17:19
@ashish10677
Crash recovery (#380)
783559a 
* Add Read from and write into file functions.

* Update contract addresses.

* Implement voting with crash recovery.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@Yashk767
Added claimBounty command (#381)
4f9c78a 
* Added claimBounty command

* Added support for claimBounty tests

* Additional structs

* Added tests

* Added CalculateBlockTime()

* Added a retry for redeemBounty and fixed tests

* multiplied duration with seconds

* Modified Readme
@Yashk767
Test create (#383)
5d811e9 
* Added support for tests

* Added tests and ran gofmt

* Ran gofmt
@ashish10677
RPC error fixes (#384)
d22d67c 
* Add TODOs for retry

* Asset.go modified with new retry function.

* Retry implemented for all functions of block.go

* Add retry to all methods necessary for voting.

* Change number of attempts for suggestGasPrice and estimateGas.

* Fix tests.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Options fix (#385)
ceb27e9 
* Update contract addresses.

* Removed unneccessary usage of address.

* Removed address and fixed tests.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@Yashk767
Test Accounts (#389)
59d9457 
* removed Accounts interface from cmd

* New Accounts Interface in accounts pkg

* Compilation fixes

* Added tests for accounts
@ashish10677
Xhtml hotfix (#388)
fe51584 
* Update contract addresses.

* Add function to handle XHTML data points.

* Add tests for TestGetDataFromHTML

* Add tests and updateJob changed.

* README updated.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@Yashk767
Unstake Input fix (#387)
d8f6671 
* Added stakedToken contract

* Added RZR,sRZR conversion functions

* Converted RZR's to sRZR's before unstake call

* Added support for tests

* Added tests

* Seperate GetAmountInSRZRs function

* Modified tests

* displayed log to highest decimals

* Changed log format to debug

* Added test cases with higher values
@Yashk767
Test config utils (#402)
1b8ca6f 
* Modified config-utils with utilsStruct

* Added support in interfaces

* Compilation fixes due to modified GetConfigdata()

* Added mocks for config functions

* fixed tests

* Added flagSetUtils to utilsStruct

* Added tests for config-Utils
@Yashk767
Test options (#404)
42930d4 
* Added support for tests

* Modified functions with RazorUtilsInterface

* compilation fixes

* changed parameter count

* Fixed tests

* Added tests for options.go
@Yashk767
Changed names of Interface and Struct in utils package (#406)
bce4f79 
* Changed interface and struct names

* Compilation fixes

* Fix tests
@Shrikant1212
configure publish step (#390)
0496cbe 
* configure publish step

* fix indentation

* configure dind in job

* configure dind in job

* configure dind in job

* test image build job

* configure docker login

* configure docker login

* configure context in ci

* configure docker host address

* cleanup

* add env vars

* Configured tag based job for publishing docker image
@ashish10677
Rogue mode for commit only (#407)
d47d01a 
* Add rogue mode for commit.
* rogueMode with commit tested.
* Only propose rogue if the rogue mode is mentioned as propose.
* Fix tests.
* Update README.
* Add tests for GetRogueRandomValue
* Removed comments.
* Change rogue to rogueData.
* Comment hotfix.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@shekhar2807
Readme updated (#417)
289fd4c 
* Readme updated
@ashish10677
V0.1.8 release parity (#410)
a98933c 
* Update package.json

* Fix data type issue.

* No compilation or running error.

* Add new command for updateCommission.

* Fix tests.

* Rename razorUtils to packageUtils.

* Change parameters in tests.

* Update README and version.

* Add condition to check if a staker has been slashed before.

* Fix waitFor issue.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@Yashk767
Reduced number of max Iteration in getIteration() (#418)
3fb1653 
* Reduced maxIteration and removed address parameter from getIteraion()

* Added tests for 100% coverage
@Yashk767
Mockery options (#412)
aacc310 
* generated mocks using mockery

* Added mockery support
@Yashk767
Added autoVote flag in stake command (#419)
dfbb97f 
* Separate initializeVote(), executeVote(), vote()

* Added autoVote feature

* modified ReadMe
@Yashk767
removed condition of 'rogue staker cannot dispute' (#421)
fd59455
@shekhar2807
jobList command added (#420)
50c7975 
* jobList command added

* Readme updated

* test fixes
@shekhar2807
Collection list command added (#423)
149ea40 
* collectionList command added

* lint fix

* minor fix
@Yashk767
Test block.go (#424)
612a9c5 
* Added method caller UtilsStruct for block.go functions

* Added mocks

* Added tests for block.go

* Compilation fixes
@ashish10677
Override (#408)
694fe4e 
* Init overrideJob.

* Override job command implemented.

* Add deleteOverride.

* Delete Override job implemented.

* Add if condition while fetching job.

* Remove packageUtils.

* Fix bug in updateCommission.

* Update tests.

* README updated.

Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Merge branch 'main' into develop
9af1f2a 
Signed-off-by: Ashish Kumar Mishra <ashish10677@gmail.com>
@ashish10677
Merge remote-tracking branch 'upstream/develop' into develop
4521c7e
@ashish10677 ashish10677 changed the title Develop Merge to Main Jan 5, 2022
@ashish10677 ashish10677 closed this Jan 6, 2022
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.

None yet
5 participants
@ashish10677 @Yashk767 @SkandaBhat @Shrikant1212 @shekhar2807