Merge pull request #4 from telosnetwork/developer

removed eosio.token dependency

Author: craigbranscom

contracts/decide/include/decide.hpp

@@ -12,7 +12,7 @@
 #include <eosio/asset.hpp>
 #include <eosio/singleton.hpp>
 
-#include <eosio.token/eosio.token.hpp>
+// #include <eosio.token/eosio.token.hpp>
 
 #include <cmath>
 

contracts/decide/include/utility.hpp

@@ -15,6 +15,16 @@ using user_resources = eosiosystem::user_resources;
 using del_bandwidth_table = eosiosystem::del_bandwidth_table;
 using rex_bal_table = eosiosystem::rex_balance_table;
 
+//eosio.token account table
+struct eosio_account {
+    asset balance;
+
+    uint64_t primary_key() const { return balance.symbol.code().raw(); }
+
+    EOSLIB_SERIALIZE(eosio_account, (balance))
+};
+typedef multi_index<name("accounts"), eosio_account> eosio_accounts_table;
+
 //defined in 
 asset get_staked_tlos(name owner) {
     del_bandwidth_table delband(name("eosio"), owner.value);

contracts/decide/src/decide.cpp

@@ -126,8 +126,16 @@ ACTION decide::withdraw(name voter, asset quantity) {
     //transfer to eosio.token
     //inline trx requires telos.decide@active to have telos.decide@eosio.code
     //TODO: replace with action handler
-    token::transfer_action transfer_act("eosio.token"_n, { get_self(), active_permission });
-    transfer_act.send(get_self(), voter, quantity, std::string("Telos Decide Withdrawal"));
+    // token::transfer_action transfer_act("eosio.token"_n, { get_self(), active_permission });
+    // transfer_act.send(get_self(), voter, quantity, std::string("Telos Decide Withdrawal"));
+
+    //inline transfer
+    action(permission_level{get_self(), name("active")}, name("eosio.token"), name("transfer"), make_tuple(
+        get_self(), //from
+        voter, //to
+        quantity, //quantity
+        std::string("Telos Decide Withdrawal") //memo
+    )).send();
 
 }
 
@@ -180,7 +188,10 @@ void decide::catch_transfer(name from, name to, asset quantity, string memo) {
         config_singleton configs(get_self(), get_self().value);
         auto config = configs.get();
 
-        asset total_transferable = (token::get_balance("eosio.token"_n, get_self(), TLOS_SYM.code()) + quantity) - config.total_deposits;
+        eosio_accounts_table eosio_accounts(name("eosio.token"), get_self().value);
+        auto& eosio_acct = eosio_accounts.get(TLOS_SYM.code().raw(), "tlos balance not found");
+
+        asset total_transferable = (eosio_acct.balance + quantity) - config.total_deposits;
 
         check(total_transferable >= quantity, "Telos Decide lacks the liquid TLOS to make this transfer");
     }