Skip to content

setcode and setabi memo #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 21, 2022
Merged

setcode and setabi memo #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
858416b
setcode and setabi memo
tbfleming Oct 1, 2021
1ba12d4
Merge remote-tracking branch 'origin/main' into setcode-memo
tbfleming Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions contracts/eosio.system/include/eosio.system/native.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <eosio/action.hpp>
#include <eosio/binary_extension.hpp>
#include <eosio/contract.hpp>
#include <eosio/crypto.hpp>
#include <eosio/fixed_bytes.hpp>
Expand All @@ -11,6 +12,7 @@

namespace eosiosystem {

using eosio::binary_extension;
using eosio::checksum256;
using eosio::ignore;
using eosio::name;
Expand Down Expand Up @@ -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<char>& abi );
void setabi( const name& account, const std::vector<char>& abi, const binary_extension<std::string>& memo );

/**
* Set code action sets the contract code for an account.
Expand All @@ -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<char>& code ) {}
void setcode( const name& account, uint8_t vmtype, uint8_t vmversion, const std::vector<char>& code,
const binary_extension<std::string>& memo ) {}

using newaccount_action = eosio::action_wrapper<"newaccount"_n, &native::newaccount>;
using updateauth_action = eosio::action_wrapper<"updateauth"_n, &native::updateauth>;
Expand Down
3 changes: 2 additions & 1 deletion contracts/eosio.system/src/eosio.system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,8 @@ namespace eosiosystem {
set_resource_limits( newact, 0, 0, 0 );
}

void native::setabi( const name& acnt, const std::vector<char>& abi ) {
void native::setabi( const name& acnt, const std::vector<char>& abi,
const binary_extension<std::string>& memo ) {
eosio::multi_index< "abihash"_n, abi_hash > table(get_self(), get_self().value);
auto itr = table.find( acnt.value );
if( itr == table.end() ) {
Expand Down