Rainbow token contract update

include/seeds.rainbows.hpp

@@ -215,11 +215,13 @@ using namespace eosio;
 
          /**
           * The opposite for issue action, if all validations succeed,
-          * it debits the statstable.supply amount. Any staked tokens are released from escrow in
-          * proportion to the quantity of tokens retired.
+          * it debits the statstable.supply amount. If `burn` flag is false,
+          * any staked tokens are released from escrow in proportion to the
+          * quantity of tokens retired.
           *
           * @param owner - the account containing tokens to retire,
           * @param quantity - the quantity of tokens to retire,
+          * @param burn - if true, staked tokens are left in escrow,
           * @param memo - the memo string to accompany the transaction.
           *
           * @pre the redeem_locked_until configuration must be in the past (except that
@@ -228,7 +230,8 @@ using namespace eosio;
           *   1. the proportional unstaking flag must be configured true, OR
           *   2. the balance in the escrow account must meet the reserve_fraction criterion
           */
-         ACTION retire( const name& owner, const asset& quantity, const string& memo );
+         ACTION retire( const name& owner, const asset& quantity,
+                        const bool& burn, const string& memo );
 
          /**
           * Allows `from` account to transfer to `to` account the `quantity` tokens.
@@ -247,9 +250,6 @@ using namespace eosio;
           *   credit if configured with credit_limit_symbol in `create` operation)
           * @pre If configured with positive_limit_symbol in `create` operation, the transfer
           *   must not put the `to` account over its maximum limit
-          *
-          * Note: Transfer of zero tokens can effectively "open" an account (create a new
-          * balance entry in the `accounts` table) using `from` acct's ram.
           */
          ACTION transfer( const name&    from,
                           const name&    to,
@@ -417,7 +417,7 @@ using namespace eosio;
    };
 
 EOSIO_DISPATCH(rainbows,
-   (create)(approve)(setstake)(setdisplay)(issue)(retire)(transfer)
+   (create)(approve)(setstake)(deletestake)(setdisplay)(issue)(retire)(transfer)
    (open)(close)(freeze)(reset)(resetacct)
 );
 

scripts/helper.js

