Merge branch 'main' into GH-1091-block-nack

AntelopeIO · Jan 14, 2025 · f4f32eb · f4f32eb
2 parents e0cc48b + 2939fea
commit f4f32eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libraries/chainbase b/libraries/chainbase
diff --git a/tests/abieos b/tests/abieos
+4 −1		CMakeLists.txt
+2 −2		include/chainbase/pinnable_mapped_file.hpp
+2 −2		src/pinnable_mapped_file.cpp
+16 −10		src/abi.cpp
+12 −0		src/test.cpp
+13 −0		tools/CMakeLists.txt
+96 −0		tools/test_utils.sh
+147 −0		tools/util_generate_hex_from_json.cpp
+137 −0		tools/util_generate_json_from_hex.cpp