GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed rewarding behaviour on not found bonds (#627)

Browse Source
This commit is contained in:
Jędrzej Stuczyński
2021-06-07 11:00:07 +01:00
committed by GitHub
parent 7b1dab8546
commit 15e377e678
2 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contracts/mixnet/src/storage.rs
+14 -26
View File
@@ -64,20 +64,18 @@ pub fn mixnodes_owners_read(storage: &dyn Storage) -> ReadonlyBucket<HumanAddr>
// helpers
pub(crate) fn increase_mixnode_bond(
storage: &mut dyn Storage,
owner: &[u8],
mut bond: MixNodeBond,
scaled_reward_rate: Decimal,
) -> StdResult<()> {
let mut bucket = mixnodes(storage);
let mut node = bucket.load(owner)?;
if node.amount.len() != 1 {
if bond.amount.len() != 1 {
return Err(StdError::generic_err(
"mixnode seems to have been bonded with multiple coin types",
));
}
let reward = node.amount[0].amount * scaled_reward_rate;
node.amount[0].amount += reward;
bucket.save(owner, &node)
let reward = bond.amount[0].amount * scaled_reward_rate;
bond.amount[0].amount += reward;
mixnodes(storage).save(bond.owner.as_bytes(), &bond)
}
// currently not used outside tests
@@ -121,19 +119,17 @@ pub fn gateways_owners_read(storage: &dyn Storage) -> ReadonlyBucket<HumanAddr>
// helpers
pub(crate) fn increase_gateway_bond(
storage: &mut dyn Storage,
owner: &[u8],
mut bond: GatewayBond,
scaled_reward_rate: Decimal,
) -> StdResult<()> {
let mut bucket = gateways(storage);
let mut node = bucket.load(owner)?;
if node.amount.len() != 1 {
if bond.amount.len() != 1 {
return Err(StdError::generic_err(
"gateway seems to have been bonded with multiple coin types",
));
}
let reward = node.amount[0].amount * scaled_reward_rate;
node.amount[0].amount += reward;
bucket.save(owner, &node)
let reward = bond.amount[0].amount * scaled_reward_rate;
bond.amount[0].amount += reward;
gateways(storage).save(bond.owner.as_bytes(), &bond)
}
// currently not used outside tests
@@ -197,11 +193,7 @@ mod tests {
// 0.001
let reward = Decimal::from_ratio(1u128, 1000u128);
// produces an error if target mixnode doesn't exist
let res = increase_mixnode_bond(&mut storage, node_owner, reward);
assert!(res.is_err());
// increases the reward appropriately if node exists
// increases the reward appropriately
let mixnode_bond = MixNodeBond {
amount: coins(1000, DENOM),
owner: std::str::from_utf8(node_owner).unwrap().into(),
@@ -212,7 +204,7 @@ mod tests {
.save(node_owner, &mixnode_bond)
.unwrap();
increase_mixnode_bond(&mut storage, node_owner, reward).unwrap();
increase_mixnode_bond(&mut storage, mixnode_bond, reward).unwrap();
let new_bond = read_mixnode_bond(&storage, node_owner).unwrap();
assert_eq!(Uint128(1001), new_bond);
}
@@ -252,11 +244,7 @@ mod tests {
// 0.001
let reward = Decimal::from_ratio(1u128, 1000u128);
// produces an error if target gateway doesn't exist
let res = increase_gateway_bond(&mut storage, node_owner, reward);
assert!(res.is_err());
// increases the reward appropriately if node exists
// increases the reward appropriately
let gateway_bond = GatewayBond {
amount: coins(1000, DENOM),
owner: std::str::from_utf8(node_owner).unwrap().into(),
@@ -267,7 +255,7 @@ mod tests {
.save(node_owner, &gateway_bond)
.unwrap();
increase_gateway_bond(&mut storage, node_owner, reward).unwrap();
increase_gateway_bond(&mut storage, gateway_bond, reward).unwrap();
let new_bond = read_gateway_bond(&storage, node_owner).unwrap();
assert_eq!(Uint128(1001), new_bond);
}
contracts/mixnet/src/transactions.rs
+30 -8
View File
@@ -295,10 +295,21 @@ pub(crate) fn try_reward_mixnode(
return Err(ContractError::Unauthorized);
}
// check if the bond even exists
let current_bond = match mixnodes(deps.storage).load(node_owner.as_bytes()) {
Ok(bond) => bond,
Err(_) => {
return Ok(HandleResponse {
attributes: vec![attr("result", "bond not found")],
..Default::default()
});
}
};
let reward = read_mixnode_epoch_reward_rate(deps.storage);
let scaled_reward = scale_reward_by_uptime(reward, uptime)?;
increase_mixnode_bond(deps.storage, node_owner.as_bytes(), scaled_reward)?;
increase_mixnode_bond(deps.storage, current_bond, scaled_reward)?;
Ok(HandleResponse::default())
}
@@ -316,10 +327,21 @@ pub(crate) fn try_reward_gateway(
return Err(ContractError::Unauthorized);
}
// check if the bond even exists
let current_bond = match gateways(deps.storage).load(gateway_owner.as_bytes()) {
Ok(bond) => bond,
Err(_) => {
return Ok(HandleResponse {
attributes: vec![attr("result", "bond not found")],
..Default::default()
});
}
};
let reward = read_gateway_epoch_reward_rate(deps.storage);
let scaled_reward = scale_reward_by_uptime(reward, uptime)?;
increase_gateway_bond(deps.storage, gateway_owner.as_bytes(), scaled_reward)?;
increase_gateway_bond(deps.storage, current_bond, scaled_reward)?;
Ok(HandleResponse::default())
}
@@ -1288,10 +1310,10 @@ pub mod tests {
let res = try_reward_mixnode(deps.as_mut(), info, "node-owner".into(), 100);
assert_eq!(res, Err(ContractError::Unauthorized));
// errors out if the target owner hasn't bound any mixnodes
// returns bond not found attribute if the target owner hasn't bonded any mixnodes
let info = mock_info(network_monitor_address.clone(), &[]);
let res = try_reward_mixnode(deps.as_mut(), info, "node-owner".into(), 100);
assert!(res.is_err());
let res = try_reward_mixnode(deps.as_mut(), info, "node-owner".into(), 100).unwrap();
assert_eq!(vec![attr("result", "bond not found")], res.attributes);
let initial_bond = 100_000000;
let mixnode_bond = MixNodeBond {
@@ -1342,10 +1364,10 @@ pub mod tests {
let res = try_reward_gateway(deps.as_mut(), info, "node-owner".into(), 100);
assert_eq!(res, Err(ContractError::Unauthorized));
// errors out if the target owner hasn't bound any mixnodes
// returns bond not found attribute if the target owner hasn't bonded any gateways
let info = mock_info(network_monitor_address.clone(), &[]);
let res = try_reward_gateway(deps.as_mut(), info, "node-owner".into(), 100);
assert!(res.is_err());
let res = try_reward_gateway(deps.as_mut(), info, "node-owner".into(), 100).unwrap();
assert_eq!(vec![attr("result", "bond not found")], res.attributes);
let initial_bond = 100_000000;
let gateway_bond = GatewayBond {