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

rm docs/go_basics.md, moved to /coding repo #199

Merged
merged 1 commit into from
Aug 2, 2017
Merged

Conversation

zramsay
Copy link
Contributor

@zramsay zramsay commented Aug 1, 2017

@ethanfrey
Copy link
Contributor

@zramsay I will merge this, but two minor issues:

  1. in general branches should be named feature/xxx-description or bugfix/xxx-description, where xxx is the issue number being addressed (or the main issue number if multiple).

  2. please rebase on unstable after other ones have been merged. Your pr should be a child of the tip of unstable. this makes cleaner graphs.

I'll rebase this now and add docs in the repo soon.

➜  basecoin git:(unstable) git log --oneline origin/rm-gobasics | head -4
7c2d8ba rm docs/go_basics.md, moved to /coding repo
0a7b8a3 Merge pull request #188 from tendermint/feature/blind-trust
75181a7 Hide trust flag
4652779 Fix up flag handling
➜  basecoin git:(unstable) git log --oneline origin/unstable | head -4
a91f75b Merge pull request #195 from tendermint/zramsay-patch-1
34e6789 update readme, fixes #189
0a7b8a3 Merge pull request #188 from tendermint/feature/blind-trust
75181a7 Hide trust flag

@ethanfrey ethanfrey merged commit 67f25f5 into unstable Aug 2, 2017
@zramsay zramsay deleted the rm-gobasics branch August 9, 2017 02:27
ParthDesai pushed a commit to ChorusOne/cosmos-sdk that referenced this pull request Apr 19, 2021
alexanderbez added a commit that referenced this pull request May 26, 2022
* Add proto for Clawback Vesting Account

* Change field to int

* Change field to int64

* add place holder for clawback

* add handler and basic msgs methods

* add clawback vesting account logic

* improvements

* fix: Dev/clawback test debug (#198)

* add tests

* add clawback before starttime test

* clean imports

* Printlns for the clawback testing

* Fix tests and logic

* Fix the gas exhaustion vuln

* Remove printlns

* Delete extraneous account set

* chore: add table driven test cases to clawback (#199)

* add table driven tests

* Modify test cases

* More detail in error message

* Update x/auth/vesting/types/vesting_account_test.go

* Update x/auth/vesting/types/vesting_account_test.go

Co-authored-by: Dev Ojha <[email protected]>

Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Dev Ojha <[email protected]>

* fix: cherry pick agoric's cosmos sdk#207 (#203)

* cherry pick compute endtime fix

* Merge branch 'osmosis-main' into mattverse/clawback

Co-authored-by: mattverse <[email protected]>
Co-authored-by: Matt, Park <[email protected]>

* feat: add clawback cli and tests (#207)

* add clawback cli and tests

* Update x/auth/vesting/client/cli/tx.go

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update x/auth/vesting/client/cli/tx.go

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update x/auth/vesting/client/cli/tx.go

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* minor fix

* Minor fix

* Update x/auth/vesting/client/cli/cli_test.go

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Change from code review from Alex and Dev

Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
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.

2 participants