status-im
/
evmc
mirror of https://github.com/status-im/evmc.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #52 from ethereum/storage-status 

Storage status
This commit is contained in:
Alex Beregszaszi 2018-08-09 11:14:02 +01:00 committed by GitHub
parent 28d2fd54ba 380ff4f501
commit ee4bcd9e32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/capi.c
View File

@ -45,7 +45,7 @@ static void get_storage(struct evmc_uint256be* result,
printf("\n");
}
static void set_storage(struct evmc_context* context,
static enum evmc_storage_status set_storage(struct evmc_context* context,
const struct evmc_address* address,
const struct evmc_uint256be* key,
const struct evmc_uint256be* value)
@ -56,6 +56,7 @@ static void set_storage(struct evmc_context* context,
printf("EVM-C: SSTORE @");
print_address(address);
printf("\n");
return EVMC_STORAGE_UNCHANGED;
}
static void get_balance(struct evmc_uint256be* result,
@ -141,9 +142,7 @@ static void get_block_hash(struct evmc_uint256be* result,
}
/// EVM log callback.
///
/// @note The `evm_log` name is used to avoid conflict with `log()` C function.
static void evm_log(struct evmc_context* context,
static void emit_log(struct evmc_context* context,
const struct evmc_address* address,
const uint8_t* data,
size_t data_size,
@ -160,7 +159,7 @@ static void evm_log(struct evmc_context* context,
static const struct evmc_context_fn_table ctx_fn_table = {
account_exists, get_storage, set_storage, get_balance, get_code_size, get_code_hash,
copy_code, selfdestruct, call, get_tx_context, get_block_hash, evm_log,
copy_code, selfdestruct, call, get_tx_context, get_block_hash, emit_log,
};
/// Example how the API is supposed to be used.

40
include/evmc/evmc.h
View File

@ -40,7 +40,7 @@ extern "C" {
enum
{
/** The EVMC ABI version number of the interface declared in this file. */
EVMC_ABI_VERSION = 4
EVMC_ABI_VERSION = 5
};
/**
@ -451,6 +451,41 @@ typedef void (*evmc_get_storage_fn)(struct evmc_uint256be* result,
const struct evmc_address* address,
const struct evmc_uint256be* key);
/**
* The effect of an attempt to modify a contract storage item.
*
* For the purpose of explaining the meaning of each element, the following
* notation is used:
* - 0 is zero value,
* - X != 0 (X is any value other than 0),
* - Y != X, Y != 0 (Y is any value other than X and 0),
* - the "->" means the change from one value to another.
*/
enum evmc_storage_status
{
/**
* The value of a storage item has been left unchanged: 0 -> 0 and X -> X.
*/
EVMC_STORAGE_UNCHANGED = 0,
/**
* The value of a storage item has been modified: X -> Y.
*/
EVMC_STORAGE_MODIFIED = 1,
/**
* A new storage item has been added: 0 -> X.
*/
EVMC_STORAGE_ADDED = 2,
/**
* A storage item has been deleted: X -> 0.
*/
EVMC_STORAGE_DELETED = 3,
};
/**
* Set storage callback function.
*
@ -461,8 +496,9 @@ typedef void (*evmc_get_storage_fn)(struct evmc_uint256be* result,
* @param address The address of the contract.
* @param key The index of the storage entry.
* @param value The value to be stored.
* @return The effect on the storage item, @see ::evmc_storage_status.
*/
typedef void (*evmc_set_storage_fn)(struct evmc_context* context,
typedef enum evmc_storage_status (*evmc_set_storage_fn)(struct evmc_context* context,
const struct evmc_address* address,
const struct evmc_uint256be* key,
const struct evmc_uint256be* value);