[Feature] Coin Transfer

src-tauri/src/commands/query.rs

@@ -30,7 +30,24 @@ pub fn get_balance(account: AccountAddress) -> Result<u64, CarpeError>{
   bal.parse::<u64>().map_err(|_|{ CarpeError::misc(&format!("Could not get balance from account: {}", account))})
 }
 
-pub fn get_events(account: AccountAddress) -> Result<Vec<EventView>, CarpeError> {
+pub fn get_payment_events(account: AccountAddress) -> Result<Vec<EventView>, CarpeError> {
+  // get payments received
+  match get_events(account, 0) {
+    Ok(mut received) => {
+      // get payments sent
+      match get_events(account, 1) {
+        Ok(mut sent) => {
+          received.append(&mut sent);
+          Ok(received)
+        },
+        Err(e) => Err(CarpeError::misc(&e.msg))
+      }
+    },
+    Err(e) => Err(CarpeError::misc(&e.msg))
+  }
+}
+
+pub fn get_events(account: AccountAddress, event_key: u64) -> Result<Vec<EventView>, CarpeError> {
   let node = get_node_obj()?;
 
   let limit = 1000;
@@ -41,7 +58,7 @@ pub fn get_events(account: AccountAddress) -> Result<Vec<EventView>, CarpeError>
 
   while events_count == limit {    
     let result = node.client.get_events(
-      EventKey::new_from_address(&account, 0),
+      EventKey::new_from_address(&account, event_key),
       start, 
       limit
     );
@@ -62,20 +79,20 @@ pub fn get_events(account: AccountAddress) -> Result<Vec<EventView>, CarpeError>
   match error {
     Some(e) => {
       if e.to_string().contains("DB corrupt") {
-        return try_again_get_events(account, &node)
+        return try_again_get_events(account, event_key, &node)
       }
       Err(CarpeError::misc(&format!("Could not query account events, message: {:?}", e)))
     },
     None => {
       if ret.is_empty() {
-        return try_again_get_events(account, &node)
+        return try_again_get_events(account, event_key, &node)
       }
       Ok(ret)
     }
   }
 }
 
-fn try_again_get_events(account: AccountAddress, current_node: &Node) -> Result<Vec<EventView>, CarpeError> {
+fn try_again_get_events(account: AccountAddress, event_key: u64, current_node: &Node) -> Result<Vec<EventView>, CarpeError> {
   match remove_node(current_node.client.url().unwrap().to_string()) {
     Err(e) => {
       if e.to_string().contains("Cannot remove last node") {
@@ -84,6 +101,6 @@ fn try_again_get_events(account: AccountAddress, current_node: &Node) -> Result<
         Err(CarpeError::misc(&format!("Could not query account events, message: {:?}", e)))
       }            
     },
-    Ok(_) => get_events(account)
+    Ok(_) => get_events(account, event_key)
   }        
 }

src-tauri/src/commands/tx.rs

@@ -1,8 +1,10 @@
 //! transaction scripts
 
-use diem_types::transaction::authenticator::AuthenticationKey;
-
-use txs::commands::{create_account_cmd::create_from_auth_and_coin, demo_cmd};
+use diem_types::{
+  transaction::authenticator::AuthenticationKey,
+  account_address::AccountAddress
+};
+use txs::commands::{create_account_cmd::create_from_auth_and_coin, demo_cmd, transfer_cmd};
 use crate::{carpe_error::CarpeError, configs};
 
 
@@ -67,3 +69,28 @@ pub fn wallet_type(type_int: u8) -> Result<String, CarpeError> {
     ))),
   }
 }
+
+#[tauri::command(async)]
+pub fn coin_transfer(
+  receiver: String, 
+  amount: u64
+) -> Result<String, CarpeError> {
+
+  let tx_params = configs::get_tx_params()
+    .map_err(|_| CarpeError::misc("Could not load tx params"))?;
+
+  let receiver_address: AccountAddress = receiver
+    .parse()
+    .map_err(|_| CarpeError::misc("Invalid receiver account address"))?;
+
+  match transfer_cmd::balance_transfer(receiver_address, amount, tx_params, None) {
+    Ok(r) => Ok(format!("Transfer success: {:?}", r)),
+    Err(e) => Err(CarpeError::misc(&format!(
+      "{:}",
+      match e.abort_code {
+        Some(code) => code,
+        None => 0
+      }
+    )))
+  }
+}

src-tauri/src/commands/wallets.rs

@@ -19,7 +19,7 @@ use std::fs::{self, create_dir_all, File};
 use std::io::prelude::*;
 
 use super::get_balance;
