Skip to content

fix(contracts): remove dead code and optimize map serialization #388

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dinma179 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(contracts): remove dead code and optimize map serialization #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/escrow-swap/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use soroban_sdk::{contracttype,contracterror,contractevent,Address,BytesN};
pub struct SwapRequest{pub id:u64,pub initiator:Address,pub responder:Address,pub token_a:Address,pub token_b:Address,pub initiator_amount:i128,pub responder_amount:i128,pub hash_lock:BytesN<32>,pub time_lock:u64,pub status:u32,pub created_at:u64}
pub const STATUS_PENDING:u32=0;pub const STATUS_ACTIVE:u32=1;pub const STATUS_COMPLETED:u32=2;pub const STATUS_CANCELLED:u32=3;
#[contracttype]#[derive(Clone)]
pub enum DataKey{Admin,SwapRequests,NextSwapId,Paused}
pub enum DataKey{Admin,SwapRequests,NextSwapId}
#[contracterror]#[derive(Debug,Clone,PartialEq,Eq)]
pub enum EscrowError{NotInitialized=1,Unauthorized=2,ContractPaused=3,InvalidAmount=4,SwapNotFound=5,SwapNotActive=6,AlreadyAccepted=7,HashLockMismatch=8,TimeLockExpired=9,InsufficientBalance=10,InvalidSwap=11,VecAccessError=12,AlreadyInitialized=13,InvalidAdmin=14}
#[contractevent(topics=["swap_new"])]#[derive(Clone,Debug)]
Expand Down
7 changes: 3 additions & 4 deletions packages/governance-token/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pub fn transfer_from(
if amount <= 0 {
return Err(TokenError::InvalidAmount);
}
let allowances: Map<(Address, Address), AllowanceData> = env.storage().persistent().get(&ALLOWANCES_KEY).ok_or(TokenError::NotInitialized)?;
let mut allowances: Map<(Address, Address), AllowanceData> = env.storage().persistent().get(&ALLOWANCES_KEY).ok_or(TokenError::NotInitialized)?;
let key = (from.clone(), spender.clone());
let allowance: AllowanceData = allowances.get(key.clone()).ok_or(TokenError::Unauthorized)?;
let current_ledger: u32 = env.ledger().sequence();
Expand All @@ -74,13 +74,12 @@ pub fn transfer_from(
if allowance.amount < amount {
return Err(TokenError::AllowanceExceeded);
}
let mut allowances_mut = allowances;
let new_allowance = allowance.amount.checked_sub(amount).ok_or(TokenError::Underflow)?;
allowances_mut.set(key, AllowanceData {
allowances.set(key, AllowanceData {
amount: new_allowance,
expiration_ledger: allowance.expiration_ledger,
});
env.storage().persistent().set(&ALLOWANCES_KEY, &allowances_mut);
env.storage().persistent().set(&ALLOWANCES_KEY, &allowances);
let mut balances: Map<Address, i128> = env.storage().persistent().get(&BALANCES_KEY).ok_or(TokenError::NotInitialized)?;
let from_balance: i128 = balances.get(from.clone()).unwrap_or(0);
if from_balance < amount {
Expand Down
1 change: 0 additions & 1 deletion packages/governance-token/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ pub enum TokenError {
Overflow = 5,
AllowanceExpired = 6,
AllowanceExceeded = 7,
NegativeAllowance = 8,
NotAdmin = 9,
ContractPaused = 10,
Underflow = 11,
Expand Down