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.

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

chore: merge release/v16 features into develop #2112

Merged
merged 6 commits into from
May 2, 2024

Conversation

ws4charlie
Copy link
Contributor

@ws4charlie ws4charlie commented May 2, 2024

Description

Merge release/v16 changes (the rate limiter, etc.) into develop.

Closes:

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Include instructions and any relevant details so others can reproduce.

  • Tested CCTX in localnet
  • Tested in development environment
  • Go unit tests
  • Go integration tests
  • Tested via GitHub Actions

Checklist:

  • I have added unit tests that prove my fix feature works

kingpinXD and others added 3 commits April 25, 2024 17:17
* allow zevm coin deposit to unknow addresses

* add e2e tests

* add changelog

* add comments
* add skip header option

* use option for migration test

* move bitcoin addresses tests to advanced

* show cctx in logs

* update version

* fix verification flags error

* update version in changelog
)

* initial commit of grpc pending cctx query with rate limiter

* replace big.Float with sdk.Dec and update mock rate limiter flags

* split big loop into backwards loop and forwards loop to be more accurate

* adjust zetaclient code to query pending cctx with rate limit

* update change log and add one more rate limiter flag test

* use outboun amount for calculation

* some minimum code refactor

* created separate file for cctx query with rate limit

* improved a few error handlling

* use old cctx query as fallback when rate limiter is disabled; some renaming

* fixed unit test compile

* added unit test for fallback query

* added unit tests for cctx value conversion

* add changelog entry

* added unit tests for query pending cctxs within rate limit

* added total value in rate limiter window for monitoring purpose

* Update x/crosschain/keeper/grpc_query_cctx_rate_limit.go

Co-authored-by: Lucas Bertrand <[email protected]>

* change variable name fCoin to foreignCoin

* Update x/fungible/keeper/foreign_coins.go

Co-authored-by: Lucas Bertrand <[email protected]>

* Update x/crosschain/keeper/grpc_query_cctx_rate_limit_test.go

Co-authored-by: Lucas Bertrand <[email protected]>

* converted rate limiter query unit tests to table test

* handle edge case when pending cctxs span wider block range than sliding window

* added zero rate check; added comment to make unit test clearer

* added unit test and note for method GetAllForeignCoinMap

* treat Rate as average block rate; stop outbound when current rate limit exceeds Rate; updated metrics

* add commented unit tests back

* replace sdk.Dec with sdkmath.Int to represent cctx value in azeta

* test: disable header proof test in local upgrade test E2E test (#2051)

* add skip header option

* use option for migration test

* move bitcoin addresses tests to advanced

* show cctx in logs

* update version

* fix verification flags error

* test(e2e): add rate limiter admin E2E test (#2063)

* refactor and create Withdraw ZETA general function

* new rate limiter test

* use rate limiter for admin test

* fix the test: single approval and add liquidity

* make generate

* fix liquidity

* fix uniswap pool

* change localnet chain params

* fix lint

* add cli query

* add nil check

* fix nil point

* modify tests

* eliminate nil pending nonce issue

* fix query

* set flags

* Update e2e/runner/evm.go

Co-authored-by: Charlie Chen <[email protected]>

* add back other advanced tests

* make generate

* add comment

* fix eth liquidity cap test

* fix withdraw count

---------

Co-authored-by: Charlie Chen <[email protected]>
Co-authored-by: Charlie Chen <[email protected]>

* removed incorrect Note

* improved variable name

* add E2E test for rate limiter gas and erc20

* remove outdated comment

---------

Co-authored-by: Lucas Bertrand <[email protected]>
Copy link

github-actions bot commented May 2, 2024

!!!WARNING!!!
nosec detected in the following files: x/crosschain/keeper/grpc_query_cctx_rate_limit.go, x/crosschain/keeper/grpc_query_cctx_rate_limit_test.go

Be very careful about using #nosec in code. It can be a quick way to suppress security warnings and move forward with development, it should be employed with caution. Suppressing warnings with #nosec can hide potentially serious vulnerabilities. Only use #nosec when you're absolutely certain that the security issue is either a false positive or has been mitigated in another way.

Only suppress a single rule (or a specific set of rules) within a section of code, while continuing to scan for other problems. To do this, you can list the rule(s) to be suppressed within the #nosec annotation, e.g: /* #nosec G401 */ or //#nosec G201 G202 G203
Broad #nosec annotations should be avoided, as they can hide other vulnerabilities. The CI will block you from merging this PR until you remove #nosec annotations that do not target specific rules.

Pay extra attention to the way #nosec is being used in the files listed above.

@github-actions github-actions bot added the nosec label May 2, 2024
Copy link

codecov bot commented May 2, 2024

Codecov Report

Attention: Patch coverage is 80.73394% with 21 lines in your changes are missing coverage. Please review.

Project coverage is 70.74%. Comparing base (5b126b5) to head (dc9d32c).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #2112      +/-   ##
===========================================
+ Coverage    69.96%   70.74%   +0.77%     
===========================================
  Files          249      249              
  Lines        14040    14069      +29     
===========================================
+ Hits          9823     9953     +130     
+ Misses        3759     3657     -102     
- Partials       458      459       +1     
Files Coverage Δ
pkg/coin/coin.go 100.00% <100.00%> (ø)
x/crosschain/keeper/grpc_query_cctx.go 91.01% <100.00%> (ø)
x/fungible/keeper/foreign_coins.go 100.00% <100.00%> (+13.84%) ⬆️
x/fungible/keeper/zevm_msg_passing.go 100.00% <100.00%> (ø)
x/observer/types/chain_params.go 99.17% <100.00%> (ø)
x/crosschain/keeper/grpc_query_cctx_rate_limit.go 96.07% <97.36%> (+75.91%) ⬆️
zetaclient/zetabridge/query.go 66.33% <0.00%> (ø)
zetaclient/zetabridge/zetacore_bridge.go 43.94% <0.00%> (ø)
zetaclient/zetacore_observer.go 16.36% <0.00%> (-0.23%) ⬇️

... and 1 file with indirect coverage changes

@ws4charlie ws4charlie marked this pull request as ready for review May 2, 2024 20:05
@ws4charlie ws4charlie merged commit 3e298ba into develop May 2, 2024
21 checks passed
@ws4charlie ws4charlie deleted the merge-v16-to-develop branch May 2, 2024 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants