Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions
2820 commits 435 branches 47 tags 121 MiB
Commit graph

2820 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
sierra19XX
bfdecbb49b
Son deposit address enhancements (#362) 
* Deposit address enhancements

* fix tests

Co-authored-by: Koneru Satyanarayana <15652887+satyakoneru@users.noreply.github.com>
 2020-08-14 19:32:33 +05:30
sierra19XX
ecd14b8329
Peerplays Marketplace + NFT (#367) 
* ppy marketplace 1 - add evaluators and objects

* NFT object and basic operations

* ci: update .gitlab-ci.yml

* ci: update .gitlab-ci.yml

* NFT evaluators and basic tests, no evaluator checks

* Evaluator checks in place

* ppy marketplace 2 - batch sale, offer_object escrow

* Database API

* Wallet API

* NFT metadata implemented

* Fix NFT tests

* Database API for NFT metadata and enumerables

* ppy marketplace 4 - Add tests NFT+Marketplace

* ppy marketplace 5 - Add revenue split

* ppy marketplace 6 - Remove unnecessary files

* ppy marketplace 7 - Add db, wallet changes and some NFT fixes

* ppy marketplace 8 - Add pagination for list APIs

* New DB API, list all NFTs, list NFTs by owner

* Marketplace + NFT + RBAC (#368)

* rbac1 - evaluators and op validators added
* rbac2 - op_type hf checks
* rbac3 - tx auth verify changes
* Update .gitlab-ci.yml
* rbac4 - basic op tests
* rbac5 - clear expired and deleted permission linked auths
* rbac6 - more tests
* rbac7 - more tests
* rbac8 - more tests
* rbac9 - wallet and db api changes
* rbac10 - db api changes for required signature fetch
* rbac11 - add db_api tests
* rbac12 - add missing code for key auths

Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
Co-authored-by: Roshan Syed <roshan.syed.rs@gmail.com>
Co-authored-by: sierra19XX <15652887+sierra19XX@users.noreply.github.com>

* Fix nft_get_token_uri returning empty string

* Fix nft_mint_evaluator to save token_uri

* Fix cli_wallet to properly pass metadata id for nft_create

* ppy marketplace 9 - FC_REFLECT offer create op

* Add stricter checks to NFTs

* Unlisting offers, add result in offer history object

* Reverting genesis.json wrong commit

* Add non-transferable non-sellable properties to NFTs

* Review comments - change variable names, use scoped enums

* nft_metadata_update changes

* NFT HF checks and op fee addition changes

* NFT make revenue_split integer from double

* revenue_split condition check allow zero or above

Co-authored-by: Srdjan Obucina <obucinac@gmail.com>
Co-authored-by: Roshan Syed <roshan.syed.rs@gmail.com>
Co-authored-by: Satyanarayana Koneru <skoneru@SK-GT.local>
Co-authored-by: obucina <11353193+obucina@users.noreply.github.com>
Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
 2020-08-10 23:18:47 +10:00
sierra19XX
c36d4c9687
Mainnet chain halt 5050 Issue (#370) 2020-07-30 21:28:27 +10:00
sierra19XX
a5aa7c200d
GPOS2 HF - Handle rolling period on missing blocks (#369) 2020-07-30 21:28:08 +10:00
Roshan Syed
75b87b3c17 chore: updated Dockerfile with dnsutils 2020-07-16 19:16:40 +00:00
Roshan Syed
490a332db1 ci: update .gitlab-ci.yml 2020-07-09 13:33:14 +00:00
Roshan Syed
23d2ce000e ci: update .gitlab-ci.yml 2020-06-16 16:53:31 +00:00
Roshan Syed
cf8f1d94a8 chore: changed building to debug mode 2020-06-12 16:23:08 +00:00
sierra19XX
129d5ebf86
Bitcoin network type deduction (#361) 
Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
 2020-05-05 22:21:07 +10:00
sierra19XX
4896e48b3e
[SON-314] - Weighted Rewards and equal weighted son-account (#360) 
Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
 2020-05-05 22:20:48 +10:00
sierra19XX
6797cdc3d3
[SON-363] - Remove son deletion (#359) 
* [SON-363] - Remove son deletion

* Fix the tests
 2020-05-04 15:37:41 +10:00
sierra19XX
be538614a9
[SON-359] - Fix Errors processing to-be-refunded deposits (#358) 
Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
 2020-04-23 11:18:30 +02:00
Srdjan Obucina
984000f63e Hotfix - Save deposit address redeem and witness script into sidechain address object 2020-04-23 02:56:24 +02:00
gladcow
072906b3fd
fix broken peerplays_sidechain tests (#357) 
Co-authored-by: gladcow <s.gladkov@pbsa.info>
 2020-04-22 22:48:33 +02:00
Srdjan Obucina
8d7e574aa5 Hotfix - fix threshold_weight calculation in redeem scripts 2020-04-22 18:01:53 +02:00
gladcow
9db4615698
[SON-135] Add timelock to user deposit address (#356) 
* timelocks
* timelocked deposit address
* test for deposit timelock

Co-authored-by: gladcow <s.gladkov@pbsa.info>
 2020-04-21 14:54:46 +02:00
obucina
746b71f2fd
Hotfix - use getrawtransaction for approvals and settling (#355) 
* Revert "Use decoderawtraction json for proposal approvals (#352)"
This reverts commit d3385b28cb.
* User getrawtransaction for proposal approvals and settling
* Code cleanup
 2020-04-21 14:53:31 +02:00
sierra19XX
4db9e3a941
Prevent incorrect signatures to be added to transaction (#354) 
* Prevent incorrect signatures to be added to transaction
* Check signers list before signing

Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
 2020-04-21 14:41:24 +02:00
pbattu123
d8ca4d4625
Merge pull request #353 from peerplays-network/issue_a_gitlab 
Unable set private-key option through cli comand
 2020-04-20 14:33:58 -03:00
sierra19XX
d3385b28cb
Use decoderawtraction json for proposal approvals (#352) 
* Use decoderawtraction json for proposal approvals
* Use default null string to get first vout

Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
 2020-04-20 16:09:56 +02:00
pbattu123
a4c922cee9 private-key option update 2020-04-20 09:15:54 -03:00
Srdjan Obucina
5030c113bc Hotfix - remove redundant deposit sidechain address recreation 2020-04-20 04:14:06 +02:00
Srdjan Obucina
e7099fbc5c Hotfix - remove importing sidechain addresses 2020-04-20 02:46:47 +02:00
obucina
453772d59f
[SON-349] Delay BTC asset issue/reserve until tx confirmed on sidchain (#348) 
* Separate transaction settling from deposit/withdrawal processing
* Handle peerplays deposits with transaction settling
* Remove logs
* All dev features enabled/disabled with single flag
* Deposit/withdraw process and sidechain transaction creation in single proposal
 2020-04-19 06:19:59 +02:00
sierra19XX
b436b790fb
SON Weighted Multi Signature Signing (#349) 
* Bring in the bitcoin utils code into plugin
* Add tx creation, signing and tests
* tx deserialization fix
* add 10-of-14 multisig address test
* Add signing and verification tests and sign_transaction_standalone
* Add send_transaction_standalone function
* Debug logs and additional tests
* Fix for son deletion in the middle
* Extend script_builder
* Witness script for weighted wallet
* btc_weighted_multisig_address implementation
* Fix for bad-txns-nonstandard-inputs
* Weighted multisignature address test
* Create test tx with weighted multisig wallet
* Fix the issues with tx signing
* End to End test weighted multi sig
* 1 or m-of-n deposit address support
* Move network_type enum to the base class
* btc_one_or_weighted_multisig_address implementation
* Simplify redeem script
* Fix error in redeem_script
* btc_one_or_weighted_multisig_address tests
* Refactor sidechain address mapping
* CLANG code format
* CLANG code format sidechain tests
* Integration of deposit and rest of weighted wallets, withdrawal fee fix, whole code refactoring
* Move util functions to Utils file
* Add proper checks for withdraw fee
* Deposit address creation, import deposit/withdraw addresses, some code cleanup

Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
Co-authored-by: gladcow <s.gladkov@pbsa.info>
Co-authored-by: Srdjan Obucina <obucinac@gmail.com>
 2020-04-18 22:18:04 +02:00
gladcow
fbb4bbd757
check object's id (#351) 
Co-authored-by: gladcow <s.gladkov@pbsa.info>
 2020-04-17 21:38:47 +02:00
obucina
5305757136
[SON-354] Fix son_info compare function (#350) 2020-04-17 21:02:30 +02:00
obucina
dd8abfe1cd
[SON-353] Refactor PW processing, PW transfer fixed (#347) 
* Add proposal checks for deposit and withdrawal
* Refactor proposal approvement
* Fix transaction verification
* Remove logs
 2020-04-15 00:33:56 +02:00
pbattu123
b857603f10
Merge pull request #340 from peerplays-network/feature/nh5050_winner_id 
Feature/nh5050 winner_ticket_id changes
 2020-04-10 11:10:51 -03:00
sierra19XX
6a8cd25878
[SON-337] - Prevent update_son_votes without GPOS vesting (#344) 
Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
 2020-04-10 14:56:20 +02:00
pbattu123
03ebcc6f3b update variable type to uint64 2020-04-10 09:39:09 -03:00
pbattu123
f701f03401 update HF date 16th April 2020 2020-04-10 08:53:25 -03:00
pbattu123
e3cf4ab9e2 changes to fetch operations based on lottery asset 2020-04-09 22:05:18 -03:00
obucina
7988236b2a
[SON-348] Transaction hash not saved in object after Bitcoin transaction is sent (#343) 
- Fixed
- Unused parameters removed
 2020-04-09 23:24:48 +02:00
obucina
44db4f5c9b
[SON-346] Sidechain transaction marked as complete even though current_weight < threshold, Fixed (#342) 2020-04-08 22:40:20 +02:00
pbattu123
dd88b8f1ff update HF check 2020-04-08 09:05:39 -03:00
obucina
4f72269cf6
[SON-344] BTC asset is created with wrong quote asset id, Fixed (#341) 
* [SON-344] BTC asset is created with wrong quote asset id, Fixed
* Respond to code review
 2020-04-08 13:51:16 +02:00
pbattu123
cb7429e818 code improvement with edge case handling 2020-04-07 01:31:17 -03:00