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(release): rebase dev to main #2332

Open
wants to merge 31 commits into
base: dev
Choose a base branch
from
Open

chore(release): rebase dev to main #2332

wants to merge 31 commits into from

Conversation

shamardy
Copy link
Collaborator

@shamardy shamardy commented Jan 30, 2025

This PR rebases dev branch to main to fix conflicts when opening release candidate PR from dev to main. The conflicts happened due to squashing commits when merging #2284

ca333 and others added 30 commits April 28, 2023 19:39
chore(release): v1.0.5-beta
chore(release): v1.0.6-beta
chore(release): v1.0.7-beta
chore(release): v2.0.0-beta
chore(release): v2.1.0-beta
chore(release): v2.2.0-beta
* feat(LRAPI): add 1inch classic swap rpc (#2222)

This commit adds initial code to connect to 1inch Liquidity Routing API (LRAPI) provider and two new RPCs to use 1inch classic swap API. It also adds 'approve' and 'allowance' RPCs (for ERC20 tokens).

* chore(release): bump mm2 version to 2.3.0-beta (#2285)

* improvement(error-handling): main files (#2288)

Makes KDF to check main files (config/coins/etc..) before reading them to prevent potential panics.

* fix(rpc): remove character check blocking password input (#2287)

This commit removes check for <, >, & characters in RPC request bodies that was incorrectly blocking valid password characters in get_mnemonic RPC call. These special characters should be allowed in passwords.

This aligns native behavior with WASM implementation.

* don't rely on core (#2289)

Signed-off-by: onur-ozkan <[email protected]>

* chore(ctx): replace gstuff constructible with oncelock (#2267)

* chore(adex-cli): use "Komodo DeFi Framework" name in adex_cli  (#2290)

* bump libp2p (#2296)

Signed-off-by: onur-ozkan <[email protected]>

---------

Signed-off-by: onur-ozkan <[email protected]>
Co-authored-by: dimxy <[email protected]>
Co-authored-by: Onur Özkan <[email protected]>
Co-authored-by: Samuel Onoja <[email protected]>
Co-authored-by: DeckerSU <[email protected]>
* add time validation core logic

Signed-off-by: onur-ozkan <[email protected]>

* nit fixes

Signed-off-by: onur-ozkan <[email protected]>

* handle time gap

Signed-off-by: onur-ozkan <[email protected]>

* improve logging

Signed-off-by: onur-ozkan <[email protected]>

* add more trackable processing logs

Signed-off-by: onur-ozkan <[email protected]>

* improve info log and remove debugging leftover

Signed-off-by: onur-ozkan <[email protected]>

* rename `NetworkInfoRequest` to `PeerInfoRequest`

Signed-off-by: onur-ozkan <[email protected]>

* handle recently dialed peers

Signed-off-by: onur-ozkan <[email protected]>

* add useful logs

Signed-off-by: onur-ozkan <[email protected]>

* create function for pre-dial check

Signed-off-by: onur-ozkan <[email protected]>

* set max cap for timestamp channel

Signed-off-by: onur-ozkan <[email protected]>

* remove leftover

Signed-off-by: onur-ozkan <[email protected]>

* use `Multiaddr` as key

Signed-off-by: onur-ozkan <[email protected]>

* fix p2p tests

Signed-off-by: onur-ozkan <[email protected]>

* update logs

Signed-off-by: onur-ozkan <[email protected]>

* rename leftovers

Signed-off-by: onur-ozkan <[email protected]>

* update timing values

Signed-off-by: onur-ozkan <[email protected]>

* minor fixes

Signed-off-by: onur-ozkan <[email protected]>

* update pre dial check calls

Signed-off-by: onur-ozkan <[email protected]>

* apply nit fixes

Signed-off-by: onur-ozkan <[email protected]>

* don't update existing expiries

Signed-off-by: onur-ozkan <[email protected]>

* revert breakage

Signed-off-by: onur-ozkan <[email protected]>

---------

Signed-off-by: onur-ozkan <[email protected]>
* handle p2p features properly

Signed-off-by: onur-ozkan <[email protected]>

* use `PeerId` type for timestamp channel straight away

Signed-off-by: onur-ozkan <[email protected]>

---------

Signed-off-by: onur-ozkan <[email protected]>
* update wasm build for docker

* lock wasm-pack version on build runners

Signed-off-by: onur-ozkan <[email protected]>

---------

Signed-off-by: onur-ozkan <[email protected]>
Co-authored-by: onur-ozkan <[email protected]>
…#2295)

* add feature flag to mm2_main and mm2_bin_lib tomls

* filter 'status:' pr labels

* remove old labels

* dont allow to pass blocked and invalid statuses

* pass in progress and pending review statuses

* update statuses list
* switch to proper rust caching

Signed-off-by: onur-ozkan <[email protected]>

* fix linting

Signed-off-by: onur-ozkan <[email protected]>

* rename cargo-cache to build-cache

Signed-off-by: onur-ozkan <[email protected]>

* try caching

Signed-off-by: onur-ozkan <[email protected]>

* switch to rust-cache

Signed-off-by: onur-ozkan <[email protected]>

---------

Signed-off-by: onur-ozkan <[email protected]>
* remove unnecessary Arc<

The inners are already `Arc<`ed

* eth websocket: avoid locking control message sender and clone it instead

* review(sami): move tx declaration close to where it's being used

* review(sami): free rx end out of the Arc

and arc the entire controller channel instead
* unlock wasm-pack version

Signed-off-by: onur-ozkan <[email protected]>

* force yes on docker build

Signed-off-by: onur-ozkan <[email protected]>

---------

Signed-off-by: onur-ozkan <[email protected]>
* fix peer response error log (only if error)

* add test for peer time difference validation

* fix linux clippy

* Revert "fix linux clippy"

This reverts commit 2bfe34c.

* Revert "add test for peer time difference validation"

This reverts commit c8d1165.

* Revert "fix peer response error log (only if error)"

This reverts commit b6d6fbc.

* add docker test for peer time sync validation

* remove unneeded test println

* use Mm2TestConf::seednode

* review(borngraced): refactor get_utc_timestamp with test code

* use const in peer time sync test
* Validate Cargo.lock

* Revert "Validate Cargo.lock" and add validate-cargo-lock.yml

* review: run only `cargo update` and simplify yml
* save dev state

Signed-off-by: onur-ozkan <[email protected]>

* save dev state

Signed-off-by: onur-ozkan <[email protected]>

* make proto types serializable for RPC endpoint

Signed-off-by: onur-ozkan <[email protected]>

* remove dummy test

Signed-off-by: onur-ozkan <[email protected]>

* add RPC error type

Signed-off-by: onur-ozkan <[email protected]>

* add TODO

Signed-off-by: onur-ozkan <[email protected]>

* fix status filtering

Signed-off-by: onur-ozkan <[email protected]>

* fix clippy warn

Signed-off-by: onur-ozkan <[email protected]>

* resolve `todo!()`s

Signed-off-by: onur-ozkan <[email protected]>

* remove inline attribute

Signed-off-by: onur-ozkan <[email protected]>

* improve `validators_rpc`

Signed-off-by: onur-ozkan <[email protected]>

* add coverage for tendermint_validators RPC

Signed-off-by: onur-ozkan <[email protected]>

* apply nit changes

Signed-off-by: onur-ozkan <[email protected]>

* document `ValidatorStatus`

Signed-off-by: onur-ozkan <[email protected]>

* use proper error variant on coin filtering

Signed-off-by: onur-ozkan <[email protected]>

* apply nits

Signed-off-by: onur-ozkan <[email protected]>

---------

Signed-off-by: onur-ozkan <[email protected]>
…ut (#2283)

This commit moves payment existence check in maker_payment/send_taker_payment before timeout validation and skips timeout if payment is already sent, as the taker swap should proceed to waiting for maker to spend the taker payment.
Fixes an issue where passphrases were incorrectly validated as BIP39 mnemonics during storage decryption. Now, passphrases no longer require bip39 validation.
This commit makes the build script straightforward and more stable without causing cache invalidation. The final versioning output remains as is, but the implementation side is robust than ever.
Bumps libp2p from k-0.52.11 to k-0.52.12 to fix build problems on IOS platform.
Adds tendermint protocol support on add_delegation RPC, and extends tendermint transaction history implementation to support delegation transactions.
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.

8 participants