feat: x/metoken end block functions #2167

kosegor · 2023-07-26T00:24:44Z

This PR contains:

Interest claiming during the end_block
Reserves rebalancing during the end_block
Integ tests for both

x/metoken/module/abci.go

-	// todo: add interest claiming
+func EndBlocker(k keeper.Keeper) []abci.ValidatorUpdate {
+	util.Panic(k.ClaimInterest())
+	util.Panic(k.RebalanceReserves())


x/metoken/module/abci.go

-	// todo: add interest claiming
+func EndBlocker(k keeper.Keeper) []abci.ValidatorUpdate {
+	util.Panic(k.ClaimInterest())
+	util.Panic(k.RebalanceReserves())


x/metoken/keeper/redeem.go

Co-authored-by: Adam Moser <63419657+toteki@users.noreply.github.com>

codecov · 2023-07-26T15:29:57Z

Codecov Report

Merging #2167 (57d7f1c) into main (7f05ad4) will decrease coverage by 5.95%.
Report is 155 commits behind head on main.
The diff coverage is 81.17%.

@@            Coverage Diff             @@
##             main    #2167      +/-   ##
==========================================
- Coverage   75.38%   69.44%   -5.95%     
==========================================
  Files         100      150      +50     
  Lines        8025    11470    +3445     
==========================================
+ Hits         6050     7965    +1915     
- Misses       1589     2966    +1377     
- Partials      386      539     +153

Files Changed	Coverage Δ
ante/spam_prevention.go	`75.92% <ø> (ø)`
x/incentive/codec.go	`47.82% <ø> (+9.89%)`	⬆️
x/incentive/keeper/invariants.go	`0.00% <0.00%> (ø)`
x/incentive/keeper/unbonding.go	`80.45% <ø> (ø)`
x/incentive/keeper/update.go	`52.11% <ø> (ø)`
x/incentive/keys.go	`100.00% <ø> (ø)`
x/incentive/msgs.go	`77.41% <ø> (-0.81%)`	⬇️
x/incentive/params.go	`89.28% <ø> (-10.72%)`	⬇️
x/leverage/client/tests/suite.go	`100.00% <ø> (ø)`
x/leverage/client/tests/tests.go	`100.00% <ø> (ø)`
... and 54 more

... and 56 files with indirect coverage changes

robert-zaremba

Please double check all errors which are going to EndBlocker. We should avoid possible panics

x/metoken/index.go

x/metoken/keeper/balance.go

x/metoken/keeper/interest.go

x/metoken/keeper/intest/interest_test.go

x/metoken/module/abci.go

-	// todo: add reserves re-balancing
-	// todo: add interest claiming
+func EndBlocker(k keeper.Keeper) []abci.ValidatorUpdate {
+	util.Panic(k.ClaimLeverageInterest())


x/metoken/module/abci.go

-	// todo: add reserves re-balancing
-	// todo: add interest claiming
+func EndBlocker(k keeper.Keeper) []abci.ValidatorUpdate {
+	util.Panic(k.ClaimLeverageInterest())


* add module-based supply and withdraw to leverage module * cl++ * change return order * godoc++ and function order * mocks * mocks --------- Co-authored-by: Egor Kostetskiy <kosegor@gmail.com>

x/metoken/keeper/interest.go

x/metoken/keeper/intest/interest_test.go

robert-zaremba

lgtm, few small things to resolve only

kosegor added 3 commits July 24, 2023 23:28

reserves and interest refeactored

14579fd

tests adapted (not working yet)

9317b16

endblock funcs

fca60b7

kosegor requested a review from a team as a code owner July 26, 2023 00:24

Merge branch 'main' into egor/metoken-end-block

2d988a1

github-advanced-security bot found potential problems Jul 26, 2023

View reviewed changes

toteki reviewed Jul 26, 2023

View reviewed changes

x/metoken/keeper/redeem.go Outdated Show resolved Hide resolved

toteki reviewed Jul 26, 2023

View reviewed changes

x/metoken/keeper/redeem.go Outdated Show resolved Hide resolved

kosegor and others added 3 commits July 26, 2023 11:55

Update x/metoken/keeper/redeem.go

5177377

Co-authored-by: Adam Moser <63419657+toteki@users.noreply.github.com>

adam comments

6b03f82

fix mocks

6841b6e

safeguard for transferring dust

b57a6ae

robert-zaremba requested changes Jul 26, 2023

View reviewed changes

kosegor added 3 commits July 26, 2023 17:24

robert comments

f1dc0d8

fix

fc039a1

Merge branch 'main' into egor/metoken-end-block

380f05d

github-advanced-security bot found potential problems Jul 26, 2023

View reviewed changes

kosegor and others added 3 commits July 26, 2023 17:48

safer exit when asset not found

a922fe8

imports

1825b00

feat: add SupplyFromModule and WithdrawFromModule to leverage (#2170)

db96bfb

* add module-based supply and withdraw to leverage module * cl++ * change return order * godoc++ and function order * mocks * mocks --------- Co-authored-by: Egor Kostetskiy <kosegor@gmail.com>

kosegor requested a review from a team as a code owner July 27, 2023 13:44

kosegor added 6 commits July 27, 2023 11:00

new integration with x/leverage

8d317fa

Merge branch 'main' into egor/metoken-end-block

f617e3b

fix after merge from main

9807958

unit mocks

464209b

fix

ae3ef5b

better logs

a497342

robert-zaremba reviewed Jul 27, 2023

View reviewed changes

x/metoken/keeper/interest.go Outdated Show resolved Hide resolved

x/metoken/keeper/intest/interest_test.go Show resolved Hide resolved

robert-zaremba approved these changes Jul 27, 2023

View reviewed changes

couple more comments

57d7f1c

kosegor added this pull request to the merge queue Jul 27, 2023

Merged via the queue into main with commit 70e8310 Jul 27, 2023

kosegor deleted the egor/metoken-end-block branch July 27, 2023 16:18

robert-zaremba mentioned this pull request Aug 2, 2023

refactore(leverage): rename ExchangeToken #2180

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: x/metoken end block functions #2167

feat: x/metoken end block functions #2167

kosegor commented Jul 26, 2023

codecov bot commented Jul 26, 2023 •

edited

Loading

robert-zaremba left a comment

robert-zaremba left a comment

feat: x/metoken end block functions #2167

feat: x/metoken end block functions #2167

Conversation

kosegor commented Jul 26, 2023

codecov bot commented Jul 26, 2023 • edited Loading

Codecov Report

robert-zaremba left a comment

Choose a reason for hiding this comment

robert-zaremba left a comment

Choose a reason for hiding this comment

codecov bot commented Jul 26, 2023 •

edited

Loading