Merge branch 'tomas/rev-osmosis' (#4260)

* tomas/rev-osmosis: Revert "Merge pull request #4133 from anoma/tiago/osmosis-swap-cli-over-v44"
anoma · Jan 21, 2025 · d1b9fb9 · d1b9fb9
2 parents 9c8bb71 + a3925c0
commit d1b9fb9
Show file tree

Hide file tree

Showing 29 changed files with 377 additions and 3,127 deletions.
diff --git a/.changelog/unreleased/features/4133-osmosis-swaps.md b/.changelog/unreleased/features/4133-osmosis-swaps.md
diff --git a/.github/workflows/scripts/e2e.json b/.github/workflows/scripts/e2e.json
@@ -9,8 +9,6 @@
     "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,

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -121,10 +121,7 @@ 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-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-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.8.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"] }

diff --git a/crates/apps/src/bin/namada/cli.rs b/crates/apps/src/bin/namada/cli.rs
@@ -50,7 +50,6 @@ 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(_)