From 5997c872d8d133bc25f8ac327695cf7fbc116441 Mon Sep 17 00:00:00 2001 From: Dimitar Ivanov Date: Sat, 1 Mar 2025 14:55:42 +0200 Subject: [PATCH] Bump gmserialization to v1.2.0 --- rebar.config | 7 ++++--- rebar.lock | 24 ++++++++++++------------ src/aeso_compiler.erl | 2 +- src/aeso_vm_decode.erl | 2 +- src/aesophia.app.src | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/rebar.config b/rebar.config index ed141dc..d948037 100644 --- a/rebar.config +++ b/rebar.config @@ -2,7 +2,8 @@ {erl_opts, [debug_info]}. -{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.4.1"}}} +{deps, [ {gmbytecode, {git, "https://git.qpq.swiss/QPQ-AG/gmbytecode.git", + {ref, "691b9742bf7e4aa6a4e8e209397916be5abe1763"}}} , {eblake2, "1.0.0"} , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}} ]}. @@ -13,8 +14,8 @@ {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]} ]}. -{relx, [{release, {aesophia, "8.0.1"}, - [aesophia, aebytecode]}, +{relx, [{release, {sophia, "8.0.1"}, + [sophia, gmbytecode]}, {dev_mode, true}, {include_erts, false}, diff --git a/rebar.lock b/rebar.lock index 8a19f04..c491f51 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,22 +1,22 @@ {"1.2.0", -[{<<"aebytecode">>, - {git,"https://github.com/aeternity/aebytecode.git", - {ref,"6bd6f82c70d800950ea1a2c70c364a4181ff5291"}}, - 0}, - {<<"aeserialization">>, - {git,"https://github.com/aeternity/aeserialization.git", - {ref,"b26e6d105424748ba1c27917267b7cff07f37802"}}, - 1}, - {<<"base58">>, - {git,"https://github.com/aeternity/erl-base58.git", - {ref,"60a335668a60328a29f9731b67c4a0e9e3d50ab6"}}, +[{<<"base58">>, + {git,"https://git.qpq.swiss/QPQ-AG/erl-base58.git", + {ref,"e6aa62eeae3d4388311401f06e4b939bf4e94b9c"}}, 2}, {<<"eblake2">>,{pkg,<<"eblake2">>,<<"1.0.0">>},0}, {<<"enacl">>, - {git,"https://github.com/aeternity/enacl.git", + {git,"https://git.qpq.swiss/QPQ-AG/enacl.git", {ref,"4eb7ec70084ba7c87b1af8797c4c4e90c84f95a2"}}, 2}, {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},1}, + {<<"gmbytecode">>, + {git,"https://git.qpq.swiss/QPQ-AG/gmbytecode.git", + {ref,"691b9742bf7e4aa6a4e8e209397916be5abe1763"}}, + 0}, + {<<"gmserialization">>, + {git,"https://git.qpq.swiss/QPQ-AG/gmserialization.git", + {ref,"ac64e01b0f675c1a34c70a827062f381920742db"}}, + 1}, {<<"jsx">>, {git,"https://github.com/talentdeficit/jsx.git", {ref,"3074d4865b3385a050badf7828ad31490d860df5"}}, diff --git a/src/aeso_compiler.erl b/src/aeso_compiler.erl index 1cc72c3..d72a828 100644 --- a/src/aeso_compiler.erl +++ b/src/aeso_compiler.erl @@ -27,7 +27,7 @@ , validate_byte_code/3 ]). --include_lib("aebytecode/include/aeb_opcodes.hrl"). +-include_lib("gmbytecode/include/aeb_opcodes.hrl"). -include("aeso_utils.hrl"). diff --git a/src/aeso_vm_decode.erl b/src/aeso_vm_decode.erl index b0e2f78..f57a782 100644 --- a/src/aeso_vm_decode.erl +++ b/src/aeso_vm_decode.erl @@ -8,7 +8,7 @@ -export([ from_fate/2 ]). --include_lib("aebytecode/include/aeb_fate_data.hrl"). +-include_lib("gmbytecode/include/aeb_fate_data.hrl"). -spec from_fate(aeso_syntax:type(), aeb_fate_data:fate_type()) -> aeso_syntax:expr(). from_fate({id, _, "address"}, ?FATE_ADDRESS(Bin)) -> {account_pubkey, [], Bin}; diff --git a/src/aesophia.app.src b/src/aesophia.app.src index 926f26a..f9ceb41 100644 --- a/src/aesophia.app.src +++ b/src/aesophia.app.src @@ -7,7 +7,7 @@ stdlib, jsx, syntax_tools, - aebytecode, + gmbytecode, eblake2 ]}, {env,[]},