chore: osmoutils, twap, downtime-detector, ibc-hooks cherry-pick to v14 #3925

czarcas7ic · 2023-01-04T21:04:59Z

Closes: #XXX

What is the purpose of the change

After internal discussions, we decided on launching v14 sooner with less features. This PR cherry picks the following features from main:

Geometric TWAP
Osmoutils refactor
Downtime Detector
IBC Hooks

Then, about four PRs were done manually by myself to fix issues that occurred due to the cherry picks.

* initial changes to migrate to ibc v4 * added checksum to proposal * begin and end block are now being called inside nextBlock * added changelog * linked pr on changelog * remove local replace * using error acks from osmoutils * osmoutils tagged * go sum * added checksum

* feat(x/twap): geometric twap code gen query boilerplate * revert cli change * query gen * wire up API * test * fix * fixes * cli * lint * refactor via flag * refactor * refactor * fixes * lint * add arithmetic twap alias

* moved ibc-hooks to its own go.mod * updated ibc hooks version * go sum * add ics23 patch into x/ibc-hooks * Fix wasm import version conflict * Update x/ibc-hooks to osmoutils v0.0.2 * Update versions Co-authored-by: Dev Ojha <dojha@berkeley.edu>

…etric twap (#3845) * refactor(x/twap): handle spot price error case * supporting test cases * table-driven log tests

…3844) * test(x/twap): add randomized test with a balancer pool * comments * multiplicative tolerance, fewer retries and larger initial supply range

* feat(x/twap): geometric twap code gen query boilerplate * revert cli change * query gen * wire up API * test * fix * fixes * add geometric queries * create pool.json * add test * resolve conflict * fix: swap uosmo in * fix problem with wallet creation * updates * simplify and add comments * Update tests/e2e/e2e_test.go * Update tests/e2e/e2e_test.go * Update tests/e2e/configurer/chain/queries.go Co-authored-by: Adam Tucker <adam@osmosis.team> * Update tests/e2e/configurer/chain/queries.go Co-authored-by: Adam Tucker <adam@osmosis.team> * Update tests/e2e/e2e_test.go Co-authored-by: Adam Tucker <adam@osmosis.team> * Update tests/e2e/e2e_test.go Co-authored-by: Adam Tucker <adam@osmosis.team> * Update tests/e2e/e2e_test.go Co-authored-by: Adam Tucker <adam@osmosis.team> * Update tests/e2e/e2e_test.go Co-authored-by: Adam Tucker <adam@osmosis.team> Co-authored-by: Roman <ackhtariev@gmail.com> Co-authored-by: Roman <roman@osmosis.team> Co-authored-by: Adam Tucker <adam@osmosis.team>

* feat(x/twap): GeometricTwap and GeometricTwapToNow queries added to Stargate whitelist * update docs

* fix(scripts): proto gen for osmoutils * Update scripts/protocgen.sh

* making osmoutils compile on chains that don't use osmosis' fork of the cosmos sdk * updated imports for e2e tests * go fumpt * updated version everywhere * added changelog entry

Sub-component of #3603 Adds types for the thin module intended for downtime detection - Add downtime detection module types No tests added - Does this pull request introduce a new feature or user-facing behavior changes? somewhat - Is a relevant changelog entry added to the `Unreleased` section in `CHANGELOG.md`? yes - How is the feature or change documented? In its spec

* WIP * Switch to enum * Remove params query * Add query * Add wiring, add import/export test * Start begin block test * Finish keeper tests * Add CLI * Wire downtime detector CLI + queries * more module wiring * add types test * Fix state alteration test * Fix superfluid test * Add stargate whitelist support * Apply code comment * Rename folder * Add requested godoc * Update x/downtime-detector/genesis.go Co-authored-by: Adam Tucker <adam@osmosis.team> * Apply adam suggestion for having a `-` * move genesis test to own file Co-authored-by: Adam Tucker <adam@osmosis.team>

* feat(osmomath): exp2 function * export exp2 * changelog * refactor ErrTolerance to use Dec instead of Int for additive tolerance * Update osmomath/exp2.go * Update osmomath/exp2.go * Update osmomath/exp2.go * Update osmomath/exp2_test.go * Update osmomath/exp2_test.go * do bit shift instead of multiplication * godoc about error bounds * comment about bit shift equivalency * merge conflict * improve godoc * typo * remove TODOs - confirmed obsolete * Runge's phenomenon comment

