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

Merge branch 'beatrice' into develop

Browse source
This commit is contained in:
Serki 2020-09-30 17:46:01 +02:00
commit 62bea3f9f5
11 changed files with 18 additions and 10 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:
- 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

1
Dockerfile
View file

@ -50,6 +50,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 && \

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 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 Thursday, 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

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

2
libraries/chain/include/graphene/chain/config.hpp
View file

@ -246,4 +246,4 @@
#define NFT_URI_MAX_LENGTH GRAPHENE_MAX_URL_LENGTH
#define ACCOUNT_ROLES_MAX_PER_ACCOUNT 20 // Max 20 roles can be created by a resource owner
#define ACCOUNT_ROLES_MAX_LIFETIME 365*24*60*60 // 1 Year
#define ACCOUNT_ROLES_MAX_LIFETIME 365*24*60*60 // 1 Year

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_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_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_approve_operation, (fee) (operator_) (approved) (token_id) (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))
}
} // namespace chain
} // namespace graphene
} // namespace graphene

4
libraries/chain/protocol/nft.cpp
View file

@ -45,6 +45,7 @@ void nft_metadata_create_operation::validate() const
FC_ASSERT(fee.amount >= 0, "Fee must not be negative");
FC_ASSERT(is_valid_nft_token_name(name), "Invalid NFT name provided");
FC_ASSERT(is_valid_nft_token_name(symbol), "Invalid NFT symbol provided");
FC_ASSERT(base_uri.length() <= NFT_URI_MAX_LENGTH, "Invalid NFT Base URI");
}
void nft_metadata_update_operation::validate() const
@ -54,11 +55,14 @@ void nft_metadata_update_operation::validate() const
FC_ASSERT(is_valid_nft_token_name(*name), "Invalid NFT name provided");
if(symbol)
FC_ASSERT(is_valid_nft_token_name(*symbol), "Invalid NFT symbol provided");
if(base_uri)
FC_ASSERT((*base_uri).length() <= NFT_URI_MAX_LENGTH, "Invalid NFT Base URI");
}
void nft_mint_operation::validate() const
{
FC_ASSERT(fee.amount >= 0, "Fee must not be negative");
FC_ASSERT(token_uri.length() <= NFT_URI_MAX_LENGTH, "Invalid NFT Token URI");
}
share_type nft_metadata_create_operation::calculate_fee(const fee_parameters_type &k) const