diff --git a/Cargo.lock b/Cargo.lock index 806d48c..b292fe1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,7 +108,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -119,7 +119,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -141,7 +141,7 @@ dependencies = [ [[package]] name = "authzpp-utils" version = "0.3.0" -source = "git+https://github.com/kakucodes/authzpp#0f5afc75db8d0fd41212c692e55419aa4a29e37a" +source = "git+https://github.com/kakucodes/authzpp#e3bc2c2db3cd9fd1595e86baa418c49efc6f73f2" dependencies = [ "cosmos-sdk-proto 0.20.0", "cosmwasm-schema", @@ -337,21 +337,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "bjuno-token" -version = "0.13.2" -source = "git+https://github.com/arufa-research/stakeeasy-juno-contracts#79f801624be278481b0611aa3ec6305f4b2ac47e" -dependencies = [ - "cosmwasm-std", - "cw-storage-plus 0.13.2", - "cw-utils 0.13.2", - "cw2 0.13.2", - "cw20 0.13.2", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "block-buffer" version = "0.9.0" @@ -714,7 +699,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -808,7 +793,7 @@ dependencies = [ [[package]] name = "cw-grant-spec" version = "0.3.0" -source = "git+https://github.com/kakucodes/authzpp#0f5afc75db8d0fd41212c692e55419aa4a29e37a" +source = "git+https://github.com/kakucodes/authzpp#e3bc2c2db3cd9fd1595e86baa418c49efc6f73f2" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1042,16 +1027,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cw-storage-plus" -version = "0.13.2" -source = "git+https://github.com/arufa-research/stakeeasy-juno-contracts#79f801624be278481b0611aa3ec6305f4b2ac47e" -dependencies = [ - "cosmwasm-std", - "schemars", - "serde", -] - [[package]] name = "cw-storage-plus" version = "0.13.4" @@ -1106,17 +1081,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cw-utils" -version = "0.13.2" -source = "git+https://github.com/arufa-research/stakeeasy-juno-contracts#79f801624be278481b0611aa3ec6305f4b2ac47e" -dependencies = [ - "cosmwasm-std", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "cw-utils" version = "0.13.4" @@ -1174,17 +1138,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cw2" -version = "0.13.2" -source = "git+https://github.com/arufa-research/stakeeasy-juno-contracts#79f801624be278481b0611aa3ec6305f4b2ac47e" -dependencies = [ - "cosmwasm-std", - "cw-storage-plus 0.13.2", - "schemars", - "serde", -] - [[package]] name = "cw2" version = "0.13.4" @@ -1237,17 +1190,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cw20" -version = "0.13.2" -source = "git+https://github.com/arufa-research/stakeeasy-juno-contracts#79f801624be278481b0611aa3ec6305f4b2ac47e" -dependencies = [ - "cosmwasm-std", - "cw-utils 0.13.2", - "schemars", - "serde", -] - [[package]] name = "cw20" version = "0.13.4" @@ -1800,9 +1742,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ "libc", "windows-sys", @@ -1846,9 +1788,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" +checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd" [[package]] name = "fixed-hash" @@ -1972,7 +1914,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2018,9 +1960,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -2559,9 +2501,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -2778,7 +2720,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3005,7 +2947,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3150,7 +3092,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3646,21 +3588,6 @@ dependencies = [ "libc", ] -[[package]] -name = "sejuno-token" -version = "0.13.2" -source = "git+https://github.com/arufa-research/stakeeasy-juno-contracts#79f801624be278481b0611aa3ec6305f4b2ac47e" -dependencies = [ - "cosmwasm-std", - "cw-storage-plus 0.13.2", - "cw-utils 0.13.2", - "cw2 0.13.2", - "cw20 0.13.2", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "semver" version = "1.0.20" @@ -3669,9 +3596,9 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -3705,13 +3632,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3744,7 +3671,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3968,9 +3895,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4188,7 +4115,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4282,7 +4209,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4444,7 +4371,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4621,7 +4548,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] @@ -4655,7 +4582,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4848,7 +4775,7 @@ dependencies = [ [[package]] name = "withdraw-rewards-tax-grant" version = "0.3.0" -source = "git+https://github.com/kakucodes/authzpp#0f5afc75db8d0fd41212c692e55419aa4a29e37a" +source = "git+https://github.com/kakucodes/authzpp#e3bc2c2db3cd9fd1595e86baa418c49efc6f73f2" dependencies = [ "authzpp-utils", "cosmos-sdk-proto 0.20.0", @@ -5080,7 +5007,6 @@ name = "ymos-junodca-outpost" version = "0.2.2" dependencies = [ "balance-token-swap", - "bjuno-token", "bond-router", "cosmos-sdk-proto 0.19.0", "cosmwasm-schema", @@ -5096,7 +5022,6 @@ dependencies = [ "cw20-vesting 1.6.0", "outpost-utils", "schemars", - "sejuno-token", "semver", "serde", "terraswap-helpers", @@ -5113,7 +5038,6 @@ name = "ymos-junostake-outpost" version = "0.2.2" dependencies = [ "balance-token-swap", - "bjuno-token", "bond-router", "cosmos-sdk-proto 0.19.0", "cosmwasm-schema", @@ -5129,7 +5053,6 @@ dependencies = [ "cw20-vesting 1.6.0", "outpost-utils", "schemars", - "sejuno-token", "semver", "serde", "terraswap-helpers", @@ -5232,5 +5155,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] diff --git a/Cargo.toml b/Cargo.toml index 50409a7..d424fc5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,12 +55,10 @@ withdraw-rewards-tax-grant = { git = "https://github.com/kakucodes/authzpp", ver balance-token-swap = { git = "https://github.com/racoon-supply-rac/balance-dao", features = [ "library", ] } -bjuno-token = { git = "https://github.com/arufa-research/stakeeasy-juno-contracts", features = [ - "library", -] } -sejuno-token = { git = "https://github.com/arufa-research/stakeeasy-juno-contracts", features = [ - "library", -] } +# stake-easy = { git = "https://github.com/arufa-research/stakeeasy-juno-contracts", features = [ +# "library", +# ], package = "staking-contract" } + bond-router = { git = "https://github.com/wynddao/wynd-lsd", features = [ "library", ] } diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt index 78cda31..d614c36 100644 --- a/artifacts/checksums.txt +++ b/artifacts/checksums.txt @@ -1,5 +1,5 @@ -f1a4cdc7b806b6879a0032046b9a47fe3187b051942e9ee64521791af0d0460f ymos_junodca_outpost-aarch64.wasm -40b0b188f3f805e3458b63d98ac60eecae5b9adbcff954110297d49ac9d34cc3 ymos_junostake_outpost-aarch64.wasm -8485ffeb68c11d134ae5d18aabbe80a9c68c80387ffe74c88431d64de3aa4c18 ymos_osmostake_outpost-aarch64.wasm -2aaf6345fce88ffe8a34d8b938303d7f1bf1975865c4749b3c482da4c9415a82 ymos_wyndlp_outpost-aarch64.wasm -884899912ffc94eec3455811e4bf38bafd30eb5ff697ac38a2d4b09ad0dc5933 ymos_wyndstake_outpost-aarch64.wasm +d8d2aa429c976964fbad3fe2bf2f6121ff094bf13d3e9a8303275f55871553cc ymos_junodca_outpost-aarch64.wasm +4f5b16fa400a900beac1b094dbca2383be19d6123d080f00cd84d54c5c4a6604 ymos_junostake_outpost-aarch64.wasm +39b4e2e51021fd8c2df6bc4b4bfad8dd825b8e1da427f2cf28ba9c1aa94cfed8 ymos_osmostake_outpost-aarch64.wasm +1c65dae05a939a1681520f5faa008827931b047361bb683d98467f7a1cd7045f ymos_wyndlp_outpost-aarch64.wasm +eeecd0ed2906fb3d97effd0c84afcd60564a9ed94802a504e9f4ddf21f8d5c4e ymos_wyndstake_outpost-aarch64.wasm diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt index 1915d91..53b6ca2 100644 --- a/artifacts/checksums_intermediate.txt +++ b/artifacts/checksums_intermediate.txt @@ -1,5 +1,5 @@ -1031bf924bc17d3ff8b053a4f3b06cbf18afac089f88d9b790ab85e118e4929a target/wasm32-unknown-unknown/release/ymos_junodca_outpost.wasm -268236bd04bdf91fb1848959d9619e50820535668c9eb39599ab6283fbfc7ae7 target/wasm32-unknown-unknown/release/ymos_junostake_outpost.wasm -4cf36f0cb2d7ef66139939a9851e47a76f0290e7bf2373354775d5f76a3e3069 target/wasm32-unknown-unknown/release/ymos_osmostake_outpost.wasm -7d49cd6041a33036da05cccbb3c0b4d51969c8d18d135cf4919b3a3dd091868f target/wasm32-unknown-unknown/release/ymos_wyndlp_outpost.wasm -dd84c23257d71f6a09df6175dff4e0fbda744843f839c83b731a868324cd5a7f target/wasm32-unknown-unknown/release/ymos_wyndstake_outpost.wasm +ba0dbbcaa945490cef1f15e5b8856720b3b21e3899a7de196089061b37a68ad8 target/wasm32-unknown-unknown/release/ymos_osmostake_outpost.wasm +b46a4da1ba14c4db8ff1cd53e175d93756e7f2c82ae32e4a93405531df8d39ca target/wasm32-unknown-unknown/release/ymos_junodca_outpost.wasm +f6377c3103fa507779b71e460e1adc22272ffec3c7b5c6f1bd44b73c2761e2bc target/wasm32-unknown-unknown/release/ymos_junostake_outpost.wasm +d95059badb85ab2eab1fd55ea71cc2d136f385dd07acab71d874ea6c3dd7cc77 target/wasm32-unknown-unknown/release/ymos_wyndlp_outpost.wasm +ba0a816cb0f03364a03c1fab4725b7e802a8735eedc2db60b38862d5489085a0 target/wasm32-unknown-unknown/release/ymos_wyndstake_outpost.wasm diff --git a/artifacts/ymos_junostake_outpost-aarch64.wasm b/artifacts/ymos_junostake_outpost-aarch64.wasm index c96de67..208e280 100644 Binary files a/artifacts/ymos_junostake_outpost-aarch64.wasm and b/artifacts/ymos_junostake_outpost-aarch64.wasm differ diff --git a/artifacts/ymos_osmostake_outpost-aarch64.wasm b/artifacts/ymos_osmostake_outpost-aarch64.wasm index 4038df8..717acc2 100644 Binary files a/artifacts/ymos_osmostake_outpost-aarch64.wasm and b/artifacts/ymos_osmostake_outpost-aarch64.wasm differ diff --git a/artifacts/ymos_wyndlp_outpost-aarch64.wasm b/artifacts/ymos_wyndlp_outpost-aarch64.wasm index de59149..e8d786d 100644 Binary files a/artifacts/ymos_wyndlp_outpost-aarch64.wasm and b/artifacts/ymos_wyndlp_outpost-aarch64.wasm differ diff --git a/artifacts/ymos_wyndstake_outpost-aarch64.wasm b/artifacts/ymos_wyndstake_outpost-aarch64.wasm index 9e7c065..d74acfc 100644 Binary files a/artifacts/ymos_wyndstake_outpost-aarch64.wasm and b/artifacts/ymos_wyndstake_outpost-aarch64.wasm differ diff --git a/contracts/junodca/Cargo.toml b/contracts/junodca/Cargo.toml index 23fb77f..f24ee6a 100644 --- a/contracts/junodca/Cargo.toml +++ b/contracts/junodca/Cargo.toml @@ -54,8 +54,7 @@ wynd-stake = { workspace = true } wynd-helpers = { workspace = true } outpost-utils = { workspace = true } balance-token-swap = { workspace = true } -bjuno-token = { workspace = true } -sejuno-token = { workspace = true } +# stake-easy = { workspace = true } bond-router = { workspace = true } cw-grant-spec = { workspace = true } cw-orch = { workspace = true, optional = true } diff --git a/contracts/junodca/src/execute.rs b/contracts/junodca/src/execute.rs index 758401b..202eb92 100644 --- a/contracts/junodca/src/execute.rs +++ b/contracts/junodca/src/execute.rs @@ -10,7 +10,7 @@ use outpost_utils::{ helpers::{calc_tax_split, calculate_compound_amounts, is_authorized_compounder, prefs_sum_to_one, TaxSplitResult}, juno_comp_prefs::{ GelottoExecute, JunoCompPrefs, JunoDestinationProject, JunoLsd, RacoonBetExec, RacoonBetGame, SparkIbcFund, - WyndLPBondingPeriod, WyndStakingBondingPeriod, + StakeEasyMsgs, WyndLPBondingPeriod, WyndStakingBondingPeriod, }, msg_gen::{create_exec_contract_msg, create_exec_msg, CosmosProtoMsg}, }; @@ -490,19 +490,13 @@ pub fn prefs_to_msgs( JunoLsd::StakeEasyB => create_exec_contract_msg( project_addrs.destination_projects.juno_lsds.b_juno.clone(), target_address, - &bjuno_token::msg::ExecuteMsg::Mint { - recipient: target_address.to_string(), - amount: comp_token_amount, - }, + &StakeEasyMsgs::StakeForBjuno { referral: 0 }, funds, )?, JunoLsd::StakeEasySe => create_exec_contract_msg( project_addrs.destination_projects.juno_lsds.se_juno.clone(), target_address, - &sejuno_token::msg::ExecuteMsg::Mint { - recipient: target_address.to_string(), - amount: comp_token_amount, - }, + &StakeEasyMsgs::Stake { referral: 0 }, funds, )?, JunoLsd::Backbone => diff --git a/contracts/junodca/src/queries.rs b/contracts/junodca/src/queries.rs index 47e9c63..642e146 100644 --- a/contracts/junodca/src/queries.rs +++ b/contracts/junodca/src/queries.rs @@ -320,7 +320,8 @@ pub fn gen_comp_pref_grants( limit: ContractExecutionAuthorizationLimit::single_fund_limit("ujuno"), filter: ContractExecutionAuthorizationFilter::AcceptedMessageKeysFilter { keys: vec![match lsd_type { - JunoLsd::StakeEasySe | JunoLsd::StakeEasyB => "mint", + JunoLsd::StakeEasySe => "stake", + JunoLsd::StakeEasyB => "stake_for_bjuno", JunoLsd::Wynd | JunoLsd::Backbone | JunoLsd::Eris => "bond", } .to_string()], diff --git a/contracts/junostake/Cargo.toml b/contracts/junostake/Cargo.toml index 3c674ef..d8fdd59 100644 --- a/contracts/junostake/Cargo.toml +++ b/contracts/junostake/Cargo.toml @@ -55,8 +55,7 @@ wynd-stake = { workspace = true } wynd-helpers = { workspace = true } outpost-utils = { workspace = true } balance-token-swap = { workspace = true } -bjuno-token = { workspace = true } -sejuno-token = { workspace = true } +# stake-easy = { workspace = true } bond-router = { workspace = true } cw-grant-spec = { workspace = true } cw-orch = { workspace = true, optional = true } diff --git a/contracts/junostake/src/execute.rs b/contracts/junostake/src/execute.rs index fdc8542..62e48d9 100644 --- a/contracts/junostake/src/execute.rs +++ b/contracts/junostake/src/execute.rs @@ -10,7 +10,7 @@ use outpost_utils::{ helpers::{calculate_compound_amounts, is_authorized_compounder, prefs_sum_to_one, sum_coins}, juno_comp_prefs::{ GelottoExecute, JunoCompPrefs, JunoDestinationProject, JunoLsd, RacoonBetExec, RacoonBetGame, SparkIbcFund, - WyndLPBondingPeriod, WyndStakingBondingPeriod, + StakeEasyMsgs, WyndLPBondingPeriod, WyndStakingBondingPeriod, }, msg_gen::{create_exec_contract_msg, create_exec_msg, CosmosProtoMsg}, }; @@ -576,19 +576,13 @@ pub fn prefs_to_msgs( JunoLsd::StakeEasyB => create_exec_contract_msg( project_addresses.destination_projects.juno_lsds.b_juno.clone(), target_address, - &bjuno_token::msg::ExecuteMsg::Mint { - recipient: target_address.to_string(), - amount: comp_token_amount, - }, + &StakeEasyMsgs::StakeForBjuno { referral: 0 }, funds, )?, JunoLsd::StakeEasySe => create_exec_contract_msg( project_addresses.destination_projects.juno_lsds.se_juno.clone(), target_address, - &sejuno_token::msg::ExecuteMsg::Mint { - recipient: target_address.to_string(), - amount: comp_token_amount, - }, + &StakeEasyMsgs::Stake { referral: 0 }, funds, )?, JunoLsd::Backbone => diff --git a/contracts/junostake/src/queries.rs b/contracts/junostake/src/queries.rs index d045819..4df687c 100644 --- a/contracts/junostake/src/queries.rs +++ b/contracts/junostake/src/queries.rs @@ -293,7 +293,8 @@ pub fn gen_comp_pref_grants( limit: ContractExecutionAuthorizationLimit::single_fund_limit("ujuno"), filter: ContractExecutionAuthorizationFilter::AcceptedMessageKeysFilter { keys: vec![match lsd_type { - JunoLsd::StakeEasySe | JunoLsd::StakeEasyB => "mint", + JunoLsd::StakeEasySe => "stake", + JunoLsd::StakeEasyB => "stake_for_bjuno", JunoLsd::Wynd | JunoLsd::Backbone | JunoLsd::Eris => "bond", } .to_string()], diff --git a/packages/deploy/src/main.rs b/packages/deploy/src/main.rs index fbb77d4..bfe4171 100644 --- a/packages/deploy/src/main.rs +++ b/packages/deploy/src/main.rs @@ -216,9 +216,9 @@ pub fn main() -> anyhow::Result<()> { .to_string(), wy_juno: "juno18wuy5qr2mswgz7zak8yr9crhwhtur3v6mw4tcytupywxzw7sufyqgza7uh" .to_string(), - se_juno: "juno1dd0k0um5rqncfueza62w9sentdfh3ec4nw4aq4lk5hkjl63vljqscth9gv" + se_juno: "juno1dlp8avgc2r6t4nnsv4yydc6lc73rjtjqvdcee9r2kf0uwuef7v0smljy8w" .to_string(), - b_juno: "juno1wwnhkagvcd3tjz6f8vsdsw5plqnw8qy2aj3rrhqr2axvktzv9q2qz8jxn3" + b_juno: "juno1dlp8avgc2r6t4nnsv4yydc6lc73rjtjqvdcee9r2kf0uwuef7v0smljy8w" .to_string(), amp_juno: "juno17cya4sw72h4886zsm2lk3udxaw5m8ssgpsl6nd6xl6a4ukepdgkqeuv99x" .to_string(), diff --git a/packages/utils/src/juno_comp_prefs.rs b/packages/utils/src/juno_comp_prefs.rs index ad6cf19..c95b5a7 100644 --- a/packages/utils/src/juno_comp_prefs.rs +++ b/packages/utils/src/juno_comp_prefs.rs @@ -228,6 +228,12 @@ pub enum SparkIbcFund { Fund(FundMsg), } +#[cw_serde] +pub enum StakeEasyMsgs { + StakeForBjuno { referral: u64 }, + Stake { referral: u64 }, +} + #[cw_serde] pub enum AddressType { Private, diff --git a/packages/wynd-helpers/src/wynd_swap.rs b/packages/wynd-helpers/src/wynd_swap.rs index 94289c2..84139e9 100644 --- a/packages/wynd-helpers/src/wynd_swap.rs +++ b/packages/wynd-helpers/src/wynd_swap.rs @@ -1,5 +1,5 @@ use cosmos_sdk_proto::{cosmos::base::v1beta1::Coin, cosmwasm::wasm::v1::MsgExecuteContract}; -use cosmwasm_std::{to_binary, Addr, Decimal, QuerierWrapper, StdError, Uint128}; +use cosmwasm_std::{to_binary, to_json_binary, Addr, Decimal, QuerierWrapper, StdError, Uint128}; use outpost_utils::msg_gen::{create_exec_contract_msg, CosmosProtoMsg}; use wyndex::{ asset::{Asset, AssetInfo, AssetValidated}, @@ -219,7 +219,7 @@ pub fn create_wyndex_swap_msg_with_simulation( // the simulation and the actual swap msg let swap_ops = create_wyndex_swap_operations(offer_asset.clone(), ask_asset_info); - let simulated_swap: wyndex::pair::SimulationResponse; + let simulated_swap: wyndex_multi_hop::msg::SimulateSwapOperationsResponse; if let wyndex_multi_hop::msg::ExecuteMsg::ExecuteSwapOperations { operations, .. } = swap_ops.clone() @@ -259,7 +259,7 @@ pub fn create_wyndex_swap_msg_with_simulation( &cw20::Cw20ExecuteMsg::Send { contract: multihop_address.to_string(), amount: offer_amount, - msg: to_binary(&swap_ops)?, + msg: to_json_binary(&swap_ops)?, }, None, )?; @@ -267,7 +267,7 @@ pub fn create_wyndex_swap_msg_with_simulation( } Ok(( vec![CosmosProtoMsg::ExecuteContract(exec)], - simulated_swap.return_amount, + simulated_swap.amount, )) }