Skip to content

Commit

Permalink
Merge pull request #4133 from anoma/tiago/osmosis-swap-cli-over-v44
Browse files Browse the repository at this point in the history
Integrate with Osmosis for shielded swaps
  • Loading branch information
mergify[bot] authored Jan 20, 2025
2 parents 04b81b1 + 1d5de2c commit 90771ba
Show file tree
Hide file tree
Showing 29 changed files with 3,127 additions and 377 deletions.
4 changes: 4 additions & 0 deletions .changelog/unreleased/features/4133-osmosis-swaps.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Integrate Namada and Osmosis, to allow swapping assets privately. Osmosis
is leveraged for its liquidity and DEX capabilities, while Namada is
leveraged for its shielded pool (i.e. MASP) and privacy guarantees.
([\#4133](https://github.com/anoma/namada/pull/4133))
2 changes: 2 additions & 0 deletions .github/workflows/scripts/e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"e2e::ibc_tests::ibc_pfm_happy_flows": 485,
"e2e::ibc_tests::ibc_pfm_unhappy_flows": 485,
"e2e::ibc_tests::ibc_upgrade_client": 280,
"e2e::ibc_tests::ibc_shielded_recv_middleware_happy_flow": 280,
"e2e::ibc_tests::ibc_shielded_recv_middleware_unhappy_flow": 280,
"e2e::eth_bridge_tests::test_add_to_bridge_pool": 10,
"e2e::ledger_tests::double_signing_gets_slashed": 12,
"e2e::ledger_tests::ledger_many_txs_in_a_block": 55,
Expand Down
94 changes: 90 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ git2 = { version = "0.18.1", default-features = false }
# branch tiago/optional-ack
ibc = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1", features = ["serde"] }
ibc-derive = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1" }
ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.8.0", features = ["borsh"] }
ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module/v0.1.0" }
ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module-macros/v0.1.0" }
ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "orm/v0.4.0" }
ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.9.0", features = ["borsh"] }
ibc-testkit = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1", default-features = false }
ics23 = "0.12.0"
usize-set = { version = "0.10.3", features = ["serialize-borsh", "serialize-serde"] }
Expand Down
1 change: 1 addition & 0 deletions crates/apps/src/bin/namada/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ fn handle_command(cmd: cli::cmds::Namada, raw_sub_cmd: String) -> Result<()> {
| cli::cmds::Namada::TxShieldingTransfer(_)
| cli::cmds::Namada::TxUnshieldingTransfer(_)
| cli::cmds::Namada::TxIbcTransfer(_)
| cli::cmds::Namada::TxOsmosisSwap(_)
| cli::cmds::Namada::TxUpdateAccount(_)
| cli::cmds::Namada::TxRevealPk(_)
| cli::cmds::Namada::TxInitProposal(_)
Expand Down
Loading

0 comments on commit 90771ba

Please sign in to comment.