Commit graph

3110 commits

Author SHA1 Message Date
serkixenos
abe17869f3
Merge beatrice only changes into develop
Merge beatrice only changes into develop
2020-10-05 14:54:05 +02:00
Serki
dcc84aee5b Merge branch 'develop' into merge/develop2beatrice 2020-10-01 15:41:35 +02:00
Serki
7121da7eb5 Merge branch 'develop' of https://github.com/peerplays-network/peerplays into develop 2020-10-01 15:37:23 +02:00
serkixenos
ed44efd19c
Sidechain Operating Node 2020-10-01 15:36:59 +02:00
Serki
cbb8cbe4c2 Fix HF info 2020-10-01 15:28:12 +02:00
Serki
bba9c3ac1d Remove base_uri length checks 2020-10-01 14:21:08 +02:00
Serki
62bea3f9f5 Merge branch 'beatrice' into develop 2020-09-30 18:04:25 +02:00
Serki
64b4b8f622 Fix son_operation_tests/son_pay_test test 2020-09-29 14:09:46 +02:00
Serki
12e07fa7ad Merge branch 'feature/SONs-base' of https://github.com/peerplays-network/peerplays into feature/SONs-base 2020-09-29 13:40:58 +02:00
Serki
e1737053b5 Fix block_tests/maintenance_interval test 2020-09-29 13:40:13 +02:00
serkixenos
808ecf6575 Decrease log level for tests 2020-09-28 13:46:48 +00:00
Serki
3e6c812883 Increase tests log_level, some cleanup 2020-09-25 23:38:06 +02:00
Serki
2582b829ec Add missing break 2020-09-25 21:05:56 +02:00
Serki
c2a3467c02 Align submodule versions 2020-09-25 19:51:05 +02:00
Serki
b43d52312b Fix failing saving_keys_wallet_test 2020-09-24 16:57:19 +02:00
Serki
0359193813 Fix failing saving_keys_wallet_test 2020-09-24 16:56:30 +02:00
Serki
e79995ba69 Cleanup changes for prettier diff 2020-09-23 16:26:51 +02:00
Serki
ec74e7fc21 Merge branch 'develop' into feature/SONs-base 2020-09-23 15:43:28 +02:00
sierra19XX
213a188c46
NFT Permissions (#380)
* Account Roles Permission 1 - Working code with tests

* Account Roles Permission 2 - Add marketplace offer/bid tests

* Account Roles Permission 3 - Add Op check

* Account Roles Permission 4 - Add chain params and limits
2020-09-23 00:26:24 +05:30
Serki
318b992cb2 Cleanup changes for prettier diff 2020-09-22 19:23:16 +02:00
Serki
2264aa0052 Cleanup changes for pretier diff 2020-09-22 18:56:19 +02:00
Serki
c6c26a7d9f Merge branch 'develop' into feature/SONs-base 2020-09-22 18:23:36 +02:00
sierra19XX
c46e899cf4
Fix for custom operation authority checking (BTS Issue #210) (#382)
* Resolve #210: [HF] Check authorities on custom_operation

The required_auths field on custom_operation was being ignored during authority checking. This commit causes it to be checked correctly, and adds a unit test verifying as much.

* Ref #381: Fixes

Build and logic fixes for Pull Request #381

* Ref #381: Fix bad merge

During merge conflict resolution, I accidentally broke custom
authorities. This fixes it.

* compilation fix

Co-authored-by: Nathan Hourt <nathan@followmyvote.com>
2020-09-08 18:05:29 +05:30
Roshan Syed
5aede1f246 ci: added additional security scanning for gitlab 2020-08-31 17:58:02 +00:00
Bobinson K B
adb22299d9 Merge branch 'ws-updates' into 'develop'
Ws updates

See merge request PBSA/peerplays!1
2020-08-29 16:27:01 +00:00
blockc p
ae3edc6e27 Ws updates 2020-08-29 16:27:01 +00:00
Nathan Hourt
ed7b8b60e0
Resolve #373: Add object notifiers 2020-08-27 20:07:36 -05:00
Nathan Hourt
f2d4bce003
Resolve #374
Replace all object refs in macros with IDs, and fix affected tests to look
up objects by ID rather than using invalidated refs.

A full audit of all tests should be performed to eliminate any further
usage of invalidated object references.
2020-08-27 18:55:37 -05:00
Nathan Hourt
6b59f8269f
Rename project in CMakeLists.txt
The CMakeLists.txt declared this project as BitShares and not Peerplays,
which makes it confusing in IDEs. Rename it to be clear which project is
open.
2020-08-25 13:02:45 -05:00
Nathan Hourt
4e3e0e010a
Final fixes
Last round of fixes following the rebase to Beatrice
2020-08-25 13:01:51 -05:00
Nathan Hourt
a9135cbdd2
Fix crash in auth checks 2020-08-23 19:31:38 -05:00
Nathan Hourt
3dd78de312
Small fix 2020-08-23 14:51:47 -05:00
Nathan Hourt
ce8caae327
Fix test
I'm pretty sure this didn't break from what I did... But I can't build
the original code, so I can't tell. Anyways, this one now passes...
Others still fail...
2020-08-23 14:51:47 -05:00
Nathan Hourt
b8c3e63f1b
More fixes
Fix errors and warnings and generally coax it to build
2020-08-23 14:51:47 -05:00
Peter Conrad
a31e56f531
Fix #1772 by decprecating cli_wallet -H 2020-08-23 14:51:47 -05:00
Nathan Hourt
1c0de74aa7
General fixes
Fix warnings, build issues, unused code, etc.
2020-08-23 14:51:45 -05:00
Nathan Hourt
2af062e7cf
Fix compile sets
Delete a couple of ghost files that were in the tree but not part
of the project (I accidentally added them to CMakeLists while
merging, but they're broken and not part of the Peerplays code), and
add several files that got dropped from the build during merge.
2020-08-23 14:43:21 -05:00
Peter Conrad
9ae796c0a2
Externalized serialization in protocol library 2020-08-23 14:43:21 -05:00
Nathan Hourt
841c6319f9
Fix .gitignore 2020-08-23 14:43:21 -05:00
Nathan Hourt
d02bea9ef0
Ref #1506/#1737: Oops 2020-08-23 14:43:21 -05:00
Nathan Hourt
f2814a451c
Ref #1506/#1737: Fix clean_name() 2020-08-23 14:43:21 -05:00
Nathan Hourt
c94e46f451
Ref #1506/#1737: Macro-fy ID type definitions
Define macros to fully de-boilerplate ID type definitions.

Externalities:
 - Rename transaction_object -> transaction_history_object
 - Rename impl_asset_dynamic_data_type ->
impl_asset_dynamic_data_object_type
 - Rename impl_asset_bitasset_data_type ->
impl_asset_bitasset_data_object_type

The first is to avoid a naming collision on transaction_id_type, and the
other two are to maintain consistency with the naming of the other
types.
2020-08-23 14:43:19 -05:00
Nathan Hourt
6074749813
Ref #1506/#1737: Some requested changes 2020-08-23 14:37:35 -05:00
Nathan Hourt
ad670ecde1
Fix build after rebase 2020-08-23 14:37:02 -05:00
Nathan Hourt
f57dc27f55
Probably fix Docker build 2020-08-23 14:37:02 -05:00
Nathan Hourt
35d864e269
Remove unused key types 2020-08-23 14:37:02 -05:00
Nathan Hourt
3a15577617
Wrap overlength line 2020-08-23 14:37:02 -05:00
Nathan Hourt
9a52c29023
Remove commented-out index code 2020-08-23 14:37:02 -05:00
Nathan Hourt
9c71579d6e
Ref #1506: Isolate chain/protocol to its own library 2020-08-23 14:37:02 -05:00
Nathan Hourt
f076bb2586
Ref #1506: Move ID types from db to protocol
The ID types, object_id and object_id_type, were defined in the db
library, and the protocol library depends on db to get these types.
Technically, the ID types are defined by the protocol and used by the
database, and not vice versa. Therefore these types should be in the
protocol library, and db should depend on protocol to get them.

This commit makes it so.
2020-08-23 14:37:02 -05:00