diff --git a/Cargo.lock b/Cargo.lock index fc95dfed..4770efea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1604,22 +1604,6 @@ dependencies = [ "white-whale-std", ] -[[package]] -name = "skip-api-swap-adapter-drop" -version = "0.3.0" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 1.2.0", - "cw-utils 1.0.3", - "cw2 1.1.2", - "drop-factory", - "drop-staking-base", - "skip", - "test-case", - "thiserror", -] - [[package]] name = "skip-go-entry-point" version = "0.3.0" @@ -1715,6 +1699,22 @@ dependencies = [ "thiserror", ] +[[package]] +name = "skip-go-swap-adapter-drop" +version = "0.3.0" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus 1.2.0", + "cw-utils 1.0.3", + "cw2 1.1.2", + "drop-factory", + "drop-staking-base", + "skip", + "test-case", + "thiserror", +] + [[package]] name = "skip-go-swap-adapter-hallswap" version = "0.3.0" diff --git a/contracts/adapters/swap/drop/tests/test_execute_swap.rs b/contracts/adapters/swap/drop/tests/test_execute_swap.rs index 90e29e26..59ae42d1 100644 --- a/contracts/adapters/swap/drop/tests/test_execute_swap.rs +++ b/contracts/adapters/swap/drop/tests/test_execute_swap.rs @@ -6,7 +6,7 @@ use cosmwasm_std::{ }; // use lido_satellite::msg::ExecuteMsg as LidoSatelliteExecuteMsg; use skip::swap::ExecuteMsg; -use skip_api_swap_adapter_drop::{ +use skip_go_swap_adapter_drop::{ error::{ContractError, ContractResult}, state::{BONDED_DENOM, DROP_CORE_CONTRACT_ADDRESS, ENTRY_POINT_CONTRACT_ADDRESS, REMOTE_DENOM}, }; @@ -135,7 +135,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> { BONDED_DENOM.save(deps.as_mut().storage, &String::from("factory/uatom"))?; // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_drop::contract::execute( + let res = skip_go_swap_adapter_drop::contract::execute( deps.as_mut(), env, info, diff --git a/scripts/configs/neutron.toml b/scripts/configs/neutron.toml index b61fb9b4..f851c48e 100644 --- a/scripts/configs/neutron.toml +++ b/scripts/configs/neutron.toml @@ -20,8 +20,8 @@ DENOM = "untrn" GAS_PRICE = 0.075 # Contract Paths -ENTRY_POINT_CONTRACT_PATH = "../artifacts/skip_api_entry_point-aarch64.wasm" -IBC_TRANSFER_ADAPTER_PATH = "../artifacts/skip_api_ibc_adapter_neutron_transfer-aarch64.wasm" +ENTRY_POINT_CONTRACT_PATH = "../artifacts/skip_go_entry_point-aarch64.wasm" +IBC_TRANSFER_ADAPTER_PATH = "../artifacts/skip_go_ibc_adapter_neutron_transfer-aarch64.wasm" # SALT USED TO GENERATE A DETERMINSTIC ADDRESS SALT = "1" @@ -31,23 +31,28 @@ ENTRY_POINT_PRE_GENERATED_ADDRESS = "
" [[swap_venues]] name = "neutron-astroport" -swap_adapter_path = "../artifacts/skip_api_swap_adapter_astroport-aarch64.wasm" +swap_adapter_path = "../artifacts/skip_go_swap_adapter_astroport-aarch64.wasm" [[swap_venues]] name = "neutron-lido-satellite" lido_satellite_contract_address = "neutron1ug740qrkquxzrk2hh29qrlx3sktkfml3je7juusc2te7xmvsscns0n2wry" -swap_adapter_path = "../artifacts/skip_api_swap_adapter_lido_satellite-aarch64.wasm" +swap_adapter_path = "../artifacts/skip_go_swap_adapter_lido_satellite-aarch64.wasm" [[swap_venues]] name = "neutron-hallswap" hallswap_contract_address = "neutron12k4hr2ecm3c8mjjsn6dc9c043xv8p7v4795qt9g2dwp4nmmlgxdqvz2ujp" -swap_adapter_path = "../artifacts/skip_api_swap_adapter_hallswap-aarch64.wasm" +swap_adapter_path = "../artifacts/skip_go_swap_adapter_hallswap-aarch64.wasm" [[testnet_swap_venues]] name = "testnet-neutron-astroport" -swap_adapter_path = "../artifacts/skip_api_swap_adapter_astroport-aarch64.wasm" +swap_adapter_path = "../artifacts/skip_go_swap_adapter_astroport-aarch64.wasm" [[testnet_swap_venues]] name = "testnet-neutron-lido-satellite" lido_satellite_contract_address = "neutron1xdtwh5jr4zjx8g3zh29jud75c666wua7tsmum3ajm6ylf782etfs60dj2h" -swap_adapter_path = "../artifacts/skip_api_swap_adapter_lido_satellite-aarch64.wasm" \ No newline at end of file +swap_adapter_path = "../artifacts/skip_go_swap_adapter_lido_satellite-aarch64.wasm" + +[[testnet_swap_venues]] +name = "testnet-neutron-drop" +drop_contract_address = "neutron13w6n6kj5pz59chgmeq63xeuy5y8shd2h9hkm2tvy5a35ugnuzzlsltznae" +swap_adapter_path = "../artifacts/skip_go_swap_adapter_drop-aarch64.wasm" \ No newline at end of file diff --git a/scripts/deploy.py b/scripts/deploy.py index 2a88c00b..9565a25a 100644 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -195,6 +195,8 @@ def main(): } if "lido_satellite_contract_address" in venue: swap_adapter_instantiate_args["lido_satellite_contract_address"] = venue["lido_satellite_contract_address"] + if "drop_contract_address" in venue: + swap_adapter_instantiate_args["drop_factory_contract_address"] = venue["drop_factory_contract_address"] if "hallswap_contract_address" in venue: swap_adapter_instantiate_args["hallswap_contract_address"] = venue["hallswap_contract_address"] if "dexter_vault_contract_address" in venue: