diff --git a/execution/evm/asm/opcodes.go b/execution/evm/asm/opcodes.go index 8dd393402452c9efbbc360ae33a30e9098905079..3017c213862a4dbbe7baa498115a73b56126c264 100644 --- a/execution/evm/asm/opcodes.go +++ b/execution/evm/asm/opcodes.go @@ -188,6 +188,7 @@ const ( // 0x70 range - other STATICCALL = 0xfa + CREATE2 = 0xfb REVERT = 0xfd INVALID = 0xfe SELFDESTRUCT = 0xff @@ -347,6 +348,7 @@ var opCodeNames = map[OpCode]string{ DELEGATECALL: "DELEGATECALL", STATICCALL: "STATICCALL", // 0x70 range - other + CREATE2: "CREATE2", REVERT: "REVERT", INVALID: "INVALID", SELFDESTRUCT: "SELFDESTRUCT", diff --git a/execution/evm/vm.go b/execution/evm/vm.go index c0191bf6b861a8534a6da9697a9eb9af447f0d56..03c67c3fc5c5e83919f037ffffd450190b1f0350 100644 --- a/execution/evm/vm.go +++ b/execution/evm/vm.go @@ -1153,7 +1153,7 @@ func (vm *VM) call(caller acm.Account, callee acm.MutableAccount, code, input [] case STOP: // 0x00 return nil, nil - case STATICCALL: + case STATICCALL, CREATE2: return nil, fmt.Errorf("%s not yet implemented", op.Name()) default: vm.Debugf("(pc) %-3v Unknown opcode %X\n", pc, op) diff --git a/rpc/tm/integration/websocket_helpers.go b/rpc/tm/integration/websocket_helpers.go index 9f0a4364816adfbb0612204d963eb35da9166eb7..ea30de8f3aac27685c104ccff78aee33fc930fde 100644 --- a/rpc/tm/integration/websocket_helpers.go +++ b/rpc/tm/integration/websocket_helpers.go @@ -37,7 +37,7 @@ import ( ) const ( - timeoutSeconds = 4 + timeoutSeconds = 8 expectBlockInSeconds = 2 )