Skip to content

chore(release): rebase dev to main#2332

Closed
shamardy wants to merge 35 commits intodevfrom
rebase-dev-main
Closed

chore(release): rebase dev to main#2332
shamardy wants to merge 35 commits intodevfrom
rebase-dev-main

Conversation

@shamardy
Copy link
Copy Markdown
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 <work@onurozkan.dev>

* 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 <work@onurozkan.dev>

---------

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Co-authored-by: dimxy <dimxy@komodoplatform.com>
Co-authored-by: Onur Özkan <work@onurozkan.dev>
Co-authored-by: Samuel Onoja <samiodev@icloud.com>
Co-authored-by: DeckerSU <support@decker.su>
* add time validation core logic

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* nit fixes

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* handle time gap

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* improve logging

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* add more trackable processing logs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* improve info log and remove debugging leftover

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* rename `NetworkInfoRequest` to `PeerInfoRequest`

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* handle recently dialed peers

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* add useful logs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* create function for pre-dial check

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* set max cap for timestamp channel

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* remove leftover

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* use `Multiaddr` as key

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* fix p2p tests

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* update logs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* rename leftovers

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* update timing values

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* minor fixes

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* update pre dial check calls

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* apply nit fixes

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* don't update existing expiries

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* revert breakage

Signed-off-by: onur-ozkan <work@onurozkan.dev>

---------

Signed-off-by: onur-ozkan <work@onurozkan.dev>
* handle p2p features properly

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* use `PeerId` type for timestamp channel straight away

Signed-off-by: onur-ozkan <work@onurozkan.dev>

---------

Signed-off-by: onur-ozkan <work@onurozkan.dev>
* update wasm build for docker

* lock wasm-pack version on build runners

Signed-off-by: onur-ozkan <work@onurozkan.dev>

---------

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Co-authored-by: onur-ozkan <work@onurozkan.dev>
…#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 <work@onurozkan.dev>

* fix linting

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* rename cargo-cache to build-cache

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* try caching

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* switch to rust-cache

Signed-off-by: onur-ozkan <work@onurozkan.dev>

---------

Signed-off-by: onur-ozkan <work@onurozkan.dev>
* 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
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
* unlock wasm-pack version

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* force yes on docker build

Signed-off-by: onur-ozkan <work@onurozkan.dev>

---------

Signed-off-by: onur-ozkan <work@onurozkan.dev>
* 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 <work@onurozkan.dev>

* save dev state

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* make proto types serializable for RPC endpoint

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* remove dummy test

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* add RPC error type

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* add TODO

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* fix status filtering

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* fix clippy warn

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* resolve `todo!()`s

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* remove inline attribute

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* improve `validators_rpc`

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* add coverage for tendermint_validators RPC

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* apply nit changes

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* document `ValidatorStatus`

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* use proper error variant on coin filtering

Signed-off-by: onur-ozkan <work@onurozkan.dev>

* apply nits

Signed-off-by: onur-ozkan <work@onurozkan.dev>

---------

Signed-off-by: onur-ozkan <work@onurozkan.dev>
…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.
@shamardy
Copy link
Copy Markdown
Collaborator Author

shamardy commented Feb 3, 2025

Blocked until I include commits from under review PRs targeted for 2.4.0-beta release

borngraced and others added 4 commits February 3, 2025 15:17
We now enforce fixed-length byte arrays instead of indexing slices.  
This prevents unhandled panics when incoming slices are too short.

- Replaced slice indexing with safe fixed-size array creation.
- Removed methods that relied on unchecked slice indexing.
- Ensured each code path now handles invalid lengths gracefully.

Closes #2275
Refactor event streaming to support dynamic client subscriptions over RPC using a unified StreamingManager. The StreamingManager now orchestrates background streamers by initializing a streamer when a client activates it via the RPC API and shutting it down when no longer needed. Legacy fee estimator endpoints have been replaced with streaming RPC methods, and new task manager RPCs for BCH and Tendermint have been added. Additionally, event stream configuration has been migrated from static JSON settings to runtime API initialization for improved flexibility.
…2333)

This fixes `task::withdraw::init` for non-trezor utxo withdraws as it was failing with "error_data": "NoTrezorDeviceAvailable". It also allows the user to withdraw from any address in the HD wallet using `task::withdraw::init` instead of only the activated address.
Adds tendermint protocol support on remove_delegation RPC, and extends tendermint transaction history implementation to support undelegate transactions.
@shamardy
Copy link
Copy Markdown
Collaborator Author

shamardy commented Feb 7, 2025

replaced by #2344

@shamardy shamardy closed this Feb 7, 2025
@shamardy shamardy deleted the rebase-dev-main branch February 7, 2025 14:08
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.

7 participants