Merge beatrice only changes into develop

Merge beatrice only changes into develop

.gitlab-ci.yml

@@ -1,5 +1,9 @@
 include:
   - template: Code-Quality.gitlab-ci.yml
+  - template: Dependency-Scanning.gitlab-ci.yml
+  - template: License-Scanning.gitlab-ci.yml
+  - template: SAST.gitlab-ci.yml
+  - template: Secret-Detection.gitlab-ci.yml
 
 stages:
   - build

Dockerfile

@@ -52,6 +52,7 @@ WORKDIR /peerplays-core
 # Compile Peerplays
 RUN \
     BOOST_ROOT=$HOME/boost_1_67_0 && \
+    git submodule sync --recursive && \
     git submodule update --init --recursive && \
     mkdir build && \
     mkdir build/release && \

libraries/chain/custom_account_authority_evaluator.cpp

@@ -125,4 +125,4 @@ void_result delete_custom_account_authority_evaluator::do_apply(const custom_acc
 }
 
 } // namespace chain
-} // namespace graphene
+} // namespace graphene

libraries/chain/hardfork.d/5050-1.hf

@@ -1,4 +1,4 @@
-// 5050_1 HARDFORK Thursday, 16 April 2020 19:00:00 GMT
+// 5050_1 HARDFORK Wednesday, 15 April 2020 20:00:00 GMT
 #ifndef HARDFORK_5050_1_TIME
-#define HARDFORK_5050_1_TIME (fc::time_point_sec( 1587063600 ))
+#define HARDFORK_5050_1_TIME (fc::time_point_sec( 1586980800 ))
 #endif

libraries/chain/hardfork.d/NFT.hf

@@ -1,4 +1,4 @@
-// NFT HARDFORK Wednesday, 20-May-20 00:00:00 UTC
+// NFT HARDFORK Sat, 15-Aug-20 00:00:00 UTC
 #ifndef HARDFORK_NFT_TIME
-#define HARDFORK_NFT_TIME (fc::time_point_sec( 1589932800 ))
+#define HARDFORK_NFT_TIME (fc::time_point_sec( 1597449600 ))
 #endif

libraries/chain/include/graphene/chain/protocol/custom_account_authority.hpp

@@ -73,4 +73,4 @@ FC_REFLECT(graphene::chain::custom_account_authority_update_operation::fee_param
 FC_REFLECT(graphene::chain::custom_account_authority_update_operation, (fee)(auth_id)(new_valid_from)(new_valid_to)(owner_account)(extensions))
 
 FC_REFLECT(graphene::chain::custom_account_authority_delete_operation::fee_parameters_type, (fee))
-FC_REFLECT(graphene::chain::custom_account_authority_delete_operation, (fee)(auth_id)(owner_account)(extensions))
+FC_REFLECT(graphene::chain::custom_account_authority_delete_operation, (fee)(auth_id)(owner_account)(extensions))

libraries/chain/include/graphene/chain/protocol/custom_permission.hpp

@@ -70,4 +70,4 @@ FC_REFLECT(graphene::chain::custom_permission_update_operation::fee_parameters_t
 FC_REFLECT(graphene::chain::custom_permission_update_operation, (fee)(permission_id)(new_auth)(owner_account)(extensions))
 
 FC_REFLECT(graphene::chain::custom_permission_delete_operation::fee_parameters_type, (fee))
-FC_REFLECT(graphene::chain::custom_permission_delete_operation, (fee)(permission_id)(owner_account)(extensions))
+FC_REFLECT(graphene::chain::custom_permission_delete_operation, (fee)(permission_id)(owner_account)(extensions))

libraries/chain/include/graphene/chain/protocol/nft_ops.hpp

@@ -146,4 +146,3 @@ FC_REFLECT( graphene::chain::nft_mint_operation, (fee) (payer) (nft_metadata_id)
 FC_REFLECT( graphene::chain::nft_safe_transfer_from_operation, (fee) (operator_) (from) (to) (token_id) (data) (extensions) )
 FC_REFLECT( graphene::chain::nft_approve_operation, (fee) (operator_) (approved) (token_id) (extensions) )
 FC_REFLECT( graphene::chain::nft_set_approval_for_all_operation, (fee) (owner) (operator_) (approved) (extensions) )
-

libraries/chain/offer_evaluator.cpp

@@ -358,4 +358,4 @@ namespace graphene
             FC_CAPTURE_AND_RETHROW((op))
         }
     } // namespace chain
-} // namespace graphene
+} // namespace graphene