Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge beatrice only changes into develop

Browse source 
Merge beatrice only changes into develop
This commit is contained in:
serkixenos 2020-10-05 14:54:05 +02:00 committed by GitHub
commit abe17869f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -1,5 +1,9 @@
include: include:
- template: Code-Quality.gitlab-ci.yml - 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: stages:
- build - build

1
Dockerfile
View file

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

2
libraries/chain/custom_account_authority_evaluator.cpp
View file

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

4
libraries/chain/hardfork.d/5050-1.hf
View file

@ -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 #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 #endif

4
libraries/chain/hardfork.d/NFT.hf
View file

@ -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 #ifndef HARDFORK_NFT_TIME
#define HARDFORK_NFT_TIME (fc::time_point_sec( 1589932800 )) #define HARDFORK_NFT_TIME (fc::time_point_sec( 1597449600 ))
#endif #endif

2
libraries/chain/include/graphene/chain/protocol/custom_account_authority.hpp
View file

@ -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_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_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))

2
libraries/chain/include/graphene/chain/protocol/custom_permission.hpp
View file

@ -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_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_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))

1
libraries/chain/include/graphene/chain/protocol/nft_ops.hpp
View file

@ -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_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_approve_operation, (fee) (operator_) (approved) (token_id) (extensions) )
FC_REFLECT( graphene::chain::nft_set_approval_for_all_operation, (fee) (owner) (operator_) (approved) (extensions) ) FC_REFLECT( graphene::chain::nft_set_approval_for_all_operation, (fee) (owner) (operator_) (approved) (extensions) )

2
libraries/chain/offer_evaluator.cpp
View file

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