* refactored twap api.go for geometric TWAP * added barebon docs * romans feedback * new * fix * nichola feedback * final roman comments

p0mvn

Confirmed that the following are the same as main:

x/twap
x/downtime-detector
x/ibc-hooks

Saw some diff in:

osmoutils
ibc-rate-limit

Noticed some PRs missing in:

osmomath related to exp2 function: osmomath: AddMut and QuoMut #3779
some binary search helpers (unsure if these are required)

Stargate whitelist LGTM

app/keepers LGTM

p0mvn · 2023-01-04T22:53:28Z

x/superfluid/client/cli/query_test.go

+		// need to adapt s.val.String() to have an intermediate account,
+		// else the response is nil and theres a panic internally.
+		// {
+		// 	"Query estimate sfs delegated amount by validator & denom",
+		// 	"/osmosis.superfluid.Query/EstimateSuperfluidDelegatedAmountByValidatorDenom",
+		// 	&types.EstimateSuperfluidDelegatedAmountByValidatorDenomRequest{ValidatorAddress: s.val.String(), Denom: "gamm/pool/1"},
+		// 	&types.EstimateSuperfluidDelegatedAmountByValidatorDenomResponse{},
+		// },


I don't understand the problem here. Are we okay with commenting this out?

This is commented out on main which is where it is coming from. Dev added this in his "Add downtime detector module" PR #3688

p0mvn · 2023-01-04T22:54:33Z

x/ibc-rate-limit/ibc_middleware_test.go

-	transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
-	clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
-	ibctesting "github.com/cosmos/ibc-go/v3/testing"
+	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"


I diffed x/ibc-rate-limit against main and there are some differences in this directory that I do not understand

The diffs are as follows (writing this for my own notes and for others to track/verify):

ibc_module.go

ibc rate-limit middleware IBC Rate-Limit Middleware #2409

module.go

linter make the linter config attractive #3486

rate_limiter.wasm

Unclear where the diff is from but I will just take it from main

error.rs

Add error test for rate limiter Add error test for rate limiter #3561

integration_tests.rs

Add error test for rate limiter Add error test for rate limiter #3561

The above diffs were remedied with this commit
da63fa8

Confirmed that is the case ^

p0mvn · 2023-01-04T22:58:52Z

osmomath/exp2.go

