Skip to content

Commit

Permalink
Halborn finding fix (#593)
Browse files Browse the repository at this point in the history
* [Bug]: Fix calculate discount and add more tests (#570)

* add calculate discount test and bug fix

* get asset by denom

* ci: use post-upgrade-snapshot-generator (#571)

* ci: use post-upgrade-snapshot-generator

* ci: update delete snapshot CI to use post upgrade snapshot gen binary

* halborn finding fixes

* fix masterchef external incentive add

* resolve tests

---------

Co-authored-by: Amit Yadav <amy29981@gmail.com>
Co-authored-by: jelysn <jun@elys.network>
  • Loading branch information
3 people committed Jun 19, 2024
1 parent 55912a9 commit ec97239
Show file tree
Hide file tree
Showing 36 changed files with 250 additions and 457 deletions.
12 changes: 6 additions & 6 deletions docs/static/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41978,10 +41978,10 @@ paths:
format: uint64
from_block:
type: string
format: uint64
format: int64
to_block:
type: string
format: uint64
format: int64
amount_per_block:
type: string
apr:
Expand Down Expand Up @@ -87291,10 +87291,10 @@ definitions:
format: uint64
from_block:
type: string
format: uint64
format: int64
to_block:
type: string
format: uint64
format: int64
amount_per_block:
type: string
apr:
Expand Down Expand Up @@ -87449,10 +87449,10 @@ definitions:
format: uint64
from_block:
type: string
format: uint64
format: int64
to_block:
type: string
format: uint64
format: int64
amount_per_block:
type: string
apr:
Expand Down
10 changes: 6 additions & 4 deletions proto/elys/masterchef/external_incentive.proto
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ message ExternalIncentive {
uint64 id = 1;
string reward_denom = 2;
uint64 pool_id = 3;
uint64 from_block = 4;
uint64 to_block = 5;
string amount_per_block = 6
[ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
int64 from_block = 4;
int64 to_block = 5;
string amount_per_block = 6 [
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
(gogoproto.nullable) = false
];
string apr = 7
[ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
}
4 changes: 2 additions & 2 deletions proto/elys/masterchef/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ message MsgAddExternalIncentive {
string sender = 1;
string reward_denom = 2;
uint64 pool_id = 3;
uint64 from_block = 4;
uint64 to_block = 5;
int64 from_block = 4;
int64 to_block = 5;
string amount_per_block = 6
[ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
}
Expand Down
10 changes: 1 addition & 9 deletions x/accountedpool/types/query.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ec97239

Please sign in to comment.