From 602eb1065cb750c68816cbbc3f179ac3745ce512 Mon Sep 17 00:00:00 2001
From: wangxxzhiyy <wangxxzhiyy@126.com>
Date: Wed, 18 Dec 2019 18:47:21 +0800
Subject: [PATCH] update system contract

---
 contracts/eosio.system/eosio.system.abi |  8 --------
 contracts/eosio.system/eosio.system.cpp |  2 +-
 contracts/eosio.system/eosio.system.hpp |  2 --
 contracts/eosio.system/voting.cpp       | 22 ----------------------
 4 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/contracts/eosio.system/eosio.system.abi b/contracts/eosio.system/eosio.system.abi
index a198c2da9..1c9f10618 100644
--- a/contracts/eosio.system/eosio.system.abi
+++ b/contracts/eosio.system/eosio.system.abi
@@ -339,10 +339,6 @@
       "fields": [
         {"name":"producer",     "type":"account_name"}
       ]
-    },{
-      "name": "clsprods2",
-      "base": "",
-      "fields": []
     },{
       "name": "seqproducer",
       "base": "",
@@ -570,10 +566,6 @@
       "name": "unregprod",
       "type": "unregprod",
       "ricardian_contract": ""
-   },{
-      "name": "clsprods2",
-      "type": "clsprods2",
-      "ricardian_contract": ""
    },{
       "name": "seqproducer",
       "type": "seqproducer",
diff --git a/contracts/eosio.system/eosio.system.cpp b/contracts/eosio.system/eosio.system.cpp
index e3476f5c7..b1f844ef9 100644
--- a/contracts/eosio.system/eosio.system.cpp
+++ b/contracts/eosio.system/eosio.system.cpp
@@ -209,7 +209,7 @@ EOSIO_ABI( eosiosystem::system_contract,
      // delegate_bandwidth.cpp
      (buyrambytes)(buyram)(sellram)(delegatebw)(undelegatebw)(refund)
      // voting.cpp
-     (regproducer)(unregprod)(voteproducer)(changevotes)(regproxy)(clsprods2)(seqproducer)(reprodlevel)(setautosche)
+     (regproducer)(unregprod)(voteproducer)(changevotes)(regproxy)(seqproducer)(reprodlevel)(setautosche)
      // producer_pay.cpp
      (onblock)(claimrewards)(rewardprods)(startreward)
 )
diff --git a/contracts/eosio.system/eosio.system.hpp b/contracts/eosio.system/eosio.system.hpp
index 53e39361b..a3e3d52ae 100644
--- a/contracts/eosio.system/eosio.system.hpp
+++ b/contracts/eosio.system/eosio.system.hpp
@@ -277,8 +277,6 @@ namespace eosiosystem {
          void unregprod( const account_name producer );
 
 //##YTA-Change  start:  
-         void clsprods2();
-
          void seqproducer( const account_name producer, const account_name shadow, uint16_t seq , uint8_t level );
 
          void reprodlevel();       
diff --git a/contracts/eosio.system/voting.cpp b/contracts/eosio.system/voting.cpp
index b31336f64..14497039c 100644
--- a/contracts/eosio.system/voting.cpp
+++ b/contracts/eosio.system/voting.cpp
@@ -85,28 +85,6 @@ namespace eosiosystem {
       change_producer_yta_info(producer, public_key(), false);
    }
 //##YTA-Change  start: 
-   void system_contract::clsprods2() {
-      //require_auth( _self );
-      require_auth(N(ytaadminuser));
-
-      while (_producersext.begin() != _producersext.end()) {
-         _producersext.erase(_producersext.begin()); 
-      }
-
-      _gstateex.total_unpaid_base_cnt = 0;
-
-      all_prods_singleton _all_prods(_self, _self);
-      all_prods_level     _all_prods_state;
-
-      if (_all_prods.exists()) {
-         _all_prods_state = _all_prods.get();
-         _all_prods_state.prods_l1.clear();
-         _all_prods_state.prods_l2.clear();
-         _all_prods.set(_all_prods_state,_self);
-      }
-
-   }
-
    void system_contract::delproducer( const account_name producer ) {
       auto itp = _producers.find(producer);
       if( itp != _producers.end() ) {
-- 
GitLab