-use super::get_events;
+use super::get_payment_events;
 #[derive(serde::Deserialize, serde::Serialize, Debug)]
 pub struct Accounts {
   pub accounts: Vec<AccountEntry>,
@@ -115,10 +115,9 @@ pub fn get_all_accounts() -> Result<Accounts, CarpeError> {
   Ok(all)
 }
 
-
 #[tauri::command(async)]
 pub fn get_account_events(account: AccountAddress) -> Result<Vec<EventView>, CarpeError> {
-  let events = get_events(account)?;
+  let events = get_payment_events(account)?;
   Ok(events)
 }
 

src-tauri/src/main.rs

@@ -79,6 +79,7 @@ fn main() {
       demo_tx,
       create_user_account,
       wallet_type,
+      coin_transfer,
       //Tower
       miner_once,
       start_backlog_sender_listener,

src/accountActions.ts

@@ -4,7 +4,7 @@ import { raise_error } from './carpeError';
 import { responses } from './debug';
 import { minerLoopEnabled, tower} from "./miner";
 import { notify_success, notify_error } from './carpeNotify';
-import { AccountEntry, all_accounts, isInit, isRefreshingAccounts, mnem, signingAccount, accountEvents } from './accounts';
+import { AccountEntry, all_accounts, isInit, isRefreshingAccounts, mnem, signingAccount, accountEvents, isAccountsLoaded } from './accounts';
 
 export const loadAccounts = async () => { 
   // fetch data from local DB
@@ -15,12 +15,15 @@ export const loadAccounts = async () => {
       if (get(signingAccount).account == "" && result.accounts.length > 0) {
         // set initial signingAccount
         let first = result.accounts[0];
-        setAccount(first.account);
+        setAccount(first.account, false);
       } else {
         /* TODO no accounts in the current network
         signingAccount.set(new_account("", "", ""));
         */
       }
+      if (!get(isAccountsLoaded)) {
+        isAccountsLoaded.set(true);
+      }
       // fetch data from the chain
       return refreshAccounts();
     })
@@ -31,9 +34,7 @@ export const refreshAccounts = async () => {
   isRefreshingAccounts.set(true);
   return invoke('refresh_accounts')
     .then((result: object) => { // TODO make this the correct return type
-
       all_accounts.set(result.accounts);
-
       result.accounts.forEach(el => {
         tryRefreshSignerAccount(el);
       });
@@ -69,7 +70,7 @@ export function findOneAccount(account: string): AccountEntry {
   return found
 }
 
-export const setAccount = async (an_address: string) => { 
+export const setAccount = async (an_address: string, notifySucess = true) => { 
   if (get(signingAccount).account == an_address) {
     return
   }
@@ -98,7 +99,9 @@ export const setAccount = async (an_address: string) => {
   })
   .then((res) => {
     responses.set(res);
-    notify_success("Account switched to " + a.nickname);
+    if (notifySucess) {
+      notify_success("Account switched to " + a.nickname);
+    }
   })
   .catch((e) => {
     raise_error(e, false, "setAccount");
@@ -115,16 +118,26 @@ export function addNewAccount(account: AccountEntry) {
   all_accounts.set(list);
 }
 
-export function checkAccountBalance(account: AccountEntry) {
-  invoke('query_balance', {account: account.account})
+export function checkSigningAccountBalance() {
+  let selected = get(signingAccount);
+  invoke('query_balance', {account: selected.account})
     .then((balance: number) => {
-      let list = get(all_accounts);
-      account.on_chain = true;
-      account.balance = Number(balance);
-      list.push(account);    
+      // update signingAccount
+      selected.on_chain = true;
+      selected.balance = Number(balance);
+      signingAccount.set(selected);
+
+      // update all accounts set
+      let list = get(all_accounts).map(each => {
+        if (each.account == selected.account) {
+          each.on_chain = true;
+          each.balance = Number(balance);
+        }
+        return each;
+      });
       all_accounts.set(list);
     })
-    .catch((e) => raise_error(e, false, "checkAccountBalance"));
+    .catch((e) => raise_error(e, false, "checkSigningAccountBalance"));
 }
 
 export function getAccountEvents(account: AccountEntry, errorCallback = null) {
@@ -138,8 +151,12 @@ export function getAccountEvents(account: AccountEntry, errorCallback = null) {
     .then((events: Array<T>) => {
       let all = get(accountEvents);     
       all[address] = events
-        .filter(each => each.data.type == "receivedpayment" || each.data.type == "sentpayment")
-        .reverse();
+        .sort((a, b) => (a.transaction_version < b.transaction_version)
+          ? 1
+          : (b.transaction_version < a.transaction_version)
+            ? -1
+            : 0
+        );
       accountEvents.set(all);
     })
     .catch(e => {

src/accounts.ts

@@ -24,4 +24,5 @@ export const mnem = writable("");
 export const isInit = writable(false);
 export const isRefreshingAccounts = writable(false);
 export const all_accounts = writable<AccountEntry[]>([]);
+export const isAccountsLoaded = writable(false);
 export const accountEvents = writable({}); // TODO define interface AccountEvent

src/coinHelpers.ts

@@ -0,0 +1,27 @@
+import { get } from 'svelte/store';
+import { locale } from 'svelte-i18n';
+
+const scaleFactor = 1000000;
+export function printCoins(amount) {
+  const scaled = unscaledCoins(amount);
+  const selectedLocale = get(locale);
+
+  return scaled.toLocaleString(selectedLocale, {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+  });
+}
+
+export function printUnscaledCoins(amount, min = 2, max = 6) {
+  const selectedLocale = get(locale);
+
+  return amount.toLocaleString(selectedLocale, {
+    minimumFractionDigits: min,
+    maximumFractionDigits: max,
+  });
+}
+
+export function unscaledCoins(amount) {
+  return amount / scaleFactor;
+}
+

src/components/events/Events.svelte

@@ -39,7 +39,7 @@
   });
 </script>
 
-<main class="uk-height-viewport">
+<main>
   <div style="position:relative">
     <div class="uk-flex uk-flex-center">
       <h2 class="uk-text-light uk-text-muted uk-text-uppercase">{$_("events.account_events")}</h2>

src/components/events/EventsTable.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
   /* Account events table with pagination */
-  import { get_locale } from "../../accountActions";
-  import PageNumber from "./PageNumber.svelte";
   import { _ } from "svelte-i18n";
+  import PageNumber from "./PageNumber.svelte";
+  import { printCoins } from "../../coinHelpers";
 
   export let events;
 
@@ -38,29 +38,19 @@
     }    
   }
 
-  // TODO: move to tauri commands
-  function formatAmount(balance) {
-    const balanceScaled = balance / 1000000;
-
-    return balanceScaled.toLocaleString(get_locale(), {
-      minimumFractionDigits: 2,
-      maximumFractionDigits: 2,
-    });
-  }
-
   function formatEventType(type) {
     const value = eventTypesDic[type];
     return value || type;
   }
 </script>
 
-<main class="uk-height-viewport">
+<main>
   <!-- Table -->
   <table class="uk-table uk-table-divider">
     <thead>
       <tr>
         <th class="uk-text-right">{$_("events.version")}</th>
-        <th class="uk-text-center">{$_("events.type")}</th>
+        <th class="uk-text-center" style="width: 98px">{$_("events.type")}</th>
         <th class="uk-text-right">{$_("events.amount")}</th>
         <th class="uk-text-center">{$_("events.sender")}</th>
         <th class="uk-text-center">{$_("events.receiver")}</th>
@@ -71,7 +61,7 @@
         <tr>
           <td class="uk-text-right">{event.transaction_version}</td>
           <td class="uk-text-center">{formatEventType(event.data.type)}</td>
-          <td class="uk-text-right">{formatAmount(event.data.amount.amount)}</td>
+          <td class="uk-text-right">{printCoins(event.data.amount.amount)}</td>
           <td class="uk-text-center">{event.data.sender}</td>
           <td class="uk-text-center">{event.data.receiver}</td>
         </tr>
@@ -103,7 +93,7 @@
       >
         <span uk-icon="chevron-left"></span>
       </a>
-      <div class="page-numbers-container uk-align-left">
+      <div class="page-numbers-container uk-align-left ">
         <!-- Case 0 -->
         {#if Object.keys(pages).length <= 7}
           {#each Object.keys(pages) as number}
@@ -171,6 +161,8 @@
     background-color: #F0F0F0;
   }
   .previous-page-btn {
+    display: flex;
+    justify-content: center;
     width: 20px; 
     height: 20px; 
     border-radius: 100%; 
@@ -182,6 +174,8 @@
   }
 
   .next-page-btn {
+    display: flex;
+    justify-content: center;
     width: 20px; 
     height: 20px; 
     border-radius: 100%; 
@@ -196,5 +190,6 @@
     height: 20px; 
     padding: 5px; 
     margin: 0px;
+    line-height: 20px !important;
   }
 </style>