Skip to content

Adding transfer function from treasury while streaming #125

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

Open
scobi7 wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Adding transfer function from treasury while streaming #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fb67d69
feature minting and transfering
scobi7 Jul 24, 2024
f2068b5
feat minting and transfer; only minting works
scobi7 Jul 24, 2024
c6eb4ad
feat mint and transfer, still broken
scobi7 Jul 24, 2024
8735c01
transfer and minting
scobi7 Jul 25, 2024
bc7b802
transfer is failing
scobi7 Jul 25, 2024
03428b8
fixing transfer
scobi7 Jul 26, 2024
5c64334
feat specific token to stream (#125)
scobi7 Aug 9, 2024
62e2692
add tokens to recipient for gas price (#125)
scobi7 Aug 7, 2024
86171b6
add token_address as parameter (#125)
scobi7 Aug 10, 2024
ddee779
implementing into treasury. still seperate
scobi7 Aug 14, 2024
80cc886
add stream to treasury (#125)
scobi7 Aug 14, 2024
ed2a2bf
feat treasury streaming (#125)
scobi7 Aug 15, 2024
1e0f827
feat treasury streaming (#125)
scobi7 Aug 15, 2024
de0b366
scarb fmt (#125)
scobi7 Aug 15, 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
115 changes: 96 additions & 19 deletions src/streaming.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ trait IStreaming<TContractState> {
start_time: u64,
end_time: u64,
total_amount: u128,
is_minting: bool,
token_address: ContractAddress
);

fn claim_stream(
Expand All @@ -20,22 +22,29 @@ trait IStreaming<TContractState> {

fn get_stream_info(
ref self: TContractState, recipient: ContractAddress, start_time: u64, end_time: u64,
) -> (u128, u128);
) -> (u128, u128, bool, ContractAddress);

fn set_treasury_address(ref self: TContractState, address: ContractAddress);
fn get_treasury_address(self: @TContractState) -> ContractAddress;
}

#[starknet::component]
mod streaming {
use konoha::contract::Governance;
use konoha::contract::{IGovernanceDispatcher, IGovernanceDispatcherTrait};
use konoha::traits::{IGovernanceTokenDispatcher, IGovernanceTokenDispatcherTrait};
use konoha::treasury::{ITreasuryDispatcher, ITreasuryDispatcherTrait};
use openzeppelin::token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};

use starknet::ContractAddress;
use starknet::{get_block_timestamp, get_caller_address, get_contract_address};

#[storage]
struct Storage {
streams: LegacyMap::<
(ContractAddress, u64, u64), (u128, u128)
> // (already_claimed, total_amount)
(ContractAddress, u64, u64), (u128, u128, bool, ContractAddress)
>, // (already_claimed, total_amount, is_minting)
treasury_address: ContractAddress
}

#[derive(starknet::Event, Drop, Serde)]
Expand All @@ -52,6 +61,7 @@ mod streaming {
start_time: u64,
end_time: u64,
total_amount: u128,
token_address: ContractAddress,
}

#[derive(starknet::Event, Drop, Serde)]
Expand All @@ -74,22 +84,39 @@ mod streaming {
impl Streaming<
TContractState, +HasComponent<TContractState>
> of super::IStreaming<ComponentState<TContractState>> {
fn set_treasury_address(
ref self: ComponentState<TContractState>, address: ContractAddress
) {
let caller = get_caller_address();
let myaddr = get_contract_address();
assert(caller == myaddr, 'can only call from proposal');
self.treasury_address.write(address);
}

fn get_treasury_address(self: @ComponentState<TContractState>) -> ContractAddress {
self.treasury_address.read()
}
fn add_new_stream(
ref self: ComponentState<TContractState>,
recipient: ContractAddress,
start_time: u64,
end_time: u64,
total_amount: u128,
is_minting: bool,
token_address: ContractAddress,
) {
let key = (recipient, start_time, end_time);

assert(get_caller_address() == get_contract_address(), 'not self-call');
//assert(get_caller_address() == get_contract_address(), 'not self-call');
assert(start_time < end_time, 'starts first');

let mut claimable_amount = 0;
self.streams.write(key, (claimable_amount, total_amount));
self.streams.write(key, (claimable_amount, total_amount, is_minting, token_address));

self.emit(StreamCreated { recipient, start_time, end_time, total_amount, });
self
.emit(
StreamCreated { recipient, start_time, end_time, total_amount, token_address }
);
}

fn claim_stream(
Expand All @@ -101,7 +128,12 @@ mod streaming {
let current_time = get_block_timestamp();

let key = (recipient, start_time, end_time);
let (already_claimed, total_amount): (u128, u128) = self.streams.read(key);
let (
already_claimed, total_amount, is_minting, token_address
): (u128, u128, bool, ContractAddress) =
self
.streams
.read(key);
assert(current_time > start_time, 'stream has not started');

let elapsed_time = if current_time > end_time {
Expand All @@ -117,11 +149,29 @@ mod streaming {
assert(amount_to_claim > 0, 'nothing to claim');

// Update the storage with the new claimed amount
self.streams.write(key, (currently_claimable, total_amount));
self.streams.write(key, (currently_claimable, total_amount, is_minting, token_address));

if is_minting {
// Mint tokens to the recipient if minting is enabled
let self_dsp = IGovernanceDispatcher { contract_address: get_contract_address() };
IGovernanceTokenDispatcher {
contract_address: self_dsp.get_governance_token_address()
}
.mint(recipient, amount_to_claim.into());
} else {
// Transfer tokens using the Treasury contract if minting is disabled
let treasury_address = self.get_treasury_address();
let treasury = ITreasuryDispatcher { contract_address: treasury_address };

let self_dsp = IGovernanceDispatcher { contract_address: get_contract_address() };
IGovernanceTokenDispatcher { contract_address: self_dsp.get_governance_token_address() }
.mint(recipient, amount_to_claim.into());
let success = treasury
.send_tokens_to_address(recipient, amount_to_claim.into(), token_address);
assert!(success, "Token transfer via Treasury failed");

// Optionally print the balance after transfer (if needed)
let erc20_token = IERC20Dispatcher { contract_address: token_address };
let balance_after = erc20_token.balance_of(treasury_address);
println!("Streaming contract balance after transfer: {}", balance_after);
}

self.emit(StreamClaimed { recipient, start_time, end_time, total_amount, });
}
Expand All @@ -135,15 +185,37 @@ mod streaming {
let key: (ContractAddress, u64, u64) = (recipient, start_time, end_time);

// Read from the streams LegacyMap
let (already_claimed, total_amount): (u128, u128) = self.streams.read(key);
let (
already_claimed, total_amount, is_minting, token_address
): (u128, u128, bool, ContractAddress) =
self
.streams
.read(key);
let to_distribute: u256 = total_amount.into() - already_claimed.into();

// Cancel stream
self.streams.write(key, (0, 0));
self.streams.write(key, (0, 0, is_minting, token_address));
if is_minting {
// Mint tokens to the recipient if minting is enabled
let self_dsp = IGovernanceDispatcher { contract_address: get_contract_address() };
IGovernanceTokenDispatcher {
contract_address: self_dsp.get_governance_token_address()
}
.mint(recipient, to_distribute.into());
} else {
// Transfer tokens using the Treasury contract if minting is disabled
let treasury_address = self.get_treasury_address();
let treasury = ITreasuryDispatcher { contract_address: treasury_address };

let success = treasury
.send_tokens_to_address(recipient, to_distribute.into(), token_address);
assert!(success, "Token transfer via Treasury failed");

let self_dsp = IGovernanceDispatcher { contract_address: get_contract_address() };
IGovernanceTokenDispatcher { contract_address: self_dsp.get_governance_token_address() }
.mint(get_caller_address(), to_distribute.into());
// Optionally print the balance after transfer (if needed)
let erc20_token = IERC20Dispatcher { contract_address: token_address };
let balance_after = erc20_token.balance_of(treasury_address);
println!("Streaming contract balance after transfer: {}", balance_after);
}

self
.emit(
Expand All @@ -158,10 +230,15 @@ mod streaming {
recipient: ContractAddress,
start_time: u64,
end_time: u64,
) -> (u128, u128) {
) -> (u128, u128, bool, ContractAddress) {
let key: (ContractAddress, u64, u64) = (recipient, start_time, end_time);
let (currently_claimable, total_amount): (u128, u128) = self.streams.read(key);
(currently_claimable, total_amount)
let (
currently_claimable, total_amount, is_minting, token_address
): (u128, u128, bool, ContractAddress) =
self
.streams
.read(key);
(currently_claimable, total_amount, is_minting, token_address)
}
}
}
Loading