@@ -372,9 +372,9 @@ var permissions = [{
 //   target: `${accounts.harvest.account}@active`,
 //   actor: `${accounts.history.account}@eosio.code`
 // }, {
-//   target: `${accounts.token.account}@active`,
-//   actor: `${accounts.token.account}@eosio.code`
-// }, {
+  target: `${accounts.token.account}@active`,
+  actor: `${accounts.token.account}@eosio.code`
+}, {
 //   target: `${accounts.history.account}@active`,
 //   actor: `${accounts.accounts.account}@active`
 // }, {
@@ -466,9 +466,9 @@ var permissions = [{
 // }, {
 //   target: `${accounts.guardians.account}@application`,
 //   action: 'claim'
-// }, {
-//   target: `${accounts.history.account}@active`,
-//   actor: `${accounts.token.account}@active`
+}, {
+  target: `${accounts.history.account}@active`,
+  actor: `${accounts.token.account}@active`
 // }, {
 //   target: `${accounts.acctcreator.account}@active`,
 //   actor: `${accounts.acctcreator.account}@eosio.code`
@@ -750,9 +750,9 @@ var permissions = [{
 // }, {
 //   target: `${accounts.accounts.account}@addcbs`,
 //   action: 'addcbs'
-// }, {
-//   target: `${accounts.pool.account}@active`,
-//   actor: `${accounts.pool.account}@eosio.code`
+}, {
+  target: `${accounts.pool.account}@active`,
+  actor: `${accounts.pool.account}@eosio.code`
 // }, {
 //   target: `${accounts.pool.account}@hrvst.pool`,
 //   actor: `${accounts.harvest.account}@eosio.code`,

src/seeds.rainbows.cpp

@@ -326,7 +326,8 @@ void rainbows::unstake_all( const name& owner, const asset& quantity ) {
     }
 }
 
-void rainbows::retire( const name& owner, const asset& quantity, const string& memo )
+void rainbows::retire( const name& owner, const asset& quantity,
+                       const bool& burn, const string& memo )
 {
     auto sym = quantity.symbol;
     check( sym.is_valid(), "invalid symbol name" );
@@ -335,20 +336,21 @@ void rainbows::retire( const name& owner, const asset& quantity, const string& m
     stats statstable( get_self(), sym.code().raw() );
     const auto& st = statstable.get( sym.code().raw(), "token with symbol does not exist" );
     configs configtable( get_self(), sym.code().raw() );
-    const auto& cf = configtable.get();
-    if( cf.redeem_locked_until.time_since_epoch() < current_time_point().time_since_epoch() ) {
-       check( !cf.transfers_frozen, "transfers are frozen");
-    } else {
-       check( owner == st.issuer, "bearer redeem is disabled");
-    }
     require_auth( owner );
     check( quantity.is_valid(), "invalid quantity" );
     check( quantity.amount > 0, "must retire positive quantity" );
-
-    check( quantity.symbol == st.supply.symbol, "symbol precision mismatch" );
-
-    unstake_all( owner, quantity );
-
+    check( quantity.symbol == st.supply.symbol, "symbol or precision mismatch" );
+    if( !burn ) {
+        const auto& cf = configtable.get();
+        if( cf.redeem_locked_until.time_since_epoch() <
+              current_time_point().time_since_epoch() ) {
+           check( !cf.transfers_frozen, "transfers are frozen");
+        } else {
+           check( owner == st.issuer, "bearer redeem is disabled");
+        }
+
+        unstake_all( owner, quantity );
+    }
     sub_balance( owner, quantity, symbol_code(0) );
     statstable.modify( st, same_payer, [&]( auto& s ) {
        s.supply -= quantity;
@@ -402,13 +404,16 @@ void rainbows::transfer( const name&    from,
     sub_balance( from, quantity, cf.cred_limit );
     add_balance( to, quantity, payer, cf.positive_limit );
 
+    stats statstable2( get_self(), sym_code_raw ); // use updated statstable for supply value
+    const auto& st2 = statstable2.get( sym_code_raw );
+    check( st2.max_supply.amount >= st2.supply.amount, "new credit exceeds available supply");
+
 }
 
 void rainbows::sub_balance( const name& owner, const asset& value, const symbol_code& limit_symbol ) {
    accounts from_acnts( get_self(), owner.value );
 
-   const auto& from = from_acnts.get( value.symbol.code().raw(), "no balance object found" );
-   uint64_t limit = 0;
+   int64_t limit = 0;
    if( limit_symbol != symbol_code(0) ) {
       auto cred = from_acnts.find( limit_symbol.raw() );
       if( cred != from_acnts.end() ) {
@@ -417,15 +422,25 @@ void rainbows::sub_balance( const name& owner, const asset& value, const symbol_
          limit = lim.balance.amount;
       }
    }
-   int64_t new_balance = from.balance.amount - value.amount;
-   check( new_balance + limit >= 0, "overdrawn balance" );
-   int64_t credit_increase = std::min( from.balance.amount, 0LL ) - std::min( new_balance, 0LL );
-   from_acnts.modify( from, same_payer, [&]( auto& a ) {
-         a.balance.amount = new_balance;
+   int64_t new_amount, old_amount;
+   const auto fr = from_acnts.find( value.symbol.code().raw() );
+   if( fr == from_acnts.end() ) {
+      old_amount = 0;
+      new_amount = -value.amount;
+      from_acnts.emplace( owner, [&]( auto& a ){
+        a.balance = asset{new_amount, value.symbol};
       });
+   } else {
+      old_amount = fr->balance.amount;
+      new_amount = old_amount - value.amount;
+      from_acnts.modify( fr, same_payer, [&]( auto& a ) {
+         a.balance.amount = new_amount;
+      });
+   }
+   check( new_amount + limit >= 0, "overdrawn balance" );
+   int64_t credit_increase = std::min( old_amount, 0LL ) - std::min( new_amount, 0LL );
    stats statstable( get_self(), value.symbol.code().raw() );
    const auto& st = statstable.get( value.symbol.code().raw() );
-   check( credit_increase <= st.max_supply.amount - st.supply.amount, "new credit exceeds available supply");
    statstable.modify( st, same_payer, [&]( auto& s ) {
       s.supply.amount += credit_increase;
    });