Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

💄 Rebrand #119

Merged
merged 2 commits into from
Jul 8, 2024
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 .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion contracts/adapters/ibc/ibc-hooks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions contracts/adapters/ibc/ibc-hooks/tests/test_reply.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions contracts/adapters/ibc/ibc-hooks/tests/test_sudo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion contracts/adapters/ibc/neutron-transfer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions contracts/adapters/ibc/neutron-transfer/tests/test_reply.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions contracts/adapters/ibc/neutron-transfer/tests/test_sudo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion contracts/adapters/swap/astroport/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down Expand Up @@ -194,7 +194,7 @@ fn test_execute_astroport_pool_swap(params: Params) -> ContractResult<()> {
let info = mock_info(&params.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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions contracts/adapters/swap/astroport/tests/test_execute_swap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down Expand Up @@ -127,7 +127,7 @@ fn test_execute_transfer_funds_back(params: Params) -> ContractResult<()> {
let info = mock_info(&params.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,
Expand Down
2 changes: 1 addition & 1 deletion contracts/adapters/swap/dexter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions contracts/adapters/swap/dexter/tests/test_execute_swap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions contracts/adapters/swap/dexter/tests/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ pub fn store_token_code(app: &mut App<BankKeeper, MockApiBech32>) -> u64 {

pub fn store_dexter_swap_adapter_code(app: &mut App<BankKeeper, MockApiBech32>) -> 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)
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/adapters/swap/hallswap/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion contracts/adapters/swap/lido-satellite/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
Loading
Loading