From 197dfd5da1ae07aa6a82048bb0c5b7eeccaadb13 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Tue, 13 Aug 2019 15:15:03 +0200 Subject: [PATCH] Let ecrecover only require two parameters --- include/aeb_opcodes.hrl | 16 ++++++++-------- src/aeb_fate_generate_ops.erl | 5 ++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/aeb_opcodes.hrl b/include/aeb_opcodes.hrl index b7af36a..31fff90 100644 --- a/include/aeb_opcodes.hrl +++ b/include/aeb_opcodes.hrl @@ -186,14 +186,14 @@ -define(PRIM_CALL_MAP_TOLIST, 305). -define(PRIM_CALL_IN_CRYPTO_RANGE(__TTYPE__), (((__TTYPE__) > 399) andalso ((__TTYPE__) < 500))). --define(PRIM_CALL_CRYPTO_ECVERIFY, 400). --define(PRIM_CALL_CRYPTO_SHA3, 401). --define(PRIM_CALL_CRYPTO_SHA256, 402). --define(PRIM_CALL_CRYPTO_BLAKE2B, 403). --define(PRIM_CALL_CRYPTO_SHA256_STRING, 404). --define(PRIM_CALL_CRYPTO_BLAKE2B_STRING, 405). --define(PRIM_CALL_CRYPTO_ECVERIFY_SECP256K1, 410). --define(PRIM_CALL_CRYPTO_ECRECOVER_SECP256K1,420). +-define(PRIM_CALL_CRYPTO_ECVERIFY, 400). +-define(PRIM_CALL_CRYPTO_SHA3, 401). +-define(PRIM_CALL_CRYPTO_SHA256, 402). +-define(PRIM_CALL_CRYPTO_BLAKE2B, 403). +-define(PRIM_CALL_CRYPTO_SHA256_STRING, 404). +-define(PRIM_CALL_CRYPTO_BLAKE2B_STRING, 405). +-define(PRIM_CALL_CRYPTO_ECVERIFY_SECP256K1, 410). +-define(PRIM_CALL_CRYPTO_ECRECOVER_SECP256K1, 420). -define(PRIM_CALL_IN_AUTH_RANGE(__TTYPE__), (((__TTYPE__) > 499) andalso ((__TTYPE__) < 600))). -define(PRIM_CALL_AUTH_TX_HASH, 500). diff --git a/src/aeb_fate_generate_ops.erl b/src/aeb_fate_generate_ops.erl index d42bd25..3396abe 100644 --- a/src/aeb_fate_generate_ops.erl +++ b/src/aeb_fate_generate_ops.erl @@ -4,7 +4,7 @@ , generate/0 , generate_documentation/1 , get_ops/0 - , test_asm_generator/1]). + , test_asm_generator/1 ]). gen_and_halt([SrcDirArg, IncludeDirArg]) -> generate(atom_to_list(SrcDirArg), @@ -175,8 +175,7 @@ ops_defs() -> , { 'IS_ORACLE', 16#7a, false, false, true, 3, [a,a], is_oracle, {address}, bool, "Arg0 := is Arg1 an oracle"} , { 'IS_CONTRACT', 16#7b, false, false, true, 3, [a,a], is_contract, {address}, bool, "Arg0 := is Arg1 a contract"} , { 'CREATOR', 16#7c, false, true, true, 3, [a], contract_creator, {}, address, "Arg0 := contract creator"} - , { 'ECRECOVER_SECP256K1', 16#7d, false, true, true, 1300, [a,a,a,a], ecrecover_secp256k1, {bytes, bytes, bytes}, bytes, "Arg0 := ecrecover_secp256k1(Hash, V, R, S)"} - + , { 'ECRECOVER_SECP256K1', 16#7d, false, true, true, 1300, [a,a,a], ecrecover_secp256k1, {bytes, bytes}, bytes, "Arg0 := ecrecover_secp256k1(Hash, Signature)"} , { 'DEACTIVATE', 16#fa, false, true, true, 3, [], deactivate, {}, none, "Mark the current contract for deactivation."} , { 'ABORT', 16#fb, true, true, true, 3, [a], abort, {string}, none, "Abort execution (dont use all gas) with error message in Arg0."}