Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion artifacts/checksums.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
c3afe3612d96ba2a7f45296b5cd03e7c785593eb899ad7fc6af21ca61c077698 dex_aggregator.wasm
a0881d16ef7b87479688715c7e9796ee67aa117c3692090813ede98bfe8109c7 dex_aggregator.wasm
fca25ee84ed0903921574c9efef0144880a81f7533e952f6ce8cb3ea4f8e57b4 mock_swap.wasm
Binary file modified artifacts/dex_aggregator.wasm
Binary file not shown.
4 changes: 2 additions & 2 deletions contracts/dex_aggregator/examples/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ fn main() {
export_schema_with_title(&schema_for!(ExecuteMsg), &out_dir, "ExecuteMsg");
export_schema_with_title(&schema_for!(QueryMsg), &out_dir, "QueryMsg");
export_schema(&schema_for!(SimulateRouteResponse), &out_dir);
export_schema(&schema_for!(Config), &out_dir);
export_schema(&schema_for!(Config), &out_dir);
export_schema(&schema_for!(FeeResponse), &out_dir);
export_schema(&schema_for!(AllFeesResponse), &out_dir);

println!("JSON schemas generated to the an aggregated directory: ./schema");
}
}
1 change: 0 additions & 1 deletion contracts/dex_aggregator/src/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ pub fn create_swap_cosmos_msg(
belief_price: None,
max_spread: None,
to: Some(recipient),
deadline: None,
};

match offer_asset_info {
Expand Down
1 change: 0 additions & 1 deletion contracts/dex_aggregator/src/msg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ pub mod amm {
belief_price: Option<Decimal>,
max_spread: Option<Decimal>,
to: Option<String>,
deadline: Option<u64>,
},
}
}
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## Mainnet Deployment

Code Id: 1865
Code Id: 1873

Address: `inj186xc3ge5mvn8995063v30f8we5ncncpujcv28w`
Address: `inj102zk4v9d3r60t2q7jnmt6mp4y7fvpywkwlnekk`

## Getting Started

Expand Down
19 changes: 6 additions & 13 deletions tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3379,12 +3379,7 @@ fn test_multi_split_to_same_orderbook_contract() {

// Execute the transaction with 100 INJ.
let funds_to_send = Coin::new(100_000_000_000_000_000_000u128, "inj");
let res = wasm.execute(
&env.aggregator_addr,
&msg,
&[funds_to_send],
&env.user,
);
let res = wasm.execute(&env.aggregator_addr, &msg, &[funds_to_send], &env.user);

assert!(res.is_ok(), "Execution failed: {:?}", res.unwrap_err());
let response = res.unwrap();
Expand Down Expand Up @@ -3422,9 +3417,10 @@ fn test_multi_split_to_same_orderbook_contract() {
.unwrap();
let final_balance = final_balance_response.balance.unwrap();

let expected_final_balance = initial_usdt_amount + Uint128::from_str(expected_total_output).unwrap();
let expected_final_balance =
initial_usdt_amount + Uint128::from_str(expected_total_output).unwrap();
let final_amount = Uint128::from_str(&final_balance.amount).unwrap();

assert_eq!(final_amount, expected_final_balance);
assert_eq!(final_balance.denom, "usdt");
}
Expand Down Expand Up @@ -3465,10 +3461,7 @@ fn test_multi_hop_consecutive_orderbook_swaps() {

let msg = ExecuteMsg::ExecuteRoute {
stages: vec![Stage {
splits: vec![Split {
percent: 100,
path,
}],
splits: vec![Split { percent: 100, path }],
}],
minimum_receive: Some(Uint128::new(299_000_000_000_000_000_000u128)),
};
Expand Down Expand Up @@ -3546,4 +3539,4 @@ fn test_multi_hop_consecutive_orderbook_swaps() {
final_amount > initial_inj_amount,
"Final amount should be greater than the initial amount for this profitable swap"
);
}
}