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.

Sign up for GitHub

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

Tos data reduce #101

Merged
merged 6 commits into from
Dec 4, 2024
Merged

Tos data reduce #101

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ceb3da
Stream deconstruct WIP
orkunkl Dec 2, 2024
cb4a3f9
Minimize stream storage load
orkunkl Dec 2, 2024
9cda094
Fix comment
orkunkl Dec 2, 2024
c3fea90
Minimize tos data on loads
orkunkl Dec 3, 2024
0363905
Generate schema
orkunkl Dec 3, 2024
6e2ff8c
Merge branch 'main' into tos-data-reduce
orkunkl Dec 4, 2024
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
66 changes: 47 additions & 19 deletions contracts/stream/src/circuit_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::helpers::build_u128_bank_send_msg;
use crate::pool::pool_refund;
use crate::state::{CONTROLLER_PARAMS, POSITIONS, STREAM};
use crate::state::{CONTROLLER_PARAMS, POSITIONS, POST_STREAM, STREAM_INFO, STREAM_STATE};
use crate::stream::{sync_stream, sync_stream_status};
use crate::ContractError;
use cosmwasm_std::{attr, BankMsg, CosmosMsg, DepsMut, Env, MessageInfo, Response, Timestamp};
Expand All @@ -13,7 +13,7 @@ pub fn execute_exit_cancelled(
env: Env,
info: MessageInfo,
) -> Result<Response, ContractError> {
let mut stream = STREAM.load(deps.storage)?;
let mut stream = STREAM_STATE.load(deps.storage)?;

let mut position = POSITIONS.load(deps.storage, &info.sender)?;
if position.owner != info.sender {
Expand Down Expand Up @@ -82,7 +82,7 @@ pub fn execute_cancel_stream(
if controller_params.protocol_admin != info.sender {
return Err(ContractError::Unauthorized {});
}
let mut stream = STREAM.load(deps.storage)?;
let mut stream = STREAM_STATE.load(deps.storage)?;
sync_stream_status(&mut stream, env.block.time);

if stream.is_finalized() || stream.is_cancelled() {
Expand All @@ -93,19 +93,28 @@ pub fn execute_cancel_stream(
stream.status_info.status = Status::Cancelled;

sync_stream(&mut stream, env.block.time);
STREAM.save(deps.storage, &stream)?;
STREAM_STATE.save(deps.storage, &stream)?;

// Refund all out tokens to stream creator(treasury)
let mut refund_coins = vec![stream.out_asset.clone()];
let pool_refund_coins = pool_refund(&deps, stream.pool_config, stream.out_asset.denom.clone())?;

refund_coins.extend(pool_refund_coins);
// refund pool creation if any
let post_stream_ops = POST_STREAM.may_load(deps.storage)?;
if let Some(post_stream_ops) = post_stream_ops {
let pool_refund_coins = pool_refund(
&deps,
post_stream_ops.pool_config,
stream.out_asset.denom.clone(),
)?;
refund_coins.extend(pool_refund_coins);
}

let stream_info = STREAM_INFO.load(deps.storage)?;
let funds_msgs: Vec<CosmosMsg> = refund_coins
.iter()
.map(|coin| {
CosmosMsg::Bank(BankMsg::Send {
to_address: stream.treasury.to_string(),
to_address: stream_info.treasury.to_string(),
amount: vec![coin.clone()],
})
})
Expand All @@ -122,9 +131,10 @@ pub fn execute_cancel_stream_with_threshold(
env: Env,
info: MessageInfo,
) -> Result<Response, ContractError> {
let mut stream = STREAM.load(deps.storage)?;
let mut stream = STREAM_STATE.load(deps.storage)?;
let stream_info = STREAM_INFO.load(deps.storage)?;
// Only stream creator can cancel the stream with threshold not reached
if info.sender != stream.stream_admin {
if info.sender != stream_info.stream_admin {
return Err(ContractError::Unauthorized {});
}
sync_stream_status(&mut stream, env.block.time);
Expand All @@ -150,19 +160,27 @@ pub fn execute_cancel_stream_with_threshold(

stream.status_info.status = Status::Cancelled;

STREAM.save(deps.storage, &stream)?;
STREAM_STATE.save(deps.storage, &stream)?;

// Refund all out tokens to stream creator(treasury)
let mut refund_coins = vec![stream.out_asset.clone()];
let pool_refund_coins = pool_refund(&deps, stream.pool_config, stream.out_asset.denom.clone())?;

refund_coins.extend(pool_refund_coins);
// refund pool creation if any
let post_stream_ops = POST_STREAM.may_load(deps.storage)?;
if let Some(post_stream_ops) = post_stream_ops {
let pool_refund_coins = pool_refund(
&deps,
post_stream_ops.pool_config,
stream.out_asset.denom.clone(),
)?;
refund_coins.extend(pool_refund_coins);
}

let funds_msgs: Vec<CosmosMsg> = refund_coins
.iter()
.map(|coin| {
CosmosMsg::Bank(BankMsg::Send {
to_address: stream.treasury.to_string(),
to_address: stream_info.treasury.to_string(),
amount: vec![coin.clone()],
})
})
Expand All @@ -178,9 +196,10 @@ pub fn execute_stream_admin_cancel(
env: Env,
info: MessageInfo,
) -> Result<Response, ContractError> {
let mut stream = STREAM.load(deps.storage)?;
let mut stream = STREAM_STATE.load(deps.storage)?;
let stream_info = STREAM_INFO.load(deps.storage)?;
// Only stream admin can cancel the stream with this method
if info.sender != stream.stream_admin {
if info.sender != stream_info.stream_admin {
return Err(ContractError::Unauthorized {});
}

Expand All @@ -194,18 +213,27 @@ pub fn execute_stream_admin_cancel(
}
stream.status_info.status = Status::Cancelled;
sync_stream(&mut stream, env.block.time);
STREAM.save(deps.storage, &stream)?;
STREAM_STATE.save(deps.storage, &stream)?;

// Refund all out tokens to stream creator(treasury)
let mut refund_coins = vec![stream.out_asset.clone()];
let pool_refund_coins = pool_refund(&deps, stream.pool_config, stream.out_asset.denom.clone())?;

refund_coins.extend(pool_refund_coins);
// refund pool creation if any
let post_stream_ops = POST_STREAM.may_load(deps.storage)?;
if let Some(post_stream_ops) = post_stream_ops {
let pool_refund_coins = pool_refund(
&deps,
post_stream_ops.pool_config,
stream.out_asset.denom.clone(),
)?;
refund_coins.extend(pool_refund_coins);
}

let funds_msgs: Vec<CosmosMsg> = refund_coins
.iter()
.map(|coin| {
CosmosMsg::Bank(BankMsg::Send {
to_address: stream.treasury.to_string(),
to_address: stream_info.treasury.to_string(),
amount: vec![coin.clone()],
})
})
Expand Down
Loading
Loading