Skip to content

chore(git-history): resolve history diversion between main & dev#2344

Merged
shamardy merged 9 commits intomainfrom
main-copy
Feb 8, 2025
Merged

chore(git-history): resolve history diversion between main & dev#2344
shamardy merged 9 commits intomainfrom
main-copy

Conversation

@mariocynicys
Copy link
Copy Markdown
Collaborator

@mariocynicys mariocynicys commented Feb 7, 2025

This PR adds a dummy merge commit (c824b02) that pulls the missing history that's in dev but not in main.
This is needed to fix the history diversion introduced by squashing the last release into a single commit in main (8206c6e).

dimxy and others added 9 commits December 3, 2024 17:06
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).
Makes KDF to check main files (config/coins/etc..) before reading them to prevent potential panics.
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.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Merge commit 'fe5a274f9e7581644c0d9e2e3112ad64ebc6c056' into main
@mariocynicys
Copy link
Copy Markdown
Collaborator Author

force pushed to change the commit message in the Re-merge commit to mention main instead of main-copy

@dimxy dimxy self-requested a review February 7, 2025 15:03
@shamardy shamardy merged commit a7ffbb1 into main Feb 8, 2025
@shamardy shamardy deleted the main-copy branch February 8, 2025 11:43
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.

6 participants