Revert "Revert "Merge pull request #249 from EOSIO/memo-248""

This reverts commit 4fcf10316c754e28de4907e6a2a60ecfbdf94ef4.

libraries/chain/chain_controller.cpp

@@ -742,9 +742,17 @@ void chain_controller::check_transaction_authorization(const SignedTransaction&
 }
 
 void chain_controller::validate_scope( const Transaction& trx )const {
-   EOS_ASSERT(trx.scope.size() > 0, transaction_exception, "No scope specified by transaction" );
+   EOS_ASSERT(trx.scope.size() + trx.readscope.size() > 0, transaction_exception, "No scope specified by transaction" );
    for( uint32_t i = 1; i < trx.scope.size(); ++i )
       EOS_ASSERT( trx.scope[i-1] < trx.scope[i], transaction_exception, "Scopes must be sorted and unique" );
+   for( uint32_t i = 1; i < trx.readscope.size(); ++i )
+      EOS_ASSERT( trx.readscope[i-1] < trx.readscope[i], transaction_exception, "Scopes must be sorted and unique" );
+
+   vector<types::AccountName> intersection;
+   std::set_intersection( trx.scope.begin(), trx.scope.end(),
+                          trx.readscope.begin(), trx.readscope.end(),
+                          std::back_inserter(intersection) );
+   FC_ASSERT( intersection.size() == 0, "a transaction may not redeclare scope in readscope" );
 }
 
 const permission_object& chain_controller::lookup_minimum_permission(types::AccountName authorizer_account,

libraries/native_contract/native_contract_chain_initializer.cpp

@@ -102,7 +102,7 @@ std::vector<chain::Message> native_contract_chain_initializer::prepare_database(
          message = chain::Message(config::EosContractName,
                                   vector<types::AccountPermission>{{config::EosContractName, "active"}},
                                   "transfer", types::transfer(config::EosContractName, acct.name,
-                                                              acct.liquid_balance.amount/*, "Genesis Allocation"*/));
+                                                              acct.liquid_balance.amount, "Genesis Allocation"));
          messages_to_process.emplace_back(std::move(message));
       }
    }

libraries/types/types.eos

@@ -25,6 +25,7 @@ struct Transaction
    refBlockPrefix    UInt32
    expiration        Time
    scope             AccountName[]   # the data may be accessed while processing this transaction
+   readscope         AccountName[]   
    messages          Message[]
 
 struct SignedTransaction inherits Transaction
@@ -71,6 +72,7 @@ struct transfer
    from      AccountName  # may not be the message.sender if message.sender has delegated authority by from
    to        AccountName
    amount    UInt64
+   memo      String
 
 struct lock
    from      AccountName

tests/common/macro_support.hpp

@@ -135,7 +135,7 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
       trx.scope = sort_names({#sender,#recipient}); \
       transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{ {#sender,"active"} }, \
-                         "transfer", types::transfer{#sender, #recipient, Amount.amount}); \
+                         "transfer", types::transfer{#sender, #recipient, Amount.amount, memo}); \
       trx.expiration = chain.head_block_time() + 100; \
       transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \

tests/slow_tests/slow_tests.cpp

@@ -311,7 +311,7 @@ void TransferCurrency( testing_blockchain& chain, AccountName from, AccountName
    trx.scope = sort_names({from,to});
    transaction_emplace_message(trx, "currency", 
                       vector<types::AccountPermission>{ {from,"active"} },
-                      "transfer", types::transfer{from, to, amount});
+                      "transfer", types::transfer{from, to, amount,""});
 
    trx.expiration = chain.head_block_time() + 100;
    transaction_set_reference_block(trx, chain.head_block_id());
@@ -324,7 +324,7 @@ void WithdrawCurrency( testing_blockchain& chain, AccountName from, AccountName
    trx.scope = sort_names({from,to});
    transaction_emplace_message(trx, "currency", 
                       vector<types::AccountPermission>{ {from,"active"},{to,"active"} },
-                      "transfer", types::transfer{from, to, amount});
+                      "transfer", types::transfer{from, to, amount,""});
    trx.expiration = chain.head_block_time() + 100;
    transaction_set_reference_block(trx, chain.head_block_id());
    chain.push_transaction(trx);
@@ -367,7 +367,7 @@ BOOST_FIXTURE_TEST_CASE(create_script, testing_fixture)
          trx.scope = sort_names({"currency","inita"});
          transaction_emplace_message(trx, "currency", 
                             vector<types::AccountPermission>{ {"currency","active"} },
-                            "transfer", types::transfer{"currency", "inita", 1+i});
+                            "transfer", types::transfer{"currency", "inita", 1+i,""});
          trx.expiration = chain.head_block_time() + 100;
          transaction_set_reference_block(trx, chain.head_block_id());
          //idump((trx));
@@ -1167,7 +1167,7 @@ BOOST_FIXTURE_TEST_CASE(create_script_w_loop, testing_fixture)
          trx.scope = sort_names({"currency","inita"});
          transaction_emplace_message(trx, "currency",
                             vector<types::AccountPermission>{ {"currency","active"} },
-                            "transfer", types::transfer{"currency", "inita", 1});
+                            "transfer", types::transfer{"currency", "inita", 1,""});
          trx.expiration = chain.head_block_time() + 100;
          transaction_set_reference_block(trx, chain.head_block_id());
          try

tests/tests/native_contract_tests.cpp

@@ -96,7 +96,7 @@ BOOST_FIXTURE_TEST_CASE(transfer, testing_fixture)
       trx.expiration = chain.head_block_time() + 100;
       trx.scope = sort_names( {"inita", "initb"} );
 
-      types::transfer trans = { "inita", "initb", (100) };
+      types::transfer trans = { "inita", "initb", (100), "" };
 
       UInt64 value(5);
       auto packed = fc::raw::pack(value);