Merge pull request #169 from Tonomy-Foundation/testnet

Master release

Author: theblockstalk

contracts/eosio.token/include/eosio.token/eosio.token.hpp

@@ -26,7 +26,6 @@ namespace eosio {
       public:
          using contract::contract;
          static constexpr eosio::symbol SYSTEM_RESOURCE_CURRENCY = eosio::symbol("TONO", 6);
-         static constexpr eosio::symbol SYSTEM_RESOURCE_CURRENCY_OLD = eosio::symbol("LEOS", 6);
 
          /**
           * Allows `issuer` account to create a token in supply of `maximum_supply`. If validation is successful a new entry in statstable for token symbol scope gets created.
@@ -104,16 +103,10 @@ namespace eosio {
          void close( const name& owner, const symbol& symbol );
 
          /**
-          * Migrates an accounts tokens from the old symbol to the new symbol
+          * Fixes the stats table, by setting the supply to be the max_supply
           */
          [[eosio::action]]
-         void migrateacc(const name &account);
-
-         /**
-          * Migrates a currency statistics from the old symbol to the new symbol
-          */
-         [[eosio::action]]
-         void migratestats();
+         void setstats();
 
          /**
           * Issues a token to a user

contracts/eosio.token/src/eosio.token.cpp

@@ -168,57 +168,22 @@ namespace eosio
       acnts.erase(it);
    }
 
-   void token::migratestats()
+   void token::setstats()
    {
       // Admin only function
       require_auth(get_self());
 
-      asset max_supply;
-      name issuer;
-
-      // Look at the table using old symbol as scope
-      stats statstable(get_self(), SYSTEM_RESOURCE_CURRENCY_OLD.code().raw());
-      // Check if old token found
-      auto existing_itr = statstable.find(SYSTEM_RESOURCE_CURRENCY_OLD.code().raw());
-      if(existing_itr != statstable.end()) {
-         max_supply = asset(existing_itr->max_supply.amount, SYSTEM_RESOURCE_CURRENCY);
-         issuer = existing_itr->issuer;
-         statstable.erase(existing_itr);
-      }
-      // Check if new token found
-      auto new_itr = statstable.find(SYSTEM_RESOURCE_CURRENCY.code().raw());
-      if(new_itr != statstable.end()) {
-         max_supply = asset(new_itr->max_supply.amount, SYSTEM_RESOURCE_CURRENCY);
-         issuer = new_itr->issuer;
-         statstable.erase(new_itr);
-      }
-
-      // New symbol as scope
       stats statstable2(get_self(), SYSTEM_RESOURCE_CURRENCY.code().raw());
-      statstable2.emplace(get_self(), [&](auto &s)
+      auto itr = statstable2.find(SYSTEM_RESOURCE_CURRENCY.code().raw());
+      check(itr != statstable2.end(), "stats table not found for system currency");
+      check(itr->supply.amount == 0, "supply is not 0, so should not be updated");
+
+      statstable2.modify(itr, same_payer, [&](auto &s)
       {
-         s.supply.symbol = SYSTEM_RESOURCE_CURRENCY;
-         s.max_supply    = max_supply;
-         s.issuer        = issuer;
+         s.supply      = itr->max_supply;
+         s.max_supply  = itr->max_supply;
+         s.issuer      = itr->issuer;
       });
-
-   }
-
-   void token::migrateacc(const name &account)
-   {
-      // Admin only function
-      require_auth(get_self());
-
-      accounts account_balance(get_self(), account.value);
-
-      auto balance_itr = account_balance.find(SYSTEM_RESOURCE_CURRENCY_OLD.code().raw());
-      
-      if (balance_itr != account_balance.end()) {
-         account_balance.emplace(get_self(), [&](auto &a) {
-            a.balance = asset(balance_itr->balance.amount, SYSTEM_RESOURCE_CURRENCY);
-         });
-         account_balance.erase(balance_itr);
-      }
    }
 
    const token::currency_stats& token::get_stats(stats& statstable, const symbol& sym) {