Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 390ad7a

Browse files
maurolacymaurolacy
authored
Merge pull request #202 from confio/release-0.17
Release 0.17
2 parents b9fba00 + f785c64 commit 390ad7a

File tree

24 files changed

+171
-167
lines changed

24 files changed

+171
-167
lines changed

‎.circleci/config.yml‎

Lines changed: 59 additions & 64 deletions
Large diffs are not rendered by default.

‎CHANGELOG.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@
22

33
## [Unreleased](https://github.com/confio/poe-contracts/tree/HEAD)
44

5-
[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.16.0...HEAD)
5+
[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.17.0...HEAD)
6+
7+
## [v0.17.0](https://github.com/confio/poe-contracts/tree/v0.17.0) (2023-01-18)
8+
9+
[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.16.0...v0.17.0)
10+
11+
**Merged pull requests:**
12+
13+
- Add undelegations processing to migration handler [\#201](https://github.com/confio/poe-contracts/pull/201) ([maurolacy](https://github.com/maurolacy))
14+
- Engagement half-life [\#200](https://github.com/confio/poe-contracts/pull/200) ([maurolacy](https://github.com/maurolacy))
615

716
## [v0.16.0](https://github.com/confio/poe-contracts/tree/v0.16.0) (2022-12-16)
817

‎Cargo.lock‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contracts/tg4-engagement/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tg4-engagement"
3-
version = "0.16.0"
3+
version = "0.17.0"
44
authors = ["Ethan Frey <[email protected]>"]
55
edition = "2018"
66
description = "Simple TG4 implementation of group membership controlled by an admin"
@@ -25,9 +25,9 @@ cw-controllers = "1.0.0"
2525
cw-storage-plus = "1.0.1"
2626
cw-utils = "1.0.1"
2727
cw2 = "1.0.0"
28-
tg-utils = { version = "0.16.0", path = "../../packages/utils" }
29-
tg-bindings = { version = "0.16.0", path = "../../packages/bindings" }
30-
tg4 = { path = "../../packages/tg4", version = "0.16.0" }
28+
tg-utils = { version = "0.17.0", path = "../../packages/utils" }
29+
tg-bindings = { version = "0.17.0", path = "../../packages/bindings" }
30+
tg4 = { path = "../../packages/tg4", version = "0.17.0" }
3131
schemars = "0.8"
3232
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
3333
thiserror = "1.0.21"
@@ -37,4 +37,4 @@ anyhow = "1"
3737
cosmwasm-schema = "1.1.9"
3838
cw-multi-test = "0.16.2"
3939
derivative = "2"
40-
tg-bindings-test = { version = "0.16.0", path = "../../packages/bindings-test" }
40+
tg-bindings-test = { version = "0.17.0", path = "../../packages/bindings-test" }

‎contracts/tg4-engagement/src/contract.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ pub fn execute_distribute_rewards<Q: CustomQuery>(
305305
.add_attribute("action", "distribute_rewards")
306306
.add_attribute("sender", sender.as_str())
307307
.add_attribute("denom", &distribution.denom)
308-
.add_attribute("amount", &amount.to_string());
308+
.add_attribute("amount", amount.to_string());
309309

310310
Ok(resp)
311311
}
@@ -352,7 +352,7 @@ pub fn execute_withdraw_rewards<Q: CustomQuery>(
352352
.add_attribute("owner", owner.as_str())
353353
.add_attribute("receiver", receiver.as_str())
354354
.add_attribute("reward", &reward.denom)
355-
.add_attribute("amount", &reward.amount.to_string())
355+
.add_attribute("amount", reward.amount.to_string())
356356
.add_submessage(SubMsg::new(BankMsg::Send {
357357
to_address: receiver.to_string(),
358358
amount: vec![reward],
@@ -449,7 +449,7 @@ pub fn execute_slash<Q: CustomQuery>(
449449
"Sender is not on slashers list".to_owned(),
450450
));
451451
}
452-
let addr = Addr::unchecked(&addr);
452+
let addr = Addr::unchecked(addr);
453453
// check if address belongs to member, otherwise leave early
454454
if members().may_load(deps.storage, &addr)?.is_none() {
455455
return Ok(Response::new());
@@ -769,7 +769,7 @@ pub fn query_withdrawable_rewards<Q: CustomQuery>(
769769
) -> StdResult<RewardsResponse> {
770770
// Not checking address, as if it is invalid it is guaranteed not to appear in maps, so
771771
// `withdrawable_rewards` would return error itself.
772-
let owner = Addr::unchecked(&owner);
772+
let owner = Addr::unchecked(owner);
773773
let distribution = DISTRIBUTION.load(deps.storage)?;
774774
let adjustment = if let Some(adj) = WITHDRAW_ADJUSTMENT.may_load(deps.storage, &owner)? {
775775
adj

‎contracts/tg4-engagement/src/multitest.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mod funds_distribution {
2222
Event::new("wasm")
2323
.add_attribute("sender", sender)
2424
.add_attribute("denom", denom)
25-
.add_attribute("amount", &amount.to_string())
25+
.add_attribute("amount", amount.to_string())
2626
}
2727

2828
#[test]
@@ -456,7 +456,7 @@ mod funds_distribution {
456456
let denom = suite.denom.clone();
457457

458458
suite
459-
.distribute_funds(&members[3], None, &coins(100, &denom))
459+
.distribute_funds(&members[3], None, &coins(100, denom))
460460
.unwrap();
461461

462462
suite
@@ -487,7 +487,7 @@ mod funds_distribution {
487487
let denom = suite.denom.clone();
488488

489489
suite
490-
.distribute_funds(&members[2], None, &coins(100, &denom))
490+
.distribute_funds(&members[2], None, &coins(100, denom))
491491
.unwrap();
492492

493493
let err = suite
@@ -535,7 +535,7 @@ mod funds_distribution {
535535
);
536536

537537
suite
538-
.distribute_funds(&members[2], None, &coins(100, &denom))
538+
.distribute_funds(&members[2], None, &coins(100, denom))
539539
.unwrap();
540540

541541
suite.delegate_withdrawal(&members[1], &members[0]).unwrap();
@@ -604,7 +604,7 @@ mod slashing {
604604
);
605605

606606
suite
607-
.distribute_funds(members[2], None, &coins(600, &denom))
607+
.distribute_funds(members[2], None, &coins(600, denom))
608608
.unwrap();
609609

610610
suite.withdraw_funds(members[0], None, None).unwrap();
@@ -649,7 +649,7 @@ mod slashing {
649649
);
650650

651651
suite
652-
.distribute_funds(members[2], None, &coins(600, &denom))
652+
.distribute_funds(members[2], None, &coins(600, denom))
653653
.unwrap();
654654

655655
suite.withdraw_funds(members[0], None, None).unwrap();
@@ -693,7 +693,7 @@ mod slashing {
693693
);
694694

695695
suite
696-
.distribute_funds(members[2], None, &coins(600, &denom))
696+
.distribute_funds(members[2], None, &coins(600, denom))
697697
.unwrap();
698698

699699
suite.withdraw_funds(members[0], None, None).unwrap();
@@ -804,7 +804,7 @@ mod slashing {
804804
);
805805

806806
suite
807-
.distribute_funds(members[2], None, &coins(600, &denom))
807+
.distribute_funds(members[2], None, &coins(600, denom))
808808
.unwrap();
809809

810810
suite.withdraw_funds(members[0], None, None).unwrap();

‎contracts/tg4-engagement/src/multitest/suite.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl Suite {
333333
let amount = self
334334
.app
335335
.wrap()
336-
.query_balance(&Addr::unchecked(owner), &self.denom)?
336+
.query_balance(Addr::unchecked(owner), &self.denom)?
337337
.amount;
338338
Ok(amount.into())
339339
}

‎contracts/tg4-group/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tg4-group"
3-
version = "0.16.0"
3+
version = "0.17.0"
44
authors = ["Mauro Lacy <[email protected]>"]
55
edition = "2018"
66
description = "Simple tg4 implementation of group membership controlled by admin"
@@ -34,7 +34,7 @@ cw-controllers = "1.0.0"
3434
cw-storage-plus = "1.0.1"
3535
schemars = "0.8.1"
3636
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
37-
tg4 = { version = "0.16.0", path = "../../packages/tg4" }
37+
tg4 = { version = "0.17.0", path = "../../packages/tg4" }
3838
thiserror = { version = "1.0.23" }
3939

4040
[dev-dependencies]

‎contracts/tg4-mixer/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tg4-mixer"
3-
version = "0.16.0"
3+
version = "0.17.0"
44
authors = ["Ethan Frey <[email protected]>"]
55
edition = "2018"
66
description = "TG4 implementation that combines two different groups with a merge function"
@@ -33,17 +33,17 @@ rust_decimal_macros = { version = "1.16", default-features = false }
3333
thiserror = "1.0.21"
3434
schemars = "0.8"
3535
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
36-
tg4 = { path = "../../packages/tg4", version = "0.16.0" }
37-
tg-utils = { path = "../../packages/utils", version = "0.16.0" }
38-
tg-bindings = { path = "../../packages/bindings", version = "0.16.0" }
36+
tg4 = { path = "../../packages/tg4", version = "0.17.0" }
37+
tg-utils = { path = "../../packages/utils", version = "0.17.0" }
38+
tg-bindings = { path = "../../packages/bindings", version = "0.17.0" }
3939

4040
[dev-dependencies]
4141
cosmwasm-schema = "1.1.9"
4242
# bench dependencies
4343
cosmwasm-vm = { version = "1.1.0" }
4444
cw-multi-test = "0.16.2"
45-
tg4-engagement = { path = "../tg4-engagement", version = "0.16.0", features = ["library"] }
46-
tg4-stake = { path = "../tg4-stake", version = "0.16.0", features = ["library"] }
45+
tg4-engagement = { path = "../tg4-engagement", version = "0.17.0", features = ["library"] }
46+
tg4-stake = { path = "../tg4-stake", version = "0.17.0", features = ["library"] }
4747

4848
[[bench]]
4949
name = "main"

‎contracts/tg4-stake/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tg4-stake"
3-
version = "0.16.0"
3+
version = "0.17.0"
44
authors = ["Ethan Frey <[email protected]>"]
55
edition = "2018"
66
description = "TG4 implementation of group based on staked tokens"
@@ -28,11 +28,11 @@ cw-storage-plus = "1.0.1"
2828
itertools = "0.10"
2929
schemars = "0.8.1"
3030
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
31-
tg4 = { path = "../../packages/tg4", version = "0.16.0" }
32-
tg-utils = { path = "../../packages/utils", version = "0.16.0" }
33-
tg-bindings = { path = "../../packages/bindings", version = "0.16.0" }
31+
tg4 = { path = "../../packages/tg4", version = "0.17.0" }
32+
tg-utils = { path = "../../packages/utils", version = "0.17.0" }
33+
tg-bindings = { path = "../../packages/bindings", version = "0.17.0" }
3434
thiserror = "1.0.21"
3535

3636
[dev-dependencies]
3737
cosmwasm-schema = "1.1.9"
38-
tg-bindings-test = { path = "../../packages/bindings-test", version = "0.16.0" }
38+
tg-bindings-test = { path = "../../packages/bindings-test", version = "0.17.0" }

0 commit comments

Comments
 (0)