From 7046b9625d63bd644fc380d7de156e6dcf44332d Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Fri, 1 Nov 2024 13:40:41 +0900 Subject: [PATCH] Merge down master --- aeserialization.app | 8 -------- src/aeser_api_encoder.erl | 2 +- src/aeser_chain_objects.erl | 2 +- src/aeser_contract_code.erl | 2 +- src/aeser_delegation.erl | 2 +- src/aeser_id.erl | 2 +- src/aeser_rlp.erl | 2 +- src/aeserialization.app.src | 15 +++++++++++++++ src/aeserialization.erl | 2 +- zomp.meta | 2 +- 10 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 aeserialization.app create mode 100644 src/aeserialization.app.src diff --git a/aeserialization.app b/aeserialization.app deleted file mode 100644 index 78c5d7c..0000000 --- a/aeserialization.app +++ /dev/null @@ -1,8 +0,0 @@ -{application,aeserialization, - [{description,"Serialization helpers for Aeternity node."}, - {registered,[]}, - {included_applications,[]}, - {applications,[stdlib,kernel]}, - {vsn,"0.1.0"}, - {modules,[]}, - {mod,{aeserialization,[]}}]}. diff --git a/src/aeser_api_encoder.erl b/src/aeser_api_encoder.erl index d0fbe2a..01d7111 100644 --- a/src/aeser_api_encoder.erl +++ b/src/aeser_api_encoder.erl @@ -5,7 +5,7 @@ %%% @end %%%------------------------------------------------------------------- -module(aeser_api_encoder). --vsn("0.1.1"). +-vsn("0.1.2"). -export([encode/2, decode/1, diff --git a/src/aeser_chain_objects.erl b/src/aeser_chain_objects.erl index 339fb61..4cf5c60 100644 --- a/src/aeser_chain_objects.erl +++ b/src/aeser_chain_objects.erl @@ -7,7 +7,7 @@ %%%------------------------------------------------------------------- -module(aeser_chain_objects). --vsn("0.1.1"). +-vsn("0.1.2"). -export([ serialize/4 , deserialize/4 diff --git a/src/aeser_contract_code.erl b/src/aeser_contract_code.erl index 3e93935..02084a3 100644 --- a/src/aeser_contract_code.erl +++ b/src/aeser_contract_code.erl @@ -5,7 +5,7 @@ %%% @end %%%------------------------------------------------------------------- -module(aeser_contract_code). --vsn("0.1.1"). +-vsn("0.1.2"). -include("aeser_contract_code.hrl"). diff --git a/src/aeser_delegation.erl b/src/aeser_delegation.erl index db5f3f5..b5e7b80 100644 --- a/src/aeser_delegation.erl +++ b/src/aeser_delegation.erl @@ -5,7 +5,7 @@ %%% @end %%%------------------------------------------------------------------- -module(aeser_delegation). --vsn("0.1.1"). +-vsn("0.1.2"). -export([ aens_preclaim_sig/3 , aens_name_sig/4 diff --git a/src/aeser_id.erl b/src/aeser_id.erl index 7ae1e1d..99c97d4 100644 --- a/src/aeser_id.erl +++ b/src/aeser_id.erl @@ -7,7 +7,7 @@ %%%------------------------------------------------------------------- -module(aeser_id). --vsn("0.1.1"). +-vsn("0.1.2"). -export([ create/2 , specialize/1 diff --git a/src/aeser_rlp.erl b/src/aeser_rlp.erl index e81f0d6..d23cbda 100644 --- a/src/aeser_rlp.erl +++ b/src/aeser_rlp.erl @@ -9,7 +9,7 @@ %%%------------------------------------------------------------------- -module(aeser_rlp). --vsn("0.1.1"). +-vsn("0.1.2"). -export([ decode/1 , decode_one/1 , encode/1 diff --git a/src/aeserialization.app.src b/src/aeserialization.app.src new file mode 100644 index 0000000..dce80c9 --- /dev/null +++ b/src/aeserialization.app.src @@ -0,0 +1,15 @@ +{application, aeserialization, + [{description, "Serialization of data for Aeternity"}, + {vsn, "0.1.0"}, + {registered, []}, + {applications, + [kernel, + stdlib, + crypto, + base58 + ]}, + {env,[]}, + {modules, []}, + {licenses, []}, + {links, []} + ]}. diff --git a/src/aeserialization.erl b/src/aeserialization.erl index 0d57616..c0d8e98 100644 --- a/src/aeserialization.erl +++ b/src/aeserialization.erl @@ -6,7 +6,7 @@ %%%------------------------------------------------------------------- -module(aeserialization). --vsn("0.1.1"). +-vsn("0.1.2"). -export([ decode_fields/2 , deserialize/5 diff --git a/zomp.meta b/zomp.meta index 2cbdd89..3ee0c1a 100644 --- a/zomp.meta +++ b/zomp.meta @@ -4,7 +4,7 @@ {prefix,none}. {author,"Hans Svensson"}. {desc,"Serialization helpers for Aeternity node."}. -{package_id,{"otpr","aeserialization",{0,1,1}}}. +{package_id,{"otpr","aeserialization",{0,1,2}}}. {deps,[{"otpr","erl_base58",{0,1,0}},{"otpr","eblake2",{1,0,0}}]}. {key_name,none}. {a_email,[]}.