Pr tvl updates #445

joe-bowman · 2023-06-02T16:15:30Z

stacked on #444 - merge that first!

adds basic validation to protocoldatas
adds automatic key generation for protocoldatas
adds IsIncentivized field to OsmosisPoolProtocolData
add BaseDenom and BaseChain fields to OsmosisParams protocol data to aid TVL calculations
add upgrade handler for applying to rhye-1 (where there is existing protocoldatas)
replace zones with denoms in OsmosisPoolProtocolData in order to support multiple denoms for the same zone (e.g. asset/qAsset pairs)

codecov-commenter · 2023-06-02T16:32:05Z

Codecov Report

Merging #445 (729e5bf) into develop (200abd5) will increase coverage by 0.64%.
The diff coverage is 50.41%.

❗ Current head 729e5bf differs from pull request most recent head f69e7b9. Consider uploading reports for the commit f69e7b9 to get more accurate results

@@             Coverage Diff             @@
##           develop     #445      +/-   ##
===========================================
+ Coverage    54.38%   55.02%   +0.64%     
===========================================
  Files          164      164              
  Lines        12255    12334      +79     
===========================================
+ Hits          6665     6787     +122     
+ Misses        5087     5029      -58     
- Partials       503      518      +15

Flag	Coverage Δ
unittests	`55.02% <50.41%> (+0.64%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
x/claimsmanager/types/codec.go	`35.29% <0.00%> (-2.21%)`	⬇️
x/interchainstaking/keeper/hooks.go	`69.04% <ø> (-1.90%)`	⬇️
x/interchainstaking/keeper/redemptions.go	`74.28% <ø> (-0.25%)`	⬇️
x/interchainstaking/types/keys.go	`40.74% <0.00%> (ø)`
x/interchainstaking/types/redemptions.go	`93.40% <ø> (-0.15%)`	⬇️
x/participationrewards/types/keys.go	`0.00% <0.00%> (ø)`
x/participationrewards/types/params.go	`60.00% <ø> (+11.02%)`	⬆️
x/participationrewards/types/protocol_data.go	`72.05% <0.00%> (-2.19%)`	⬇️
x/participationrewards/types/submodule_liquid.go	`91.66% <0.00%> (-8.34%)`	⬇️
x/interchainstaking/keeper/callbacks.go	`25.00% <4.46%> (-6.48%)`	⬇️
... and 24 more

ajansari95

some comments - critical one is map iteration over the denoms field in osmosis Pd
otherwise looks good

osmosis-types/gamm/pool-models/balancer/marshal.go

osmosis-types/gamm/pool-models/balancer/pool.go

osmosis-types/gamm/pool-models/stableswap/pool.go

osmosis-types/validation.go

proto/quicksilver/interchainquery/v1/query.proto

…tomatic key generation, basechain/basedenom in osmosisparams and updated tvl calculation

… KV store objects; switch to native bech32 decode/encode as we dont expect prefix of pools to match sdk.GetConfig().Bech32Prefix

…mosis-types

joe-bowman · 2023-06-08T14:51:20Z

@ajansari95 @aljo242 @muku314115 - have updated w.r.t the nits above. Please review.

x/interchainstaking/keeper/receipt.go

x/participationrewards/keeper/submodule_liquid.go

ajansari95

Looks good just few more nits

ajansari95

LGTM

ajansari95

LGTM

x/interchainstaking/keeper/receipt.go

x/interchainstaking/keeper/delegation.go

ajansari95

lgtm

* front-port v1.2.13 * fix delegation flush test * add tests for HandleDepositTransaction * update tests for new error handling * remove superflous field in proto * final v1.2.13 front-port and test fixes * s/s/suite/ * remove fmt.Printlns used for debugging * update participation rewards and protocoldatas, to add validation, automatic key generation, basechain/basedenom in osmosisparams and updated tvl calculation * front-port v1.2.13 * remove balancerPoolPretty json marshal/unmarshal, as we deal with raw KV store objects; switch to native bech32 decode/encode as we dont expect prefix of pools to match sdk.GetConfig().Bech32Prefix * fix: allow support for multiple denoms from same zone in tvl calc * lint * fix: refactor utils/address.go to avoid import cycle when using in osmosis-types * add test for randomutils * fix: remove potential non-det by iterating over maps using sorted keys * resolve outstanding nits * lint * fix nits * bump go to 1.20.5 * Update x/interchainstaking/keeper/receipt.go * Apply suggestions from code review * lint * bump hermes to v1.5.0 * update icq and relayer in test scripts

* sdk 47 * cleanup * use wasmd 47 * cosmossdk.io/simapp * use lsm sdk 47 * update pruning & distclient paths * intergrate with sdk47 => using ibc v7.0.0 * tendermint/spm/ibckeeper -> ibc-go/v7/ibckeeper * update packet forward moiddleware to v7 * tendermint -> comebft * fix keepers: ConsensusParamsKeeper, add logger to InitKeepers, NewCommunityPoolSpendProposalHandler no longer available * fix app.go * upgrade handler from v46 => v47 * fix cometbft path * fix app folder * fix cmd & wasm * need to cast type * fix x/ modules * fix iavl conflict version: use 0.20.0 * gogoproto => cosmos proto * add consensusparams & crisiskeeper keys * add tendermint appmodulebasic and set baseapp chain id in test setup * move set baseapp chainID in if nest * add govrouter to gov module legacy router and add checksum in test submit wasm prop * add checksum * change testchainID * using icaControllerKeeper msg_server for registerInterchainAccount and SendTx * clean up * fix zone test * restore app_test.go * fix testcase * move get context * Update app/config.go Co-authored-by: Alex Johnson <[email protected]> * minor clean up * revert * resolve some reviews * fix install err * lint * fix lint * add port to unstable rule (#450) (#454) (cherry picked from commit 200abd5) Co-authored-by: Alex Johnson <[email protected]> * fix last test * fix port owner * lint * Pr tvl updates (#445) * front-port v1.2.13 * fix delegation flush test * add tests for HandleDepositTransaction * update tests for new error handling * remove superflous field in proto * final v1.2.13 front-port and test fixes * s/s/suite/ * remove fmt.Printlns used for debugging * update participation rewards and protocoldatas, to add validation, automatic key generation, basechain/basedenom in osmosisparams and updated tvl calculation * front-port v1.2.13 * remove balancerPoolPretty json marshal/unmarshal, as we deal with raw KV store objects; switch to native bech32 decode/encode as we dont expect prefix of pools to match sdk.GetConfig().Bech32Prefix * fix: allow support for multiple denoms from same zone in tvl calc * lint * fix: refactor utils/address.go to avoid import cycle when using in osmosis-types * add test for randomutils * fix: remove potential non-det by iterating over maps using sorted keys * resolve outstanding nits * lint * fix nits * bump go to 1.20.5 * Update x/interchainstaking/keeper/receipt.go * Apply suggestions from code review * lint * bump hermes to v1.5.0 * update icq and relayer in test scripts * format and update * fix makefile * remove legacy * remove legacy param sim * fix hard code * remove gogo * update ibc-go * remove * format * remove deprecated * remove * fix * zones helpers * zones helpers * remove hard code for owner field * use proper replaces * make note for nolint * make note for nolint * use proper broadcast mode in test * make note for nolint * make note for nolint * add error check * clean * fix proto-gen * update protobuf make file * proto-gen-swagger * fix make build-docker * fix warning proto * fix gen * fix set chainID * lint * ensure grpc port is opened for connections from other docker containers * add register node grpc * banktypes * correct goleveldb ver * add SetOrderExportGenesis * proposal need title and summary * update registerzone bash test * update govkeeper * Bump Interchain-test v7 for sdk47 * del duplicate sethook gov * add a check for claimed capability in SubmitTX * add register-zone ictest * fix interchaintest * use submit-proposal * update amount deposit * quicksilverEncoding * setup params * rm go.work.sum * add claim chancap in createChannelICA test setup * add err check * proposal struct * lint * fix lint * add register_zone_test * go mod tidy * set ICS module * remove scope * chore: clean duplicate and unused * add consensus module * fix can not register ICA * seperate interchaintest to pr #521 * clean code commented * revert SendTokenIBC func * fix error when run make test-docker-regen * fix check lint error --------- Co-authored-by: Hieu Vu <[email protected]> Co-authored-by: sontrinh16 <[email protected]> Co-authored-by: Alex Johnson <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: ThanhNhann <[email protected]> Co-authored-by: Joe Bowman <[email protected]> Co-authored-by: ducnt131 <[email protected]> Co-authored-by: catShaark <[email protected]>

joe-bowman requested review from ajansari95 and aljo242 as code owners June 2, 2023 16:15

joe-bowman mentioned this pull request Jun 6, 2023

feat: ics rewards #446

Merged

2 tasks

ajansari95 requested changes Jun 7, 2023

View reviewed changes

joe-bowman requested a review from muku314115 as a code owner June 8, 2023 00:48

Joe Bowman added 16 commits June 8, 2023 01:49

front-port v1.2.13

3f9412a

fix delegation flush test

c1056cd

add tests for HandleDepositTransaction

f59917a

update tests for new error handling

2637729

remove superflous field in proto

cd44c38

final v1.2.13 front-port and test fixes

f9a1f71

s/s/suite/

c8f0205

remove fmt.Printlns used for debugging

be20f50

update participation rewards and protocoldatas, to add validation, au…

b18cd9f

…tomatic key generation, basechain/basedenom in osmosisparams and updated tvl calculation

front-port v1.2.13

6a77679

remove balancerPoolPretty json marshal/unmarshal, as we deal with raw…

058bd08

… KV store objects; switch to native bech32 decode/encode as we dont expect prefix of pools to match sdk.GetConfig().Bech32Prefix

fix: allow support for multiple denoms from same zone in tvl calc

5502cb3

lint

43f0dcf

fix: refactor utils/address.go to avoid import cycle when using in os…

48ef8cc

…mosis-types

add test for randomutils

a8333ed

fix: remove potential non-det by iterating over maps using sorted keys

08c6382

joe-bowman force-pushed the pr-tvl-updates branch from 7a30364 to 8225911 Compare June 8, 2023 12:15

resolve outstanding nits

a8bc5eb

joe-bowman force-pushed the pr-tvl-updates branch from 8225911 to a8bc5eb Compare June 8, 2023 14:41

lint

8f9c1a5

ajansari95 reviewed Jun 8, 2023

View reviewed changes

x/interchainstaking/keeper/receipt.go Outdated Show resolved Hide resolved

ajansari95 reviewed Jun 8, 2023

View reviewed changes

x/participationrewards/keeper/submodule_liquid.go Show resolved Hide resolved

ajansari95 reviewed Jun 8, 2023

View reviewed changes

Joe Bowman added 2 commits June 9, 2023 11:54

fix nits

27174c0

bump go to 1.20.5

87ed29e

ajansari95 previously approved these changes Jun 9, 2023

View reviewed changes

Merge branch 'develop' into pr-tvl-updates

2a7d2c4

joe-bowman dismissed ajansari95’s stale review via 2a7d2c4 June 9, 2023 11:45

ajansari95 previously approved these changes Jun 9, 2023

View reviewed changes

joe-bowman mentioned this pull request Jun 12, 2023

front-port v1.2.13 to develop #444

Closed

joe-bowman commented Jun 12, 2023

View reviewed changes

x/interchainstaking/keeper/receipt.go Outdated Show resolved Hide resolved

Update x/interchainstaking/keeper/receipt.go

729e5bf

joe-bowman dismissed ajansari95’s stale review via 729e5bf June 12, 2023 10:12

joe-bowman commented Jun 12, 2023

View reviewed changes

x/interchainstaking/keeper/delegation.go Outdated Show resolved Hide resolved

joe-bowman commented Jun 12, 2023

View reviewed changes

x/interchainstaking/keeper/delegation.go Outdated Show resolved Hide resolved

joe-bowman commented Jun 12, 2023

View reviewed changes

x/interchainstaking/keeper/delegation.go Outdated Show resolved Hide resolved

Joe Bowman added 4 commits June 12, 2023 11:22

Apply suggestions from code review

f69e7b9

lint

dcbb1fb

bump hermes to v1.5.0

ccf97e2

update icq and relayer in test scripts

974ea7f

ajansari95 approved these changes Jun 12, 2023

View reviewed changes

muku314115 approved these changes Jun 12, 2023

View reviewed changes

joe-bowman merged commit c5fbdb3 into develop Jun 12, 2023

joe-bowman deleted the pr-tvl-updates branch June 12, 2023 11:49

ajansari95 mentioned this pull request Jul 13, 2023

upgrade: 1.4.4-rc0 #500

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pr tvl updates #445

Pr tvl updates #445

joe-bowman commented Jun 2, 2023 •

edited

Loading

codecov-commenter commented Jun 2, 2023 •

edited

Loading

ajansari95 left a comment

joe-bowman commented Jun 8, 2023

ajansari95 left a comment

ajansari95 left a comment

ajansari95 left a comment

ajansari95 left a comment

Pr tvl updates #445

Pr tvl updates #445

Conversation

joe-bowman commented Jun 2, 2023 • edited Loading

codecov-commenter commented Jun 2, 2023 • edited Loading

Codecov Report

ajansari95 left a comment

Choose a reason for hiding this comment

joe-bowman commented Jun 8, 2023

ajansari95 left a comment

Choose a reason for hiding this comment

ajansari95 left a comment

Choose a reason for hiding this comment

ajansari95 left a comment

Choose a reason for hiding this comment

ajansari95 left a comment

Choose a reason for hiding this comment

joe-bowman commented Jun 2, 2023 •

edited

Loading

codecov-commenter commented Jun 2, 2023 •

edited

Loading