diff --git a/contracts/eosio.system/include/eosio.system/native.hpp b/contracts/eosio.system/include/eosio.system/native.hpp index a0931cde..d3805b13 100644 --- a/contracts/eosio.system/include/eosio.system/native.hpp +++ b/contracts/eosio.system/include/eosio.system/native.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include @@ -11,6 +12,7 @@ namespace eosiosystem { + using eosio::binary_extension; using eosio::checksum256; using eosio::ignore; using eosio::name; @@ -233,9 +235,10 @@ namespace eosiosystem { * * @param account - the account for which to set the contract abi. * @param abi - the abi content to be set, in the form of a blob binary. + * @param memo - may be omitted */ [[eosio::action]] - void setabi( const name& account, const std::vector& abi ); + void setabi( const name& account, const std::vector& abi, const binary_extension& memo ); /** * Set code action sets the contract code for an account. @@ -244,9 +247,11 @@ namespace eosiosystem { * @param vmtype - reserved, set it to zero. * @param vmversion - reserved, set it to zero. * @param code - the code content to be set, in the form of a blob binary.. + * @param memo - may be omitted */ [[eosio::action]] - void setcode( const name& account, uint8_t vmtype, uint8_t vmversion, const std::vector& code ) {} + void setcode( const name& account, uint8_t vmtype, uint8_t vmversion, const std::vector& code, + const binary_extension& memo ) {} using newaccount_action = eosio::action_wrapper<"newaccount"_n, &native::newaccount>; using updateauth_action = eosio::action_wrapper<"updateauth"_n, &native::updateauth>; diff --git a/contracts/eosio.system/src/eosio.system.cpp b/contracts/eosio.system/src/eosio.system.cpp index 202210c7..6dac14e6 100644 --- a/contracts/eosio.system/src/eosio.system.cpp +++ b/contracts/eosio.system/src/eosio.system.cpp @@ -358,7 +358,8 @@ namespace eosiosystem { set_resource_limits( newact, 0, 0, 0 ); } - void native::setabi( const name& acnt, const std::vector& abi ) { + void native::setabi( const name& acnt, const std::vector& abi, + const binary_extension& memo ) { eosio::multi_index< "abihash"_n, abi_hash > table(get_self(), get_self().value); auto itr = table.find( acnt.value ); if( itr == table.end() ) {