From 68d8533bf7eb18909e01965d1f68921fcd11fe84 Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Mon, 10 Jun 2019 14:48:35 +0200 Subject: [PATCH] Introduce oracle query object and ORACLE_QUERY operation --- include/aeb_fate_data.hrl | 3 +++ src/aeb_fate_asm.erl | 8 ++++++++ src/aeb_fate_asm_scan.template | 1 + src/aeb_fate_data.erl | 7 ++++++- src/aeb_fate_encoding.erl | 10 ++++++++-- src/aeb_fate_generate_ops.erl | 6 ++++-- test/asm_code/oracles.fate | 9 ++++++++- 7 files changed, 38 insertions(+), 6 deletions(-) diff --git a/include/aeb_fate_data.hrl b/include/aeb_fate_data.hrl index db11d0b..8ef98dd 100644 --- a/include/aeb_fate_data.hrl +++ b/include/aeb_fate_data.hrl @@ -11,6 +11,7 @@ -define(FATE_SIGNATURE_T, {signature, binary()}). -define(FATE_CONTRACT_T, {contract, <<_:256>>}). -define(FATE_ORACLE_T, {oracle, <<_:256>>}). +-define(FATE_ORACLE_Q_T, {oracle_query, <<_:256>>}). -define(FATE_NAME_T, {name, <<_:256>>}). -define(FATE_CHANNEL_T, {channel, <<_:256>>}). -define(FATE_VARIANT_T, {variant, [byte()], ?FATE_BYTE_T, tuple()}). @@ -28,6 +29,7 @@ -define(IS_FATE_SIGNATURE(X), (is_tuple(X) andalso (signature == element(1, X) andalso is_binary(element(2, X))))). -define(IS_FATE_CONTRACT(X), (is_tuple(X) andalso (contract == element(1, X) andalso is_binary(element(2, X))))). -define(IS_FATE_ORACLE(X), (is_tuple(X) andalso (oracle == element(1, X) andalso is_binary(element(2, X))))). +-define(IS_FATE_ORACLE_Q(X), (is_tuple(X) andalso (oracle_query == element(1, X) andalso is_binary(element(2, X))))). -define(IS_FATE_NAME(X), (is_tuple(X) andalso (name == element(1, X) andalso is_binary(element(2, X))))). -define(IS_FATE_CHANNEL(X), (is_tuple(X) andalso (channel == element(1, X) andalso is_binary(element(2, X))))). -define(IS_FATE_BITS(X), (is_tuple(X) andalso (bits == element(1, X) andalso is_integer(element(2, X))))). @@ -48,6 +50,7 @@ -define(FATE_SIGNATURE(S), {signature, S}). -define(FATE_CONTRACT(X), {contract, X}). -define(FATE_ORACLE(X), {oracle, X}). +-define(FATE_ORACLE_Q(X), {oracle_query, X}). -define(FATE_NAME(X), {name, X}). -define(FATE_CHANNEL(X), {channel, X}). -define(FATE_BITS(B), {bits, B}). diff --git a/src/aeb_fate_asm.erl b/src/aeb_fate_asm.erl index 82de00b..68eab63 100644 --- a/src/aeb_fate_asm.erl +++ b/src/aeb_fate_asm.erl @@ -267,6 +267,11 @@ to_bytecode([{object,_line, {oracle, Value}}|Rest], to_bytecode(Rest, Address, Env, [{immediate, aeb_fate_data:make_oracle(Value)}|Code], Opts); +to_bytecode([{object,_line, {oracle_query, Value}}|Rest], + Address, Env, Code, Opts) -> + to_bytecode(Rest, Address, Env, + [{immediate, aeb_fate_data:make_oracle_query(Value)}|Code], + Opts); to_bytecode([{object,_line, {name, Value}}|Rest], Address, Env, Code, Opts) -> to_bytecode(Rest, Address, Env, @@ -400,6 +405,8 @@ parse_value([{object,_line, {contract, Address}} | Rest]) -> {aeb_fate_data:make_contract(Address), Rest}; parse_value([{object,_line, {oracle, Address}} | Rest]) -> {aeb_fate_data:make_oracle(Address), Rest}; +parse_value([{object,_line, {oracle_query, Address}} | Rest]) -> + {aeb_fate_data:make_oracle_query(Address), Rest}; parse_value([{object,_line, {name, Address}} | Rest]) -> {aeb_fate_data:make_name(Address), Rest}; parse_value([{object,_line, {channel, Address}} | Rest]) -> @@ -435,6 +442,7 @@ to_type([{id, _, "string"} | Rest]) -> {string, Rest}; to_type([{id, _, "address"} | Rest]) -> {address, Rest}; to_type([{id, _, "contract"} | Rest]) -> {contract, Rest}; to_type([{id, _, "oracle"} | Rest]) -> {oracle, Rest}; +to_type([{id, _, "oracle_query"} | Rest]) -> {oracle_query, Rest}; to_type([{id, _, "name"} | Rest]) -> {name, Rest}; to_type([{id, _, "channel"} | Rest]) -> {channel, Rest}; to_type([{id, _, "hash"} | Rest]) -> {hash, Rest}; diff --git a/src/aeb_fate_asm_scan.template b/src/aeb_fate_asm_scan.template index ec7a6e8..48639a7 100644 --- a/src/aeb_fate_asm_scan.template +++ b/src/aeb_fate_asm_scan.template @@ -119,6 +119,7 @@ parse_object([_|Chars]) -> {account_pubkey, Bin} -> {address, Bin}; {contract_pubkey, Bin} -> {contract, Bin}; {oracle_pubkey, Bin} -> {oracle, Bin}; + {oracle_query_id, Bin} -> {oracle_query, Bin}; {name, Bin} -> {name, Bin}; {channel, Bin} -> {channel, Bin}; {signature, Bin} -> {signature, Bin} diff --git a/src/aeb_fate_data.erl b/src/aeb_fate_data.erl index 7567dfb..25e7c87 100644 --- a/src/aeb_fate_data.erl +++ b/src/aeb_fate_data.erl @@ -91,6 +91,7 @@ , make_signature/1 , make_contract/1 , make_oracle/1 + , make_oracle_query/1 , make_name/1 , make_channel/1 , make_bits/1 @@ -116,6 +117,7 @@ make_hash(X) -> ?FATE_HASH(X). make_signature(X) -> ?FATE_SIGNATURE(X). make_contract(X) -> ?FATE_CONTRACT(X). make_oracle(X) -> ?FATE_ORACLE(X). +make_oracle_query(X) -> ?FATE_ORACLE_Q(X). make_name(X) -> ?FATE_NAME(X). make_channel(X) -> ?FATE_CHANNEL(X). make_integer(I) when is_integer(I) -> ?MAKE_FATE_INTEGER(I). @@ -175,6 +177,8 @@ format(?FATE_CONTRACT(X)) -> ["@", aeser_api_encoder:encode(contract_pubkey, X)]; format(?FATE_ORACLE(X)) -> ["@", aeser_api_encoder:encode(oracle_pubkey, X)]; +format(?FATE_ORACLE_Q(X)) -> + ["@", aeser_api_encoder:encode(oracle_query_id, X)]; format(?FATE_NAME(X)) -> ["@", aeser_api_encoder:encode(name, X)]; format(?FATE_CHANNEL(X)) -> @@ -221,7 +225,8 @@ ordinal(T) when ?IS_FATE_STRING(T) -> 10; ordinal(T) when ?IS_FATE_TUPLE(T) -> 11; ordinal(T) when ?IS_FATE_MAP(T) -> 12; ordinal(T) when ?IS_FATE_LIST(T) -> 13; -ordinal(T) when ?IS_FATE_VARIANT(T) -> 14. +ordinal(T) when ?IS_FATE_VARIANT(T) -> 14; +ordinal(T) when ?IS_FATE_ORACLE_Q(T) -> 15. -spec lt(fate_type(), fate_type()) -> boolean(). diff --git a/src/aeb_fate_encoding.erl b/src/aeb_fate_encoding.erl index f58779f..5e48113 100644 --- a/src/aeb_fate_encoding.erl +++ b/src/aeb_fate_encoding.erl @@ -112,8 +112,9 @@ -define(OTYPE_SIGNATURE, 2). -define(OTYPE_CONTRACT, 3). -define(OTYPE_ORACLE, 4). --define(OTYPE_NAME, 5). --define(OTYPE_CHANNEL, 6). +-define(OTYPE_ORACLE_Q, 5). +-define(OTYPE_NAME, 6). +-define(OTYPE_CHANNEL, 7). -define(IS_TYPE_TAG(X), (X =:= ?TYPE_INTEGER orelse X =:= ?TYPE_BOOLEAN orelse @@ -162,6 +163,8 @@ serialize(?FATE_CONTRACT(Address)) when is_binary(Address) -> <>; serialize(?FATE_ORACLE(Address)) when is_binary(Address) -> <>; +serialize(?FATE_ORACLE_Q(Address)) when is_binary(Address) -> + <>; serialize(?FATE_NAME(Address)) when is_binary(Address) -> <>; serialize(?FATE_CHANNEL(Address)) when is_binary(Address) -> @@ -235,6 +238,7 @@ serialize_type(hash) -> [?TYPE_OBJECT, ?OTYPE_HASH]; serialize_type(signature) -> [?TYPE_OBJECT, ?OTYPE_SIGNATURE]; serialize_type(contract) -> [?TYPE_OBJECT, ?OTYPE_CONTRACT]; serialize_type(oracle) -> [?TYPE_OBJECT, ?OTYPE_ORACLE]; +serialize_type(oracle_query)-> [?TYPE_OBJECT, ?OTYPE_ORACLE_Q]; serialize_type(name) -> [?TYPE_OBJECT, ?OTYPE_NAME]; serialize_type(channel) -> [?TYPE_OBJECT, ?OTYPE_CHANNEL]; serialize_type(bits) -> [?TYPE_BITS]; @@ -266,6 +270,7 @@ deserialize_type(<>) -> ?OTYPE_SIGNATURE -> {signature, Rest}; ?OTYPE_CONTRACT -> {contract, Rest}; ?OTYPE_ORACLE -> {oracle, Rest}; + ?OTYPE_ORACLE_Q -> {oracle_query, Rest}; ?OTYPE_NAME -> {name, Rest}; ?OTYPE_CHANNEL -> {channel, Rest} end; @@ -385,6 +390,7 @@ deserialize2(<>) -> ?OTYPE_SIGNATURE -> ?FATE_SIGNATURE(A); ?OTYPE_CONTRACT -> ?FATE_CONTRACT(A); ?OTYPE_ORACLE -> ?FATE_ORACLE(A); + ?OTYPE_ORACLE_Q -> ?FATE_ORACLE_Q(A); ?OTYPE_NAME -> ?FATE_NAME(A); ?OTYPE_CHANNEL -> ?FATE_CHANNEL(A) end, diff --git a/src/aeb_fate_generate_ops.erl b/src/aeb_fate_generate_ops.erl index 9d9a84e..0e40173 100644 --- a/src/aeb_fate_generate_ops.erl +++ b/src/aeb_fate_generate_ops.erl @@ -142,9 +142,11 @@ ops_defs() -> , { 'LOG4', 16#5f, false, 3, [a,a,a,a,a], log, {integer, integer, integer, integer, string}, none, "Create a log message with four topics in the call object."} %% Transaction ops , { 'SPEND', 16#60, false, 3, [a,a], spend, {address, integer}, none, "Transfer Arg1 tokens to account Arg0. (If the contract account has at least that many tokens."} - , { 'ORACLE_REGISTER', 16#61, false, 3, [a,a,a,a,a,a,a], oracle_register, {any,any,any,any,any,any}, oracle, "TODO: Document and describe types"} + , { 'ORACLE_REGISTER', 16#61, false, 3, [a,a,a,a,a,a,a], + oracle_register, {any,any,any,any,any,any}, oracle, "TODO: Document and describe types"} + , { 'ORACLE_QUERY', 16#62, false, 3, [a,a,a,a,a,a], + oracle_query, {any,any,any,any,any},oracle_query, "TODO: Document and describe types."} %% TODO: - , { 'ORACLE_QUERY', 16#62, false, 3, [], oracle_query, {}, none, "NYI"} , { 'ORACLE_RESPOND', 16#63, false, 3, [], oracle_respond, {}, none, "NYI"} , { 'ORACLE_EXTEND', 16#64, false, 3, [], oracle_extend, {}, none, "NYI"} , { 'ORACLE_GET_ANSWER', 16#65, false, 3, [], oracle_get_answer, {}, none, "NYI"} diff --git a/test/asm_code/oracles.fate b/test/asm_code/oracles.fate index 3c9b676..77df02f 100644 --- a/test/asm_code/oracles.fate +++ b/test/asm_code/oracles.fate @@ -1,5 +1,12 @@ ;; CONTRACT oracles FUNCTION register (address, integer, {variant, [{tuple, [integer]}, {tuple, [integer]}]}) : oracle - ORACLE_REGISTER a () arg0 arg1 arg2 'string '{variant, [{tuple, []}, {tuple, [integer]}]} + ORACLE_REGISTER a "0000000000000000000000000000000000000000000000000000000000000000" arg0 arg1 arg2 'string '{variant, [{tuple, []}, {tuple, [integer]}]} RETURN + +FUNCTION query (oracle, integer, string) : oracle_query + ORACLE_QUERY a arg0 arg1 arg2 (| [1,1] | 0 | (100) |) (| [1,1] | 0 | (100) |) + RETURN + +FUNCTION bogus_query () : oracle_query + RETURNR @oq_nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv