Merge pull request #125 from ethereum/byzantium

Split Metropolis into Byzantium and Constantinople
This commit is contained in:
Paweł Bylica 2017-08-04 15:19:37 +02:00 committed by GitHub
commit 262161eb42
2 changed files with 4 additions and 3 deletions

View File

@ -56,8 +56,8 @@ static struct evm_result execute(struct evm_instance* instance,
struct evm_result ret = {}; struct evm_result ret = {};
if (code_size == 0) { if (code_size == 0) {
// In case of empty code return a fancy error message. // In case of empty code return a fancy error message.
const char* error = mode == EVM_METROPOLIS ? const char* error = mode == EVM_BYZANTIUM ?
"Welcome to Metropolis!" : "Hello Ethereum!"; "Welcome to Byzantium!" : "Hello Ethereum!";
ret.output_data = (const uint8_t*)error; ret.output_data = (const uint8_t*)error;
ret.output_size = strlen(error); ret.output_size = strlen(error);
ret.code = EVM_FAILURE; ret.code = EVM_FAILURE;

View File

@ -387,7 +387,8 @@ enum evm_mode {
EVM_HOMESTEAD = 1, EVM_HOMESTEAD = 1,
EVM_ANTI_DOS = 2, EVM_ANTI_DOS = 2,
EVM_CLEARING = 3, EVM_CLEARING = 3,
EVM_METROPOLIS = 4, EVM_BYZANTIUM = 4,
EVM_CONSTANTINOPLE = 5,
}; };