Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added RL sliding windows and osmo RLs #4461

Merged
merged 7 commits into from
Mar 1, 2023
Merged

added RL sliding windows and osmo RLs #4461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
234ef18
added RL sliding windows and osmo RLs
nicolaslara Feb 28, 2023
ceab372
added missing comma
nicolaslara Feb 28, 2023
76a6eb8
osmo name
nicolaslara Mar 1, 2023
88d204e
changelog
nicolaslara Mar 1, 2023
1c3c397
updated test
nicolaslara Mar 1, 2023
b709e93
Merge branch 'main' into nicolas/RL-windows-and-osmo
nicolaslara Mar 1, 2023
e094ac0
removed uosmo until we can get the proper channel value from ibc
nicolaslara Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* [#4131](https://github.com/osmosis-labs/osmosis/pull/4141) Add GatherValuesFromStorePrefixWithKeyParser function to osmoutils.
* [#4388](https://github.com/osmosis-labs/osmosis/pull/4388) Increase the max allowed contract size for non-proposal contracts to 3MB
* [#4384](https://github.com/osmosis-labs/osmosis/pull/4384) migrate stXXX/XXX constant product pools 833, 817, 810 to stable swap
* [#4461](https://github.com/osmosis-labs/osmosis/pull/4461) added rate limit quotas for a set of high value tokens

### API breaks

Expand Down
54 changes: 36 additions & 18 deletions app/upgrades/v15/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,64 +134,82 @@ func setRateLimits(ctx sdk.Context, accountKeeper *authkeeper.AccountKeeper, rat
`{"add_path": {"channel_id": "any", "denom": "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
"quotas":
[
{"name":"ATOM-DAY","duration":86400,"send_recv":[30,30]},
{"name":"ATOM-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"ATOM-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"ATOM-DAY-2","duration":129600,"send_recv":[30,30]},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Asking to learn: can you please elaborate on the sliding window method and how this change enabled it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. If we have a limit of 30% every 24h, for example, that means that at the seams (when one period ends and the other begins) you could actually transfer 60%, 30% in the block before, and then 30% in the block after.

To avoid this, we stagger the windows by half the time, so if you tried to do the above, the second quota would prevent it.

{"name":"ATOM-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"ATOM-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
`{"add_path": {"channel_id": "any", "denom": "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858",
"quotas":
[
{"name":"USDC-DAY","duration":86400,"send_recv":[30,30]},
{"name":"USDC-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"USDC-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"USDC-DAY-2","duration":129600,"send_recv":[30,30]},
{"name":"USDC-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"USDC-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
`{"add_path": {"channel_id": "any", "denom": "ibc/D1542AA8762DB13087D8364F3EA6509FD6F009A34F00426AF9E4F9FA85CBBF1F",
"quotas":
[
{"name":"WBTC-DAY","duration":86400,"send_recv":[30,30]},
{"name":"WBTC-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"WBTC-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"WBTC-DAY-2","duration":129600,"send_recv":[30,30]},
{"name":"WBTC-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"WBTC-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
`{"add_path": {"channel_id": "any", "denom": "ibc/EA1D43981D5C9A1C4AAEA9C23BB1D4FA126BA9BC7020A25E0AE4AA841EA25DC5",
"quotas":
[
{"name":"WETH-DAY","duration":86400,"send_recv":[30,30]},
{"name":"WETH-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"WETH-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"WETH-DAY-2","duration":129600,"send_recv":[30,30]},
{"name":"WETH-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"WETH-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
`{"add_path": {"channel_id": "any", "denom": "ibc/6AE98883D4D5D5FF9E50D7130F1305DA2FFA0C652D1DD9C123657C6B4EB2DF8A",
"quotas":
[
{"name":"EVMOS-DAY","duration":86400,"send_recv":[30,30]},
{"name":"EVMOS-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"EVMOS-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"EVMOS-DAY-2","duration":129600,"send_recv":[30,30]},
{"name":"EVMOS-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"EVMOS-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
`{"add_path": {"channel_id": "any", "denom": "ibc/987C17B11ABC2B20019178ACE62929FE9840202CE79498E29FE8E5CB02B7C0A4",
"quotas":
[
{"name":"STARS-DAY","duration":86400,"send_recv":[30,30]},
{"name":"STARS-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"STARS-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"STARS-DAY-2","duration":129600,"send_recv":[30,30]},
{"name":"STARS-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"STARS-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
`{"add_path": {"channel_id": "any", "denom": "ibc/0CD3A0285E1341859B5E86B6AB7682F023D03E97607CCC1DC95706411D866DF7",
"quotas":
[
{"name":"DAI-DAY","duration":86400,"send_recv":[30,30]},
{"name":"DAI-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"DAI-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"DAI-DAY-2","duration":129600,"send_recv":[30,30]},
{"name":"DAI-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"DAI-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
`{"add_path": {"channel_id": "any", "denom": "ibc/46B44899322F3CD854D2D46DEEF881958467CDD4B3B10086DA49296BBED94BED",
"quotas":
[
{"name":"JUNO-DAY","duration":86400,"send_recv":[30,30]},
{"name":"JUNO-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"JUNO-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"JUNO-DAY-2","duration":129600,"send_recv":[30,30]},
{"name":"JUNO-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"JUNO-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
`{"add_path": {"channel_id": "any", "denom": "ibc/E6931F78057F7CC5DA0FD6CEF82FF39373A6E0452BF1FD76910B93292CF356C1",
"quotas":
[
{"name":"CRO-DAY","duration":86400,"send_recv":[30,30]},
{"name":"CRO-WEEK","duration":604800,"send_recv":[60,60]}
{"name":"CRO-DAY-1","duration":86400,"send_recv":[30,30]},
{"name":"CRO-DAY-2","duration":129600,"send_recv":[30,30]},
{"name":"CRO-WEEK-1","duration":604800,"send_recv":[60,60]},
{"name":"CRO-WEEK-2","duration":907200,"send_recv":[60,60]}
]
}}`,
}
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ func (s *IntegrationTestSuite) TestRateLimitingParam() {

// When upgrading to v15, we want to make sure that the rate limits have been set.
quotas, err := nodeA.QueryWasmSmartArray(paramA, `{"get_quotas": {"channel_id": "any", "denom": "ibc/E6931F78057F7CC5DA0FD6CEF82FF39373A6E0452BF1FD76910B93292CF356C1"}}`)
s.Require().Len(quotas, 2)
s.Require().Len(quotas, 4)
s.Require().NoError(err)
}

Expand Down