update hdddeposit contract -- N/A

contracts/hdddeposit/hdddeposit.cpp

@@ -32,11 +32,20 @@ void hdddeposit::paydeposit(account_name user, uint64_t minerid, asset quant) {
         real_balance.amount -= acc->deposit.amount;
         real_balance.amount -= acc->forfeit.amount;     
     }
-    //to do : also need sub lock_token in futuer( 也可能不需要，取决于需求)
-    //......
-
     eosio_assert( real_balance.amount >= quant.amount, "user balance not enough." );
 
+    //insert or update accdeposit table
+    if ( acc == _deposit.end() ) {
+        _deposit.emplace( _self, [&]( auto& a ){
+            a.account_name = name{user};
+            a.deposit = quant;
+        });
+    } else {
+        _deposit.modify( acc, 0, [&]( auto& a ) {
+            a.deposit += quant;
+        });
+    }
+
     //insert or update minerdeposit table
     minerdeposit_table _mdeposit(_self, _self);
     auto miner = _mdeposit.find( minerid );
@@ -54,18 +63,6 @@ void hdddeposit::paydeposit(account_name user, uint64_t minerid, asset quant) {
             a.dep_total += quant;
         });
     }
-
-    //insert or update accdeposit table
-    if ( acc == _deposit.end() ) {
-        _deposit.emplace( _self, [&]( auto& a ){
-            a.account_name = name{user};
-            a.deposit = quant;
-        });
-    } else {
-        _deposit.modify( acc, 0, [&]( auto& a ) {
-            a.deposit += quant;
-        });
-    }
 }
 
 void hdddeposit::undeposit(name user, uint64_t minerid, asset quant) {
@@ -119,13 +116,54 @@ void hdddeposit::payforfeit(name user, uint64_t minerid, asset quant, uint8_t ac
 
     _deposit.modify( acc, 0, [&]( auto& a ) {
         a.deposit.amount -= quant.amount;
-        a.forfeit.amount += quant.amount;
-    });    
+        //a.forfeit.amount += quant.amount;
+    });  
 
+    action(
+       permission_level{user, active_permission},
+       token_account, N(transfer),
+       std::make_tuple(user, hdd_deposit_account, quant, std::string("draw forfeit")))
+       .send();
 }
 
-void hdddeposit::drawforfeit(name user, uint8_t acc_type, name caller) {
+void hdddeposit::delminer(uint64_t minerid) {
+    require_auth(_self);
+          
+    minerdeposit_table _mdeposit(_self, _self);
+    auto miner = _mdeposit.find(minerid);
+    if(miner == _mdeposit.end())
+        return;
+    accdeposit_table   _deposit(_self, miner->account_name.value );
+    auto acc = _deposit.find(miner->account_name.value);
+    if(acc != _deposit.end()) {
+        if(acc->deposit.amount >= miner->deposit.amount) {
+            _deposit.modify( acc, 0, [&]( auto& a ) {
+                a.deposit.amount -= miner->deposit.amount;
+            });    
+        }            
+    }
+    _mdeposit.erase( miner );
+}
 
+void hdddeposit::setrate(int64_t rate) {
+    require_auth(_self);
+    grate_singleton _rate(_self, _self);
+    deposit_rate    _rateState;
+
+   if (_rate.exists())
+      _rateState = _rate.get();
+   else
+      _rateState = deposit_rate{};
+
+    _rateState.rate = rate;
+
+    _rate.set(_rateState, _self);
+
+}
+
+
+void hdddeposit::drawforfeit(name user, uint8_t acc_type, name caller) {
+    /* 
     if(acc_type == 2) {
         eosio_assert(is_account(caller), "caller not a account.");
         eosio_assert(is_bp_account(caller.value), "caller not a BP account.");
@@ -147,14 +185,14 @@ void hdddeposit::drawforfeit(name user, uint8_t acc_type, name caller) {
     
     _deposit.modify( acc, 0, [&]( auto& a ) {
         a.forfeit.amount = 0;
-    });      
+    });   
+    */   
 
 }
 
 void hdddeposit::cutvote(name user, uint8_t acc_type, name caller) {
 
-    return;
-
+    /* 
     if(acc_type == 2) {
         eosio_assert(is_account(caller), "caller not a account.");
         eosio_assert(is_bp_account(caller.value), "caller not a BP account.");
@@ -170,50 +208,14 @@ void hdddeposit::cutvote(name user, uint8_t acc_type, name caller) {
     asset quantb{acc.forfeit.amount/2, CORE_SYMBOL};
     asset quantw{acc.forfeit.amount/2, CORE_SYMBOL};
     
-    //asset quantb{10000, CORE_SYMBOL};
-    //asset quantw{10000, CORE_SYMBOL};
-
     action(
        permission_level{user, active_permission},
        system_account, N(undelegatebw),
        std::make_tuple(user, user, quantb, quantw))
        .send();
+    */   
 }
 
-void hdddeposit::delminer(uint64_t minerid) {
-    require_auth(_self);
-          
-    minerdeposit_table _mdeposit(_self, _self);
-    auto miner = _mdeposit.find(minerid);
-    if(miner == _mdeposit.end())
-        return;
-    accdeposit_table   _deposit(_self, miner->account_name.value );
-    auto acc = _deposit.find(miner->account_name.value);
-    if(acc != _deposit.end()) {
-        if(acc->deposit.amount >= miner->deposit.amount) {
-            _deposit.modify( acc, 0, [&]( auto& a ) {
-                a.deposit.amount -= miner->deposit.amount;
-            });    
-        }            
-    }
-    _mdeposit.erase( miner );
-}
-
-void hdddeposit::setrate(int64_t rate) {
-    require_auth(_self);
-    grate_singleton _rate(_self, _self);
-    deposit_rate    _rateState;
-
-   if (_rate.exists())
-      _rateState = _rate.get();
-   else
-      _rateState = deposit_rate{};
-
-    _rateState.rate = rate;
-
-    _rate.set(_rateState, _self);
-
-}
 
 bool hdddeposit::is_bp_account(uint64_t uservalue)
 {