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

Halborn finding fixes #572

Merged
merged 7 commits into from
Jun 19, 2024
Merged

Halborn finding fixes #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62d5ec8
[Bug]: Fix calculate discount and add more tests (#570)
amityadav0 Jun 17, 2024
3eec461
ci: use post-upgrade-snapshot-generator (#571)
cosmic-vagabond Jun 17, 2024
8de3a89
halborn finding fixes
jelysn Jun 18, 2024
105ff81
fix masterchef external incentive add
jelysn Jun 18, 2024
531a784
resolve tests
jelysn Jun 19, 2024
ef03ec9
Merge branch 'develop' of github.com:elys-network/elys into halborn_f…
jelysn Jun 19, 2024
335ed95
Merge branch 'develop' into halborn_finding_fix
cosmic-vagabond Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/static/openapi.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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

Loading
Loading