Fix: withdraw pending balance #64
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 6 commits
September 20, 2022 14:12
b0xtch
reviewed
Sep 22, 2022
b0xtch
approved these changes
Sep 22, 2022
fcavazzoli
force-pushed
the
fix/withdraw_payload
branch
3 times, most recently
from
e931607
to
1f31b75
Compare
fcavazzoli
force-pushed
the
fix/withdraw_payload
branch
from
95c6c32
to
d2a86b0
Compare
b0xtch
reviewed
Sep 28, 2022
| @@ -77,7 +80,7 @@ pub struct ProxyState { | |||
| /// store incoming messages against status locks | |||
| pub incoming_messages: RefCell<HashMap<MessageHash, MessageStatus>>, | |||
| /// user balances | |||
| pub balances: RefCell<HashMap<Principal, HashMap<TokendId, Nat>>>, | |||
| pub balances: RefCell<HashMap<Principal, Vec<(Principal, Nat)>>>, | |||
There was a problem hiding this comment.
Suggested change
| pub balances: RefCell<HashMap<Principal, Vec<(Principal, Nat)>>>, | |
| pub balances: RefCell<HashMap<EthereumAddr, Nat>>, |
Could we narrow it down to this?
There was a problem hiding this comment.
If we need caller then ignore
There was a problem hiding this comment.
we need the caller
| @@ -91,7 +94,7 @@ pub struct StableProxyState { | |||
| /// store incoming messages against status locks | |||
| pub incoming_messages: HashMap<MessageHash, MessageStatus>, | |||
| /// user balances | |||
| pub balances: HashMap<Principal, HashMap<Principal, Nat>>, | |||
| pub balances: Option<HashMap<Principal, Vec<(Principal, Nat)>>>, | |||
There was a problem hiding this comment.
Suggested change
| pub balances: Option<HashMap<Principal, Vec<(Principal, Nat)>>>, | |
| pub balances: RefCell<HashMap<EthereumAddr, Nat>>, |
The same usage can be applied here
There was a problem hiding this comment.
Also Is Optional being committed or only required for upgrades?
There was a problem hiding this comment.
it is required for the upgrades
Comment on lines
69
to
76
| let mut binding = self.balances.borrow_mut(); | ||
| let balance = binding.entry(caller).or_default(); | ||
| match balance.into_iter().find(|tx| tx.0 == to) { | ||
| Some(value) => value.1 += amount, | ||
| None => { | ||
| balance.push((to, amount)); | ||
| } | ||
| } |
There was a problem hiding this comment.
using a hashmap in the original structure could simplify this a lot
RefCell<HashMap<Principal, HashMap<EthereumAddr, Nat>>>
Comment on lines
80
to
90
| pub fn update_balance(&self, caller: Principal, to: Principal, amount: Nat) { | ||
| let mut binding = self.balances.borrow_mut(); | ||
| let user_balances = binding.get_mut(&caller).unwrap(); | ||
| // if new amount is zero, we remove the tx. | ||
| if amount == 0 { | ||
| let index = user_balances.into_iter().position(|tx| tx.0 == to).unwrap(); | ||
| user_balances.remove(index); | ||
| } else { | ||
| let mut balance = user_balances.iter_mut().find(|tx| tx.0 == to).unwrap(); | ||
| balance.1 = amount; | ||
| } |
There was a problem hiding this comment.
same as above, simplifying our structure
| @@ -78,7 +81,7 @@ pub struct ProxyState { | |||
| /// store incoming messages against status locks | |||
| pub incoming_messages: RefCell<HashMap<MessageHash, MessageStatus>>, | |||
| /// user balances | |||
| pub balances: RefCell<HashMap<Principal, HashMap<TokendId, Nat>>>, | |||
| pub balances: RefCell<HashMap<Principal, HashMap<TokendId, Vec<(Principal, Nat)>>>>, | |||
There was a problem hiding this comment.
Same idea as the eth_proxy balances structure.
- Simplify
- and if caller is not needed truncate to:
RefCell<HashMap<EthereumAddr, HashMap<TokenId, , Nat>>>,| Some(balance) => balance.clone(), | ||
| None => Nat::from(0_u32), | ||
| }) | ||
| pub fn get_balance( |
There was a problem hiding this comment.
this will be simplified, if the structure is also simplified
fcavazzoli
force-pushed
the
fix/withdraw_payload
branch
2 times, most recently
from
be0acdc
to
748fc0a
Compare
added 9 commits
October 18, 2022 12:15
added 9 commits
October 18, 2022 12:30
fcavazzoli
force-pushed
the
fix/withdraw_payload
branch
from
4b95f1c
to
44d66f9
Compare
fcavazzoli
force-pushed
the
chore/use_cap_for_claimable_assets
branch
from
69c0b08
to
765207d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Changes
withdraw(eth_contract_as_principal: TokendId, eth_addr: EthereumAddr, _amount: Nat,)pub struct WithdrawableBalance(pub Vec<(String, String, Nat)>)