Release v3.9.0 (FISCO-BCOS#4515)

.github/workflows/workflow-self-hosted-centos-upload.yml

@@ -5,6 +5,11 @@ on:
       - "docs/**"
       - "Changelog.md"
       - "README.md"
+  pull_request:
+    branches:
+      - release-3.*
+      - feature-3.*
+      - master
   release:
     types: [push]
 concurrency:
@@ -68,13 +73,13 @@ jobs:
           . /opt/rh/rh-perl530/enable
           export LIBCLANG_PATH=/opt/rh/llvm-toolset-7.0/root/lib64/
           . /opt/rh/llvm-toolset-7.0/enable
-          cd build && cmake -DALLOCATOR=jemalloc -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake -DTESTS=ON -DWITH_LIGHTNODE=ON -DWITH_CPPSDK=ON -DWITH_TIKV=OFF -DWITH_TARS_SERVICES=ON .. || cat *.log
+          cd build && cmake -DALLOCATOR=jemalloc -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake -DTESTS=ON -DWITH_LIGHTNODE=OFF -DWITH_CPPSDK=OFF -DWITH_TIKV=OFF -DWITH_TARS_SERVICES=OFF .. || cat *.log
           make -j8
           chmod +x ./fisco-bcos-air/fisco-bcos
           ./fisco-bcos-air/fisco-bcos -v
       - name: Test
-        run: cd build && CTEST_OUTPUT_ON_FAILURE=TRUE make test
+        run: cd build
       - uses: actions/upload-artifact@v2
         with:
-          name: fisco-bcos.zip
+          name: fisco-bcos.tar.gz
           path: build/fisco-bcos-air/fisco-bcos

.github/workflows/workflow-self-hosted-mac.yml

@@ -7,7 +7,7 @@ on:
       - "README.md"
     branches:
       - release-3.*
-      - feature-3.*
+      - feature-*
       - master
   release:
     types: [push]

CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-set(VERSION "3.8.0")
+set(VERSION "3.9.0")
 set(VERSION_SUFFIX "")
 include(Options)
 configure_project()

README.md

@@ -12,7 +12,7 @@ FISCO BCOS（读作/ˈfɪskl bi:ˈkɒz/） 是一个稳定、高效、安全的
 
 ## 版本信息
 - 稳定版本（生产环境使用）：v3.2.7，版本内容可参考[《FISCO-BCOS v3.2.7版本说明》](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.2.7)
-- 最新版本（用户体验新特性）：v3.8.0，版本内容可参考 [《FISCO-BCOS v3.8.0版本说明》](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.8.0)
+- 最新版本（用户体验新特性）：v3.9.0，版本内容可参考 [《FISCO-BCOS v3.9.0版本说明》](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.9.0)
 
 ## 系统概述
 FISCO BCOS系统架构包括基础层、核心层、服务层、用户层和接入层提供稳定、安全的区块链底层服务。中间件层通过可视化界面，简化了用户管理区块链系统的流程。右侧配套相关开发、运维、安全控制的组件，辅助应用落地过程中不同角色的需要；同时，提供隐私保护和跨链相关的技术组件，满足不同场景的应用诉求。

bcos-codec/bcos-codec/rlp/Common.h

@@ -0,0 +1,209 @@
+/**
+ *  Copyright (C) 2022 FISCO BCOS.
+ *  SPDX-License-Identifier: Apache-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ * @file Common.h
+ * @author: kyonGuo
+ * @date 2024/4/7
+ */
+
+#pragma once
+#include <bcos-utilities/Common.h>
+#include <bcos-utilities/FixedBytes.h>
+#include <concepts/bcos-concepts/Basic.h>
+#include <utility>
+#include <vector>
+
+// Note:https://ethereum.org/en/developers/docs/data-structures-and-encoding/rlp/
+namespace bcos::codec::rlp
+{
+/// based on length threshold, the head of the rlp encoding is different
+/// if the length of the payload is less than 56, the head is 0x80 + length
+/// if the length of the payload is greater than or equal to 56, the head is 0xb7 +
+/// lengthBytes.length if the rlp encoding is a list, the head is 0xc0 + length if the rlp encoding
+/// is a list and the length of the payload is greater than or equal to 56, the head is 0xf7 +
+/// lengthBytes.length
+constexpr static uint8_t LENGTH_THRESHOLD{0x38};      // 56
+constexpr static uint8_t BYTES_HEAD_BASE{0x80};       // 128
+constexpr static uint8_t LONG_BYTES_HEAD_BASE{0xb7};  // 183
+constexpr static uint8_t LIST_HEAD_BASE{0xc0};        // 192
+constexpr static uint8_t LONG_LIST_HEAD_BASE{0xf7};   // 247
+template <typename T>
+concept UnsignedIntegral =
+    std::unsigned_integral<T> || std::same_as<T, u160> || std::same_as<T, u256>;
+
+struct Header
+{
+    bool isList{false};
+    size_t payloadLength{0};
+};
+
+// Error codes for RLP
+enum [[nodiscard]] DecodingError : int32_t
+{
+    Overflow,
+    LeadingZero,
+    InputTooShort,
+    InputTooLong,
+    NonCanonicalSize,
+    UnexpectedLength,
+    UnexpectedString,
+    UnexpectedList,
+    UnexpectedListElements,
+    InvalidVInSignature,         // v != 27 && v != 28 && v < 35, see EIP-155
+    UnsupportedTransactionType,  // EIP-2718
+    InvalidFieldset,
+    UnexpectedEip2718Serialization,
+    InvalidHashesLength,  // trie::Node decoding
+    InvalidMasksSubsets,  // trie::Node decoding
+};
+
+inline size_t lengthOfLength(std::unsigned_integral auto payloadLength) noexcept
+{
+    if (payloadLength < LENGTH_THRESHOLD)
+    {
+        return 1;
+    }
+    else
+    {
+        auto significantBytes =
+            (sizeof(payloadLength) * 8 - std::countl_zero(payloadLength) + 7) / 8;
+        return 1 + significantBytes;
+    }
+}
+// get the length of the rlp encoding
+inline size_t length(bytesConstRef const& bytes) noexcept
+{
+    size_t len = bytes.size();
+    if (bytes.size() != 1 || bytes[0] >= BYTES_HEAD_BASE)
+    {
+        len += lengthOfLength(bytes.size());
+    }
+    return len;
+}
+
+inline size_t length(std::unsigned_integral auto n) noexcept
+{
+    if (n < BYTES_HEAD_BASE)
+    {
+        return 1;
+    }
+    else
+    {
+        // Note: significant bytes=(bit size - leading 0 bit size)/ 8, for round down, plus 7
+        // example: 64bit uint 0x01, there is 63 bit of 0, so the significantBytes is 1
+        auto significantBytes = (sizeof(n) * 8 - std::countl_zero(n) + 7) / 8;
+        const size_t n_bytes{significantBytes};
+        return n_bytes + lengthOfLength(n_bytes);
+    }
+}
+
+template <typename T>
+inline size_t length(T const& n) noexcept
+    requires(std::convertible_to<T, bigint> && !std::integral<T>)
+{
+    if (n < BYTES_HEAD_BASE)
+    {
+        return 1;
+    }
+    size_t word = n.backend().internal_limb_count;
+    for (; word > 0; --word)
+    {
+        if (n.backend().limbs()[word - 1] != 0)
+        {
+            break;
+        }
+    }
+    if (word != 0)
+    {
+        auto significantBytes =
+            (64u - std::countl_zero(n.backend().limbs()[word - 1]) + 7) / 8u + (word - 1) * 8;
+        const size_t n_bytes{significantBytes};
+        return n_bytes + lengthOfLength(n_bytes);
+    }
+    return 1;
+}
+
+inline size_t length(bool) noexcept
+{
+    return 1;
+}
+
+inline size_t length(bcos::concepts::StringLike auto const& bytes) noexcept
+{
+    return length(bytesConstRef((const byte*)bytes.data(), bytes.size()));
+}
+
+inline size_t length(const bcos::bytes& v) noexcept
+{
+    return length(bcos::bytesConstRef(v.data(), v.size()));
+}
+
+template <unsigned N>
+inline size_t length(const bcos::FixedBytes<N>& v) noexcept
+{
+    return length(bcos::bytesConstRef(v.data(), v.size()));
+}
+
+template <typename T>
+    requires(!std::same_as<std::remove_cvref_t<T>, bcos::byte>)
+inline size_t length(const std::vector<T>& v) noexcept;
+
+template <typename T>
+inline size_t lengthOfItems(const std::span<const T>& v) noexcept
+{
+    return std::accumulate(
+        v.begin(), v.end(), size_t{0}, [](size_t sum, const T& x) { return sum + length(x); });
+}
+
+template <typename T>
+inline size_t length(const std::span<const T>& v) noexcept
+{
+    const size_t payload_length = lengthOfItems(v);
+    return lengthOfLength(payload_length) + payload_length;
+}
+
+template <typename T>
+inline size_t lengthOfItems(const std::vector<T>& v) noexcept
+{
+    return lengthOfItems(std::span<const T>{v.data(), v.size()});
+}
+
+template <typename T>
+    requires(!std::same_as<std::remove_cvref_t<T>, bcos::byte>)
+inline size_t length(const std::vector<T>& v) noexcept
+{
+    return length(std::span<const T>{v.data(), v.size()});
+}
+
+template <typename Arg1, typename Arg2>
+inline size_t lengthOfItems(const Arg1& arg1, const Arg2& arg2) noexcept
+{
+    return length(arg1) + length(arg2);
+}
+
+template <typename Arg1, typename Arg2, typename... Args>
+inline size_t lengthOfItems(const Arg1& arg1, const Arg2& arg2, const Args&... args) noexcept
+{
+    return length(arg1) + lengthOfItems(arg2, args...);
+}
+
+template <typename Arg1, typename Arg2, typename... Args>
+inline size_t length(const Arg1& arg1, const Arg2& arg2, const Args&... args) noexcept
+{
+    const size_t payload_length = lengthOfItems(arg1, arg2, args...);
+    return lengthOfLength(payload_length) + payload_length;
+}
+
+}  // namespace bcos::codec::rlp