feat: dry ticket length, increase ticket length from 5 to 6, make max holders configurable #55
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
instead of using current_prize_buckets, use lottery_balance to account for the appreciation since the last lottery
this way you can call calculate_lottery_balance from query_lottery_balance
aesmonty
reviewed
Dec 27, 2021
contracts/lotto/src/error.rs
Outdated
|
|
||
| #[error("Insufficient deposit amount for {0} tickets")] | ||
| InsufficientDepositAmount(u64), | ||
|
|
||
| #[error("Sequence must be 5 digits between 0-9")] | ||
| InvalidSequence {}, | ||
| #[error("Sequence must be 5 digits between 0-f but instead it was: {0}")] |
There was a problem hiding this comment.
We should remove the hard-coded "5 digits" here
There was a problem hiding this comment.
I ended up hard-codeding it to "6" instead, do you think that works? It seems const formatting is not supported by std: rust-lang/rust#69133. If we wanted we could add const format as a dependency: https://github.com/rodrimati1992/const_format_crates
There was a problem hiding this comment.
let's keep with the hard-coded 6 then, didn't know that. It's not a big deal anyway
aesmonty
reviewed
Dec 27, 2021
| @@ -1021,8 +1041,11 @@ pub fn execute_claim_lottery( | |||
| config.stable_denom.clone(), | |||
| )?; | |||
|
|
|||
| if net_send > balance.into() { | |||
| return Err(ContractError::InsufficientFunds {}); | |||
| if to_send > balance.into() { | |||
Ruborcalor
changed the title
* feat: increase ticket length to 6 * feat: configurable max holders (#59) * feat: make max_holders configurable * test: add test for max_holders configuration * build: build wasm and schema json artifacts * fix: add max holders bounds, make sure that max holders only increases * fix: add tests for max_holders * build: update build artifacts * Trigger actions * build: empty commit to trigger github actions
Ruborcalor
added a commit
that referenced
this pull request
Apr 28, 2022
## What's This Fix unnecessary duplication of `MigrateOldDepositors` and `UpdateConfig` messages. Also update `migrate_old_depositors` function to throw an error if there are no lotteries left to migrate. * fix: unnecessary duplication of execute msgs Unnecessary duplication of MigrateOldDepositors and UpdateConfig messages
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's This
Notable Changes
TICKET_LENGTHandNUM_PRIZE_BUCKETSas public consts toglow_protocol::lottoand import them when relevant.MAX_LIMITto10000from100.Changes To Error Types
Update
InvalidDepositInstantiationto take aUint128which specifies the invalid deposit amount.(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Rename
InvalidDepositAmounttoZeroDepositAmount.(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Update
InvalidSequencetext and to specify the sequence that was invalid.(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Update
InvalidHoldertext and to specify the sequence that was invalid.(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Rename
InvalidGifttoGiftToSelf(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Rename
InvalidGiftAmounttoZeroGiftAmount(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Rename
InvalidSponsorshipAmounttoZeroSponsorshipAmount(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Update
LotteryNotReadyto specify when the lottery will be ready.(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Update
SpecifiedWithdrawAmountTooSmall,SpecifiedWithdrawAmountTooBig,WithdrawingTooManyTicketsandInsufficientFundsto specify the requested value and its corresponding limit that was exceeded.https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L49-R69
Update
InsufficientPoolFundswith more information.(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Update text for
InsufficientLotteryFunds(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Update
InvalidClaimLotteryNotAwardedwith more information(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Update
InvalidClaimPrizeAlreadyClaimedwith more information(https://github.com/elevenyellow/glow-protocol/pull/55/files#diff-5163afc26d70ac053dac70e5c837917724f85cbd0091ff376fee9d744cec48b5L9-R12)
Remove
InsufficientSponsorFunds,InvalidClaimAmount,InvalidLotteryFundsExecution,InvalidLotteryTicketsExecution,InvalidLotteryExecution.They weren't being used.