+	for i := 1; i < len(numeratorCoefficients13Param); i++ {
+		x_exp_i.MulMut(x)
+
+		h_x = h_x.Add(numeratorCoefficients13Param[i].Mul(x_exp_i))


This is missing an additional PR with updates about AddMut and MulMut. Please double-check that all osmomath PRs have been backported as I'm seeing some diff in binary search logic as well

I actually did not think we were backporting all the osmomath PRs and only backported the ones that were needed from the twap logic. If this is a requirement I can go back and cherry pick them and/or just take the whole folder over

If we did want to include everything from main from osmomath, the following is what is missing:

binary_search_test.go

gamm stableswap improvements Gamm stableswap improvements #3839

binary_search.go

gamm stableswap improvements Gamm stableswap improvements #3839

fix stableswap use of osmomath Fix stableswap use of osmomath #3909

decimal_test.go

power with decimal exponent feat(osmomath): Power with decimal exponent #3731

decimal.go

power with decimal exponent feat(osmomath): Power with decimal exponent #3731

exp2.go

osmomath AddMut and QuoMut osmomath: AddMut and QuoMut #3779

sigfig_round_test.go

Just a lint

We should have: #3779

The rest makes sense to not have to me

Done! f864dcf

Going to add #3839 in the Ibc-hooks PR

p0mvn · 2023-01-04T23:01:37Z

osmoutils/ibc.go

@@ -3,11 +3,25 @@ package osmoutils
 import (
 	"encoding/json"



Seeing some diff in osmoutils from main. Some of the are accum package which makes sense but there are also a few other helper changes.

They seem unrelated and acceptable to me but commenting for visibility

The diff is as follows:

The entire accum folder (I dont think we need this, right?)

module_account.go

Just lints make the linter config attractive #3486

slice_helper.go

Adds containsDuplicate func [ValSet-Pref] Module Wired up and created MsgSetValidatorSetPreference #2892 (this is for Valset Pref so we dont need this)

parsers_test.go

Random lints from feat(osmoutils): Accumulator AddToPosition, RemoveFromPosition, and GetPositionSize #3856

query_cmd_wrap.go

Lints from make the linter config attractive #3486

Fairly confident all these are not needed

Makes sense to me to not have all these, thanks for summarizing

* mut add * test add mut * quo mut * test quo mut/ remove want from test struct * refactor exp * change mutatives code * change * not allocaing * exp change to quomut * remove file * refactor quo * refactor ad * refactor tests

p0mvn

LGTM. Thank you @czarcas7ic

My review is based on diffing the relevant modules, osmomath, osmotutils, and app folders against main.

Only skimmed other changes.

mattverse

Reviewed by comparing individual commits from main LGTM

Wondering if we can get

Fix: Support HTTP requests for FilteredPools #3737 included.

Also wondering if it is possible to update CHANGELOG to latest changes (v14 section & unreleased section) I'm concerned about the case that we might lose track of commits that
we've made to main and then they would be forgotten at some point(If you agree, I could also help with organizing changelog)

* whitelist EstimateSwapExactAmountOut * doc: changelog

* added cargo.lock * added Cargo.lock as an artifact * added new bytecode with lock file

nicolaslara · 2023-01-05T13:24:49Z

It makes sense that the contract tests would fail if the bytecode was fetched from main. The Cargo.lock file didn't exist in this branch since #3576 was not inclided. I've cherry picked it.

nicolaslara · 2023-01-05T16:42:56Z

app/keepers/keepers.go

+	)
+	appKeepers.IBCHooksKeeper = &hooksKeeper
+
+	appKeepers.WireICS20PreWasmKeeper(appCodec, bApp, appKeepers.IBCHooksKeeper)


What's the reason for adding these manually instead of cherry picking #3589 ?

It might have just been my confusion dealing with multiple cherry picks

nicolaslara · 2023-01-05T16:46:28Z

tests/e2e/e2e_test.go

 	node.StoreWasmCode("rate_limiter.wasm", initialization.ValidatorWalletName)
-	chainA.LatestCodeId += 1
+	chainA.LatestCodeId = 1


@czarcas7ic This looks good, but similar question. Why not cherry pick #3635?

I think my main concern was I didn't want to cherry-pick a PR and not realize it had some drive by that it shouldn't have

ValarDragon · 2023-01-06T06:23:49Z

PR LGTM, great job on this!

nicolaslara and others added 20 commits January 4, 2023 13:59

feat(x/twap): modify cli to add geometric option (#3812)

e8c3c6c

* feat(x/twap): geometric twap code gen query boilerplate * revert cli change * query gen * wire up API * test * fix * fixes * cli * lint * refactor via flag * refactor * refactor * fixes * lint * add arithmetic twap alias

Make wasm hooks importable (#3850)

a2fc2c8

* moved ibc-hooks to its own go.mod * updated ibc hooks version * go sum * add ics23 patch into x/ibc-hooks * Fix wasm import version conflict * Update x/ibc-hooks to osmoutils v0.0.2 * Update versions Co-authored-by: Dev Ojha <dojha@berkeley.edu>

refactor(x/twap): handle spot price error case in the context of geom…

129cbcb

…etric twap (#3845) * refactor(x/twap): handle spot price error case * supporting test cases * table-driven log tests

test(x/twap): add randomized geometric twap test on a balancer pool (#…

8196036

…3844) * test(x/twap): add randomized test with a balancer pool * comments * multiplicative tolerance, fewer retries and larger initial supply range

feat(x/twap): whitelist GeometricTwap and GeometricTwapToNow (#3852)

1afb23e

* feat(x/twap): GeometricTwap and GeometricTwapToNow queries added to Stargate whitelist * update docs

fix(scripts): proto gen for osmoutils (#3854)

c12bfa3

* fix(scripts): proto gen for osmoutils * Update scripts/protocgen.sh

fix(scripts): proto gen osmoutils path (#3859)

168ccda

added packet timeouts to wasm hooks (#3862)

de76db0

add negative to cli (#3888)

8f88f7d

Making osmoutils compile on chains that don't use our SDK fork (#3899)

f4c7d47

* making osmoutils compile on chains that don't use osmosis' fork of the cosmos sdk * updated imports for e2e tests * go fumpt * updated version everywhere * added changelog entry

remove deprecation from arithmetic & geometric twap to now query (#3917)

19e4a9d

Initial by hand fixes

ecde767

[x/TWAP] Expose a geometric TWAP API (#3529)

048a2a5

* refactored twap api.go for geometric TWAP * added barebon docs * romans feedback * new * fix * nichola feedback * final roman comments

fix twap by hand

7ade440

change to gamm

ea3af42

github-actions bot added C:app-wiring Changes to the app folder C:CLI C:docs Improvements or additions to documentation C:x/gamm Changes, features and bugs related to the gamm module. C:x/superfluid C:x/twap Changes to the twap module T:build labels Jan 4, 2023

fix balancer test

813a6e8

czarcas7ic changed the title ~~chore: osmoutils, twap, downtime-detector, ibc-hooks cherry-pick~~ chore: osmoutils, twap, downtime-detector, ibc-hooks cherry-pick to v14 Jan 4, 2023

bump to v14 upgrade

640dfb9

e2e fix

f7ded6c

czarcas7ic marked this pull request as ready for review January 4, 2023 21:59

czarcas7ic requested review from ValarDragon and p0mvn January 4, 2023 21:59

p0mvn reviewed Jan 4, 2023

View reviewed changes

czarcas7ic added 2 commits January 4, 2023 20:56

add remaining diff from main to ibc-rate-limit

da63fa8

update contracts test

7d25928

github-actions bot added the T:CI label Jan 5, 2023

osmomath: AddMut and QuoMut (#3779)

f864dcf

* mut add * test add mut * quo mut * test quo mut/ remove want from test struct * refactor exp * change mutatives code * change * not allocaing * exp change to quomut * remove file * refactor quo * refactor ad * refactor tests

p0mvn approved these changes Jan 5, 2023

View reviewed changes

mattverse approved these changes Jan 5, 2023

View reviewed changes

mattverse and others added 4 commits January 5, 2023 15:20

Modify CHANGELOG

35ab94e

Whitelist EstimateSwapExactAmountOut (#3693)

09ccc37

* whitelist EstimateSwapExactAmountOut * doc: changelog

updated rate limit contract

3a4aac2

Fix rust checks (#3576)

d5dda29

* added cargo.lock * added Cargo.lock as an artifact * added new bytecode with lock file

czarcas7ic merged commit 961738a into v14.x Jan 5, 2023

czarcas7ic deleted the adam/cherry-pick-from-main branch January 5, 2023 16:40

nicolaslara reviewed Jan 5, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: osmoutils, twap, downtime-detector, ibc-hooks cherry-pick to v14 #3925

chore: osmoutils, twap, downtime-detector, ibc-hooks cherry-pick to v14 #3925

czarcas7ic commented Jan 4, 2023 •

edited

Loading

p0mvn left a comment •

edited

Loading

p0mvn Jan 4, 2023

czarcas7ic Jan 5, 2023

p0mvn Jan 4, 2023

czarcas7ic Jan 5, 2023

czarcas7ic Jan 5, 2023

p0mvn Jan 5, 2023

p0mvn Jan 4, 2023 •

edited

Loading

czarcas7ic Jan 5, 2023

czarcas7ic Jan 5, 2023 •

edited

Loading

p0mvn Jan 5, 2023

czarcas7ic Jan 5, 2023

ValarDragon Jan 6, 2023

p0mvn Jan 4, 2023

czarcas7ic Jan 5, 2023

p0mvn Jan 5, 2023

p0mvn left a comment

mattverse left a comment

nicolaslara commented Jan 5, 2023

nicolaslara Jan 5, 2023

czarcas7ic Jan 5, 2023

nicolaslara Jan 5, 2023

czarcas7ic Jan 5, 2023

ValarDragon commented Jan 6, 2023

chore: osmoutils, twap, downtime-detector, ibc-hooks cherry-pick to v14 #3925

chore: osmoutils, twap, downtime-detector, ibc-hooks cherry-pick to v14 #3925

Conversation

czarcas7ic commented Jan 4, 2023 • edited Loading

What is the purpose of the change

p0mvn left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

p0mvn Jan 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

czarcas7ic Jan 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

p0mvn left a comment

Choose a reason for hiding this comment

mattverse left a comment

Choose a reason for hiding this comment

nicolaslara commented Jan 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ValarDragon commented Jan 6, 2023

czarcas7ic commented Jan 4, 2023 •

edited

Loading

p0mvn left a comment •

edited

Loading

p0mvn Jan 4, 2023 •

edited

Loading

czarcas7ic Jan 5, 2023 •

edited

Loading