Skip to content

Commit e5048bb

Browse files
committed
Change CastBallotBoxVoteParameters::reward_token_quantity to u64
Some reward tokens may have > i32::MAX (~2 billion) tokens
1 parent 7eed4a6 commit e5048bb

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

core/src/box_kind/ballot_box.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,11 @@ impl BallotBoxWrapper {
118118
warn!("Reward token id in R7 register differs to config. Could be due to vote.");
119119
}
120120

121-
let register_reward_token_quantity = ergo_box
121+
let register_reward_token_quantity: u64 = ergo_box
122122
.get_register(NonMandatoryRegisterId::R8.into())
123123
.ok_or(BallotBoxError::NoRewardTokenQuantityInR8)?
124-
.try_extract_into::<i64>()? as u32;
124+
.try_extract_into::<i64>()?
125+
as u64;
125126

126127
if register_reward_token_quantity != *reward_token_quantity {
127128
warn!(
@@ -197,7 +198,7 @@ impl VoteBallotBoxWrapper {
197198
let reward_token_quantity = ergo_box
198199
.get_register(NonMandatoryRegisterId::R8.into())
199200
.ok_or(BallotBoxError::NoRewardTokenQuantityInR8)?
200-
.try_extract_into::<i64>()? as u32;
201+
.try_extract_into::<i64>()? as u64;
201202

202203
let contract = BallotContract::from_ergo_tree(ergo_box.ergo_tree.clone(), inputs.into())?;
203204
let vote_parameters = CastBallotBoxVoteParameters {

core/src/cli_commands/update_pool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ fn build_update_pool_box_tx(
210210
let vote_parameters = CastBallotBoxVoteParameters {
211211
pool_box_address_hash: pool_box_hash,
212212
reward_token_id: reward_tokens.token_id.clone(),
213-
reward_token_quantity: *reward_tokens.amount.as_u64() as u32, // TODO: Change vote parameters to i64
213+
reward_token_quantity: *reward_tokens.amount.as_u64(), // TODO: Change vote parameters to i64
214214
};
215215
// Find ballot boxes that are voting for the new pool hash
216216
let mut sorted_ballot_boxes = ballot_boxes.get_ballot_boxes()?;

core/src/oracle_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub struct BallotBoxWrapperParameters {
5555
pub struct CastBallotBoxVoteParameters {
5656
pub pool_box_address_hash: Digest32,
5757
pub reward_token_id: TokenId,
58-
pub reward_token_quantity: u32,
58+
pub reward_token_quantity: u64,
5959
}
6060

6161
/// Holds the token ids of every important token used by the oracle pool.

0 commit comments

Comments
 (0)