Duality Swap Adapter Fixes (#155)

* adaptor fixes * remove unused tests and update old tests * clippy * give larger amount buffer * fmt * amount_out check * fix clippy * run make fmt * run make schema --------- Co-authored-by: Jeremy Liu <[email protected]>
skip-mev · Jan 9, 2025 · dc3f516 · dc3f516
1 parent e23f8d8
commit dc3f516
Show file tree

Hide file tree

Showing 30 changed files with 305 additions and 563 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/adapters/hyperlane/src/contract.rs b/contracts/adapters/hyperlane/src/contract.rs
@@ -35,9 +35,9 @@ pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> ContractResult<Resp
         ))
 }
 
-///////////////////
-/// INSTANTIATE ///
-///////////////////
+/////////////////
+// INSTANTIATE //
+/////////////////
 
 // Contract name and version used for migration.
 const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");

diff --git a/contracts/adapters/ibc/ibc-hooks/src/contract.rs b/contracts/adapters/ibc/ibc-hooks/src/contract.rs
@@ -46,9 +46,9 @@ pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> ContractResult<Resp
         ))
 }
 
-///////////////////
-/// INSTANTIATE ///
-///////////////////
+/////////////////
+// INSTANTIATE //
+/////////////////
 
 // Contract name and version used for migration.
 const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");
@@ -275,9 +275,9 @@ pub fn sudo(deps: DepsMut, env: Env, msg: SudoMsg) -> ContractResult<Response> {
         .add_attribute("action", sudo_type))
 }
 
-////////////////////////
-/// HELPER FUNCTIONS ///
-////////////////////////
+//////////////////////
+// HELPER FUNCTIONS //
+//////////////////////
 
 // Verifies the given memo is empty or valid json, and then adds the necessary
 // key/value pair to trigger the ibc hooks callback logic.

diff --git a/contracts/adapters/ibc/neutron-transfer/src/contract.rs b/contracts/adapters/ibc/neutron-transfer/src/contract.rs
@@ -27,9 +27,9 @@ pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> ContractResult<Re
     unimplemented!()
 }
 
-///////////////////
-/// INSTANTIATE ///
-///////////////////
+/////////////////
+// INSTANTIATE //
+/////////////////
 
 // Contract name and version used for migration.
 const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");
@@ -225,9 +225,9 @@ pub fn sudo(deps: DepsMut, env: Env, msg: TransferSudoMsg) -> ContractResult<Res
         .add_attribute("action", sudo_type))
 }
 
-////////////////////////
-/// HELPER FUNCTIONS ///
-////////////////////////
+//////////////////////
+// HELPER FUNCTIONS //
+//////////////////////
 
 // Helper function to get the ack_id (channel id, sequence id) from a RequestPacket
 fn get_ack_id(req: &RequestPacket) -> ContractResult<AckID> {

diff --git a/contracts/adapters/swap/astroport/src/contract.rs b/contracts/adapters/swap/astroport/src/contract.rs
@@ -50,9 +50,9 @@ pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> ContractResult<Resp
         ))
 }
 
-///////////////////
-/// INSTANTIATE ///
-///////////////////
+/////////////////
+// INSTANTIATE //
+/////////////////
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn instantiate(
@@ -79,9 +79,9 @@ pub fn instantiate(
         ))
 }
 
-///////////////
-/// RECEIVE ///
-///////////////
+/////////////
+// RECEIVE //
+/////////////
 
 // Receive is the main entry point for the contract to
 // receive cw20 tokens and execute the swap

diff --git a/contracts/adapters/swap/astrovault/src/contract.rs b/contracts/adapters/swap/astrovault/src/contract.rs
@@ -40,9 +40,9 @@ pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> ContractResult<Res
     Ok(Response::default())
 }
 
-///////////////////
-/// INSTANTIATE ///
-///////////////////
+/////////////////
+// INSTANTIATE //
+/////////////////
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn instantiate(
@@ -90,9 +90,9 @@ pub fn instantiate(
         ))
 }
 
-///////////////
-/// RECEIVE ///
-///////////////
+/////////////
+// RECEIVE //
+/////////////
 
 // Receive is the main entry point for the contract to
 // receive cw20 tokens and execute the swap

diff --git a/contracts/adapters/swap/dexter/src/contract.rs b/contracts/adapters/swap/dexter/src/contract.rs
@@ -38,9 +38,9 @@ pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> ContractResult<Re
     unimplemented!()
 }
 
-///////////////////
-/// INSTANTIATE ///
-///////////////////
+/////////////////
+// INSTANTIATE //
+/////////////////
 
 // Contract name and version used for migration.
 const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");
@@ -79,9 +79,9 @@ pub fn instantiate(
         ))
 }
 
-///////////////
-/// RECEIVE ///
-///////////////
+/////////////
+// RECEIVE //
+/////////////
 
 // Receive is the main entry point for the contract to
 // receive cw20 tokens and execute the swap

diff --git a/contracts/adapters/swap/drop/src/contract.rs b/contracts/adapters/swap/drop/src/contract.rs
@@ -29,9 +29,9 @@ pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> ContractResult<Re
     unimplemented!()
 }
 
-///////////////////
-/// INSTANTIATE ///
-///////////////////
+/////////////////
+// INSTANTIATE //
+/////////////////
 
 // Contract name and version used for migration.
 const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME");

diff --git a/contracts/adapters/swap/duality/Cargo.toml b/contracts/adapters/swap/duality/Cargo.toml
@@ -20,7 +20,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-neutron-sdk      = "0.10.0"
+neutron-sdk       = { git = "https://github.com/neutron-org/neutron-sdk", branch = "patch/sim_requests"}
 cosmwasm-schema  = { workspace = true }
 cosmwasm-std     = { workspace = true }
 cw2              = { workspace = true }