diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e2e2f703..de8c624c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -93,7 +93,7 @@ jobs: - name: Run schema diff check # use nightly toolchain so that we get all the latest formatting features run: | - cargo run --package skip-api-entry-point --bin schema + cargo run --package skip-go-entry-point --bin schema if [[ `git status --porcelain` ]]; then echo "Schema is different, please run make schema" exit 1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 281724af..8a2d2fd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -75,7 +75,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [v0.1.0](https://github.com/skip-mev/skip-api-contracts/releases/tag/v0.1.0) - 2023-07-18 -Let There Be Skip API Contracts! +Let There Be Skip Go Contracts! ### Features - Supports swap exact in for the user. diff --git a/Cargo.lock b/Cargo.lock index 9a6f236d..4a11119c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1310,7 +1310,7 @@ dependencies = [ ] [[package]] -name = "skip-api-entry-point" +name = "skip-go-entry-point" version = "0.3.0" dependencies = [ "cosmwasm-schema", @@ -1325,7 +1325,7 @@ dependencies = [ ] [[package]] -name = "skip-api-ibc-adapter-ibc-hooks" +name = "skip-go-ibc-adapter-ibc-hooks" version = "0.3.0" dependencies = [ "cosmwasm-schema", @@ -1342,7 +1342,7 @@ dependencies = [ ] [[package]] -name = "skip-api-ibc-adapter-neutron-transfer" +name = "skip-go-ibc-adapter-neutron-transfer" version = "0.3.0" dependencies = [ "cosmos-sdk-proto 0.19.0", @@ -1359,7 +1359,7 @@ dependencies = [ ] [[package]] -name = "skip-api-placeholder" +name = "skip-go-placeholder" version = "0.3.0" dependencies = [ "cosmwasm-std", @@ -1367,7 +1367,7 @@ dependencies = [ ] [[package]] -name = "skip-api-swap-adapter-astroport" +name = "skip-go-swap-adapter-astroport" version = "0.3.0" dependencies = [ "astroport", @@ -1383,7 +1383,7 @@ dependencies = [ ] [[package]] -name = "skip-api-swap-adapter-dexter" +name = "skip-go-swap-adapter-dexter" version = "0.3.0" dependencies = [ "cosmwasm-schema", @@ -1405,7 +1405,7 @@ dependencies = [ ] [[package]] -name = "skip-api-swap-adapter-hallswap" +name = "skip-go-swap-adapter-hallswap" version = "0.3.0" dependencies = [ "astroport", @@ -1421,7 +1421,7 @@ dependencies = [ ] [[package]] -name = "skip-api-swap-adapter-lido-satellite" +name = "skip-go-swap-adapter-lido-satellite" version = "0.3.0" dependencies = [ "cosmwasm-schema", @@ -1436,7 +1436,7 @@ dependencies = [ ] [[package]] -name = "skip-api-swap-adapter-osmosis-poolmanager" +name = "skip-go-swap-adapter-osmosis-poolmanager" version = "0.3.0" dependencies = [ "cosmwasm-schema", @@ -1451,7 +1451,7 @@ dependencies = [ ] [[package]] -name = "skip-api-swap-adapter-white-whale" +name = "skip-go-swap-adapter-white-whale" version = "0.3.0" dependencies = [ "cosmwasm-schema", diff --git a/Cargo.toml b/Cargo.toml index 61a614d7..5f82a91f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ edition = "2021" rust-version = "1.71.0" license = "TBD" homepage = "https://skip.money/" -repository = "https://github.com/skip-mev/skip-api-contracts" -documentation = "https://github.com/skip-mev/skip-api-contracts#readme" +repository = "https://github.com/skip-mev/skip-go-cosmwasm-contracts" +documentation = "https://github.com/skip-mev/skip-go-cosmwasm-contracts#readme" keywords = ["cosmwasm"] [workspace.dependencies] diff --git a/Makefile b/Makefile index 505ae284..4c5d2f3a 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ fmt: # contract that can be called externally. .PHONY: schema schema: - cargo run --package skip-api-entry-point --bin schema + cargo run --package skip-go-entry-point --bin schema test: cargo test --locked --workspace diff --git a/README.md b/README.md index 90d5c2d4..13eadbc5 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ ![Skip Swap Swirl](assets/skip_swirl.png "Skipping, Swapping, and Swirling") -# Skip API Contracts +# Skip Go CosmWasm Contracts -The contracts in this repository are used in [Skip API](https://api-swagger.skip.money/) to enable any-to-any swaps as part of multi-chain workflows. +The contracts in this repository are used in [Skip Go API](https://docs.skip.build) to enable any-to-any swaps as part of multi-chain workflows. -Skip API is a unified REST API + SDK that helps developers create more seamless cross-chain experiences for their end users with IBC [(Inter-Blockchain Communication protocol)](https://ibcprotocol.dev/). +Skip Go is a unified REST API, Widget, and Core Package that helps developers create more seamless cross-chain experiences for their end users with IBC [(Inter-Blockchain Communication protocol)](https://ibcprotocol.dev/). -Skip API is designed so that even developers who are new to IBC can offer incredible cross-chain experiences, like swaps and transfers between any two IBC-enabled chains and tokens in as few transactions as possible, with reliable multi-chain relaying, packet tracking, and more. +Skip Go API is designed so that even developers who are new to IBC can offer incredible cross-chain experiences, like swaps and transfers between any two IBC-enabled chains and tokens in as few transactions as possible, with reliable multi-chain relaying, packet tracking, and more. # Overview diff --git a/contracts/adapters/ibc/ibc-hooks/Cargo.toml b/contracts/adapters/ibc/ibc-hooks/Cargo.toml index 89d55608..180e7ae8 100644 --- a/contracts/adapters/ibc/ibc-hooks/Cargo.toml +++ b/contracts/adapters/ibc/ibc-hooks/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-ibc-adapter-ibc-hooks" +name = "skip-go-ibc-adapter-ibc-hooks" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/adapters/ibc/ibc-hooks/tests/test_execute_ibc_transfer.rs b/contracts/adapters/ibc/ibc-hooks/tests/test_execute_ibc_transfer.rs index 6d693854..69c27f4e 100644 --- a/contracts/adapters/ibc/ibc-hooks/tests/test_execute_ibc_transfer.rs +++ b/contracts/adapters/ibc/ibc-hooks/tests/test_execute_ibc_transfer.rs @@ -8,7 +8,7 @@ use ibc_proto::cosmos::base::v1beta1::Coin as IbcCoin; use ibc_proto::ibc::applications::transfer::v1::MsgTransfer; use prost::Message; use skip::ibc::{ExecuteMsg, IbcFee, IbcInfo}; -use skip_api_ibc_adapter_ibc_hooks::{ +use skip_go_ibc_adapter_ibc_hooks::{ error::ContractResult, state::{ENTRY_POINT_CONTRACT_ADDRESS, IN_PROGRESS_CHANNEL_ID, IN_PROGRESS_RECOVER_ADDRESS}, }; @@ -230,7 +230,7 @@ fn test_execute_ibc_transfer(params: Params) -> ContractResult<()> { ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?; // Call execute_ibc_transfer with the given test parameters - let res = skip_api_ibc_adapter_ibc_hooks::contract::execute( + let res = skip_go_ibc_adapter_ibc_hooks::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/ibc/ibc-hooks/tests/test_reply.rs b/contracts/adapters/ibc/ibc-hooks/tests/test_reply.rs index b2de97d3..836748d9 100644 --- a/contracts/adapters/ibc/ibc-hooks/tests/test_reply.rs +++ b/contracts/adapters/ibc/ibc-hooks/tests/test_reply.rs @@ -4,7 +4,7 @@ use cosmwasm_std::{ }; use ibc_proto::ibc::applications::transfer::v1::MsgTransferResponse; use prost::Message; -use skip_api_ibc_adapter_ibc_hooks::{ +use skip_go_ibc_adapter_ibc_hooks::{ error::ContractResult, state::{ACK_ID_TO_RECOVER_ADDRESS, IN_PROGRESS_CHANNEL_ID, IN_PROGRESS_RECOVER_ADDRESS}, }; @@ -206,7 +206,7 @@ fn test_reply(params: Params) -> ContractResult<()> { } // Call reply with the given test parameters - let res = skip_api_ibc_adapter_ibc_hooks::contract::reply(deps.as_mut(), env, params.reply); + let res = skip_go_ibc_adapter_ibc_hooks::contract::reply(deps.as_mut(), env, params.reply); // Assert the behavior is correct match res { diff --git a/contracts/adapters/ibc/ibc-hooks/tests/test_sudo.rs b/contracts/adapters/ibc/ibc-hooks/tests/test_sudo.rs index 994b468b..66b0bf77 100644 --- a/contracts/adapters/ibc/ibc-hooks/tests/test_sudo.rs +++ b/contracts/adapters/ibc/ibc-hooks/tests/test_sudo.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ StdError, SubMsg, }; use skip::{ibc::IbcLifecycleComplete, sudo::OsmosisSudoMsg as SudoMsg}; -use skip_api_ibc_adapter_ibc_hooks::{error::ContractResult, state::ACK_ID_TO_RECOVER_ADDRESS}; +use skip_go_ibc_adapter_ibc_hooks::{error::ContractResult, state::ACK_ID_TO_RECOVER_ADDRESS}; use test_case::test_case; /* @@ -153,7 +153,7 @@ fn test_sudo(params: Params) -> ContractResult<()> { } // Call sudo with the given test parameters - let res = skip_api_ibc_adapter_ibc_hooks::contract::sudo(deps.as_mut(), env, params.sudo_msg); + let res = skip_go_ibc_adapter_ibc_hooks::contract::sudo(deps.as_mut(), env, params.sudo_msg); // Assert the behavior is correct match res { diff --git a/contracts/adapters/ibc/neutron-transfer/Cargo.toml b/contracts/adapters/ibc/neutron-transfer/Cargo.toml index 90c3d3f7..60ac8709 100644 --- a/contracts/adapters/ibc/neutron-transfer/Cargo.toml +++ b/contracts/adapters/ibc/neutron-transfer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-ibc-adapter-neutron-transfer" +name = "skip-go-ibc-adapter-neutron-transfer" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/adapters/ibc/neutron-transfer/tests/test_execute_ibc_transfer.rs b/contracts/adapters/ibc/neutron-transfer/tests/test_execute_ibc_transfer.rs index 907f0163..3d4d2a9a 100644 --- a/contracts/adapters/ibc/neutron-transfer/tests/test_execute_ibc_transfer.rs +++ b/contracts/adapters/ibc/neutron-transfer/tests/test_execute_ibc_transfer.rs @@ -7,7 +7,7 @@ use cosmwasm_std::{ }; use neutron_proto::neutron::{feerefunder::Fee as NeutronFee, transfer::MsgTransfer}; use skip::ibc::{ExecuteMsg, IbcFee, IbcInfo}; -use skip_api_ibc_adapter_neutron_transfer::{ +use skip_go_ibc_adapter_neutron_transfer::{ error::ContractResult, state::{ENTRY_POINT_CONTRACT_ADDRESS, IN_PROGRESS_RECOVER_ADDRESS}, }; @@ -142,7 +142,7 @@ fn test_execute_ibc_transfer(params: Params) -> ContractResult<()> { ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?; // Call execute_ibc_transfer with the given test parameters - let res = skip_api_ibc_adapter_neutron_transfer::contract::execute( + let res = skip_go_ibc_adapter_neutron_transfer::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/ibc/neutron-transfer/tests/test_reply.rs b/contracts/adapters/ibc/neutron-transfer/tests/test_reply.rs index 7faf71b7..3238d3cb 100644 --- a/contracts/adapters/ibc/neutron-transfer/tests/test_reply.rs +++ b/contracts/adapters/ibc/neutron-transfer/tests/test_reply.rs @@ -4,7 +4,7 @@ use cosmwasm_std::{ }; use neutron_proto::neutron::transfer::MsgTransferResponse; use prost::Message; -use skip_api_ibc_adapter_neutron_transfer::{ +use skip_go_ibc_adapter_neutron_transfer::{ error::{ContractError, ContractResult}, state::{ACK_ID_TO_RECOVER_ADDRESS, IN_PROGRESS_RECOVER_ADDRESS}, }; @@ -176,7 +176,7 @@ fn test_reply(params: Params) -> ContractResult<()> { // Call reply with the given test parameters let res = - skip_api_ibc_adapter_neutron_transfer::contract::reply(deps.as_mut(), env, params.reply); + skip_go_ibc_adapter_neutron_transfer::contract::reply(deps.as_mut(), env, params.reply); // Assert the behavior is correct match res { diff --git a/contracts/adapters/ibc/neutron-transfer/tests/test_sudo.rs b/contracts/adapters/ibc/neutron-transfer/tests/test_sudo.rs index c0687a9f..85ef0a77 100644 --- a/contracts/adapters/ibc/neutron-transfer/tests/test_sudo.rs +++ b/contracts/adapters/ibc/neutron-transfer/tests/test_sudo.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ StdError, SubMsg, }; use neutron_sdk::sudo::msg::{RequestPacket, TransferSudoMsg}; -use skip_api_ibc_adapter_neutron_transfer::{ +use skip_go_ibc_adapter_neutron_transfer::{ error::{ContractError, ContractResult}, state::ACK_ID_TO_RECOVER_ADDRESS, }; @@ -320,7 +320,7 @@ fn test_sudo(params: Params) -> ContractResult<()> { // Call sudo with the given test parameters let res = - skip_api_ibc_adapter_neutron_transfer::contract::sudo(deps.as_mut(), env, params.sudo_msg); + skip_go_ibc_adapter_neutron_transfer::contract::sudo(deps.as_mut(), env, params.sudo_msg); // Assert the behavior is correct match res { diff --git a/contracts/adapters/swap/astroport/Cargo.toml b/contracts/adapters/swap/astroport/Cargo.toml index 46ee290b..668b001e 100644 --- a/contracts/adapters/swap/astroport/Cargo.toml +++ b/contracts/adapters/swap/astroport/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-swap-adapter-astroport" +name = "skip-go-swap-adapter-astroport" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/adapters/swap/astroport/tests/test_execute_astroport_pool_swap.rs b/contracts/adapters/swap/astroport/tests/test_execute_astroport_pool_swap.rs index 8ab51e81..58be24ca 100644 --- a/contracts/adapters/swap/astroport/tests/test_execute_astroport_pool_swap.rs +++ b/contracts/adapters/swap/astroport/tests/test_execute_astroport_pool_swap.rs @@ -12,7 +12,7 @@ use cosmwasm_std::{ }; use cw20::{BalanceResponse, Cw20ExecuteMsg}; use skip::swap::{ExecuteMsg, SwapOperation}; -use skip_api_swap_adapter_astroport::error::{ContractError, ContractResult}; +use skip_go_swap_adapter_astroport::error::{ContractError, ContractResult}; use test_case::test_case; /* @@ -194,7 +194,7 @@ fn test_execute_astroport_pool_swap(params: Params) -> ContractResult<()> { let info = mock_info(¶ms.caller, &[]); // Call execute_astroport_pool_swap with the given test parameters - let res = skip_api_swap_adapter_astroport::contract::execute( + let res = skip_go_swap_adapter_astroport::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/astroport/tests/test_execute_receive.rs b/contracts/adapters/swap/astroport/tests/test_execute_receive.rs index 0962b1ad..cd27e41d 100644 --- a/contracts/adapters/swap/astroport/tests/test_execute_receive.rs +++ b/contracts/adapters/swap/astroport/tests/test_execute_receive.rs @@ -12,7 +12,7 @@ use skip::{ error::SkipError::Payment, swap::{ExecuteMsg, SwapOperation}, }; -use skip_api_swap_adapter_astroport::{ +use skip_go_swap_adapter_astroport::{ error::{ContractError, ContractResult}, state::ENTRY_POINT_CONTRACT_ADDRESS, }; @@ -200,7 +200,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> { ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?; // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_astroport::contract::execute( + let res = skip_go_swap_adapter_astroport::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/astroport/tests/test_execute_swap.rs b/contracts/adapters/swap/astroport/tests/test_execute_swap.rs index a4309313..28ae99b0 100644 --- a/contracts/adapters/swap/astroport/tests/test_execute_swap.rs +++ b/contracts/adapters/swap/astroport/tests/test_execute_swap.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ SubMsg, WasmMsg, }; use skip::swap::{ExecuteMsg, SwapOperation}; -use skip_api_swap_adapter_astroport::{ +use skip_go_swap_adapter_astroport::{ error::{ContractError, ContractResult}, state::ENTRY_POINT_CONTRACT_ADDRESS, }; @@ -214,7 +214,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> { ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?; // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_astroport::contract::execute( + let res = skip_go_swap_adapter_astroport::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/astroport/tests/test_execute_transfer_funds_back.rs b/contracts/adapters/swap/astroport/tests/test_execute_transfer_funds_back.rs index 65522b6e..e925f386 100644 --- a/contracts/adapters/swap/astroport/tests/test_execute_transfer_funds_back.rs +++ b/contracts/adapters/swap/astroport/tests/test_execute_transfer_funds_back.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ SubMsg, }; use skip::{error::SkipError, swap::ExecuteMsg}; -use skip_api_swap_adapter_astroport::error::{ContractError, ContractResult}; +use skip_go_swap_adapter_astroport::error::{ContractError, ContractResult}; use test_case::test_case; /* @@ -127,7 +127,7 @@ fn test_execute_transfer_funds_back(params: Params) -> ContractResult<()> { let info = mock_info(¶ms.caller, &[]); // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_astroport::contract::execute( + let res = skip_go_swap_adapter_astroport::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/dexter/Cargo.toml b/contracts/adapters/swap/dexter/Cargo.toml index 29227000..88bdaf72 100644 --- a/contracts/adapters/swap/dexter/Cargo.toml +++ b/contracts/adapters/swap/dexter/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-swap-adapter-dexter" +name = "skip-go-swap-adapter-dexter" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/adapters/swap/dexter/tests/test_execute_swap.rs b/contracts/adapters/swap/dexter/tests/test_execute_swap.rs index ebc943b2..f5395eb1 100644 --- a/contracts/adapters/swap/dexter/tests/test_execute_swap.rs +++ b/contracts/adapters/swap/dexter/tests/test_execute_swap.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ SubMsg, Uint128, WasmMsg, }; use skip::swap::{ExecuteMsg, SwapOperation}; -use skip_api_swap_adapter_dexter::{ +use skip_go_swap_adapter_dexter::{ error::ContractResult, state::{DEXTER_ROUTER_ADDRESS, DEXTER_VAULT_ADDRESS, ENTRY_POINT_CONTRACT_ADDRESS}, }; @@ -302,7 +302,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> { DEXTER_ROUTER_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("dexter_router"))?; // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_dexter::contract::execute( + let res = skip_go_swap_adapter_dexter::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/dexter/tests/utils/mod.rs b/contracts/adapters/swap/dexter/tests/utils/mod.rs index a3352a27..19fcaf1b 100644 --- a/contracts/adapters/swap/dexter/tests/utils/mod.rs +++ b/contracts/adapters/swap/dexter/tests/utils/mod.rs @@ -79,9 +79,9 @@ pub fn store_token_code(app: &mut App) -> u64 { pub fn store_dexter_swap_adapter_code(app: &mut App) -> u64 { let dexter_swap_adapter_contract = Box::new(ContractWrapper::new_with_empty( - skip_api_swap_adapter_dexter::contract::execute, - skip_api_swap_adapter_dexter::contract::instantiate, - skip_api_swap_adapter_dexter::contract::query, + skip_go_swap_adapter_dexter::contract::execute, + skip_go_swap_adapter_dexter::contract::instantiate, + skip_go_swap_adapter_dexter::contract::query, )); app.store_code(dexter_swap_adapter_contract) } diff --git a/contracts/adapters/swap/hallswap/Cargo.toml b/contracts/adapters/swap/hallswap/Cargo.toml index 4b16d526..9250e308 100644 --- a/contracts/adapters/swap/hallswap/Cargo.toml +++ b/contracts/adapters/swap/hallswap/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-swap-adapter-hallswap" +name = "skip-go-swap-adapter-hallswap" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/adapters/swap/lido-satellite/Cargo.toml b/contracts/adapters/swap/lido-satellite/Cargo.toml index f08e2e1f..5af391ac 100644 --- a/contracts/adapters/swap/lido-satellite/Cargo.toml +++ b/contracts/adapters/swap/lido-satellite/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-swap-adapter-lido-satellite" +name = "skip-go-swap-adapter-lido-satellite" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/adapters/swap/lido-satellite/tests/test_execute_swap.rs b/contracts/adapters/swap/lido-satellite/tests/test_execute_swap.rs index 6f980eab..5f07dd56 100644 --- a/contracts/adapters/swap/lido-satellite/tests/test_execute_swap.rs +++ b/contracts/adapters/swap/lido-satellite/tests/test_execute_swap.rs @@ -6,7 +6,7 @@ use cosmwasm_std::{ }; use lido_satellite::msg::ExecuteMsg as LidoSatelliteExecuteMsg; use skip::swap::{ExecuteMsg, SwapOperation}; -use skip_api_swap_adapter_lido_satellite::{ +use skip_go_swap_adapter_lido_satellite::{ error::{ContractError, ContractResult}, state::{ BRIDGED_DENOM, CANONICAL_DENOM, ENTRY_POINT_CONTRACT_ADDRESS, @@ -180,7 +180,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> { CANONICAL_DENOM.save(deps.as_mut().storage, &String::from("factory/wstETH"))?; // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_lido_satellite::contract::execute( + let res = skip_go_swap_adapter_lido_satellite::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/osmosis-poolmanager/Cargo.toml b/contracts/adapters/swap/osmosis-poolmanager/Cargo.toml index a3aea215..b707fdb4 100644 --- a/contracts/adapters/swap/osmosis-poolmanager/Cargo.toml +++ b/contracts/adapters/swap/osmosis-poolmanager/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-swap-adapter-osmosis-poolmanager" +name = "skip-go-swap-adapter-osmosis-poolmanager" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/adapters/swap/osmosis-poolmanager/tests/test_execute_swap.rs b/contracts/adapters/swap/osmosis-poolmanager/tests/test_execute_swap.rs index eb18ab1a..8561984f 100644 --- a/contracts/adapters/swap/osmosis-poolmanager/tests/test_execute_swap.rs +++ b/contracts/adapters/swap/osmosis-poolmanager/tests/test_execute_swap.rs @@ -7,7 +7,7 @@ use cosmwasm_std::{ use osmosis_std::types::cosmos::base::v1beta1::Coin as OsmosisStdCoin; use osmosis_std::types::osmosis::poolmanager::v1beta1::{MsgSwapExactAmountIn, SwapAmountInRoute}; use skip::swap::{ExecuteMsg, SwapOperation}; -use skip_api_swap_adapter_osmosis_poolmanager::{ +use skip_go_swap_adapter_osmosis_poolmanager::{ error::ContractResult, state::ENTRY_POINT_CONTRACT_ADDRESS, }; use test_case::test_case; @@ -276,7 +276,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> { ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?; // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_osmosis_poolmanager::contract::execute( + let res = skip_go_swap_adapter_osmosis_poolmanager::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/osmosis-poolmanager/tests/test_execute_transfer_funds_back.rs b/contracts/adapters/swap/osmosis-poolmanager/tests/test_execute_transfer_funds_back.rs index ba1d034f..b4f9705f 100644 --- a/contracts/adapters/swap/osmosis-poolmanager/tests/test_execute_transfer_funds_back.rs +++ b/contracts/adapters/swap/osmosis-poolmanager/tests/test_execute_transfer_funds_back.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ SubMsg, }; use skip::{error::SkipError, swap::ExecuteMsg}; -use skip_api_swap_adapter_osmosis_poolmanager::error::{ContractError, ContractResult}; +use skip_go_swap_adapter_osmosis_poolmanager::error::{ContractError, ContractResult}; use test_case::test_case; /* @@ -127,7 +127,7 @@ fn test_execute_transfer_funds_back(params: Params) -> ContractResult<()> { let info = mock_info(¶ms.caller, &[]); // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_osmosis_poolmanager::contract::execute( + let res = skip_go_swap_adapter_osmosis_poolmanager::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/white-whale/Cargo.toml b/contracts/adapters/swap/white-whale/Cargo.toml index c4163064..99fa438d 100644 --- a/contracts/adapters/swap/white-whale/Cargo.toml +++ b/contracts/adapters/swap/white-whale/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-swap-adapter-white-whale" +name = "skip-go-swap-adapter-white-whale" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/adapters/swap/white-whale/tests/test_execute_receive.rs b/contracts/adapters/swap/white-whale/tests/test_execute_receive.rs index 7c8d6ccf..1cb2579e 100644 --- a/contracts/adapters/swap/white-whale/tests/test_execute_receive.rs +++ b/contracts/adapters/swap/white-whale/tests/test_execute_receive.rs @@ -12,7 +12,7 @@ use skip::{ error::SkipError::Payment, swap::{ExecuteMsg, SwapOperation}, }; -use skip_api_swap_adapter_white_whale::{ +use skip_go_swap_adapter_white_whale::{ error::{ContractError, ContractResult}, state::ENTRY_POINT_CONTRACT_ADDRESS, }; @@ -200,7 +200,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> { ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?; // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_white_whale::contract::execute( + let res = skip_go_swap_adapter_white_whale::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/white-whale/tests/test_execute_swap.rs b/contracts/adapters/swap/white-whale/tests/test_execute_swap.rs index a617fabb..46660f78 100644 --- a/contracts/adapters/swap/white-whale/tests/test_execute_swap.rs +++ b/contracts/adapters/swap/white-whale/tests/test_execute_swap.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ SubMsg, WasmMsg, }; use skip::swap::{ExecuteMsg, SwapOperation}; -use skip_api_swap_adapter_white_whale::{ +use skip_go_swap_adapter_white_whale::{ error::{ContractError, ContractResult}, state::ENTRY_POINT_CONTRACT_ADDRESS, }; @@ -214,7 +214,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> { ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?; // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_white_whale::contract::execute( + let res = skip_go_swap_adapter_white_whale::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/white-whale/tests/test_execute_transfer_funds_back.rs b/contracts/adapters/swap/white-whale/tests/test_execute_transfer_funds_back.rs index c67dfeb9..0d314584 100644 --- a/contracts/adapters/swap/white-whale/tests/test_execute_transfer_funds_back.rs +++ b/contracts/adapters/swap/white-whale/tests/test_execute_transfer_funds_back.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ SubMsg, }; use skip::{error::SkipError, swap::ExecuteMsg}; -use skip_api_swap_adapter_white_whale::error::{ContractError, ContractResult}; +use skip_go_swap_adapter_white_whale::error::{ContractError, ContractResult}; use test_case::test_case; /* @@ -127,7 +127,7 @@ fn test_execute_transfer_funds_back(params: Params) -> ContractResult<()> { let info = mock_info(¶ms.caller, &[]); // Call execute_swap with the given test parameters - let res = skip_api_swap_adapter_white_whale::contract::execute( + let res = skip_go_swap_adapter_white_whale::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/adapters/swap/white-whale/tests/test_execute_white_whale_pool_swap.rs b/contracts/adapters/swap/white-whale/tests/test_execute_white_whale_pool_swap.rs index bfbebf27..286ebaa8 100644 --- a/contracts/adapters/swap/white-whale/tests/test_execute_white_whale_pool_swap.rs +++ b/contracts/adapters/swap/white-whale/tests/test_execute_white_whale_pool_swap.rs @@ -8,7 +8,7 @@ use cosmwasm_std::{ }; use cw20::{BalanceResponse, Cw20ExecuteMsg}; use skip::swap::{ExecuteMsg, SwapOperation}; -use skip_api_swap_adapter_white_whale::error::{ContractError, ContractResult}; +use skip_go_swap_adapter_white_whale::error::{ContractError, ContractResult}; use test_case::test_case; use white_whale_std::pool_network::{ asset::{Asset as WhiteWhaleAsset, AssetInfo}, @@ -192,7 +192,7 @@ fn test_execute_white_whale_pool_swap(params: Params) -> ContractResult<()> { let info = mock_info(¶ms.caller, &[]); // Call execute_white_whale_pool_swap with the given test parameters - let res = skip_api_swap_adapter_white_whale::contract::execute( + let res = skip_go_swap_adapter_white_whale::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/entry-point/Cargo.toml b/contracts/entry-point/Cargo.toml index cbc82f61..ee71053c 100644 --- a/contracts/entry-point/Cargo.toml +++ b/contracts/entry-point/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-entry-point" +name = "skip-go-entry-point" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/contracts/entry-point/tests/test_execute_post_swap_action.rs b/contracts/entry-point/tests/test_execute_post_swap_action.rs index d05aca93..c1622ccf 100644 --- a/contracts/entry-point/tests/test_execute_post_swap_action.rs +++ b/contracts/entry-point/tests/test_execute_post_swap_action.rs @@ -10,7 +10,7 @@ use skip::{ entry_point::{Action, ExecuteMsg}, ibc::{ExecuteMsg as IbcTransferExecuteMsg, IbcFee, IbcInfo}, }; -use skip_api_entry_point::{ +use skip_go_entry_point::{ error::ContractError, state::{BLOCKED_CONTRACT_ADDRESSES, IBC_TRANSFER_CONTRACT_ADDRESS, PRE_SWAP_OUT_ASSET_AMOUNT}, }; @@ -658,7 +658,7 @@ fn test_execute_post_swap_action(params: Params) { .unwrap(); // Call execute_post_swap_action with the given test parameters - let res = skip_api_entry_point::contract::execute( + let res = skip_go_entry_point::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/entry-point/tests/test_execute_receive.rs b/contracts/entry-point/tests/test_execute_receive.rs index 62d5a456..09a2a856 100644 --- a/contracts/entry-point/tests/test_execute_receive.rs +++ b/contracts/entry-point/tests/test_execute_receive.rs @@ -10,7 +10,7 @@ use skip::{ entry_point::{Action, Affiliate, Cw20HookMsg, ExecuteMsg}, swap::{Swap, SwapExactAssetIn, SwapOperation}, }; -use skip_api_entry_point::{ +use skip_go_entry_point::{ error::ContractError, reply::RECOVER_REPLY_ID, state::{IBC_TRANSFER_CONTRACT_ADDRESS, SWAP_VENUE_MAP}, @@ -236,7 +236,7 @@ fn test_execute_receive(params: Params) { // Call execute_receive with the given test case params let res = match params.recovery_addr { - Some(recovery_addr) => skip_api_entry_point::contract::execute( + Some(recovery_addr) => skip_go_entry_point::contract::execute( deps.as_mut(), env, info, @@ -254,7 +254,7 @@ fn test_execute_receive(params: Params) { .unwrap(), }), ), - None => skip_api_entry_point::contract::execute( + None => skip_go_entry_point::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/entry-point/tests/test_execute_swap_and_action.rs b/contracts/entry-point/tests/test_execute_swap_and_action.rs index a06ad1de..93a89b45 100644 --- a/contracts/entry-point/tests/test_execute_swap_and_action.rs +++ b/contracts/entry-point/tests/test_execute_swap_and_action.rs @@ -20,7 +20,7 @@ use skip::{ SwapExactAssetOut, SwapOperation, }, }; -use skip_api_entry_point::{ +use skip_go_entry_point::{ error::ContractError, state::{IBC_TRANSFER_CONTRACT_ADDRESS, PRE_SWAP_OUT_ASSET_AMOUNT, SWAP_VENUE_MAP}, }; @@ -1911,7 +1911,7 @@ fn test_execute_swap_and_action(params: Params) { .unwrap(); // Call execute_swap_and_action with the given test case params - let res = skip_api_entry_point::contract::execute( + let res = skip_go_entry_point::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/entry-point/tests/test_execute_swap_and_action_with_recover.rs b/contracts/entry-point/tests/test_execute_swap_and_action_with_recover.rs index afa1b6f3..315fb67c 100644 --- a/contracts/entry-point/tests/test_execute_swap_and_action_with_recover.rs +++ b/contracts/entry-point/tests/test_execute_swap_and_action_with_recover.rs @@ -8,7 +8,7 @@ use skip::{ entry_point::{Action, Affiliate, ExecuteMsg}, swap::{Swap, SwapExactAssetIn, SwapOperation}, }; -use skip_api_entry_point::{error::ContractError, state::RECOVER_TEMP_STORAGE}; +use skip_go_entry_point::{error::ContractError, state::RECOVER_TEMP_STORAGE}; use test_case::test_case; /* @@ -387,7 +387,7 @@ fn test_execute_swap_and_action_with_recover(params: Params) { let recovery_addr = Addr::unchecked("recovery_address"); // Call execute_swap_and_action with the given test case params - let res = skip_api_entry_point::contract::execute( + let res = skip_go_entry_point::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/entry-point/tests/test_instantiate.rs b/contracts/entry-point/tests/test_instantiate.rs index c5a39fdd..c646185f 100644 --- a/contracts/entry-point/tests/test_instantiate.rs +++ b/contracts/entry-point/tests/test_instantiate.rs @@ -3,7 +3,7 @@ use cosmwasm_std::{ Addr, }; use skip::{entry_point::InstantiateMsg, swap::SwapVenue}; -use skip_api_entry_point::{ +use skip_go_entry_point::{ error::ContractError, state::{BLOCKED_CONTRACT_ADDRESSES, IBC_TRANSFER_CONTRACT_ADDRESS, SWAP_VENUE_MAP}, }; @@ -71,7 +71,7 @@ fn test_instantiate(params: Params) { env.contract.address = Addr::unchecked("entry_point"); // Call instantiate with the given test parameters - let res = skip_api_entry_point::contract::instantiate( + let res = skip_go_entry_point::contract::instantiate( deps.as_mut(), env, info, diff --git a/contracts/entry-point/tests/test_reply.rs b/contracts/entry-point/tests/test_reply.rs index e646bbd5..706c84f8 100644 --- a/contracts/entry-point/tests/test_reply.rs +++ b/contracts/entry-point/tests/test_reply.rs @@ -5,7 +5,7 @@ use cosmwasm_std::{ }; use cw20::{Cw20Coin, Cw20ExecuteMsg}; use skip::asset::Asset; -use skip_api_entry_point::{reply::RecoverTempStorage, state::RECOVER_TEMP_STORAGE}; +use skip_go_entry_point::{reply::RecoverTempStorage, state::RECOVER_TEMP_STORAGE}; use test_case::test_case; /* @@ -179,7 +179,7 @@ fn test_reply(params: Params) { } // Call reply with the given test parameters - let res = skip_api_entry_point::contract::reply(deps.as_mut(), env, params.reply); + let res = skip_go_entry_point::contract::reply(deps.as_mut(), env, params.reply); // Assert the behavior is correct match res { diff --git a/contracts/entry-point/tests/test_user_swap.rs b/contracts/entry-point/tests/test_user_swap.rs index 4ebdb6f0..f9ecc625 100644 --- a/contracts/entry-point/tests/test_user_swap.rs +++ b/contracts/entry-point/tests/test_user_swap.rs @@ -18,7 +18,7 @@ use skip::{ SwapExactAssetOut, SwapOperation, }, }; -use skip_api_entry_point::{error::ContractError, state::SWAP_VENUE_MAP}; +use skip_go_entry_point::{error::ContractError, state::SWAP_VENUE_MAP}; use test_case::test_case; /* @@ -1230,7 +1230,7 @@ fn test_execute_user_swap(params: Params) { .unwrap(); // Call execute_swap_and_action with the given test case params - let res = skip_api_entry_point::contract::execute( + let res = skip_go_entry_point::contract::execute( deps.as_mut(), env, info, diff --git a/contracts/placeholder/Cargo.toml b/contracts/placeholder/Cargo.toml index 9a4379f4..43124306 100644 --- a/contracts/placeholder/Cargo.toml +++ b/contracts/placeholder/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "skip-api-placeholder" +name = "skip-go-placeholder" version = { workspace = true } rust-version = { workspace = true } authors = { workspace = true } diff --git a/packages/skip/README.md b/packages/skip/README.md index a2714ade..b6e903e6 100644 --- a/packages/skip/README.md +++ b/packages/skip/README.md @@ -1,4 +1,4 @@ # Skip: Common Types and Functions -This Skip packages folder contains common types and functions that are used across multiple Skip API contracts. +This Skip packages folder contains common types and functions that are used across multiple Skip Go contracts. diff --git a/schema/skip-api-entry-point.json b/schema/skip-go-entry-point.json similarity index 99% rename from schema/skip-api-entry-point.json rename to schema/skip-go-entry-point.json index 45b26885..2770df5d 100644 --- a/schema/skip-api-entry-point.json +++ b/schema/skip-go-entry-point.json @@ -1,5 +1,5 @@ { - "contract_name": "skip-api-entry-point", + "contract_name": "skip-go-entry-point", "contract_version": "0.3.0", "idl_version": "1.0.0", "instantiate": {