From deb6b94cef19317c7df65a8e252ff571a3fcb9dd Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Mon, 19 Sep 2022 13:55:02 +0300 Subject: [PATCH] Squashed commit of the following: commit 804cc3f92aa5e5de3163684238264e71bbfe4429 Merge: 4034e3ff ca2bf01a Author: Andy Oknen Date: Mon Sep 19 13:42:51 2022 +0300 Merge pull request #416 from pocketnetteam/fix/optimize-getunspents-index fix: optimize getunspents index commit ca2bf01a6870d00d169a3a793f418bbb634c25fc Author: Andy Oknen Date: Mon Sep 19 10:49:58 2022 +0300 Change used index for fast sorting GetUnspents commit 4034e3ff3096e365b0bbb1779d5975b6961d7dcc Merge: 930f8229 2d5e9c24 Author: Andy Oknen Date: Sun Sep 18 10:17:19 2022 +0300 Merge pull request #415 from pocketnetteam/fix/bad-txns-premature-spend-of-coinbase commit 930f82293c29fae26f30402f62bd38f7a60358bd Merge: 297fe2e1 2e81916d Author: Andy Oknen Date: Sun Sep 18 10:16:42 2022 +0300 Merge pull request #413 from pocketnetteam/fix/delete-account commit 2d5e9c2455e75b6f33a04277bf98ee5fa81fac50 Author: Andy Oknen Date: Sun Sep 18 01:03:24 2022 +0300 Include coinstake to check bad-txns-premature-spend-of-coinbase commit 2e81916d2f1b46f14db76412d48ecd9bc608cad0 Author: Andy Oknen Date: Fri Sep 16 18:26:05 2022 +0300 Fix enable deleting transaction commit 297fe2e1e87477a0fe0e97eff2e8ab60cfcb05b6 Author: Andy Oknen Date: Fri Sep 16 17:58:25 2022 +0300 feat: delete account (#405) * Add type for account deleting transaction * Refactoring models & AccountDelete transaction * Fix check height in ExistsInMempool * Refactoring account editing * Move to base class opReturnCheck * Squashed commit of the following: commit 84b78aab2b2f7c9baa2009f57eee3f92385aafb3 Merge: 7b7338c8 499f514b Author: Andy Oknen Date: Fri Sep 9 14:37:44 2022 +0300 Merge pull request #408 from pocketnetteam/actualization/0.20 Squashed commit of the following: commit 499f514bf494920d2847225ae31eeef5811f305b Author: Andy Oknen Date: Fri Sep 9 10:50:15 2022 +0300 Squashed commit of the following: commit aca3fe7d05c1f0c8a9ea76bf02eff87cefd47142 Merge: 78065768 1cce975f Author: Andy Oknen Date: Thu Sep 8 18:40:05 2022 +0300 Merge pull request #399 from HiHat/patch-1 Important details regarding address and fixes commit 780657681d2564844a42c24de0938da74777c642 Merge: bfaef570 5ce96412 Author: Andy Oknen Date: Thu Sep 8 15:09:22 2022 +0300 Merge pull request #402 from pocketnetteam/andyoknen-patch-1 Update README.md commit 5ce96412b1cc0f67148aa4933dd74fe3b43f6c29 Author: Andy Oknen Date: Wed Sep 7 10:51:21 2022 +0300 Update README.md commit 1cce975f41f0bc130f58e8004ac35f1f8cfd7179 Author: HiHat Date: Tue Sep 6 19:09:26 2022 +0300 Important details regarding address and fixes commit bfaef57025253beb6564dbe4afd30dfe51e059a4 Author: Pocketnet Team Date: Wed Aug 31 13:23:31 2022 +0300 Create add.tasks.to.project.yml commit 8ad81f1601554be5eb557a5fda204a78fd3d3be3 Author: Pocketnet Team Date: Tue Aug 30 15:00:15 2022 +0300 Set maximum depth 1 month for RPC GetMostCommentedFeed commit c1e5845465970d7bbafe909a9528abe0ac3cfd67 Author: Pocketnet Team Date: Tue Aug 30 14:57:23 2022 +0300 Set fork height for BlockingCancel.hpp commit b8bc0adf5c46dc3fb0d14332f49e34dec6105dd3 Merge: 8383efb4 8abd1bb7 Author: Andy Oknen Date: Tue Aug 30 14:45:32 2022 +0300 Merge pull request #385 from pocketnetteam/fix/wrong-key-threshold fix: wrong map key threshold_shark_reg_depth -> threshold_whale_reg_depth commit 8abd1bb75fb52ea6dff9ad73e560362abfd4b1c5 Author: Andy Oknen Date: Tue Aug 30 14:42:46 2022 +0300 Comment not used now RPC commit fee5e39f227d46ac0259d0b26b5680fb451a3eaa Author: Andy Oknen Date: Tue Aug 30 11:13:50 2022 +0300 Extend height for fork to 1873500 block commit 0ea51a2868b2ad0befb1149c2b5a0270cac7ecd1 Author: Andy Oknen Date: Mon Aug 29 14:14:26 2022 +0300 Fix wrong map key threshold_shark_reg_depth -> threshold_whale_reg_depth commit 8383efb46582ec24455867157474dbf29c0bc4f2 Author: Pocketnet Team Date: Thu Aug 25 00:21:32 2022 +0300 Delete project.add.issues.yml commit 95b97de883e4116a7f6d54af3be842e017e7fd01 Author: Pocketnet Team Date: Thu Aug 25 00:17:56 2022 +0300 Create project.add.issues.yml commit 9693e62933ae1ca02560fba1311dbdd4c88c8a77 Author: Pocketnet Team Date: Thu Aug 25 00:07:19 2022 +0300 Create auto_assign.yml commit 7b7338c801e665435cc429381ff3eb98d2a68f57 Merge: 88af7848 b6b9f45f Author: lostystyg <54471935+lostystyg@users.noreply.github.com> Date: Fri Sep 9 10:41:39 2022 +0300 Merge pull request #302 from lostystyg/feature/events feature: events, push notifications and activities commit 88af7848ba0e56fe22a136715bb7fbca46eda966 Merge: dddb3c6d 6280c078 Author: Andy Oknen Date: Thu Sep 8 18:45:15 2022 +0300 Merge pull request #407 from pocketnetteam/fix/clear-database Fix clear database commit 6280c078ae1e1cf38a1d69e67b6bc2203469eda8 Author: Andy Oknen Date: Thu Sep 8 18:39:43 2022 +0300 Fix clear database commit dddb3c6dd0e6a5088d46bfb70051e5fa95fc08fe Merge: 1a03ee9d 6d1975a2 Author: Andy Oknen Date: Thu Sep 8 15:22:39 2022 +0300 Merge pull request #401 from pocketnetteam/feat/txindex-disable-always feat: disable txindex by default commit 1a03ee9d2340909fbedcc8ded34915efc5c9489f Merge: adce55f2 bc022eca Author: Andy Oknen Date: Thu Sep 8 15:07:28 2022 +0300 Merge pull request #406 from pocketnetteam/fix/full-reindex-lists fix: full reindex lists commit b6b9f45f711821ba98a657b55529ae9a6037abab Author: lostystyg Date: Thu Sep 8 15:55:12 2022 +0400 Fix new line commit 314c1a84137a1bba0f246f0649cbd9334625cc03 Author: lostystyg Date: Thu Sep 8 15:52:07 2022 +0400 Temporarily disable getevents rpc commit bbd05740a461ff9ca4c68cfae216e82f28bf1b8d Merge: 32b0e15f adce55f2 Author: lostystyg Date: Thu Sep 8 15:51:13 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit bc022ecac23e00dfb7236ffffbb2e77e6e995682 Author: Andy Oknen Date: Thu Sep 8 14:40:46 2022 +0300 Logging clean commit 8107ae50a48790d12bb0d0662c1ea2dc21cc3e45 Author: Andy Oknen Date: Thu Sep 8 14:38:53 2022 +0300 Call rollback lists for full reindexing commit 32b0e15f67da6f08069173585fa801f641209d88 Author: lostystyg Date: Thu Sep 8 15:26:58 2022 +0400 Optimized notifications collecting commit 24e63f43b73f38a3b534682ca5c2b864863f7bf2 Author: lostystyg Date: Thu Sep 8 13:13:52 2022 +0400 Filling notification result with account info commit 1344fe5b189542b154f2bf9d9a47d23cbc4e83e9 Author: lostystyg Date: Thu Sep 8 12:29:31 2022 +0400 Language for short account commit 710886c50ae33edfda37472b2265aa2adaf127ce Author: lostystyg Date: Thu Sep 8 12:17:28 2022 +0400 Correctly filling notifications answer commit 6d1975a22e50550ff6ef7b393441e49f2cadbfe4 Author: Andy Oknen Date: Wed Sep 7 10:40:06 2022 +0300 Disable enabling txindex by default commit 5b04354199e527de52c08dd1880a12c1f8225ba5 Author: lostystyg Date: Mon Sep 5 15:33:28 2022 +0400 Removed outdated comment commit 57f275ea9dcd3c7c61a75561c809cef6a97f6937 Author: lostystyg Date: Mon Sep 5 15:04:22 2022 +0400 Cosmetics for blocking query in activities commit 88ed33a8731e61a9364840264b099e7012c659cd Author: lostystyg Date: Mon Sep 5 14:47:08 2022 +0400 Removed number from outputs in activities and notifications commit 24534072f1ece6cf940f9033fa032cd20b7471c7 Author: lostystyg Date: Mon Sep 5 13:04:59 2022 +0400 Reuse height binder in notifications for money commit 77f9e87343e7b691227dd97b5a114460a55df7f2 Author: lostystyg Date: Fri Sep 2 16:41:06 2022 +0400 Order outputs by number for activities and notifications commit 8ef4a5bbdd8aed5b860e73c95504fc9676977bec Merge: 2b3a0164 357d1558 Author: lostystyg Date: Thu Sep 1 22:28:12 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 2b3a0164de79b2ecf67f87dee0e2842fc8ec22df Author: lostystyg Date: Thu Sep 1 22:24:10 2022 +0400 Removed trash from badge in activities commit 66e9054ae456ebdb6b49a0682a141e6abc76c448 Author: lostystyg Date: Thu Sep 1 22:22:59 2022 +0400 Removed trash from badge field in notification queries commit f8924a6f595da8dbff0fe7f341a39399c1b09a6a Author: lostystyg Date: Thu Sep 1 22:21:18 2022 +0400 Ported notifications from 0.20-based dropped branch commit 6d8148ded4c31ea2019b5384fd8e90714cf5010e Author: lostystyg Date: Thu Sep 1 12:10:41 2022 +0400 Added blockings for notifications commit c23e94c4678ab27c7c4dfd1074b50f306a97e6bf Author: lostystyg Date: Wed Aug 31 13:29:41 2022 +0400 Added optional multiple addresses to shortform commit c29ab129b3c2ceb9da564a2f37649e321b50b869 Author: lostystyg Date: Tue Aug 30 19:06:08 2022 +0400 Removed unnecessary todo commit 736748f798fcbecc1f8e8b9e855ca215c3db5d3d Author: lostystyg Date: Tue Aug 30 19:03:32 2022 +0400 Some todo's commit cabb0603547edb11d29363d19fd9328729a2c7ba Author: lostystyg Date: Tue Aug 30 19:02:08 2022 +0400 All action history for comments and answers in activities commit cf5021c9c4f25c22ada7b59f2c143b953c6ad84b Author: lostystyg Date: Tue Aug 30 18:36:51 2022 +0400 Collect roottxhash in activity queries commit 328a3ecd8cad8cdef92b5baa5173f6516ac4d1de Author: lostystyg Date: Tue Aug 30 17:51:10 2022 +0400 Added root tx hash to shortform commit f6fa4a45ca88a8ce0970aaa0dc0950bce1465790 Author: lostystyg Date: Tue Aug 30 17:42:02 2022 +0400 Full history for notifications commit 077f0f26f5b52cf86229d2418cf73d465dbc0b29 Author: lostystyg Date: Thu Aug 25 09:35:42 2022 +0400 Added blocking shorttype commit e2913158f2226f719242e376b8a846ca660ef26b Author: lostystyg Date: Thu Aug 25 09:33:55 2022 +0400 Removed not up to date todo commit 884893775de6aea42350bddcdd93ec42c47c6d04 Author: lostystyg Date: Wed Aug 24 16:55:14 2022 +0400 Removed reposts from activities commit b5631e70c1e54ef4ae60207f2c25f9a72663d458 Merge: e4c102c3 b7b49914 Author: lostystyg Date: Wed Aug 24 16:21:26 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit e4c102c39cc9ebd7cd3bdf38b5c053841c39ca01 Author: lostystyg Date: Wed Aug 24 15:53:24 2022 +0400 Validate filters for events on rpc level commit ac03dcb727512a5ed29450c2a720c1259bcdd158 Author: lostystyg Date: Wed Aug 24 15:49:33 2022 +0400 Validate filters for activities on rpc level commit fcb2fed45b43c3e510be0dfb33504b680b97d016 Author: lostystyg Date: Wed Aug 24 15:49:10 2022 +0400 Removed pocketnetteam from events and activities commit 876e7b574c9ad099fd00721aa92c79561d3eb2b7 Author: lostystyg Date: Wed Aug 24 15:35:47 2022 +0400 Fixed crash if non-valid filters are specified for notifications/activities/events commit 5732263c174be41fb9be7dbc15b48acef6e1e263 Author: lostystyg Date: Mon Aug 22 23:52:32 2022 +0400 Removed todo for money in activities commit 9c7438fb22ddc857876e4cc734fd3885481e9386 Merge: 99c11087 6e530784 Author: lostystyg Date: Mon Aug 22 15:16:13 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 99c11087a786a017b7c1e4039cb94615d6e742c2 Author: lostystyg Date: Sat Aug 20 18:02:14 2022 +0400 Fixed typo in query commit 6057f91580b1e35399f7cfbbbf43e57d2cf6f486 Author: lostystyg Date: Sat Aug 20 17:53:37 2022 +0400 Removed commented out queries for notifications commit 35375ed1d01fa436ea83a65f910fdd746a8e1e5b Author: lostystyg Date: Sat Aug 20 16:39:23 2022 +0400 Validating filters for getnotificationssummary commit f1be1700c842a7cd1960665cbf969f97b4fe4892 Author: lostystyg Date: Sat Aug 20 16:38:13 2022 +0400 Optimization and fixed for notifications summary queries commit 1d371a0870f3053d77cf65df7c6a537370ede685 Author: lostystyg Date: Sat Aug 20 16:36:29 2022 +0400 Allow to specify union separator commit fcf526c45eb12f853f4da331398b9cf0dbfb6536 Merge: 46edf275 9df85fb7 Author: lostystyg Date: Fri Aug 19 19:26:37 2022 +0400 Merge remote-tracking branch 'origin/fixes/multiplelocks' into feature/events commit 46edf275c6f5e113be1209bca42b3ecf6962cad7 Author: lostystyg Date: Wed Aug 17 18:09:35 2022 +0400 Notifications summary commit 29164ac17d0da9ad5f8ead8f6d87fa8a9bdf30a3 Author: lostystyg Date: Mon Aug 15 11:22:23 2022 +0400 Fixed help for getnotifications commit c26ddf05be536577ca8334fbd57737a848b74805 Merge: 3a49aa58 1bbe483a Author: lostystyg Date: Fri Aug 12 14:01:39 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 3a49aa58477b3e5cac571a83eedc95b57106bbaa Merge: 5365be10 8a1b0af6 Author: lostystyg Date: Thu Aug 11 16:27:31 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 5365be10f9f6df46bf973c15b03e1915062ac75e Author: lostystyg Date: Thu Aug 11 14:52:19 2022 +0400 Correct ordering by original txs in activities commit 3339a738328bbdfeb7517254f017a85a693ddaac Author: lostystyg Date: Thu Aug 11 14:51:32 2022 +0400 Removed unnecessary todos commit 1b256cd1fb3b46266b946dca2b2f3ea7da5bb92a Author: lostystyg Date: Thu Aug 11 14:49:12 2022 +0400 Explicitly set index for account joins in activities commit 3ae1ff87786b593bcd6bdc5652f26bb066d50a0a Author: lostystyg Date: Wed Aug 10 11:30:05 2022 +0400 Fixed address positioning in sql query for activities in ContentScore and CommentScore commit fa8543b5c97ee93b84e997b74336aa55d961fbe8 Merge: a433e3ac cc77fdcb Author: lostystyg Date: Wed Aug 10 10:21:20 2022 +0400 Merge branch '0.21' into feature/events commit a433e3ac5bb2dca719697a913e14594c5f46e2d8 Author: lostystyg Date: Mon Aug 8 10:55:52 2022 +0400 Removed orig height from activities because it breaks pagination commit 67febbef23c006f91886b92bb84e88e6d10fe448 Author: lostystyg Date: Fri Jul 22 10:36:48 2022 +0300 Fixed referals for events commit 9845755c09e0e98380dd4a020db8a08e2e551545 Author: lostystyg Date: Fri Jul 22 10:11:06 2022 +0300 Orig height for activities commit eb5c9e6621d4cd35c82af7a13eaa14cb5a0f8a90 Merge: d60cfd32 c6fa67b4 Author: lostystyg Date: Fri Jul 22 09:03:43 2022 +0300 Merge branch '0.21' into feature/events commit d60cfd32e626356ae728db6f51cb3bb36148ab94 Author: lostystyg Date: Wed Jul 20 18:16:05 2022 +0300 A bit cosmetics for events commit 86e5df5a081973a2b6fd9aa546f12d8033373b33 Author: lostystyg Date: Wed Jul 20 18:01:43 2022 +0300 Full comment text in description for events and activities commit fabcc4e520227c4367a39bf0882097201acd155f Author: lostystyg Date: Wed Jul 20 15:30:28 2022 +0300 Inner join instead of cross for repost in activities commit f782b68e000f9ded107f962e8b82f2e986a828bc Author: lostystyg Date: Wed Jul 20 15:26:48 2022 +0300 Fixed repost queries for activities and events commit 7e865aa4b8a31df75f685bedd7cf0bd6973ffa5c Author: lostystyg Date: Wed Jul 20 14:56:19 2022 +0300 Fixed subscriber in activities commit c01a27472ce995c4d80da691f3ca7b3fef8e2c87 Author: lostystyg Date: Tue Jul 19 18:55:36 2022 +0300 Optimizing activity queries commit 91d85294992c2db69c6def5840b324ecdf2bedf9 Author: lostystyg Date: Mon Jul 18 16:36:03 2022 +0300 Optimizing pocketnetteam notifications commit c137b10912886fffb8f9992990873d77878b69d6 Author: lostystyg Date: Mon Jul 18 16:26:56 2022 +0300 Fixed binds for notifications commit e265c7ff37d4531133e2e792c84b444dd79349ed Author: Andy Oknen Date: Mon Jul 18 13:17:59 2022 +0300 Optimize reposts commit dadabe0f0d15f67e74157652dfab24f16ae5441e Author: Andy Oknen Date: Mon Jul 18 13:12:50 2022 +0300 Fix private content from subscribers (not reposts) commit 8c423e45e86fe237a55873828a574f7885faf73c Author: Andy Oknen Date: Mon Jul 18 13:09:11 2022 +0300 Optimize reposts query commit 814a958f101c6c3f924f6db0977d45294662f197 Author: Andy Oknen Date: Mon Jul 18 12:51:01 2022 +0300 Fix incoming money commit 1d0d17e2a8b5491b421e71f0df2547e08468804f Author: lostystyg Date: Mon Jul 18 12:32:41 2022 +0300 getnotification better todos and fixed index commit e3f474ba52e4a1d234ed1f3910014519f99ac0da Author: lostystyg Date: Fri Jul 15 18:02:37 2022 +0300 Added optional related content (in case of reposts) for pocketnetteam posts and private content for notifications commit 427d320494f6390b921ef26e85d83b67f7a5a7aa Author: lostystyg Date: Fri Jul 15 18:01:45 2022 +0300 Fixed reposts for notifications commit 5c261246ad1117d5c393f6c90511a8dc20bd83a9 Author: lostystyg Date: Fri Jul 15 18:01:06 2022 +0300 Moved pocketnetteam posts for notifications to a specific key in answer commit 5e8b8066d31046beccd717bd6cdcb45357259a60 Author: lostystyg Date: Wed Jul 13 18:11:33 2022 +0300 Fixed var name for events contentscore commit 39b478d611fe69437c45c33535fe9e01be8904aa Author: lostystyg Date: Wed Jul 13 18:10:31 2022 +0300 Ignoring empty avatar for short form account commit 848abcae88f1d0b1d922ed9be7a37c9ac820368f Author: lostystyg Date: Wed Jul 13 13:55:24 2022 +0300 Fixed typo in contentscore for activities commit aaac24ae58a9b176beee95f31dfb425281d26d01 Author: lostystyg Date: Wed Jul 13 13:54:54 2022 +0300 Fixed content description for contentscore in activities commit 5d7e566222d686212ba1d475e5581df78a805ba2 Author: lostystyg Date: Tue Jul 12 11:48:56 2022 +0300 Inner join instead of cross for activities and events commit 5bb78a6f327bcaed0cf07e229613b0d236677bcc Author: lostystyg Date: Tue Jul 12 11:22:39 2022 +0300 Updated activities query commit d3c243d4fce004f2da5fab1a83dd587f472cfb18 Author: lostystyg Date: Fri Jul 8 17:31:35 2022 +0300 Comment score activity commit 0a936ade276adea029a29aa26c645cf7f4c997a8 Author: lostystyg Date: Fri Jul 8 17:22:20 2022 +0300 Subscriber activity commit b5d0c401eb859478bdea99f883523ccb828add98 Author: lostystyg Date: Fri Jul 8 17:14:00 2022 +0300 Added comments for activities commit 638c874a0287ebd69aecbca5b675dcb24d1f7669 Author: lostystyg Date: Fri Jul 8 17:13:39 2022 +0300 Fixed answers request for activities commit f3a202681561a3426be3c37748e353907941b50f Author: lostystyg Date: Fri Jul 8 16:36:07 2022 +0300 Base activities rpc request commit 3665c8076186734a16103f1feda707d9bac0e373 Author: lostystyg Date: Fri Jul 8 14:59:17 2022 +0300 Renamed notifications rpc commit d560b5ad7b34847e8644daf7dc09cc2ef4e45927 Author: lostystyg Date: Wed Jul 6 16:18:08 2022 +0300 Fixed acc's rep for getevents commit 071f6ed8d6e7c0f1ff8ad7777675c64b83aa6c21 Author: lostystyg Date: Wed Jul 6 16:17:48 2022 +0300 Ignore badge fort short account commit 1576c8dc6fb2436f030a5f9b79ddd9db3fe843f4 Author: lostystyg Date: Wed Jul 6 15:50:37 2022 +0300 Only orig entries for notifications + some optimizations commit 60e0489fb1976fe6801ceefbaf72370c913d64d5 Author: lostystyg Date: Tue Jul 5 15:44:20 2022 +0300 Updated getnotifications rpc description commit 5e1740fb58b36c0b36b2f99b1b86d9d4bcbcd729 Author: lostystyg Date: Tue Jul 5 15:38:25 2022 +0300 Updated getevents rpc description commit a66588336365912e73e61f5921f430faf085f6b4 Merge: 6828322d 9b8e4bd6 Author: lostystyg Date: Tue Jul 5 15:11:55 2022 +0300 Merge branch '0.21' into feature/events commit 6828322d0616f5c6c9c846e5558a50eaaa4561f1 Author: lostystyg Date: Mon Jul 4 20:34:34 2022 +0300 Money notification commit b227a1cdc0888f532aaec1f86dbe544909e2c83b Author: lostystyg Date: Mon Jul 4 19:41:35 2022 +0300 Extracted common bind for notifications commit ef325659593eaf1f8faeec91fc405099024c9766 Merge: 16a3455f c0f6636c Author: lostystyg Date: Fri Jul 1 19:34:12 2022 +0300 Merge branch '0.21' into feature/events commit 16a3455f20d79b3028db961c280da0e75cea68e3 Author: lostystyg Date: Fri Jul 1 19:14:10 2022 +0300 Notifications commit 9c8a9b3f0d2d0c47c8a6ebd9de34b3fa576c9320 Author: lostystyg Date: Fri Jul 1 19:14:00 2022 +0300 Fixed ShortAccount commit 061a7ab966fafc41644034bf38a259f47bab9f10 Author: lostystyg Date: Wed Jun 29 17:17:24 2022 +0300 A bit generalization in processing filters for events commit b9f3b6a95832ac38782d9003ab4d8f4ad1af990a Author: lostystyg Date: Wed Jun 29 15:38:07 2022 +0300 Restructured events commit b8f37cbf82b986962ec85674d8859ad150567a9c Merge: f862108d 8465afed Author: lostystyg Date: Tue Jun 28 14:35:03 2022 +0300 Merge remote-tracking branch 'origin/0.21' into feature/events commit f862108dd6ca23059c62cad7b227b4d032e41d9c Merge: 8090d0e8 4429a24f Author: lostystyg Date: Mon Jun 27 13:37:20 2022 +0300 Merge branch '0.21' into feature/events commit 8090d0e8464d9b538c0617cab97cb2c08ac11411 Merge: 21b3c715 5c9755ac Author: lostystyg Date: Mon Jun 27 12:39:57 2022 +0300 Merge branch 'minor_fixes' into feature/events commit 21b3c715ae8ef56cc276e62975bb1a727cfb2cde Merge: 78eb6155 8c9006b4 Author: lostystyg Date: Mon Jun 27 12:39:51 2022 +0300 Merge branch '0.21' into feature/events commit 5c9755ac27adf6801e7936d8fefb218494fbc6a4 Author: lostystyg Date: Fri Jun 24 19:09:19 2022 +0300 Some minor fixes commit 78eb6155d9626dea1de3635f0e1484c643a27af9 Merge: 3207e0fc 97cf205e Author: lostystyg Date: Thu Jun 23 19:09:06 2022 +0300 Merge branch '0.21' into feature/events commit 3207e0fc601d9e099cb0181a1fd4dc784672001d Merge: 156ed36a 67a8917f Author: lostystyg Date: Mon Jun 13 16:15:56 2022 +0300 Merge branch '0.21' into feature/events commit 156ed36a5d4155c1b619a17c484c8587b23bb459 Author: lostystyg Date: Fri Jun 10 16:03:17 2022 +0300 Answer fixes for events commit 854e6f5b9ccba90961633409cbbcd7335857e50a Author: lostystyg Date: Fri Jun 10 14:58:52 2022 +0300 Donate value for comment event commit 576fed8fed67233522eea657f4801aa4519b6351 Author: lostystyg Date: Fri Jun 10 13:50:56 2022 +0300 Fixed events height commit 337c1efcc064e68aee3235d944c19da43b465169 Author: lostystyg Date: Fri Jun 10 13:38:03 2022 +0300 Disabled hight border in related content for events commit 7b2c630c686225e3ca28c40c3d349cc3eb295c48 Author: lostystyg Date: Fri Jun 10 13:27:55 2022 +0300 Events queries formatting commit e4f3666e6ff1aabb65efcc17ace03652209353df Author: lostystyg Date: Fri Jun 10 13:15:34 2022 +0300 Comment answer events fulfilled with data commit 775c8d454364df3d8775b78b891e4810b5fd959b Author: Andy Oknen Date: Fri Jun 10 12:14:10 2022 +0300 index comment answer commit 1b5a4966f75358c3a0140267a2e2a342b73ee755 Author: Andy Oknen Date: Fri Jun 10 11:30:03 2022 +0300 Add height limit for answer comments commit 6d0985262639ec83784ec1df4a9f74b96a5b1060 Author: Andy Oknen Date: Fri Jun 10 11:01:04 2022 +0300 comment commit 7805b8e8f7c600c471126e7304bf28fb380ad9aa Author: Andy Oknen Date: Fri Jun 10 10:54:36 2022 +0300 Sql fixes commit 011f94f29438ad36cb423a2faf6dc4686905902c Author: Andy Oknen Date: Fri Jun 10 09:43:51 2022 +0300 Fix sql typo commit a62fd177da5dfb00260cd13db1572b0824e21742 Author: lostystyg Date: Fri Jun 10 09:05:43 2022 +0300 Fixed select ordering in events commit af47ba0b7bb84185fc78c18c178720f8254281e8 Author: Andy Oknen Date: Fri Jun 10 08:50:18 2022 +0300 Fix comment answers sql index commit c97d7f55ddea43ffcde4b0c591086b8ddb6102b3 Author: lostystyg Date: Mon Jun 6 16:00:19 2022 +0300 Fixed description for scores events commit 134f3095dac5169d58a0213a795002d347c33769 Author: lostystyg Date: Mon Jun 6 15:35:51 2022 +0300 Throwing in case of event reconstructor error commit 0c3319a6878381b2bc528f9a24d8e7e491ce4dff Author: Andy Oknen Date: Mon May 23 14:11:21 2022 +0300 Downgrade likers count for testnet commit 367fa1a7a38cbe3f31ac83c3c6afef57ff1229df Author: Andy Oknen Date: Fri Apr 22 10:36:33 2022 +0300 Formatting commit 0421fbf7bf4af46fbb216517eb6f8867ca39f0a5 Author: lostystyg Date: Mon Jun 6 12:47:01 2022 +0300 Optimizing event queries commit aff9e13fece8167e8f7352c3d13206dbccde94b0 Author: lostystyg Date: Mon Jun 6 12:25:58 2022 +0300 Events fixes commit 423d4f9f91b61283e6878b408fc92ae8120ca467 Merge: 7127a3eb 039f41fb Author: lostystyg Date: Fri Jun 3 00:34:41 2022 +0300 Merge remote-tracking branch 'origin/0.21' into feature/events commit 7127a3ebd2bfff8f469afa7e5f980d5c41ae5ff0 Author: lostystyg Date: Fri Jun 3 00:34:12 2022 +0300 Short forms for events commit b8f13088d20cceb8fc67229bffb8154a00c08a20 Author: lostystyg Date: Fri Jun 3 00:34:02 2022 +0300 Updated short forms commit 03c0bd4a9c52a89d276ca9da219a9a323cb41a8c Author: lostystyg Date: Tue May 31 01:01:20 2022 +0300 ShortTxType for short forms commit dfd80a5a62d32e055cbaeabdf089bc4b1e0dbb4d Author: lostystyg Date: Mon May 30 22:52:28 2022 +0300 Added short forms commit 0b2aca0a697fd47cd0b4aee4264acf99aa57f86d Author: lostystyg Date: Mon May 30 15:26:51 2022 +0300 Raw sql query to get all events at height for each account commit 78681c897118244d758fc40732685ad9ba19c524 Author: lostystyg Date: Fri May 6 17:31:21 2022 +0300 Forgotten finalizing stmt commit 8d23c2e6e401f9a41c41d7a6236be2dc1785c19e Author: lostystyg Date: Fri May 6 17:01:01 2022 +0300 Updated args description for getevents commit 4030e741e98038f7297cccae706ba072beb992c2 Author: lostystyg Date: Fri May 6 16:57:43 2022 +0300 Events for single address commit b7ec0f7f40237ac2a6e12f3394163ba1a05a8c98 Author: lostystyg Date: Fri May 6 16:42:10 2022 +0300 constant depth for events commit 1ae34c266e55cdae51aa5df95d28cae91d5385ee Author: lostystyg Date: Fri May 6 16:40:43 2022 +0300 privatecontent for events commit 086a1fa52778907c63eab88d9e691b62edff5246 Author: lostystyg Date: Fri May 6 16:34:57 2022 +0300 Fixed binding for events commit d77c6b6cf4dda626454170d466345fadcf6b12f9 Author: lostystyg Date: Fri May 6 13:37:39 2022 +0300 Fixed filtering for events commit 19591f2421a9e7d9579fe6034f82314ccaaf4562 Author: lostystyg Date: Thu May 5 23:15:02 2022 +0300 Updated events commit 244a198523d5efe7f9c251e7ccd8111dd26eae0c Author: lostystyg Date: Wed May 4 17:04:33 2022 +0300 Fixed filtering for events commit 3deae2ea8a8dded1f50d3ec7ee9bda2616667e90 Author: lostystyg Date: Wed May 4 16:09:02 2022 +0300 FIlters, height and blocknum for events request commit 2600f314343ec9ce45acbd46774e1f2e4924e6a4 Author: lostystyg Date: Sat Apr 30 14:41:04 2022 +0300 Sorting events by height outside of sqlite commit 7f3d953ecb6c01fdf2e5fb6f1cf2d8cc424098a7 Author: lostystyg Date: Sat Apr 30 00:42:26 2022 +0300 Fixed events rpc description commit 192ad0cab7f3639824fe2c9ed4a3862941c89b2e Author: lostystyg Date: Sat Apr 30 00:41:11 2022 +0300 Events optimization commit 7a51e15cb185f07536ca713eebafd0e5c06111dc Author: lostystyg Date: Mon Apr 25 18:35:32 2022 +0300 Better indexing content from private subscribers event commit 3d8e46bfd1b13af691c876d8c82caf77f6035411 Author: lostystyg Date: Mon Apr 25 18:30:38 2022 +0300 Do not check for last for boost events commit dbea23e6036b2cd141552c408a149562351618cd Merge: af71bdf4 b0497826 Author: lostystyg Date: Mon Apr 25 18:20:24 2022 +0300 Merge remote-tracking branch 'origin/0.21.todo' into feature/events commit af71bdf4fdaaffe602ef6fa70efa63ef35ec5c63 Author: lostystyg Date: Mon Apr 25 18:17:09 2022 +0300 Base events logic commit c0e9504a610807a759cffbd239dd9bd2852ad805 Author: lostystyg Date: Mon Apr 18 17:23:50 2022 +0300 Method to get POCKETNET_TEAM address commit 9722326760ef90af0ccb57bbacc5c5c51d76f7d6 Author: lostystyg Date: Mon Apr 18 17:22:46 2022 +0300 Using network id instead of string for getting pocketnet developers * Squashed commit of the following: commit 84b78aab2b2f7c9baa2009f57eee3f92385aafb3 Merge: 7b7338c8 499f514b Author: Andy Oknen Date: Fri Sep 9 14:37:44 2022 +0300 Merge pull request #408 from pocketnetteam/actualization/0.20 Squashed commit of the following: commit 499f514bf494920d2847225ae31eeef5811f305b Author: Andy Oknen Date: Fri Sep 9 10:50:15 2022 +0300 Squashed commit of the following: commit aca3fe7d05c1f0c8a9ea76bf02eff87cefd47142 Merge: 78065768 1cce975f Author: Andy Oknen Date: Thu Sep 8 18:40:05 2022 +0300 Merge pull request #399 from HiHat/patch-1 Important details regarding address and fixes commit 780657681d2564844a42c24de0938da74777c642 Merge: bfaef570 5ce96412 Author: Andy Oknen Date: Thu Sep 8 15:09:22 2022 +0300 Merge pull request #402 from pocketnetteam/andyoknen-patch-1 Update README.md commit 5ce96412b1cc0f67148aa4933dd74fe3b43f6c29 Author: Andy Oknen Date: Wed Sep 7 10:51:21 2022 +0300 Update README.md commit 1cce975f41f0bc130f58e8004ac35f1f8cfd7179 Author: HiHat Date: Tue Sep 6 19:09:26 2022 +0300 Important details regarding address and fixes commit bfaef57025253beb6564dbe4afd30dfe51e059a4 Author: Pocketnet Team Date: Wed Aug 31 13:23:31 2022 +0300 Create add.tasks.to.project.yml commit 8ad81f1601554be5eb557a5fda204a78fd3d3be3 Author: Pocketnet Team Date: Tue Aug 30 15:00:15 2022 +0300 Set maximum depth 1 month for RPC GetMostCommentedFeed commit c1e5845465970d7bbafe909a9528abe0ac3cfd67 Author: Pocketnet Team Date: Tue Aug 30 14:57:23 2022 +0300 Set fork height for BlockingCancel.hpp commit b8bc0adf5c46dc3fb0d14332f49e34dec6105dd3 Merge: 8383efb4 8abd1bb7 Author: Andy Oknen Date: Tue Aug 30 14:45:32 2022 +0300 Merge pull request #385 from pocketnetteam/fix/wrong-key-threshold fix: wrong map key threshold_shark_reg_depth -> threshold_whale_reg_depth commit 8abd1bb75fb52ea6dff9ad73e560362abfd4b1c5 Author: Andy Oknen Date: Tue Aug 30 14:42:46 2022 +0300 Comment not used now RPC commit fee5e39f227d46ac0259d0b26b5680fb451a3eaa Author: Andy Oknen Date: Tue Aug 30 11:13:50 2022 +0300 Extend height for fork to 1873500 block commit 0ea51a2868b2ad0befb1149c2b5a0270cac7ecd1 Author: Andy Oknen Date: Mon Aug 29 14:14:26 2022 +0300 Fix wrong map key threshold_shark_reg_depth -> threshold_whale_reg_depth commit 8383efb46582ec24455867157474dbf29c0bc4f2 Author: Pocketnet Team Date: Thu Aug 25 00:21:32 2022 +0300 Delete project.add.issues.yml commit 95b97de883e4116a7f6d54af3be842e017e7fd01 Author: Pocketnet Team Date: Thu Aug 25 00:17:56 2022 +0300 Create project.add.issues.yml commit 9693e62933ae1ca02560fba1311dbdd4c88c8a77 Author: Pocketnet Team Date: Thu Aug 25 00:07:19 2022 +0300 Create auto_assign.yml commit 7b7338c801e665435cc429381ff3eb98d2a68f57 Merge: 88af7848 b6b9f45f Author: lostystyg <54471935+lostystyg@users.noreply.github.com> Date: Fri Sep 9 10:41:39 2022 +0300 Merge pull request #302 from lostystyg/feature/events feature: events, push notifications and activities commit 88af7848ba0e56fe22a136715bb7fbca46eda966 Merge: dddb3c6d 6280c078 Author: Andy Oknen Date: Thu Sep 8 18:45:15 2022 +0300 Merge pull request #407 from pocketnetteam/fix/clear-database Fix clear database commit 6280c078ae1e1cf38a1d69e67b6bc2203469eda8 Author: Andy Oknen Date: Thu Sep 8 18:39:43 2022 +0300 Fix clear database commit dddb3c6dd0e6a5088d46bfb70051e5fa95fc08fe Merge: 1a03ee9d 6d1975a2 Author: Andy Oknen Date: Thu Sep 8 15:22:39 2022 +0300 Merge pull request #401 from pocketnetteam/feat/txindex-disable-always feat: disable txindex by default commit 1a03ee9d2340909fbedcc8ded34915efc5c9489f Merge: adce55f2 bc022eca Author: Andy Oknen Date: Thu Sep 8 15:07:28 2022 +0300 Merge pull request #406 from pocketnetteam/fix/full-reindex-lists fix: full reindex lists commit b6b9f45f711821ba98a657b55529ae9a6037abab Author: lostystyg Date: Thu Sep 8 15:55:12 2022 +0400 Fix new line commit 314c1a84137a1bba0f246f0649cbd9334625cc03 Author: lostystyg Date: Thu Sep 8 15:52:07 2022 +0400 Temporarily disable getevents rpc commit bbd05740a461ff9ca4c68cfae216e82f28bf1b8d Merge: 32b0e15f adce55f2 Author: lostystyg Date: Thu Sep 8 15:51:13 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit bc022ecac23e00dfb7236ffffbb2e77e6e995682 Author: Andy Oknen Date: Thu Sep 8 14:40:46 2022 +0300 Logging clean commit 8107ae50a48790d12bb0d0662c1ea2dc21cc3e45 Author: Andy Oknen Date: Thu Sep 8 14:38:53 2022 +0300 Call rollback lists for full reindexing commit 32b0e15f67da6f08069173585fa801f641209d88 Author: lostystyg Date: Thu Sep 8 15:26:58 2022 +0400 Optimized notifications collecting commit 24e63f43b73f38a3b534682ca5c2b864863f7bf2 Author: lostystyg Date: Thu Sep 8 13:13:52 2022 +0400 Filling notification result with account info commit 1344fe5b189542b154f2bf9d9a47d23cbc4e83e9 Author: lostystyg Date: Thu Sep 8 12:29:31 2022 +0400 Language for short account commit 710886c50ae33edfda37472b2265aa2adaf127ce Author: lostystyg Date: Thu Sep 8 12:17:28 2022 +0400 Correctly filling notifications answer commit 6d1975a22e50550ff6ef7b393441e49f2cadbfe4 Author: Andy Oknen Date: Wed Sep 7 10:40:06 2022 +0300 Disable enabling txindex by default commit 5b04354199e527de52c08dd1880a12c1f8225ba5 Author: lostystyg Date: Mon Sep 5 15:33:28 2022 +0400 Removed outdated comment commit 57f275ea9dcd3c7c61a75561c809cef6a97f6937 Author: lostystyg Date: Mon Sep 5 15:04:22 2022 +0400 Cosmetics for blocking query in activities commit 88ed33a8731e61a9364840264b099e7012c659cd Author: lostystyg Date: Mon Sep 5 14:47:08 2022 +0400 Removed number from outputs in activities and notifications commit 24534072f1ece6cf940f9033fa032cd20b7471c7 Author: lostystyg Date: Mon Sep 5 13:04:59 2022 +0400 Reuse height binder in notifications for money commit 77f9e87343e7b691227dd97b5a114460a55df7f2 Author: lostystyg Date: Fri Sep 2 16:41:06 2022 +0400 Order outputs by number for activities and notifications commit 8ef4a5bbdd8aed5b860e73c95504fc9676977bec Merge: 2b3a0164 357d1558 Author: lostystyg Date: Thu Sep 1 22:28:12 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 2b3a0164de79b2ecf67f87dee0e2842fc8ec22df Author: lostystyg Date: Thu Sep 1 22:24:10 2022 +0400 Removed trash from badge in activities commit 66e9054ae456ebdb6b49a0682a141e6abc76c448 Author: lostystyg Date: Thu Sep 1 22:22:59 2022 +0400 Removed trash from badge field in notification queries commit f8924a6f595da8dbff0fe7f341a39399c1b09a6a Author: lostystyg Date: Thu Sep 1 22:21:18 2022 +0400 Ported notifications from 0.20-based dropped branch commit 6d8148ded4c31ea2019b5384fd8e90714cf5010e Author: lostystyg Date: Thu Sep 1 12:10:41 2022 +0400 Added blockings for notifications commit c23e94c4678ab27c7c4dfd1074b50f306a97e6bf Author: lostystyg Date: Wed Aug 31 13:29:41 2022 +0400 Added optional multiple addresses to shortform commit c29ab129b3c2ceb9da564a2f37649e321b50b869 Author: lostystyg Date: Tue Aug 30 19:06:08 2022 +0400 Removed unnecessary todo commit 736748f798fcbecc1f8e8b9e855ca215c3db5d3d Author: lostystyg Date: Tue Aug 30 19:03:32 2022 +0400 Some todo's commit cabb0603547edb11d29363d19fd9328729a2c7ba Author: lostystyg Date: Tue Aug 30 19:02:08 2022 +0400 All action history for comments and answers in activities commit cf5021c9c4f25c22ada7b59f2c143b953c6ad84b Author: lostystyg Date: Tue Aug 30 18:36:51 2022 +0400 Collect roottxhash in activity queries commit 328a3ecd8cad8cdef92b5baa5173f6516ac4d1de Author: lostystyg Date: Tue Aug 30 17:51:10 2022 +0400 Added root tx hash to shortform commit f6fa4a45ca88a8ce0970aaa0dc0950bce1465790 Author: lostystyg Date: Tue Aug 30 17:42:02 2022 +0400 Full history for notifications commit 077f0f26f5b52cf86229d2418cf73d465dbc0b29 Author: lostystyg Date: Thu Aug 25 09:35:42 2022 +0400 Added blocking shorttype commit e2913158f2226f719242e376b8a846ca660ef26b Author: lostystyg Date: Thu Aug 25 09:33:55 2022 +0400 Removed not up to date todo commit 884893775de6aea42350bddcdd93ec42c47c6d04 Author: lostystyg Date: Wed Aug 24 16:55:14 2022 +0400 Removed reposts from activities commit b5631e70c1e54ef4ae60207f2c25f9a72663d458 Merge: e4c102c3 b7b49914 Author: lostystyg Date: Wed Aug 24 16:21:26 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit e4c102c39cc9ebd7cd3bdf38b5c053841c39ca01 Author: lostystyg Date: Wed Aug 24 15:53:24 2022 +0400 Validate filters for events on rpc level commit ac03dcb727512a5ed29450c2a720c1259bcdd158 Author: lostystyg Date: Wed Aug 24 15:49:33 2022 +0400 Validate filters for activities on rpc level commit fcb2fed45b43c3e510be0dfb33504b680b97d016 Author: lostystyg Date: Wed Aug 24 15:49:10 2022 +0400 Removed pocketnetteam from events and activities commit 876e7b574c9ad099fd00721aa92c79561d3eb2b7 Author: lostystyg Date: Wed Aug 24 15:35:47 2022 +0400 Fixed crash if non-valid filters are specified for notifications/activities/events commit 5732263c174be41fb9be7dbc15b48acef6e1e263 Author: lostystyg Date: Mon Aug 22 23:52:32 2022 +0400 Removed todo for money in activities commit 9c7438fb22ddc857876e4cc734fd3885481e9386 Merge: 99c11087 6e530784 Author: lostystyg Date: Mon Aug 22 15:16:13 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 99c11087a786a017b7c1e4039cb94615d6e742c2 Author: lostystyg Date: Sat Aug 20 18:02:14 2022 +0400 Fixed typo in query commit 6057f91580b1e35399f7cfbbbf43e57d2cf6f486 Author: lostystyg Date: Sat Aug 20 17:53:37 2022 +0400 Removed commented out queries for notifications commit 35375ed1d01fa436ea83a65f910fdd746a8e1e5b Author: lostystyg Date: Sat Aug 20 16:39:23 2022 +0400 Validating filters for getnotificationssummary commit f1be1700c842a7cd1960665cbf969f97b4fe4892 Author: lostystyg Date: Sat Aug 20 16:38:13 2022 +0400 Optimization and fixed for notifications summary queries commit 1d371a0870f3053d77cf65df7c6a537370ede685 Author: lostystyg Date: Sat Aug 20 16:36:29 2022 +0400 Allow to specify union separator commit fcf526c45eb12f853f4da331398b9cf0dbfb6536 Merge: 46edf275 9df85fb7 Author: lostystyg Date: Fri Aug 19 19:26:37 2022 +0400 Merge remote-tracking branch 'origin/fixes/multiplelocks' into feature/events commit 46edf275c6f5e113be1209bca42b3ecf6962cad7 Author: lostystyg Date: Wed Aug 17 18:09:35 2022 +0400 Notifications summary commit 29164ac17d0da9ad5f8ead8f6d87fa8a9bdf30a3 Author: lostystyg Date: Mon Aug 15 11:22:23 2022 +0400 Fixed help for getnotifications commit c26ddf05be536577ca8334fbd57737a848b74805 Merge: 3a49aa58 1bbe483a Author: lostystyg Date: Fri Aug 12 14:01:39 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 3a49aa58477b3e5cac571a83eedc95b57106bbaa Merge: 5365be10 8a1b0af6 Author: lostystyg Date: Thu Aug 11 16:27:31 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 5365be10f9f6df46bf973c15b03e1915062ac75e Author: lostystyg Date: Thu Aug 11 14:52:19 2022 +0400 Correct ordering by original txs in activities commit 3339a738328bbdfeb7517254f017a85a693ddaac Author: lostystyg Date: Thu Aug 11 14:51:32 2022 +0400 Removed unnecessary todos commit 1b256cd1fb3b46266b946dca2b2f3ea7da5bb92a Author: lostystyg Date: Thu Aug 11 14:49:12 2022 +0400 Explicitly set index for account joins in activities commit 3ae1ff87786b593bcd6bdc5652f26bb066d50a0a Author: lostystyg Date: Wed Aug 10 11:30:05 2022 +0400 Fixed address positioning in sql query for activities in ContentScore and CommentScore commit fa8543b5c97ee93b84e997b74336aa55d961fbe8 Merge: a433e3ac cc77fdcb Author: lostystyg Date: Wed Aug 10 10:21:20 2022 +0400 Merge branch '0.21' into feature/events commit a433e3ac5bb2dca719697a913e14594c5f46e2d8 Author: lostystyg Date: Mon Aug 8 10:55:52 2022 +0400 Removed orig height from activities because it breaks pagination commit 67febbef23c006f91886b92bb84e88e6d10fe448 Author: lostystyg Date: Fri Jul 22 10:36:48 2022 +0300 Fixed referals for events commit 9845755c09e0e98380dd4a020db8a08e2e551545 Author: lostystyg Date: Fri Jul 22 10:11:06 2022 +0300 Orig height for activities commit eb5c9e6621d4cd35c82af7a13eaa14cb5a0f8a90 Merge: d60cfd32 c6fa67b4 Author: lostystyg Date: Fri Jul 22 09:03:43 2022 +0300 Merge branch '0.21' into feature/events commit d60cfd32e626356ae728db6f51cb3bb36148ab94 Author: lostystyg Date: Wed Jul 20 18:16:05 2022 +0300 A bit cosmetics for events commit 86e5df5a081973a2b6fd9aa546f12d8033373b33 Author: lostystyg Date: Wed Jul 20 18:01:43 2022 +0300 Full comment text in description for events and activities commit fabcc4e520227c4367a39bf0882097201acd155f Author: lostystyg Date: Wed Jul 20 15:30:28 2022 +0300 Inner join instead of cross for repost in activities commit f782b68e000f9ded107f962e8b82f2e986a828bc Author: lostystyg Date: Wed Jul 20 15:26:48 2022 +0300 Fixed repost queries for activities and events commit 7e865aa4b8a31df75f685bedd7cf0bd6973ffa5c Author: lostystyg Date: Wed Jul 20 14:56:19 2022 +0300 Fixed subscriber in activities commit c01a27472ce995c4d80da691f3ca7b3fef8e2c87 Author: lostystyg Date: Tue Jul 19 18:55:36 2022 +0300 Optimizing activity queries commit 91d85294992c2db69c6def5840b324ecdf2bedf9 Author: lostystyg Date: Mon Jul 18 16:36:03 2022 +0300 Optimizing pocketnetteam notifications commit c137b10912886fffb8f9992990873d77878b69d6 Author: lostystyg Date: Mon Jul 18 16:26:56 2022 +0300 Fixed binds for notifications commit e265c7ff37d4531133e2e792c84b444dd79349ed Author: Andy Oknen Date: Mon Jul 18 13:17:59 2022 +0300 Optimize reposts commit dadabe0f0d15f67e74157652dfab24f16ae5441e Author: Andy Oknen Date: Mon Jul 18 13:12:50 2022 +0300 Fix private content from subscribers (not reposts) commit 8c423e45e86fe237a55873828a574f7885faf73c Author: Andy Oknen Date: Mon Jul 18 13:09:11 2022 +0300 Optimize reposts query commit 814a958f101c6c3f924f6db0977d45294662f197 Author: Andy Oknen Date: Mon Jul 18 12:51:01 2022 +0300 Fix incoming money commit 1d0d17e2a8b5491b421e71f0df2547e08468804f Author: lostystyg Date: Mon Jul 18 12:32:41 2022 +0300 getnotification better todos and fixed index commit e3f474ba52e4a1d234ed1f3910014519f99ac0da Author: lostystyg Date: Fri Jul 15 18:02:37 2022 +0300 Added optional related content (in case of reposts) for pocketnetteam posts and private content for notifications commit 427d320494f6390b921ef26e85d83b67f7a5a7aa Author: lostystyg Date: Fri Jul 15 18:01:45 2022 +0300 Fixed reposts for notifications commit 5c261246ad1117d5c393f6c90511a8dc20bd83a9 Author: lostystyg Date: Fri Jul 15 18:01:06 2022 +0300 Moved pocketnetteam posts for notifications to a specific key in answer commit 5e8b8066d31046beccd717bd6cdcb45357259a60 Author: lostystyg Date: Wed Jul 13 18:11:33 2022 +0300 Fixed var name for events contentscore commit 39b478d611fe69437c45c33535fe9e01be8904aa Author: lostystyg Date: Wed Jul 13 18:10:31 2022 +0300 Ignoring empty avatar for short form account commit 848abcae88f1d0b1d922ed9be7a37c9ac820368f Author: lostystyg Date: Wed Jul 13 13:55:24 2022 +0300 Fixed typo in contentscore for activities commit aaac24ae58a9b176beee95f31dfb425281d26d01 Author: lostystyg Date: Wed Jul 13 13:54:54 2022 +0300 Fixed content description for contentscore in activities commit 5d7e566222d686212ba1d475e5581df78a805ba2 Author: lostystyg Date: Tue Jul 12 11:48:56 2022 +0300 Inner join instead of cross for activities and events commit 5bb78a6f327bcaed0cf07e229613b0d236677bcc Author: lostystyg Date: Tue Jul 12 11:22:39 2022 +0300 Updated activities query commit d3c243d4fce004f2da5fab1a83dd587f472cfb18 Author: lostystyg Date: Fri Jul 8 17:31:35 2022 +0300 Comment score activity commit 0a936ade276adea029a29aa26c645cf7f4c997a8 Author: lostystyg Date: Fri Jul 8 17:22:20 2022 +0300 Subscriber activity commit b5d0c401eb859478bdea99f883523ccb828add98 Author: lostystyg Date: Fri Jul 8 17:14:00 2022 +0300 Added comments for activities commit 638c874a0287ebd69aecbca5b675dcb24d1f7669 Author: lostystyg Date: Fri Jul 8 17:13:39 2022 +0300 Fixed answers request for activities commit f3a202681561a3426be3c37748e353907941b50f Author: lostystyg Date: Fri Jul 8 16:36:07 2022 +0300 Base activities rpc request commit 3665c8076186734a16103f1feda707d9bac0e373 Author: lostystyg Date: Fri Jul 8 14:59:17 2022 +0300 Renamed notifications rpc commit d560b5ad7b34847e8644daf7dc09cc2ef4e45927 Author: lostystyg Date: Wed Jul 6 16:18:08 2022 +0300 Fixed acc's rep for getevents commit 071f6ed8d6e7c0f1ff8ad7777675c64b83aa6c21 Author: lostystyg Date: Wed Jul 6 16:17:48 2022 +0300 Ignore badge fort short account commit 1576c8dc6fb2436f030a5f9b79ddd9db3fe843f4 Author: lostystyg Date: Wed Jul 6 15:50:37 2022 +0300 Only orig entries for notifications + some optimizations commit 60e0489fb1976fe6801ceefbaf72370c913d64d5 Author: lostystyg Date: Tue Jul 5 15:44:20 2022 +0300 Updated getnotifications rpc description commit 5e1740fb58b36c0b36b2f99b1b86d9d4bcbcd729 Author: lostystyg Date: Tue Jul 5 15:38:25 2022 +0300 Updated getevents rpc description commit a66588336365912e73e61f5921f430faf085f6b4 Merge: 6828322d 9b8e4bd6 Author: lostystyg Date: Tue Jul 5 15:11:55 2022 +0300 Merge branch '0.21' into feature/events commit 6828322d0616f5c6c9c846e5558a50eaaa4561f1 Author: lostystyg Date: Mon Jul 4 20:34:34 2022 +0300 Money notification commit b227a1cdc0888f532aaec1f86dbe544909e2c83b Author: lostystyg Date: Mon Jul 4 19:41:35 2022 +0300 Extracted common bind for notifications commit ef325659593eaf1f8faeec91fc405099024c9766 Merge: 16a3455f c0f6636c Author: lostystyg Date: Fri Jul 1 19:34:12 2022 +0300 Merge branch '0.21' into feature/events commit 16a3455f20d79b3028db961c280da0e75cea68e3 Author: lostystyg Date: Fri Jul 1 19:14:10 2022 +0300 Notifications commit 9c8a9b3f0d2d0c47c8a6ebd9de34b3fa576c9320 Author: lostystyg Date: Fri Jul 1 19:14:00 2022 +0300 Fixed ShortAccount commit 061a7ab966fafc41644034bf38a259f47bab9f10 Author: lostystyg Date: Wed Jun 29 17:17:24 2022 +0300 A bit generalization in processing filters for events commit b9f3b6a95832ac38782d9003ab4d8f4ad1af990a Author: lostystyg Date: Wed Jun 29 15:38:07 2022 +0300 Restructured events commit b8f37cbf82b986962ec85674d8859ad150567a9c Merge: f862108d 8465afed Author: lostystyg Date: Tue Jun 28 14:35:03 2022 +0300 Merge remote-tracking branch 'origin/0.21' into feature/events commit f862108dd6ca23059c62cad7b227b4d032e41d9c Merge: 8090d0e8 4429a24f Author: lostystyg Date: Mon Jun 27 13:37:20 2022 +0300 Merge branch '0.21' into feature/events commit 8090d0e8464d9b538c0617cab97cb2c08ac11411 Merge: 21b3c715 5c9755ac Author: lostystyg Date: Mon Jun 27 12:39:57 2022 +0300 Merge branch 'minor_fixes' into feature/events commit 21b3c715ae8ef56cc276e62975bb1a727cfb2cde Merge: 78eb6155 8c9006b4 Author: lostystyg Date: Mon Jun 27 12:39:51 2022 +0300 Merge branch '0.21' into feature/events commit 5c9755ac27adf6801e7936d8fefb218494fbc6a4 Author: lostystyg Date: Fri Jun 24 19:09:19 2022 +0300 Some minor fixes commit 78eb6155d9626dea1de3635f0e1484c643a27af9 Merge: 3207e0fc 97cf205e Author: lostystyg Date: Thu Jun 23 19:09:06 2022 +0300 Merge branch '0.21' into feature/events commit 3207e0fc601d9e099cb0181a1fd4dc784672001d Merge: 156ed36a 67a8917f Author: lostystyg Date: Mon Jun 13 16:15:56 2022 +0300 Merge branch '0.21' into feature/events commit 156ed36a5d4155c1b619a17c484c8587b23bb459 Author: lostystyg Date: Fri Jun 10 16:03:17 2022 +0300 Answer fixes for events commit 854e6f5b9ccba90961633409cbbcd7335857e50a Author: lostystyg Date: Fri Jun 10 14:58:52 2022 +0300 Donate value for comment event commit 576fed8fed67233522eea657f4801aa4519b6351 Author: lostystyg Date: Fri Jun 10 13:50:56 2022 +0300 Fixed events height commit 337c1efcc064e68aee3235d944c19da43b465169 Author: lostystyg Date: Fri Jun 10 13:38:03 2022 +0300 Disabled hight border in related content for events commit 7b2c630c686225e3ca28c40c3d349cc3eb295c48 Author: lostystyg Date: Fri Jun 10 13:27:55 2022 +0300 Events queries formatting commit e4f3666e6ff1aabb65efcc17ace03652209353df Author: lostystyg Date: Fri Jun 10 13:15:34 2022 +0300 Comment answer events fulfilled with data commit 775c8d454364df3d8775b78b891e4810b5fd959b Author: Andy Oknen Date: Fri Jun 10 12:14:10 2022 +0300 index comment answer commit 1b5a4966f75358c3a0140267a2e2a342b73ee755 Author: Andy Oknen Date: Fri Jun 10 11:30:03 2022 +0300 Add height limit for answer comments commit 6d0985262639ec83784ec1df4a9f74b96a5b1060 Author: Andy Oknen Date: Fri Jun 10 11:01:04 2022 +0300 comment commit 7805b8e8f7c600c471126e7304bf28fb380ad9aa Author: Andy Oknen Date: Fri Jun 10 10:54:36 2022 +0300 Sql fixes commit 011f94f29438ad36cb423a2faf6dc4686905902c Author: Andy Oknen Date: Fri Jun 10 09:43:51 2022 +0300 Fix sql typo commit a62fd177da5dfb00260cd13db1572b0824e21742 Author: lostystyg Date: Fri Jun 10 09:05:43 2022 +0300 Fixed select ordering in events commit af47ba0b7bb84185fc78c18c178720f8254281e8 Author: Andy Oknen Date: Fri Jun 10 08:50:18 2022 +0300 Fix comment answers sql index commit c97d7f55ddea43ffcde4b0c591086b8ddb6102b3 Author: lostystyg Date: Mon Jun 6 16:00:19 2022 +0300 Fixed description for scores events commit 134f3095dac5169d58a0213a795002d347c33769 Author: lostystyg Date: Mon Jun 6 15:35:51 2022 +0300 Throwing in case of event reconstructor error commit 0c3319a6878381b2bc528f9a24d8e7e491ce4dff Author: Andy Oknen Date: Mon May 23 14:11:21 2022 +0300 Downgrade likers count for testnet commit 367fa1a7a38cbe3f31ac83c3c6afef57ff1229df Author: Andy Oknen Date: Fri Apr 22 10:36:33 2022 +0300 Formatting commit 0421fbf7bf4af46fbb216517eb6f8867ca39f0a5 Author: lostystyg Date: Mon Jun 6 12:47:01 2022 +0300 Optimizing event queries commit aff9e13fece8167e8f7352c3d13206dbccde94b0 Author: lostystyg Date: Mon Jun 6 12:25:58 2022 +0300 Events fixes commit 423d4f9f91b61283e6878b408fc92ae8120ca467 Merge: 7127a3eb 039f41fb Author: lostystyg Date: Fri Jun 3 00:34:41 2022 +0300 Merge remote-tracking branch 'origin/0.21' into feature/events commit 7127a3ebd2bfff8f469afa7e5f980d5c41ae5ff0 Author: lostystyg Date: Fri Jun 3 00:34:12 2022 +0300 Short forms for events commit b8f13088d20cceb8fc67229bffb8154a00c08a20 Author: lostystyg Date: Fri Jun 3 00:34:02 2022 +0300 Updated short forms commit 03c0bd4a9c52a89d276ca9da219a9a323cb41a8c Author: lostystyg Date: Tue May 31 01:01:20 2022 +0300 ShortTxType for short forms commit dfd80a5a62d32e055cbaeabdf089bc4b1e0dbb4d Author: lostystyg Date: Mon May 30 22:52:28 2022 +0300 Added short forms commit 0b2aca0a697fd47cd0b4aee4264acf99aa57f86d Author: lostystyg Date: Mon May 30 15:26:51 2022 +0300 Raw sql query to get all events at height for each account commit 78681c897118244d758fc40732685ad9ba19c524 Author: lostystyg Date: Fri May 6 17:31:21 2022 +0300 Forgotten finalizing stmt commit 8d23c2e6e401f9a41c41d7a6236be2dc1785c19e Author: lostystyg Date: Fri May 6 17:01:01 2022 +0300 Updated args description for getevents commit 4030e741e98038f7297cccae706ba072beb992c2 Author: lostystyg Date: Fri May 6 16:57:43 2022 +0300 Events for single address commit b7ec0f7f40237ac2a6e12f3394163ba1a05a8c98 Author: lostystyg Date: Fri May 6 16:42:10 2022 +0300 constant depth for events commit 1ae34c266e55cdae51aa5df95d28cae91d5385ee Author: lostystyg Date: Fri May 6 16:40:43 2022 +0300 privatecontent for events commit 086a1fa52778907c63eab88d9e691b62edff5246 Author: lostystyg Date: Fri May 6 16:34:57 2022 +0300 Fixed binding for events commit d77c6b6cf4dda626454170d466345fadcf6b12f9 Author: lostystyg Date: Fri May 6 13:37:39 2022 +0300 Fixed filtering for events commit 19591f2421a9e7d9579fe6034f82314ccaaf4562 Author: lostystyg Date: Thu May 5 23:15:02 2022 +0300 Updated events commit 244a198523d5efe7f9c251e7ccd8111dd26eae0c Author: lostystyg Date: Wed May 4 17:04:33 2022 +0300 Fixed filtering for events commit 3deae2ea8a8dded1f50d3ec7ee9bda2616667e90 Author: lostystyg Date: Wed May 4 16:09:02 2022 +0300 FIlters, height and blocknum for events request commit 2600f314343ec9ce45acbd46774e1f2e4924e6a4 Author: lostystyg Date: Sat Apr 30 14:41:04 2022 +0300 Sorting events by height outside of sqlite commit 7f3d953ecb6c01fdf2e5fb6f1cf2d8cc424098a7 Author: lostystyg Date: Sat Apr 30 00:42:26 2022 +0300 Fixed events rpc description commit 192ad0cab7f3639824fe2c9ed4a3862941c89b2e Author: lostystyg Date: Sat Apr 30 00:41:11 2022 +0300 Events optimization commit 7a51e15cb185f07536ca713eebafd0e5c06111dc Author: lostystyg Date: Mon Apr 25 18:35:32 2022 +0300 Better indexing content from private subscribers event commit 3d8e46bfd1b13af691c876d8c82caf77f6035411 Author: lostystyg Date: Mon Apr 25 18:30:38 2022 +0300 Do not check for last for boost events commit dbea23e6036b2cd141552c408a149562351618cd Merge: af71bdf4 b0497826 Author: lostystyg Date: Mon Apr 25 18:20:24 2022 +0300 Merge remote-tracking branch 'origin/0.21.todo' into feature/events commit af71bdf4fdaaffe602ef6fa70efa63ef35ec5c63 Author: lostystyg Date: Mon Apr 25 18:17:09 2022 +0300 Base events logic commit c0e9504a610807a759cffbd239dd9bd2852ad805 Author: lostystyg Date: Mon Apr 18 17:23:50 2022 +0300 Method to get POCKETNET_TEAM address commit 9722326760ef90af0ccb57bbacc5c5c51d76f7d6 Author: lostystyg Date: Mon Apr 18 17:22:46 2022 +0300 Using network id instead of string for getting pocketnet developers * Revert * Fix delete transaction helper * Fix check register deleted account * Deleted account does not have payload * Fixed typo in GetProfileFeed * Remove data from deleted account in last comments * Fix begin/commit/abort sql transaction * refact * wallet log clean * Clean logs * Fix check register block * Clean logs * Remove data from deleted account in all feeds * Fix debug typo * Fixed typo in GetLastComments * Added flag if account deleted in GetAccountState * // TODO (brangr): delete * Include deleted accounts in block lists * Add 170 for get user account data * Complete check deleted account * consensus add deleted account check 2 * Remove comments from deleted accounts in GetCommentsByPost * refactoring * Fix getuseraddress for empty request * Fix check double account transaction in block * 1 * Fixed mixing stake treshhold values * Moved mutex to a proper place * Fixed cleaning sqlite * 1 * Fork height for enabling account delete transaction * Fix typos * Return check opreturn for next detect checkpoints * Description for stake threshold values * Optimizing coinstake logic * Fix checkpoints for double users * Remove counting referrals from account profile * SQLOptimizations * Fix user checkpoint check * Move notifier repository to self db connection * Extend sendtoaddress with destaddress for change * Revert "Optimizing coinstake logic" and "Fixed mixing stake treshhold values" This reverts commits 2adff23f29899754eea2fd8643742dee9abdb56a and 6e537ae9ce910cb7eadbad2d18ef0948d3900bac Co-authored-by: brangr Co-authored-by: only1question Co-authored-by: lostystyg commit 84b78aab2b2f7c9baa2009f57eee3f92385aafb3 Merge: 7b7338c8 499f514b Author: Andy Oknen Date: Fri Sep 9 14:37:44 2022 +0300 Merge pull request #408 from pocketnetteam/actualization/0.20 Squashed commit of the following: commit 499f514bf494920d2847225ae31eeef5811f305b Author: Andy Oknen Date: Fri Sep 9 10:50:15 2022 +0300 Squashed commit of the following: commit aca3fe7d05c1f0c8a9ea76bf02eff87cefd47142 Merge: 78065768 1cce975f Author: Andy Oknen Date: Thu Sep 8 18:40:05 2022 +0300 Merge pull request #399 from HiHat/patch-1 Important details regarding address and fixes commit 780657681d2564844a42c24de0938da74777c642 Merge: bfaef570 5ce96412 Author: Andy Oknen Date: Thu Sep 8 15:09:22 2022 +0300 Merge pull request #402 from pocketnetteam/andyoknen-patch-1 Update README.md commit 5ce96412b1cc0f67148aa4933dd74fe3b43f6c29 Author: Andy Oknen Date: Wed Sep 7 10:51:21 2022 +0300 Update README.md commit 1cce975f41f0bc130f58e8004ac35f1f8cfd7179 Author: HiHat Date: Tue Sep 6 19:09:26 2022 +0300 Important details regarding address and fixes commit bfaef57025253beb6564dbe4afd30dfe51e059a4 Author: Pocketnet Team Date: Wed Aug 31 13:23:31 2022 +0300 Create add.tasks.to.project.yml commit 8ad81f1601554be5eb557a5fda204a78fd3d3be3 Author: Pocketnet Team Date: Tue Aug 30 15:00:15 2022 +0300 Set maximum depth 1 month for RPC GetMostCommentedFeed commit c1e5845465970d7bbafe909a9528abe0ac3cfd67 Author: Pocketnet Team Date: Tue Aug 30 14:57:23 2022 +0300 Set fork height for BlockingCancel.hpp commit b8bc0adf5c46dc3fb0d14332f49e34dec6105dd3 Merge: 8383efb4 8abd1bb7 Author: Andy Oknen Date: Tue Aug 30 14:45:32 2022 +0300 Merge pull request #385 from pocketnetteam/fix/wrong-key-threshold fix: wrong map key threshold_shark_reg_depth -> threshold_whale_reg_depth commit 8abd1bb75fb52ea6dff9ad73e560362abfd4b1c5 Author: Andy Oknen Date: Tue Aug 30 14:42:46 2022 +0300 Comment not used now RPC commit fee5e39f227d46ac0259d0b26b5680fb451a3eaa Author: Andy Oknen Date: Tue Aug 30 11:13:50 2022 +0300 Extend height for fork to 1873500 block commit 0ea51a2868b2ad0befb1149c2b5a0270cac7ecd1 Author: Andy Oknen Date: Mon Aug 29 14:14:26 2022 +0300 Fix wrong map key threshold_shark_reg_depth -> threshold_whale_reg_depth commit 8383efb46582ec24455867157474dbf29c0bc4f2 Author: Pocketnet Team Date: Thu Aug 25 00:21:32 2022 +0300 Delete project.add.issues.yml commit 95b97de883e4116a7f6d54af3be842e017e7fd01 Author: Pocketnet Team Date: Thu Aug 25 00:17:56 2022 +0300 Create project.add.issues.yml commit 9693e62933ae1ca02560fba1311dbdd4c88c8a77 Author: Pocketnet Team Date: Thu Aug 25 00:07:19 2022 +0300 Create auto_assign.yml commit 7b7338c801e665435cc429381ff3eb98d2a68f57 Merge: 88af7848 b6b9f45f Author: lostystyg <54471935+lostystyg@users.noreply.github.com> Date: Fri Sep 9 10:41:39 2022 +0300 Merge pull request #302 from lostystyg/feature/events feature: events, push notifications and activities commit 88af7848ba0e56fe22a136715bb7fbca46eda966 Merge: dddb3c6d 6280c078 Author: Andy Oknen Date: Thu Sep 8 18:45:15 2022 +0300 Merge pull request #407 from pocketnetteam/fix/clear-database Fix clear database commit 6280c078ae1e1cf38a1d69e67b6bc2203469eda8 Author: Andy Oknen Date: Thu Sep 8 18:39:43 2022 +0300 Fix clear database commit dddb3c6dd0e6a5088d46bfb70051e5fa95fc08fe Merge: 1a03ee9d 6d1975a2 Author: Andy Oknen Date: Thu Sep 8 15:22:39 2022 +0300 Merge pull request #401 from pocketnetteam/feat/txindex-disable-always feat: disable txindex by default commit 1a03ee9d2340909fbedcc8ded34915efc5c9489f Merge: adce55f2 bc022eca Author: Andy Oknen Date: Thu Sep 8 15:07:28 2022 +0300 Merge pull request #406 from pocketnetteam/fix/full-reindex-lists fix: full reindex lists commit b6b9f45f711821ba98a657b55529ae9a6037abab Author: lostystyg Date: Thu Sep 8 15:55:12 2022 +0400 Fix new line commit 314c1a84137a1bba0f246f0649cbd9334625cc03 Author: lostystyg Date: Thu Sep 8 15:52:07 2022 +0400 Temporarily disable getevents rpc commit bbd05740a461ff9ca4c68cfae216e82f28bf1b8d Merge: 32b0e15f adce55f2 Author: lostystyg Date: Thu Sep 8 15:51:13 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit bc022ecac23e00dfb7236ffffbb2e77e6e995682 Author: Andy Oknen Date: Thu Sep 8 14:40:46 2022 +0300 Logging clean commit 8107ae50a48790d12bb0d0662c1ea2dc21cc3e45 Author: Andy Oknen Date: Thu Sep 8 14:38:53 2022 +0300 Call rollback lists for full reindexing commit 32b0e15f67da6f08069173585fa801f641209d88 Author: lostystyg Date: Thu Sep 8 15:26:58 2022 +0400 Optimized notifications collecting commit 24e63f43b73f38a3b534682ca5c2b864863f7bf2 Author: lostystyg Date: Thu Sep 8 13:13:52 2022 +0400 Filling notification result with account info commit 1344fe5b189542b154f2bf9d9a47d23cbc4e83e9 Author: lostystyg Date: Thu Sep 8 12:29:31 2022 +0400 Language for short account commit 710886c50ae33edfda37472b2265aa2adaf127ce Author: lostystyg Date: Thu Sep 8 12:17:28 2022 +0400 Correctly filling notifications answer commit 6d1975a22e50550ff6ef7b393441e49f2cadbfe4 Author: Andy Oknen Date: Wed Sep 7 10:40:06 2022 +0300 Disable enabling txindex by default commit 5b04354199e527de52c08dd1880a12c1f8225ba5 Author: lostystyg Date: Mon Sep 5 15:33:28 2022 +0400 Removed outdated comment commit 57f275ea9dcd3c7c61a75561c809cef6a97f6937 Author: lostystyg Date: Mon Sep 5 15:04:22 2022 +0400 Cosmetics for blocking query in activities commit 88ed33a8731e61a9364840264b099e7012c659cd Author: lostystyg Date: Mon Sep 5 14:47:08 2022 +0400 Removed number from outputs in activities and notifications commit 24534072f1ece6cf940f9033fa032cd20b7471c7 Author: lostystyg Date: Mon Sep 5 13:04:59 2022 +0400 Reuse height binder in notifications for money commit 77f9e87343e7b691227dd97b5a114460a55df7f2 Author: lostystyg Date: Fri Sep 2 16:41:06 2022 +0400 Order outputs by number for activities and notifications commit 8ef4a5bbdd8aed5b860e73c95504fc9676977bec Merge: 2b3a0164 357d1558 Author: lostystyg Date: Thu Sep 1 22:28:12 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 2b3a0164de79b2ecf67f87dee0e2842fc8ec22df Author: lostystyg Date: Thu Sep 1 22:24:10 2022 +0400 Removed trash from badge in activities commit 66e9054ae456ebdb6b49a0682a141e6abc76c448 Author: lostystyg Date: Thu Sep 1 22:22:59 2022 +0400 Removed trash from badge field in notification queries commit f8924a6f595da8dbff0fe7f341a39399c1b09a6a Author: lostystyg Date: Thu Sep 1 22:21:18 2022 +0400 Ported notifications from 0.20-based dropped branch commit adce55f2d4e57ee30e82639209439302e3a0e27c Merge: 58db46dc a182e317 Author: Andy Oknen Date: Thu Sep 1 17:53:37 2022 +0300 Merge pull request #394 from pocketnetteam/refactor/build-versioning commit a182e3172d0a7aee1d14c07761a6cbb620a289fa Author: brangr Date: Thu Sep 1 13:13:37 2022 +0300 Fix build versioning commit 58db46dce814a9f1f641cb75a9e3da084796d249 Merge: 357d1558 8c3afc0f Author: Andy Oknen Date: Thu Sep 1 11:50:24 2022 +0300 Merge pull request #393 from pocketnetteam/fix/deb-icon fix: path to icon and change icon commit 6d8148ded4c31ea2019b5384fd8e90714cf5010e Author: lostystyg Date: Thu Sep 1 12:10:41 2022 +0400 Added blockings for notifications commit 8c3afc0ff14b335dae51274f84e9d2670862ac67 Author: Andy Oknen Date: Wed Aug 31 19:02:31 2022 +0300 Fix path to icon and change to logo_color/sky_250.png commit c23e94c4678ab27c7c4dfd1074b50f306a97e6bf Author: lostystyg Date: Wed Aug 31 13:29:41 2022 +0400 Added optional multiple addresses to shortform commit c29ab129b3c2ceb9da564a2f37649e321b50b869 Author: lostystyg Date: Tue Aug 30 19:06:08 2022 +0400 Removed unnecessary todo commit 736748f798fcbecc1f8e8b9e855ca215c3db5d3d Author: lostystyg Date: Tue Aug 30 19:03:32 2022 +0400 Some todo's commit cabb0603547edb11d29363d19fd9328729a2c7ba Author: lostystyg Date: Tue Aug 30 19:02:08 2022 +0400 All action history for comments and answers in activities commit cf5021c9c4f25c22ada7b59f2c143b953c6ad84b Author: lostystyg Date: Tue Aug 30 18:36:51 2022 +0400 Collect roottxhash in activity queries commit 328a3ecd8cad8cdef92b5baa5173f6516ac4d1de Author: lostystyg Date: Tue Aug 30 17:51:10 2022 +0400 Added root tx hash to shortform commit f6fa4a45ca88a8ce0970aaa0dc0950bce1465790 Author: lostystyg Date: Tue Aug 30 17:42:02 2022 +0400 Full history for notifications commit 077f0f26f5b52cf86229d2418cf73d465dbc0b29 Author: lostystyg Date: Thu Aug 25 09:35:42 2022 +0400 Added blocking shorttype commit e2913158f2226f719242e376b8a846ca660ef26b Author: lostystyg Date: Thu Aug 25 09:33:55 2022 +0400 Removed not up to date todo commit 884893775de6aea42350bddcdd93ec42c47c6d04 Author: lostystyg Date: Wed Aug 24 16:55:14 2022 +0400 Removed reposts from activities commit b5631e70c1e54ef4ae60207f2c25f9a72663d458 Merge: e4c102c3 b7b49914 Author: lostystyg Date: Wed Aug 24 16:21:26 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit e4c102c39cc9ebd7cd3bdf38b5c053841c39ca01 Author: lostystyg Date: Wed Aug 24 15:53:24 2022 +0400 Validate filters for events on rpc level commit ac03dcb727512a5ed29450c2a720c1259bcdd158 Author: lostystyg Date: Wed Aug 24 15:49:33 2022 +0400 Validate filters for activities on rpc level commit fcb2fed45b43c3e510be0dfb33504b680b97d016 Author: lostystyg Date: Wed Aug 24 15:49:10 2022 +0400 Removed pocketnetteam from events and activities commit 876e7b574c9ad099fd00721aa92c79561d3eb2b7 Author: lostystyg Date: Wed Aug 24 15:35:47 2022 +0400 Fixed crash if non-valid filters are specified for notifications/activities/events commit 5732263c174be41fb9be7dbc15b48acef6e1e263 Author: lostystyg Date: Mon Aug 22 23:52:32 2022 +0400 Removed todo for money in activities commit 9c7438fb22ddc857876e4cc734fd3885481e9386 Merge: 99c11087 6e530784 Author: lostystyg Date: Mon Aug 22 15:16:13 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 99c11087a786a017b7c1e4039cb94615d6e742c2 Author: lostystyg Date: Sat Aug 20 18:02:14 2022 +0400 Fixed typo in query commit 6057f91580b1e35399f7cfbbbf43e57d2cf6f486 Author: lostystyg Date: Sat Aug 20 17:53:37 2022 +0400 Removed commented out queries for notifications commit 35375ed1d01fa436ea83a65f910fdd746a8e1e5b Author: lostystyg Date: Sat Aug 20 16:39:23 2022 +0400 Validating filters for getnotificationssummary commit f1be1700c842a7cd1960665cbf969f97b4fe4892 Author: lostystyg Date: Sat Aug 20 16:38:13 2022 +0400 Optimization and fixed for notifications summary queries commit 1d371a0870f3053d77cf65df7c6a537370ede685 Author: lostystyg Date: Sat Aug 20 16:36:29 2022 +0400 Allow to specify union separator commit fcf526c45eb12f853f4da331398b9cf0dbfb6536 Merge: 46edf275 9df85fb7 Author: lostystyg Date: Fri Aug 19 19:26:37 2022 +0400 Merge remote-tracking branch 'origin/fixes/multiplelocks' into feature/events commit 46edf275c6f5e113be1209bca42b3ecf6962cad7 Author: lostystyg Date: Wed Aug 17 18:09:35 2022 +0400 Notifications summary commit 29164ac17d0da9ad5f8ead8f6d87fa8a9bdf30a3 Author: lostystyg Date: Mon Aug 15 11:22:23 2022 +0400 Fixed help for getnotifications commit c26ddf05be536577ca8334fbd57737a848b74805 Merge: 3a49aa58 1bbe483a Author: lostystyg Date: Fri Aug 12 14:01:39 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 3a49aa58477b3e5cac571a83eedc95b57106bbaa Merge: 5365be10 8a1b0af6 Author: lostystyg Date: Thu Aug 11 16:27:31 2022 +0400 Merge remote-tracking branch 'origin/0.21' into feature/events commit 5365be10f9f6df46bf973c15b03e1915062ac75e Author: lostystyg Date: Thu Aug 11 14:52:19 2022 +0400 Correct ordering by original txs in activities commit 3339a738328bbdfeb7517254f017a85a693ddaac Author: lostystyg Date: Thu Aug 11 14:51:32 2022 +0400 Removed unnecessary todos commit 1b256cd1fb3b46266b946dca2b2f3ea7da5bb92a Author: lostystyg Date: Thu Aug 11 14:49:12 2022 +0400 Explicitly set index for account joins in activities commit 3ae1ff87786b593bcd6bdc5652f26bb066d50a0a Author: lostystyg Date: Wed Aug 10 11:30:05 2022 +0400 Fixed address positioning in sql query for activities in ContentScore and CommentScore commit fa8543b5c97ee93b84e997b74336aa55d961fbe8 Merge: a433e3ac cc77fdcb Author: lostystyg Date: Wed Aug 10 10:21:20 2022 +0400 Merge branch '0.21' into feature/events commit a433e3ac5bb2dca719697a913e14594c5f46e2d8 Author: lostystyg Date: Mon Aug 8 10:55:52 2022 +0400 Removed orig height from activities because it breaks pagination commit 67febbef23c006f91886b92bb84e88e6d10fe448 Author: lostystyg Date: Fri Jul 22 10:36:48 2022 +0300 Fixed referals for events commit 9845755c09e0e98380dd4a020db8a08e2e551545 Author: lostystyg Date: Fri Jul 22 10:11:06 2022 +0300 Orig height for activities commit eb5c9e6621d4cd35c82af7a13eaa14cb5a0f8a90 Merge: d60cfd32 c6fa67b4 Author: lostystyg Date: Fri Jul 22 09:03:43 2022 +0300 Merge branch '0.21' into feature/events commit d60cfd32e626356ae728db6f51cb3bb36148ab94 Author: lostystyg Date: Wed Jul 20 18:16:05 2022 +0300 A bit cosmetics for events commit 86e5df5a081973a2b6fd9aa546f12d8033373b33 Author: lostystyg Date: Wed Jul 20 18:01:43 2022 +0300 Full comment text in description for events and activities commit fabcc4e520227c4367a39bf0882097201acd155f Author: lostystyg Date: Wed Jul 20 15:30:28 2022 +0300 Inner join instead of cross for repost in activities commit f782b68e000f9ded107f962e8b82f2e986a828bc Author: lostystyg Date: Wed Jul 20 15:26:48 2022 +0300 Fixed repost queries for activities and events commit 7e865aa4b8a31df75f685bedd7cf0bd6973ffa5c Author: lostystyg Date: Wed Jul 20 14:56:19 2022 +0300 Fixed subscriber in activities commit c01a27472ce995c4d80da691f3ca7b3fef8e2c87 Author: lostystyg Date: Tue Jul 19 18:55:36 2022 +0300 Optimizing activity queries commit 91d85294992c2db69c6def5840b324ecdf2bedf9 Author: lostystyg Date: Mon Jul 18 16:36:03 2022 +0300 Optimizing pocketnetteam notifications commit c137b10912886fffb8f9992990873d77878b69d6 Author: lostystyg Date: Mon Jul 18 16:26:56 2022 +0300 Fixed binds for notifications commit e265c7ff37d4531133e2e792c84b444dd79349ed Author: Andy Oknen Date: Mon Jul 18 13:17:59 2022 +0300 Optimize reposts commit dadabe0f0d15f67e74157652dfab24f16ae5441e Author: Andy Oknen Date: Mon Jul 18 13:12:50 2022 +0300 Fix private content from subscribers (not reposts) commit 8c423e45e86fe237a55873828a574f7885faf73c Author: Andy Oknen Date: Mon Jul 18 13:09:11 2022 +0300 Optimize reposts query commit 814a958f101c6c3f924f6db0977d45294662f197 Author: Andy Oknen Date: Mon Jul 18 12:51:01 2022 +0300 Fix incoming money commit 1d0d17e2a8b5491b421e71f0df2547e08468804f Author: lostystyg Date: Mon Jul 18 12:32:41 2022 +0300 getnotification better todos and fixed index commit e3f474ba52e4a1d234ed1f3910014519f99ac0da Author: lostystyg Date: Fri Jul 15 18:02:37 2022 +0300 Added optional related content (in case of reposts) for pocketnetteam posts and private content for notifications commit 427d320494f6390b921ef26e85d83b67f7a5a7aa Author: lostystyg Date: Fri Jul 15 18:01:45 2022 +0300 Fixed reposts for notifications commit 5c261246ad1117d5c393f6c90511a8dc20bd83a9 Author: lostystyg Date: Fri Jul 15 18:01:06 2022 +0300 Moved pocketnetteam posts for notifications to a specific key in answer commit 5e8b8066d31046beccd717bd6cdcb45357259a60 Author: lostystyg Date: Wed Jul 13 18:11:33 2022 +0300 Fixed var name for events contentscore commit 39b478d611fe69437c45c33535fe9e01be8904aa Author: lostystyg Date: Wed Jul 13 18:10:31 2022 +0300 Ignoring empty avatar for short form account commit 848abcae88f1d0b1d922ed9be7a37c9ac820368f Author: lostystyg Date: Wed Jul 13 13:55:24 2022 +0300 Fixed typo in contentscore for activities commit aaac24ae58a9b176beee95f31dfb425281d26d01 Author: lostystyg Date: Wed Jul 13 13:54:54 2022 +0300 Fixed content description for contentscore in activities commit 5d7e566222d686212ba1d475e5581df78a805ba2 Author: lostystyg Date: Tue Jul 12 11:48:56 2022 +0300 Inner join instead of cross for activities and events commit 5bb78a6f327bcaed0cf07e229613b0d236677bcc Author: lostystyg Date: Tue Jul 12 11:22:39 2022 +0300 Updated activities query commit d3c243d4fce004f2da5fab1a83dd587f472cfb18 Author: lostystyg Date: Fri Jul 8 17:31:35 2022 +0300 Comment score activity commit 0a936ade276adea029a29aa26c645cf7f4c997a8 Author: lostystyg Date: Fri Jul 8 17:22:20 2022 +0300 Subscriber activity commit b5d0c401eb859478bdea99f883523ccb828add98 Author: lostystyg Date: Fri Jul 8 17:14:00 2022 +0300 Added comments for activities commit 638c874a0287ebd69aecbca5b675dcb24d1f7669 Author: lostystyg Date: Fri Jul 8 17:13:39 2022 +0300 Fixed answers request for activities commit f3a202681561a3426be3c37748e353907941b50f Author: lostystyg Date: Fri Jul 8 16:36:07 2022 +0300 Base activities rpc request commit 3665c8076186734a16103f1feda707d9bac0e373 Author: lostystyg Date: Fri Jul 8 14:59:17 2022 +0300 Renamed notifications rpc commit d560b5ad7b34847e8644daf7dc09cc2ef4e45927 Author: lostystyg Date: Wed Jul 6 16:18:08 2022 +0300 Fixed acc's rep for getevents commit 071f6ed8d6e7c0f1ff8ad7777675c64b83aa6c21 Author: lostystyg Date: Wed Jul 6 16:17:48 2022 +0300 Ignore badge fort short account commit 1576c8dc6fb2436f030a5f9b79ddd9db3fe843f4 Author: lostystyg Date: Wed Jul 6 15:50:37 2022 +0300 Only orig entries for notifications + some optimizations commit 60e0489fb1976fe6801ceefbaf72370c913d64d5 Author: lostystyg Date: Tue Jul 5 15:44:20 2022 +0300 Updated getnotifications rpc description commit 5e1740fb58b36c0b36b2f99b1b86d9d4bcbcd729 Author: lostystyg Date: Tue Jul 5 15:38:25 2022 +0300 Updated getevents rpc description commit a66588336365912e73e61f5921f430faf085f6b4 Merge: 6828322d 9b8e4bd6 Author: lostystyg Date: Tue Jul 5 15:11:55 2022 +0300 Merge branch '0.21' into feature/events commit 6828322d0616f5c6c9c846e5558a50eaaa4561f1 Author: lostystyg Date: Mon Jul 4 20:34:34 2022 +0300 Money notification commit b227a1cdc0888f532aaec1f86dbe544909e2c83b Author: lostystyg Date: Mon Jul 4 19:41:35 2022 +0300 Extracted common bind for notifications commit ef325659593eaf1f8faeec91fc405099024c9766 Merge: 16a3455f c0f6636c Author: lostystyg Date: Fri Jul 1 19:34:12 2022 +0300 Merge branch '0.21' into feature/events commit 16a3455f20d79b3028db961c280da0e75cea68e3 Author: lostystyg Date: Fri Jul 1 19:14:10 2022 +0300 Notifications commit 9c8a9b3f0d2d0c47c8a6ebd9de34b3fa576c9320 Author: lostystyg Date: Fri Jul 1 19:14:00 2022 +0300 Fixed ShortAccount commit 061a7ab966fafc41644034bf38a259f47bab9f10 Author: lostystyg Date: Wed Jun 29 17:17:24 2022 +0300 A bit generalization in processing filters for events commit b9f3b6a95832ac38782d9003ab4d8f4ad1af990a Author: lostystyg Date: Wed Jun 29 15:38:07 2022 +0300 Restructured events commit b8f37cbf82b986962ec85674d8859ad150567a9c Merge: f862108d 8465afed Author: lostystyg Date: Tue Jun 28 14:35:03 2022 +0300 Merge remote-tracking branch 'origin/0.21' into feature/events commit f862108dd6ca23059c62cad7b227b4d032e41d9c Merge: 8090d0e8 4429a24f Author: lostystyg Date: Mon Jun 27 13:37:20 2022 +0300 Merge branch '0.21' into feature/events commit 8090d0e8464d9b538c0617cab97cb2c08ac11411 Merge: 21b3c715 5c9755ac Author: lostystyg Date: Mon Jun 27 12:39:57 2022 +0300 Merge branch 'minor_fixes' into feature/events commit 21b3c715ae8ef56cc276e62975bb1a727cfb2cde Merge: 78eb6155 8c9006b4 Author: lostystyg Date: Mon Jun 27 12:39:51 2022 +0300 Merge branch '0.21' into feature/events commit 5c9755ac27adf6801e7936d8fefb218494fbc6a4 Author: lostystyg Date: Fri Jun 24 19:09:19 2022 +0300 Some minor fixes commit 78eb6155d9626dea1de3635f0e1484c643a27af9 Merge: 3207e0fc 97cf205e Author: lostystyg Date: Thu Jun 23 19:09:06 2022 +0300 Merge branch '0.21' into feature/events commit 3207e0fc601d9e099cb0181a1fd4dc784672001d Merge: 156ed36a 67a8917f Author: lostystyg Date: Mon Jun 13 16:15:56 2022 +0300 Merge branch '0.21' into feature/events commit 156ed36a5d4155c1b619a17c484c8587b23bb459 Author: lostystyg Date: Fri Jun 10 16:03:17 2022 +0300 Answer fixes for events commit 854e6f5b9ccba90961633409cbbcd7335857e50a Author: lostystyg Date: Fri Jun 10 14:58:52 2022 +0300 Donate value for comment event commit 576fed8fed67233522eea657f4801aa4519b6351 Author: lostystyg Date: Fri Jun 10 13:50:56 2022 +0300 Fixed events height commit 337c1efcc064e68aee3235d944c19da43b465169 Author: lostystyg Date: Fri Jun 10 13:38:03 2022 +0300 Disabled hight border in related content for events commit 7b2c630c686225e3ca28c40c3d349cc3eb295c48 Author: lostystyg Date: Fri Jun 10 13:27:55 2022 +0300 Events queries formatting commit e4f3666e6ff1aabb65efcc17ace03652209353df Author: lostystyg Date: Fri Jun 10 13:15:34 2022 +0300 Comment answer events fulfilled with data commit 775c8d454364df3d8775b78b891e4810b5fd959b Author: Andy Oknen Date: Fri Jun 10 12:14:10 2022 +0300 index comment answer commit 1b5a4966f75358c3a0140267a2e2a342b73ee755 Author: Andy Oknen Date: Fri Jun 10 11:30:03 2022 +0300 Add height limit for answer comments commit 6d0985262639ec83784ec1df4a9f74b96a5b1060 Author: Andy Oknen Date: Fri Jun 10 11:01:04 2022 +0300 comment commit 7805b8e8f7c600c471126e7304bf28fb380ad9aa Author: Andy Oknen Date: Fri Jun 10 10:54:36 2022 +0300 Sql fixes commit 011f94f29438ad36cb423a2faf6dc4686905902c Author: Andy Oknen Date: Fri Jun 10 09:43:51 2022 +0300 Fix sql typo commit a62fd177da5dfb00260cd13db1572b0824e21742 Author: lostystyg Date: Fri Jun 10 09:05:43 2022 +0300 Fixed select ordering in events commit af47ba0b7bb84185fc78c18c178720f8254281e8 Author: Andy Oknen Date: Fri Jun 10 08:50:18 2022 +0300 Fix comment answers sql index commit c97d7f55ddea43ffcde4b0c591086b8ddb6102b3 Author: lostystyg Date: Mon Jun 6 16:00:19 2022 +0300 Fixed description for scores events commit 134f3095dac5169d58a0213a795002d347c33769 Author: lostystyg Date: Mon Jun 6 15:35:51 2022 +0300 Throwing in case of event reconstructor error commit 0c3319a6878381b2bc528f9a24d8e7e491ce4dff Author: Andy Oknen Date: Mon May 23 14:11:21 2022 +0300 Downgrade likers count for testnet commit 367fa1a7a38cbe3f31ac83c3c6afef57ff1229df Author: Andy Oknen Date: Fri Apr 22 10:36:33 2022 +0300 Formatting commit 0421fbf7bf4af46fbb216517eb6f8867ca39f0a5 Author: lostystyg Date: Mon Jun 6 12:47:01 2022 +0300 Optimizing event queries commit aff9e13fece8167e8f7352c3d13206dbccde94b0 Author: lostystyg Date: Mon Jun 6 12:25:58 2022 +0300 Events fixes commit 423d4f9f91b61283e6878b408fc92ae8120ca467 Merge: 7127a3eb 039f41fb Author: lostystyg Date: Fri Jun 3 00:34:41 2022 +0300 Merge remote-tracking branch 'origin/0.21' into feature/events commit 7127a3ebd2bfff8f469afa7e5f980d5c41ae5ff0 Author: lostystyg Date: Fri Jun 3 00:34:12 2022 +0300 Short forms for events commit b8f13088d20cceb8fc67229bffb8154a00c08a20 Author: lostystyg Date: Fri Jun 3 00:34:02 2022 +0300 Updated short forms commit 03c0bd4a9c52a89d276ca9da219a9a323cb41a8c Author: lostystyg Date: Tue May 31 01:01:20 2022 +0300 ShortTxType for short forms commit dfd80a5a62d32e055cbaeabdf089bc4b1e0dbb4d Author: lostystyg Date: Mon May 30 22:52:28 2022 +0300 Added short forms commit 0b2aca0a697fd47cd0b4aee4264acf99aa57f86d Author: lostystyg Date: Mon May 30 15:26:51 2022 +0300 Raw sql query to get all events at height for each account commit 78681c897118244d758fc40732685ad9ba19c524 Author: lostystyg Date: Fri May 6 17:31:21 2022 +0300 Forgotten finalizing stmt commit 8d23c2e6e401f9a41c41d7a6236be2dc1785c19e Author: lostystyg Date: Fri May 6 17:01:01 2022 +0300 Updated args description for getevents commit 4030e741e98038f7297cccae706ba072beb992c2 Author: lostystyg Date: Fri May 6 16:57:43 2022 +0300 Events for single address commit b7ec0f7f40237ac2a6e12f3394163ba1a05a8c98 Author: lostystyg Date: Fri May 6 16:42:10 2022 +0300 constant depth for events commit 1ae34c266e55cdae51aa5df95d28cae91d5385ee Author: lostystyg Date: Fri May 6 16:40:43 2022 +0300 privatecontent for events commit 086a1fa52778907c63eab88d9e691b62edff5246 Author: lostystyg Date: Fri May 6 16:34:57 2022 +0300 Fixed binding for events commit d77c6b6cf4dda626454170d466345fadcf6b12f9 Author: lostystyg Date: Fri May 6 13:37:39 2022 +0300 Fixed filtering for events commit 19591f2421a9e7d9579fe6034f82314ccaaf4562 Author: lostystyg Date: Thu May 5 23:15:02 2022 +0300 Updated events commit 244a198523d5efe7f9c251e7ccd8111dd26eae0c Author: lostystyg Date: Wed May 4 17:04:33 2022 +0300 Fixed filtering for events commit 3deae2ea8a8dded1f50d3ec7ee9bda2616667e90 Author: lostystyg Date: Wed May 4 16:09:02 2022 +0300 FIlters, height and blocknum for events request commit 2600f314343ec9ce45acbd46774e1f2e4924e6a4 Author: lostystyg Date: Sat Apr 30 14:41:04 2022 +0300 Sorting events by height outside of sqlite commit 7f3d953ecb6c01fdf2e5fb6f1cf2d8cc424098a7 Author: lostystyg Date: Sat Apr 30 00:42:26 2022 +0300 Fixed events rpc description commit 192ad0cab7f3639824fe2c9ed4a3862941c89b2e Author: lostystyg Date: Sat Apr 30 00:41:11 2022 +0300 Events optimization commit 7a51e15cb185f07536ca713eebafd0e5c06111dc Author: lostystyg Date: Mon Apr 25 18:35:32 2022 +0300 Better indexing content from private subscribers event commit 3d8e46bfd1b13af691c876d8c82caf77f6035411 Author: lostystyg Date: Mon Apr 25 18:30:38 2022 +0300 Do not check for last for boost events commit dbea23e6036b2cd141552c408a149562351618cd Merge: af71bdf4 b0497826 Author: lostystyg Date: Mon Apr 25 18:20:24 2022 +0300 Merge remote-tracking branch 'origin/0.21.todo' into feature/events commit af71bdf4fdaaffe602ef6fa70efa63ef35ec5c63 Author: lostystyg Date: Mon Apr 25 18:17:09 2022 +0300 Base events logic commit c0e9504a610807a759cffbd239dd9bd2852ad805 Author: lostystyg Date: Mon Apr 18 17:23:50 2022 +0300 Method to get POCKETNET_TEAM address commit 9722326760ef90af0ccb57bbacc5c5c51d76f7d6 Author: lostystyg Date: Mon Apr 18 17:22:46 2022 +0300 Using network id instead of string for getting pocketnet developers --- .github/workflows/add.tasks.to.project.yml | 21 + Makefile.am | 2 +- README.md | 22 +- share/data/pocketnetcore.desktop | 2 +- share/genbuild.sh | 30 +- share/genversion.sh | 44 +- src/CMakeLists.txt | 119 +- src/Makefile.am | 100 +- src/clientversion.cpp | 7 +- src/consensus/params.h | 6 +- src/consensus/tx_verify.cpp | 2 +- src/httpserver.cpp | 1 + src/init.cpp | 13 +- src/net.cpp | 4 - src/pocketdb/SQLiteDatabase.cpp | 3 +- src/pocketdb/consensus/Base.h | 1 + src/pocketdb/consensus/Helper.cpp | 11 +- src/pocketdb/consensus/Helper.h | 8 +- src/pocketdb/consensus/Social.h | 8 +- src/pocketdb/consensus/moderation/Flag.hpp | 2 +- .../consensus/social/AccountDelete.hpp | 107 + .../consensus/social/AccountSetting.hpp | 8 +- .../social/{User.hpp => AccountUser.hpp} | 128 +- src/pocketdb/consensus/social/Article.hpp | 8 +- src/pocketdb/consensus/social/Blocking.hpp | 8 +- .../consensus/social/BlockingCancel.hpp | 8 +- .../consensus/social/BoostContent.hpp | 8 +- src/pocketdb/consensus/social/Comment.hpp | 15 +- .../consensus/social/CommentDelete.hpp | 8 +- src/pocketdb/consensus/social/CommentEdit.hpp | 16 +- src/pocketdb/consensus/social/Complain.hpp | 8 +- .../consensus/social/ContentDelete.hpp | 8 +- src/pocketdb/consensus/social/Post.hpp | 8 +- .../consensus/social/ScoreComment.hpp | 10 +- .../consensus/social/ScoreContent.hpp | 8 +- src/pocketdb/consensus/social/Subscribe.hpp | 8 +- .../consensus/social/SubscribeCancel.hpp | 8 +- .../consensus/social/SubscribePrivate.hpp | 8 +- src/pocketdb/consensus/social/Video.hpp | 9 +- src/pocketdb/helpers/PocketnetHelper.h | 8 +- src/pocketdb/helpers/ShortFormHelper.cpp | 56 +- src/pocketdb/helpers/ShortFormHelper.h | 18 + src/pocketdb/helpers/TransactionHelper.cpp | 31 +- src/pocketdb/helpers/TransactionHelper.h | 46 +- src/pocketdb/migrations/main.cpp | 3 + src/pocketdb/models/base/PocketTypes.h | 11 +- src/pocketdb/models/dto/account/Delete.cpp | 27 + src/pocketdb/models/dto/account/Delete.h | 23 + .../Setting.cpp} | 2 +- .../{AccountSetting.h => account/Setting.h} | 2 +- .../models/dto/{ => account}/User.cpp | 2 +- src/pocketdb/models/dto/{ => account}/User.h | 0 .../models/dto/{ => action}/Blocking.cpp | 2 +- .../models/dto/{ => action}/Blocking.h | 0 .../dto/{ => action}/BlockingCancel.cpp | 2 +- .../models/dto/{ => action}/BlockingCancel.h | 2 +- .../models/dto/{ => action}/BoostContent.cpp | 2 +- .../models/dto/{ => action}/BoostContent.h | 0 .../models/dto/{ => action}/Complain.cpp | 2 +- .../models/dto/{ => action}/Complain.h | 0 .../models/dto/{ => action}/ScoreComment.cpp | 2 +- .../models/dto/{ => action}/ScoreComment.h | 0 .../models/dto/{ => action}/ScoreContent.cpp | 2 +- .../models/dto/{ => action}/ScoreContent.h | 0 .../models/dto/{ => action}/Subscribe.cpp | 2 +- .../models/dto/{ => action}/Subscribe.h | 0 .../dto/{ => action}/SubscribeCancel.cpp | 2 +- .../models/dto/{ => action}/SubscribeCancel.h | 2 +- .../dto/{ => action}/SubscribePrivate.cpp | 2 +- .../dto/{ => action}/SubscribePrivate.h | 2 +- .../models/dto/{ => content}/Article.cpp | 2 +- .../models/dto/{ => content}/Article.h | 2 +- .../models/dto/{ => content}/Comment.cpp | 2 +- .../models/dto/{ => content}/Comment.h | 0 .../dto/{ => content}/CommentDelete.cpp | 2 +- .../models/dto/{ => content}/CommentDelete.h | 2 +- .../models/dto/{ => content}/CommentEdit.cpp | 2 +- .../models/dto/{ => content}/CommentEdit.h | 2 +- .../models/dto/{ => content}/Content.cpp | 2 +- .../models/dto/{ => content}/Content.h | 0 .../dto/{ => content}/ContentDelete.cpp | 2 +- .../models/dto/{ => content}/ContentDelete.h | 2 +- .../models/dto/{ => content}/Post.cpp | 2 +- src/pocketdb/models/dto/{ => content}/Post.h | 2 +- .../models/dto/{ => content}/Video.cpp | 2 +- src/pocketdb/models/dto/{ => content}/Video.h | 2 +- .../models/dto/{ => money}/Coinbase.cpp | 2 +- .../models/dto/{ => money}/Coinbase.h | 2 +- .../models/dto/{ => money}/Coinstake.cpp | 2 +- .../models/dto/{ => money}/Coinstake.h | 2 +- .../models/dto/{ => money}/Default.cpp | 2 +- src/pocketdb/models/dto/{ => money}/Default.h | 0 .../models/shortform/ShortAccount.cpp | 11 + src/pocketdb/models/shortform/ShortAccount.h | 5 +- src/pocketdb/models/shortform/ShortForm.h | 1 - src/pocketdb/models/shortform/ShortTxData.cpp | 52 +- src/pocketdb/models/shortform/ShortTxData.h | 16 +- .../models/shortform/ShortTxOutput.cpp | 45 + src/pocketdb/models/shortform/ShortTxOutput.h | 44 + src/pocketdb/models/shortform/ShortTxType.h | 3 +- src/pocketdb/pocketnet.cpp | 1 - src/pocketdb/repositories/BaseRepository.h | 58 +- src/pocketdb/repositories/ChainRepository.cpp | 163 +- src/pocketdb/repositories/ChainRepository.h | 2 + .../repositories/CheckpointRepository.cpp | 4 +- .../repositories/ConsensusRepository.cpp | 182 +- .../repositories/ConsensusRepository.h | 10 +- .../repositories/MigrationRepository.cpp | 8 +- .../repositories/TransactionRepository.h | 3 - .../repositories/web/ExplorerRepository.cpp | 4 +- .../repositories/web/NotifierRepository.cpp | 40 +- .../repositories/web/NotifierRepository.h | 2 + .../repositories/web/WebRepository.cpp | 2 +- .../repositories/web/WebRpcRepository.cpp | 3231 +++++++++++++---- .../repositories/web/WebRpcRepository.h | 26 +- src/pocketdb/services/Serializer.h | 15 - src/pocketdb/web/PocketAccountRpc.cpp | 2 +- src/pocketdb/web/PocketContentRpc.cpp | 270 +- src/pocketdb/web/PocketContentRpc.h | 4 +- src/pocketdb/web/PocketRpc.cpp | 5 +- src/pocketdb/web/PocketTagsRpc.cpp | 4 +- src/pocketdb/web/PocketTransactionRpc.cpp | 34 +- src/pocketdb/web/SearchRpc.cpp | 12 +- src/policy/fees.cpp | 2 +- src/pos.cpp | 4 - src/rest.cpp | 3 +- src/rpc/blockchain.cpp | 4 +- src/rpc/rawtransaction.cpp | 8 +- src/staker.cpp | 7 +- src/txmempool.cpp | 13 +- src/validation.cpp | 2 +- src/wallet/rpcwallet.cpp | 6 +- src/wallet/scriptpubkeyman.cpp | 38 +- src/wallet/wallet.cpp | 8 +- src/websocket/notifyprocessor.cpp | 43 +- src/websocket/notifyprocessor.h | 9 + 136 files changed, 4000 insertions(+), 1492 deletions(-) create mode 100644 .github/workflows/add.tasks.to.project.yml create mode 100644 src/pocketdb/consensus/social/AccountDelete.hpp rename src/pocketdb/consensus/social/{User.hpp => AccountUser.hpp} (64%) create mode 100644 src/pocketdb/models/dto/account/Delete.cpp create mode 100644 src/pocketdb/models/dto/account/Delete.h rename src/pocketdb/models/dto/{AccountSetting.cpp => account/Setting.cpp} (97%) rename src/pocketdb/models/dto/{AccountSetting.h => account/Setting.h} (94%) rename src/pocketdb/models/dto/{ => account}/User.cpp (99%) rename src/pocketdb/models/dto/{ => account}/User.h (100%) rename src/pocketdb/models/dto/{ => action}/Blocking.cpp (98%) rename src/pocketdb/models/dto/{ => action}/Blocking.h (100%) rename src/pocketdb/models/dto/{ => action}/BlockingCancel.cpp (92%) rename src/pocketdb/models/dto/{ => action}/BlockingCancel.h (91%) rename src/pocketdb/models/dto/{ => action}/BoostContent.cpp (97%) rename src/pocketdb/models/dto/{ => action}/BoostContent.h (100%) rename src/pocketdb/models/dto/{ => action}/Complain.cpp (97%) rename src/pocketdb/models/dto/{ => action}/Complain.h (100%) rename src/pocketdb/models/dto/{ => action}/ScoreComment.cpp (97%) rename src/pocketdb/models/dto/{ => action}/ScoreComment.h (100%) rename src/pocketdb/models/dto/{ => action}/ScoreContent.cpp (97%) rename src/pocketdb/models/dto/{ => action}/ScoreContent.h (100%) rename src/pocketdb/models/dto/{ => action}/Subscribe.cpp (97%) rename src/pocketdb/models/dto/{ => action}/Subscribe.h (100%) rename src/pocketdb/models/dto/{ => action}/SubscribeCancel.cpp (92%) rename src/pocketdb/models/dto/{ => action}/SubscribeCancel.h (91%) rename src/pocketdb/models/dto/{ => action}/SubscribePrivate.cpp (92%) rename src/pocketdb/models/dto/{ => action}/SubscribePrivate.h (91%) rename src/pocketdb/models/dto/{ => content}/Article.cpp (90%) rename src/pocketdb/models/dto/{ => content}/Article.h (90%) rename src/pocketdb/models/dto/{ => content}/Comment.cpp (98%) rename src/pocketdb/models/dto/{ => content}/Comment.h (100%) rename src/pocketdb/models/dto/{ => content}/CommentDelete.cpp (95%) rename src/pocketdb/models/dto/{ => content}/CommentDelete.h (92%) rename src/pocketdb/models/dto/{ => content}/CommentEdit.cpp (90%) rename src/pocketdb/models/dto/{ => content}/CommentEdit.h (90%) rename src/pocketdb/models/dto/{ => content}/Content.cpp (94%) rename src/pocketdb/models/dto/{ => content}/Content.h (100%) rename src/pocketdb/models/dto/{ => content}/ContentDelete.cpp (97%) rename src/pocketdb/models/dto/{ => content}/ContentDelete.h (94%) rename src/pocketdb/models/dto/{ => content}/Post.cpp (99%) rename src/pocketdb/models/dto/{ => content}/Post.h (96%) rename src/pocketdb/models/dto/{ => content}/Video.cpp (90%) rename src/pocketdb/models/dto/{ => content}/Video.h (90%) rename src/pocketdb/models/dto/{ => money}/Coinbase.cpp (90%) rename src/pocketdb/models/dto/{ => money}/Coinbase.h (90%) rename src/pocketdb/models/dto/{ => money}/Coinstake.cpp (90%) rename src/pocketdb/models/dto/{ => money}/Coinstake.h (90%) rename src/pocketdb/models/dto/{ => money}/Default.cpp (93%) rename src/pocketdb/models/dto/{ => money}/Default.h (100%) create mode 100644 src/pocketdb/models/shortform/ShortTxOutput.cpp create mode 100644 src/pocketdb/models/shortform/ShortTxOutput.h diff --git a/.github/workflows/add.tasks.to.project.yml b/.github/workflows/add.tasks.to.project.yml new file mode 100644 index 000000000..017b1a683 --- /dev/null +++ b/.github/workflows/add.tasks.to.project.yml @@ -0,0 +1,21 @@ +name: Add new tasks to project + +on: + issues: + types: + - opened + pull_request: + types: + - opened + +jobs: + add-to-project: + name: Add new task to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@v0.3.0 + with: + project-url: https://github.com/users/pocketnetteam/projects/3 + github-token: ${{ secrets.AUTO_PROJECT_TOKEN }} + # labeled: bug, needs-triage + # label-operator: OR or AND diff --git a/Makefile.am b/Makefile.am index 3bfdc5b59..1b1cb834b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,7 +94,7 @@ $(POCKETCOIN_LINUX_INSTALLER): all-recursive $(MKDIR_P) $(abs_top_builddir)/release/usr/local/share/pixmaps @cp $(abs_top_builddir)/contrib/debian/control $(abs_top_builddir)/release/DEBIAN/ @cp $(abs_top_builddir)/share/data/pocketnetcore.desktop $(abs_top_builddir)/release/usr/local/share/applications/ - @cp $(abs_top_builddir)/share/pixmaps/pocketcoin.png $(abs_top_builddir)/release/usr/local/share/pixmaps/ + @cp $(abs_top_builddir)/share/pixmaps/logo_color/sky_250.png $(abs_top_builddir)/release/usr/local/share/pixmaps/pocketcoin.png @sed -i "s/Version:.*/Version: $(PACKAGE_VERSION)/" $(abs_top_builddir)/release/DEBIAN/control @sed -i "s/Version=.*/Version=$(PACKAGE_VERSION)/" $(abs_top_builddir)/release/usr/local/share/applications/pocketnetcore.desktop @dpkg -b $(abs_top_builddir)/release diff --git a/README.md b/README.md index b84ec1823..487add98b 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ PocketnetCore is distributed in two ways: binary installer and build from source Minimum system requirements: - 2 core x86-64 CPU - 4GB RAM -- 100 GB harddrive +- 150 GB harddrive - 10 Mbps internet connection Recommended System Requirements @@ -75,7 +75,6 @@ $ $ pocketcoin-cli --help $ pocketcoin-tx --help ``` - More information : https://hub.docker.com/r/pocketnetteam/pocketnet.core # First full synchronization @@ -100,9 +99,8 @@ $ pocketcoind --help # Latest snapshot archive https://snapshot.pocketnet.app/latest.tgz - https://snapshot.pocketnet.app/latest.bz2 ``` -4. There must be archive tgz with 5 directories: +3. There must be archive tgz with 5 directories: ```shell blocks\ - ... @@ -141,12 +139,24 @@ $ pocketcoind --help # for bz2 archive $ tar -xjf latest.tgz -C ./ + + # create wallets directory if not exist + $ mkdir wallets ``` -5. Make sure the folders and files inside are not set to "read only" +5. Make sure the folders and files inside are not set to "read only" (grant permissions to all files for current user via ```chmod -R ~/.pocketcoin/``` unix command) 6. Start the node. **VERY IMPORTANT**: save the **wallet.dat** file or **wallets/** files before cleaning the directory. It is recommended to even save these files somewhere for backup. +# Get address (for PKOIN receiving) and private key info (Linux, Docker) +```shell +# get address for PKOIN receiving +$ pocketcoin-cli getnewaddress "node" + +$ +# get private key info for private safe storage +$ pocketcoin-cli dumpprivkey "" +``` # Build from source code See `doc/build-*.md` files for build instructions. @@ -154,7 +164,7 @@ See `doc/build-*.md` files for build instructions. # Help You can get help and useful information from different sources: -- https://pocketnet.app/help +- https://bastyon.com/help - https://github.com/pocketnetteam/pocketnet.core/blob/master/doc/public_access.md - https://github.com/pocketnetteam/pocketnet.core/tree/master/doc/help - https://github.com/pocketnetteam/pocketnet.core/blob/master/share/examples/pocketcoin.conf diff --git a/share/data/pocketnetcore.desktop b/share/data/pocketnetcore.desktop index 8df0ee3d5..834ca4c7d 100644 --- a/share/data/pocketnetcore.desktop +++ b/share/data/pocketnetcore.desktop @@ -5,7 +5,7 @@ Name[en_US]=PocketnetCore GenericName=PocketnetCore Exec=pocketcoin-qt Terminal=false -Icon[en_US]=/usr/share/pixmaps/pocketcoin.png +Icon[en_US]=/usr/local/share/pixmaps/pocketcoin.png Type=Application Categories=Application;Network; Comment[en_US]=PocketnetCore GUI \ No newline at end of file diff --git a/share/genbuild.sh b/share/genbuild.sh index db3a748c7..872c3d5de 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2012-2016 The Bitcoin Core developers +# Copyright (c) 2012-2019 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -18,31 +18,27 @@ else exit 1 fi -git_check_in_repo() { - ! { git status --porcelain -uall --ignored "$@" 2>/dev/null || echo '??'; } | grep -q '?' -} - -DESC="" -SUFFIX="" -if [ "${POCKETCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then +GIT_TAG="" +GIT_COMMIT="" +if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then # clean 'dirty' status of touched files that haven't been modified - git diff >/dev/null 2>/dev/null + git diff >/dev/null 2>/dev/null # if latest commit is tagged and not dirty, then override using the tag name RAWDESC=$(git describe --abbrev=0 2>/dev/null) if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC 2>/dev/null)" ]; then - git diff-index --quiet HEAD -- && DESC=$RAWDESC + git diff-index --quiet HEAD -- && GIT_TAG=$RAWDESC fi # otherwise generate suffix from git, i.e. string like "59887e8-dirty" - SUFFIX=$(git rev-parse --short HEAD) - git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty" + GIT_COMMIT=$(git rev-parse --short HEAD) + git diff-index --quiet HEAD -- || GIT_COMMIT="$GIT_COMMIT-dirty" fi -if [ -n "$DESC" ]; then - NEWINFO="#define BUILD_DESC \"$DESC\"" -elif [ -n "$SUFFIX" ]; then - NEWINFO="#define BUILD_SUFFIX $SUFFIX" +if [ -n "$GIT_TAG" ]; then + NEWINFO="#define BUILD_GIT_TAG \"$GIT_TAG\"" +elif [ -n "$GIT_COMMIT" ]; then + NEWINFO="#define BUILD_GIT_COMMIT \"$GIT_COMMIT\"" else NEWINFO="// No build information available" fi @@ -50,4 +46,4 @@ fi # only update build.h if necessary if [ "$INFO" != "$NEWINFO" ]; then echo "$NEWINFO" >"$FILE" -fi +fi \ No newline at end of file diff --git a/share/genversion.sh b/share/genversion.sh index 61ef99c6b..d5203f16d 100755 --- a/share/genversion.sh +++ b/share/genversion.sh @@ -1,38 +1,46 @@ #!/bin/sh -# Copyright (c) 2012-2016 The Bitcoin Core developers -# Copyright (c) 2018-20122The Pocketcoin Core developers +# Copyright (c) 2012-2019 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. export LC_ALL=C +if [ $# -gt 1 ]; then + cd "$2" || exit 1 +fi +if [ $# -gt 0 ]; then + FILE="$1" + shift + if [ -f "$FILE" ]; then + INFO="$(head -n 1 "$FILE")" + fi +else + echo "Usage: $0 " + exit 1 +fi -git_check_in_repo() { - ! { git status --porcelain -uall --ignored "$@" 2>/dev/null || echo '??'; } | grep -q '?' -} - -DESC="" -SUFFIX="" -if [ "${POCKETCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then +GIT_TAG="" +GIT_COMMIT="" +if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then # clean 'dirty' status of touched files that haven't been modified - git diff >/dev/null 2>/dev/null + git diff >/dev/null 2>/dev/null # if latest commit is tagged and not dirty, then override using the tag name RAWDESC=$(git describe --abbrev=0 2>/dev/null) if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC 2>/dev/null)" ]; then - git diff-index --quiet HEAD -- && DESC=$RAWDESC + git diff-index --quiet HEAD -- && GIT_TAG=$RAWDESC fi # otherwise generate suffix from git, i.e. string like "59887e8-dirty" - SUFFIX=$(git rev-parse --short HEAD) - git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty" + GIT_COMMIT=$(git rev-parse --short HEAD) + git diff-index --quiet HEAD -- || GIT_COMMIT="$GIT_COMMIT-dirty" fi -if [ -n "$DESC" ]; then - NEWINFO=$DESC -elif [ -n "$SUFFIX" ]; then - NEWINFO=$SUFFIX +if [ -n "$GIT_TAG" ]; then + NEWINFO="#define BUILD_GIT_TAG \"$GIT_TAG\"" +elif [ -n "$GIT_COMMIT" ]; then + NEWINFO="#define BUILD_GIT_COMMIT \"$GIT_COMMIT\"" else - NEWINFO="---" + NEWINFO="// No build information available" fi echo $NEWINFO diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6776c6ba4..770d09ac0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -557,69 +557,77 @@ set(POCKETDB pocketdb) add_library(${POCKETDB} pocketdb/migrations/base.h pocketdb/migrations/main.h - pocketdb/migrations/web.h pocketdb/migrations/main.cpp + pocketdb/migrations/web.h pocketdb/migrations/web.cpp + pocketdb/models/base/PocketTypes.h + pocketdb/models/base/DtoModels.h pocketdb/models/base/Base.h - pocketdb/models/base/Payload.h - pocketdb/models/base/Transaction.h - pocketdb/models/base/TransactionInput.h - pocketdb/models/base/TransactionOutput.h - pocketdb/models/base/SocialTransaction.h - pocketdb/models/base/Rating.h pocketdb/models/base/Base.cpp + pocketdb/models/base/Payload.h pocketdb/models/base/Payload.cpp + pocketdb/models/base/Transaction.h pocketdb/models/base/Transaction.cpp + pocketdb/models/base/TransactionInput.h pocketdb/models/base/TransactionInput.cpp + pocketdb/models/base/TransactionOutput.h pocketdb/models/base/TransactionOutput.cpp + pocketdb/models/base/SocialTransaction.h pocketdb/models/base/SocialTransaction.cpp - pocketdb/models/base/DtoModels.h - pocketdb/models/dto/Default.h - pocketdb/models/dto/Coinbase.h - pocketdb/models/dto/Coinstake.h - pocketdb/models/dto/Post.h - pocketdb/models/dto/User.h - pocketdb/models/dto/ScoreContent.h - pocketdb/models/dto/ScoreComment.h - pocketdb/models/dto/Blocking.h - pocketdb/models/dto/BlockingCancel.h - pocketdb/models/dto/CommentEdit.h - pocketdb/models/dto/CommentDelete.h - pocketdb/models/dto/Subscribe.h - pocketdb/models/dto/SubscribePrivate.h - pocketdb/models/dto/SubscribeCancel.h - pocketdb/models/dto/Complain.h - pocketdb/models/dto/Video.h - pocketdb/models/dto/AccountSetting.h - pocketdb/models/dto/ContentDelete.h - pocketdb/models/dto/BoostContent.h - pocketdb/models/dto/BoostContent.cpp + pocketdb/models/base/Rating.h pocketdb/models/base/Rating.cpp - pocketdb/models/dto/Default.cpp - pocketdb/models/dto/Coinbase.cpp - pocketdb/models/dto/Coinstake.cpp - pocketdb/models/dto/Content.h - pocketdb/models/dto/Content.cpp - pocketdb/models/dto/Post.cpp - pocketdb/models/dto/Video.cpp - pocketdb/models/dto/Article.h - pocketdb/models/dto/Article.cpp - pocketdb/models/dto/User.cpp - pocketdb/models/dto/ScoreContent.cpp - pocketdb/models/dto/ScoreComment.cpp - pocketdb/models/dto/Blocking.cpp - pocketdb/models/dto/BlockingCancel.cpp - pocketdb/models/dto/Comment.h - pocketdb/models/dto/Comment.cpp - pocketdb/models/dto/CommentEdit.cpp - pocketdb/models/dto/CommentDelete.cpp - pocketdb/models/dto/Subscribe.cpp - pocketdb/models/dto/SubscribePrivate.cpp - pocketdb/models/dto/SubscribeCancel.cpp - pocketdb/models/dto/Complain.cpp - pocketdb/models/dto/AccountSetting.cpp - pocketdb/models/dto/ContentDelete.cpp + + pocketdb/models/dto/money/Default.h + pocketdb/models/dto/money/Default.cpp + pocketdb/models/dto/money/Coinbase.h + pocketdb/models/dto/money/Coinbase.cpp + pocketdb/models/dto/money/Coinstake.h + pocketdb/models/dto/money/Coinstake.cpp + + pocketdb/models/dto/account/User.h + pocketdb/models/dto/account/User.cpp + pocketdb/models/dto/account/Setting.h + pocketdb/models/dto/account/Setting.cpp + pocketdb/models/dto/account/Delete.h + pocketdb/models/dto/account/Delete.cpp + + pocketdb/models/dto/content/Content.h + pocketdb/models/dto/content/Content.cpp + pocketdb/models/dto/content/ContentDelete.h + pocketdb/models/dto/content/ContentDelete.cpp + pocketdb/models/dto/content/Post.h + pocketdb/models/dto/content/Post.cpp + pocketdb/models/dto/content/Video.h + pocketdb/models/dto/content/Video.cpp + pocketdb/models/dto/content/Article.h + pocketdb/models/dto/content/Article.cpp + pocketdb/models/dto/content/Comment.h + pocketdb/models/dto/content/Comment.cpp + pocketdb/models/dto/content/CommentEdit.h + pocketdb/models/dto/content/CommentEdit.cpp + pocketdb/models/dto/content/CommentDelete.h + pocketdb/models/dto/content/CommentDelete.cpp + + pocketdb/models/dto/action/ScoreContent.h + pocketdb/models/dto/action/ScoreContent.cpp + pocketdb/models/dto/action/ScoreComment.h + pocketdb/models/dto/action/ScoreComment.cpp + pocketdb/models/dto/action/Blocking.h + pocketdb/models/dto/action/Blocking.cpp + pocketdb/models/dto/action/BlockingCancel.h + pocketdb/models/dto/action/BlockingCancel.cpp + pocketdb/models/dto/action/Subscribe.h + pocketdb/models/dto/action/Subscribe.cpp + pocketdb/models/dto/action/SubscribePrivate.h + pocketdb/models/dto/action/SubscribePrivate.cpp + pocketdb/models/dto/action/SubscribeCancel.h + pocketdb/models/dto/action/SubscribeCancel.cpp + pocketdb/models/dto/action/Complain.h + pocketdb/models/dto/action/Complain.cpp + pocketdb/models/dto/action/BoostContent.h + pocketdb/models/dto/action/BoostContent.cpp + pocketdb/models/dto/moderation/Flag.h pocketdb/models/dto/moderation/Flag.cpp pocketdb/models/dto/moderation/Moderator.h @@ -636,9 +644,11 @@ add_library(${POCKETDB} pocketdb/models/dto/moderation/RegisterRequest.cpp pocketdb/models/dto/moderation/RegisterCancel.h pocketdb/models/dto/moderation/RegisterCancel.cpp + pocketdb/models/web/WebTag.h pocketdb/models/web/WebContent.h pocketdb/models/web/SearchRequest.h + pocketdb/models/shortform/ShortForm.h pocketdb/models/shortform/ShortForm.cpp pocketdb/models/shortform/ShortTxData.h @@ -646,6 +656,8 @@ add_library(${POCKETDB} pocketdb/models/shortform/ShortAccount.h pocketdb/models/shortform/ShortAccount.cpp pocketdb/models/shortform/ShortTxType.h + pocketdb/models/shortform/ShortTxOutput.h + pocketdb/models/shortform/ShortTxOutput.cpp ) target_link_libraries(${POCKETDB} PRIVATE ${POCKETCOIN_COMMON} ${POCKETCOIN_UTIL} ${POCKETCOIN_CRYPTO} univalue leveldb) @@ -1141,8 +1153,9 @@ add_library(${POCKETCOIN_SERVER} pocketdb/consensus/social/Subscribe.hpp pocketdb/consensus/social/SubscribeCancel.hpp pocketdb/consensus/social/SubscribePrivate.hpp - pocketdb/consensus/social/User.hpp + pocketdb/consensus/social/AccountUser.hpp pocketdb/consensus/social/AccountSetting.hpp + pocketdb/consensus/social/AccountDelete.hpp pocketdb/consensus/social/ContentDelete.hpp pocketdb/consensus/social/BoostContent.hpp pocketdb/consensus/moderation/Flag.hpp diff --git a/src/Makefile.am b/src/Makefile.am index b63ea6335..9d80f85c2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -177,7 +177,7 @@ POCKETDB_H = \ pocketdb/consensus/social/Subscribe.hpp \ pocketdb/consensus/social/SubscribeCancel.hpp \ pocketdb/consensus/social/SubscribePrivate.hpp \ - pocketdb/consensus/social/User.hpp \ + pocketdb/consensus/social/AccountUser.hpp \ pocketdb/consensus/social/AccountSetting.hpp \ pocketdb/consensus/social/ContentDelete.hpp \ \ @@ -194,28 +194,29 @@ POCKETDB_H = \ pocketdb/models/base/Payload.h \ pocketdb/models/base/DtoModels.h \ \ - pocketdb/models/dto/Default.h \ - pocketdb/models/dto/Coinbase.h \ - pocketdb/models/dto/Coinstake.h \ - pocketdb/models/dto/Content.h \ - pocketdb/models/dto/Post.h \ - pocketdb/models/dto/ContentDelete.h \ - pocketdb/models/dto/BoostContent.h \ - pocketdb/models/dto/AccountSetting.h \ - pocketdb/models/dto/User.h \ - pocketdb/models/dto/ScoreContent.h \ - pocketdb/models/dto/ScoreComment.h \ - pocketdb/models/dto/Blocking.h \ - pocketdb/models/dto/BlockingCancel.h \ - pocketdb/models/dto/Comment.h \ - pocketdb/models/dto/CommentEdit.h \ - pocketdb/models/dto/CommentDelete.h \ - pocketdb/models/dto/Subscribe.h \ - pocketdb/models/dto/SubscribePrivate.h \ - pocketdb/models/dto/SubscribeCancel.h \ - pocketdb/models/dto/Complain.h \ - pocketdb/models/dto/Video.h \ - pocketdb/models/dto/Article.h \ + pocketdb/models/dto/money/Default.h \ + pocketdb/models/dto/money/Coinbase.h \ + pocketdb/models/dto/money/Coinstake.h \ + pocketdb/models/dto/content/Content.h \ + pocketdb/models/dto/content/Post.h \ + pocketdb/models/dto/content/ContentDelete.h \ + pocketdb/models/dto/action/BoostContent.h \ + pocketdb/models/dto/account/Delete.h \ + pocketdb/models/dto/account/Setting.h \ + pocketdb/models/dto/account/User.h \ + pocketdb/models/dto/action/ScoreContent.h \ + pocketdb/models/dto/action/ScoreComment.h \ + pocketdb/models/dto/action/Blocking.h \ + pocketdb/models/dto/action/BlockingCancel.h \ + pocketdb/models/dto/content/Comment.h \ + pocketdb/models/dto/content/CommentEdit.h \ + pocketdb/models/dto/content/CommentDelete.h \ + pocketdb/models/dto/action/Subscribe.h \ + pocketdb/models/dto/action/SubscribePrivate.h \ + pocketdb/models/dto/action/SubscribeCancel.h \ + pocketdb/models/dto/action/Complain.h \ + pocketdb/models/dto/content/Video.h \ + pocketdb/models/dto/content/Article.h \ pocketdb/models/dto/moderation/Flag.h \ \ pocketdb/models/web/WebTag.h \ @@ -224,7 +225,8 @@ POCKETDB_H = \ pocketdb/models/shortform/ShortForm.h \ pocketdb/models/shortform/ShortAccount.h \ pocketdb/models/shortform/ShortTxData.h \ - pocketdb/models/shortform/ShortTxType.h + pocketdb/models/shortform/ShortTxType.h \ + pocketdb/models/shortform/ShortTxOutput.h # PocketDb CPP POCKETDB_CPP = \ @@ -284,33 +286,35 @@ POCKETDB_CPP = \ pocketdb/web/PocketRpc.cpp \ pocketdb/web/WebRpcUtils.cpp \ \ - pocketdb/models/dto/Default.cpp \ - pocketdb/models/dto/Coinbase.cpp \ - pocketdb/models/dto/Coinstake.cpp \ - pocketdb/models/dto/Content.cpp \ - pocketdb/models/dto/Post.cpp \ - pocketdb/models/dto/ContentDelete.cpp \ - pocketdb/models/dto/BoostContent.cpp \ - pocketdb/models/dto/AccountSetting.cpp \ - pocketdb/models/dto/User.cpp \ - pocketdb/models/dto/ScoreContent.cpp \ - pocketdb/models/dto/ScoreComment.cpp \ - pocketdb/models/dto/Blocking.cpp \ - pocketdb/models/dto/BlockingCancel.cpp \ - pocketdb/models/dto/Comment.cpp \ - pocketdb/models/dto/CommentEdit.cpp \ - pocketdb/models/dto/CommentDelete.cpp \ - pocketdb/models/dto/Subscribe.cpp \ - pocketdb/models/dto/SubscribePrivate.cpp \ - pocketdb/models/dto/SubscribeCancel.cpp \ - pocketdb/models/dto/Complain.cpp \ - pocketdb/models/dto/Video.cpp \ - pocketdb/models/dto/BoostContent.cpp \ - pocketdb/models/dto/Article.cpp \ + pocketdb/models/dto/money/Default.cpp \ + pocketdb/models/dto/money/Coinbase.cpp \ + pocketdb/models/dto/money/Coinstake.cpp \ + pocketdb/models/dto/content/Content.cpp \ + pocketdb/models/dto/content/Post.cpp \ + pocketdb/models/dto/content/ContentDelete.cpp \ + pocketdb/models/dto/action/BoostContent.cpp \ + pocketdb/models/dto/account/Setting.cpp \ + pocketdb/models/dto/account/Delete.cpp \ + pocketdb/models/dto/account/User.cpp \ + pocketdb/models/dto/action/ScoreContent.cpp \ + pocketdb/models/dto/action/ScoreComment.cpp \ + pocketdb/models/dto/action/Blocking.cpp \ + pocketdb/models/dto/action/BlockingCancel.cpp \ + pocketdb/models/dto/content/Comment.cpp \ + pocketdb/models/dto/content/CommentEdit.cpp \ + pocketdb/models/dto/content/CommentDelete.cpp \ + pocketdb/models/dto/action/Subscribe.cpp \ + pocketdb/models/dto/action/SubscribePrivate.cpp \ + pocketdb/models/dto/action/SubscribeCancel.cpp \ + pocketdb/models/dto/action/Complain.cpp \ + pocketdb/models/dto/content/Video.cpp \ + pocketdb/models/dto/action/BoostContent.cpp \ + pocketdb/models/dto/content/Article.cpp \ pocketdb/models/dto/moderation/Flag.cpp \ pocketdb/models/shortform/ShortForm.cpp \ pocketdb/models/shortform/ShortAccount.cpp \ - pocketdb/models/shortform/ShortTxData.cpp + pocketdb/models/shortform/ShortTxData.cpp \ + pocketdb/models/shortform/ShortTxOutput.cpp # CORE POCKETCOIN_CORE_H = \ diff --git a/src/clientversion.cpp b/src/clientversion.cpp index bba8dfbe2..aace0a763 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -26,16 +26,11 @@ const std::string CLIENT_NAME("Satoshi"); //! git will put "#define GIT_COMMIT_ID ..." on the next line inside archives. $Format:%n#define GIT_COMMIT_ID "%H"$ -// TODO (losty-fur): is it really needed? -#define BUILD_GENERAL_VERSION(maj, min, rev) \ - "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) - #ifdef BUILD_GIT_TAG #define BUILD_DESC BUILD_GIT_TAG #define BUILD_SUFFIX "" #else - #define BUILD_DESC "v" STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) \ - "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) + #define BUILD_DESC STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) #ifdef BUILD_GIT_COMMIT #define BUILD_SUFFIX "-" BUILD_GIT_COMMIT #elif defined(GIT_COMMIT_ID) diff --git a/src/consensus/params.h b/src/consensus/params.h index e432e98cb..2d6eed595 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -94,10 +94,10 @@ struct Params { unsigned int nStakeMinAge; int64_t nPosTargetSpacing; int64_t nPosTargetTimespan; - int64_t nStakeCombineThreshold; + int64_t nStakeCombineThreshold; // Minimum required SUM of coinstake inputs int64_t nStakeSplitThreshold; - int64_t nStakeMinimumThreshold; - int64_t nStakeMaximumThreshold; + int64_t nStakeMinimumThreshold; // Minimum required value if single (!) coinstake input + int64_t nStakeMaximumThreshold; // Maximum meaningful sum of coinstake inputs int nDailyBlockCount; unsigned int nModifierInterval; diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp index 278139c17..7bcf56a29 100644 --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -176,7 +176,7 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state, strprintf("tried to spend %s at depth %d - %d = %d", "pocketnet", nSpendHeight, coin.nHeight, nSpendHeight - coin.nHeight)); } // If prev is coinbase, check that it's matured - else if (coin.IsCoinBase() && nSpendHeight - coin.nHeight < COINBASE_MATURITY) { + else if ((coin.IsCoinBase() || coin.IsCoinStake()) && nSpendHeight - coin.nHeight < COINBASE_MATURITY) { return state.Invalid(TxValidationResult::TX_PREMATURE_SPEND, "bad-txns-premature-spend-of-coinbase", strprintf("tried to spend coinbase at depth %d", nSpendHeight - coin.nHeight)); } diff --git a/src/httpserver.cpp b/src/httpserver.cpp index aea4844ea..ffc2ba608 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -634,6 +634,7 @@ void HTTPSocket::BindAddress(std::string ipAddr, int port) { CNetAddr addr; if (ipAddr.empty() || (LookupHost(ipAddr, addr, false) && addr.IsBindAny())) { + // TODO (brangr, lostystyg): only for private ports LogPrintf("WARNING: the RPC server is not safe to expose to untrusted networks such as the public internet\n"); } m_boundSockets.push_back(bind_handle); diff --git a/src/init.cpp b/src/init.cpp index cb8ad9cfe..936e3195a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -185,7 +185,6 @@ void ShutdownPocketServices() PocketDb::ChainRepoInst.Destroy(); PocketDb::RatingsRepoInst.Destroy(); PocketDb::ConsensusRepoInst.Destroy(); - PocketDb::NotifierRepoInst.Destroy(); PocketDb::MigrationRepoInst.Destroy(); PocketDb::SQLiteDbInst.DetachDatabase("web"); @@ -223,7 +222,7 @@ void Shutdown(NodeContext& node) if (notifyClientsThread) notifyClientsThread->Stop(); - + StopHTTPRPC(); StopREST(); StopSTATIC(); @@ -485,6 +484,7 @@ void SetupServerArgs(NodeContext& node) argsman.AddArg("-skip-validation=", "Skip consensus check and validation before N block logic if running with -reindex or -reindex-chainstate", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-reindex-start", "Start block for -reindex logic (Deafult: 0)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-mempoolclean", "Clean mempool on loading and delete or non blocked transactions from sqlite db", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-disconnectlast", "Disconnect latest blocks up to the specified height (Default: -1)", false, OptionsCategory::COMMANDS); #if HAVE_SYSTEM argsman.AddArg("-startupnotify=", "Execute command on startup.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); @@ -2127,9 +2127,12 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA fFeeEstimatesInitialized = true; // ********************************************************* Step 8: start indexers - // TODO (brangr): maybe not needed? - g_txindex = MakeUnique(nTxIndexCache, false, fReindex); - g_txindex->Start(); + // TODO (brangr): 0.21.0 check need txindex test + if (args.GetBoolArg("-txindex", DEFAULT_TXINDEX)) + { + g_txindex = MakeUnique(nTxIndexCache, false, fReindex); + g_txindex->Start(); + } for (const auto& filter_type : g_enabled_filter_types) { InitBlockFilterIndex(filter_type, filter_index_cache, false, fReindex); diff --git a/src/net.cpp b/src/net.cpp index c3a1184a5..17ad0f97c 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -400,10 +400,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo // Look for an existing connection CNode* pnode = FindNode(static_cast(addrConnect)); if (pnode) - { - LogPrintf("Failed to open new connection, already connected\n"); return nullptr; - } } /// debug print @@ -430,7 +427,6 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo if (pnode) { pnode->MaybeSetAddrName(std::string(pszDest)); - LogPrintf("Failed to open new connection, already connected\n"); return nullptr; } } diff --git a/src/pocketdb/SQLiteDatabase.cpp b/src/pocketdb/SQLiteDatabase.cpp index fc6799d0b..e110bfd82 100644 --- a/src/pocketdb/SQLiteDatabase.cpp +++ b/src/pocketdb/SQLiteDatabase.cpp @@ -9,7 +9,7 @@ #include "validation.h" #include -#include "pocketdb/services/Serializer.h" +// #include "pocketdb/services/Serializer.h" namespace PocketDb { @@ -62,7 +62,6 @@ namespace PocketDb ChainRepoInst.Init(); RatingsRepoInst.Init(); ConsensusRepoInst.Init(); - NotifierRepoInst.Init(); SystemRepoInst.Init(); MigrationRepoInst.Init(); diff --git a/src/pocketdb/consensus/Base.h b/src/pocketdb/consensus/Base.h index c5cd207fd..9a212bca2 100644 --- a/src/pocketdb/consensus/Base.h +++ b/src/pocketdb/consensus/Base.h @@ -82,6 +82,7 @@ namespace PocketConsensus SocialConsensusResult_SelfFlag = 64, SocialConsensusResult_ExceededLimit = 65, SocialConsensusResult_LowReputation = 66, + SocialConsensusResult_AccountDeleted = 67, }; static inline string SocialConsensusResultString(SocialConsensusResult code) diff --git a/src/pocketdb/consensus/Helper.cpp b/src/pocketdb/consensus/Helper.cpp index 7863cdc73..5a4fe5866 100644 --- a/src/pocketdb/consensus/Helper.cpp +++ b/src/pocketdb/consensus/Helper.cpp @@ -10,7 +10,8 @@ namespace PocketConsensus VideoConsensusFactory SocialConsensusHelper::m_videoFactory; ArticleConsensusFactory SocialConsensusHelper::m_articleFactory; AccountSettingConsensusFactory SocialConsensusHelper::m_accountSettingFactory; - UserConsensusFactory SocialConsensusHelper::m_userFactory; + AccountDeleteConsensusFactory SocialConsensusHelper::m_accountDeleteFactory; + AccountUserConsensusFactory SocialConsensusHelper::m_accountUserFactory; CommentConsensusFactory SocialConsensusHelper::m_commentFactory; CommentEditConsensusFactory SocialConsensusHelper::m_commentEditFactory; CommentDeleteConsensusFactory SocialConsensusHelper::m_commentDeleteFactory; @@ -167,8 +168,10 @@ namespace PocketConsensus { case ACCOUNT_SETTING: return m_accountSettingFactory.Instance(height)->Check(tx, static_pointer_cast(ptx)); + case ACCOUNT_DELETE: + return m_accountDeleteFactory.Instance(height)->Check(tx, static_pointer_cast(ptx)); case ACCOUNT_USER: - return m_userFactory.Instance(height)->Check(tx, static_pointer_cast(ptx)); + return m_accountUserFactory.Instance(height)->Check(tx, static_pointer_cast(ptx)); case CONTENT_POST: return m_postFactory.Instance(height)->Check(tx, static_pointer_cast(ptx)); case CONTENT_VIDEO: @@ -234,8 +237,10 @@ namespace PocketConsensus { case ACCOUNT_SETTING: return m_accountSettingFactory.Instance(height)->Validate(tx, static_pointer_cast(ptx), pBlock); + case ACCOUNT_DELETE: + return m_accountDeleteFactory.Instance(height)->Validate(tx, static_pointer_cast(ptx), pBlock); case ACCOUNT_USER: - return m_userFactory.Instance(height)->Validate(tx, static_pointer_cast(ptx), pBlock); + return m_accountUserFactory.Instance(height)->Validate(tx, static_pointer_cast(ptx), pBlock); case CONTENT_POST: return m_postFactory.Instance(height)->Validate(tx, static_pointer_cast(ptx), pBlock); case CONTENT_VIDEO: diff --git a/src/pocketdb/consensus/Helper.h b/src/pocketdb/consensus/Helper.h index 7d81cf98a..32c608038 100644 --- a/src/pocketdb/consensus/Helper.h +++ b/src/pocketdb/consensus/Helper.h @@ -24,8 +24,9 @@ #include "pocketdb/consensus/social/Subscribe.hpp" #include "pocketdb/consensus/social/SubscribeCancel.hpp" #include "pocketdb/consensus/social/SubscribePrivate.hpp" -#include "pocketdb/consensus/social/User.hpp" +#include "pocketdb/consensus/social/AccountUser.hpp" #include "pocketdb/consensus/social/AccountSetting.hpp" +#include "pocketdb/consensus/social/AccountDelete.hpp" #include "pocketdb/consensus/social/ContentDelete.hpp" #include "pocketdb/consensus/moderation/Flag.hpp" @@ -56,10 +57,12 @@ namespace PocketConsensus static tuple check(const CTransactionRef& tx, const PTransactionRef& ptx, int height); static bool isConsensusable(TxType txType); private: + static AccountUserConsensusFactory m_accountUserFactory; + static AccountSettingConsensusFactory m_accountSettingFactory; + static AccountDeleteConsensusFactory m_accountDeleteFactory; static PostConsensusFactory m_postFactory; static VideoConsensusFactory m_videoFactory; static ArticleConsensusFactory m_articleFactory; - static UserConsensusFactory m_userFactory; static CommentConsensusFactory m_commentFactory; static CommentEditConsensusFactory m_commentEditFactory; static CommentDeleteConsensusFactory m_commentDeleteFactory; @@ -71,7 +74,6 @@ namespace PocketConsensus static BlockingConsensusFactory m_blockingFactory; static BlockingCancelConsensusFactory m_blockingCancelFactory; static ComplainConsensusFactory m_complainFactory; - static AccountSettingConsensusFactory m_accountSettingFactory; static ContentDeleteConsensusFactory m_contentDeleteFactory; static BoostContentConsensusFactory m_boostContentFactory; diff --git a/src/pocketdb/consensus/Social.h b/src/pocketdb/consensus/Social.h index 47aa09c65..665dc922b 100644 --- a/src/pocketdb/consensus/Social.h +++ b/src/pocketdb/consensus/Social.h @@ -46,11 +46,15 @@ namespace PocketConsensus bool inBlock = false; for (auto& blockTx: *block) { - if (!TransactionHelper::IsIn(*blockTx->GetType(), {ACCOUNT_USER})) + if (!TransactionHelper::IsIn(*blockTx->GetType(), { ACCOUNT_USER, ACCOUNT_DELETE })) continue; if (*blockTx->GetString1() == address) { + // TODO (brangr): delete - в один блок пусть с удалением пролазят - проверитЬ! + // if (*blockTx->GetType() == ACCOUNT_DELETE) + // return {false, SocialConsensusResult_AccountDeleted}; + inBlock = true; break; } @@ -67,7 +71,7 @@ namespace PocketConsensus // Check registrations in DB if (!addressesForCheck.empty() && - !PocketDb::ConsensusRepoInst.ExistsUserRegistrations(addressesForCheck, false)) + !PocketDb::ConsensusRepoInst.ExistsUserRegistrations(addressesForCheck)) return {false, SocialConsensusResult_NotRegistered}; } diff --git a/src/pocketdb/consensus/moderation/Flag.hpp b/src/pocketdb/consensus/moderation/Flag.hpp index 0876413ef..8d8f19a47 100644 --- a/src/pocketdb/consensus/moderation/Flag.hpp +++ b/src/pocketdb/consensus/moderation/Flag.hpp @@ -45,7 +45,7 @@ namespace PocketConsensus return Success; } - + ConsensusValidateResult Check(const CTransactionRef& tx, const ModerationFlagRef& ptx) override { if (auto[baseCheck, baseCheckCode] = SocialConsensus::Check(tx, ptx); !baseCheck) diff --git a/src/pocketdb/consensus/social/AccountDelete.hpp b/src/pocketdb/consensus/social/AccountDelete.hpp new file mode 100644 index 000000000..b79b2b43f --- /dev/null +++ b/src/pocketdb/consensus/social/AccountDelete.hpp @@ -0,0 +1,107 @@ +// Copyright (c) 2018-2022 The Pocketnet developers +// Distributed under the Apache 2.0 software license, see the accompanying +// https://www.apache.org/licenses/LICENSE-2.0 + +#ifndef POCKETCONSENSUS_ACCOUNT_DELETE_HPP +#define POCKETCONSENSUS_ACCOUNT_DELETE_HPP + +#include "pocketdb/consensus/Social.h" +#include "pocketdb/models/dto/account/Delete.h" + +namespace PocketConsensus +{ + using namespace std; + typedef shared_ptr AccountDeleteRef; + + /******************************************************************************************************************* + * AccountDelete consensus base class + *******************************************************************************************************************/ + class AccountDeleteConsensus : public SocialConsensus + { + public: + AccountDeleteConsensus(int height) : SocialConsensus(height) {} + + ConsensusValidateResult Check(const CTransactionRef& tx, const AccountDeleteRef& ptx) override + { + if (auto[baseCheck, baseCheckCode] = SocialConsensus::Check(tx, ptx); !baseCheck) + return {false, baseCheckCode}; + + if (IsEmpty(ptx->GetAddress())) + return {false, SocialConsensusResult_Failed}; + + return EnableTransaction(); + } + + protected: + + virtual ConsensusValidateResult EnableTransaction() + { + return { false, SocialConsensusResult_NotAllowed }; + } + + ConsensusValidateResult ValidateBlock(const AccountDeleteRef& ptx, const PocketBlockRef& block) override + { + // Only one transaction allowed in block + for (auto& blockTx : *block) + { + if (!TransactionHelper::IsIn(*blockTx->GetType(), { ACCOUNT_USER, ACCOUNT_DELETE })) + continue; + + if (*ptx->GetHash() == *blockTx->GetHash()) + continue; + + auto blockPtx = static_pointer_cast(blockTx); + if (*ptx->GetAddress() == *blockPtx->GetAddress()) + return {false, SocialConsensusResult_ManyTransactions}; + } + + return Success; + } + + ConsensusValidateResult ValidateMempool(const AccountDeleteRef& ptx) override + { + if (ConsensusRepoInst.ExistsInMempool(*ptx->GetAddress(), { ACCOUNT_USER, ACCOUNT_DELETE })) + return {false, SocialConsensusResult_ManyTransactions}; + + return Success; + } + }; + + // TODO (brangr): remove after fork enabled + class AccountDeleteConsensus_checkpoint_enable : public AccountDeleteConsensus + { + public: + AccountDeleteConsensus_checkpoint_enable(int height) : AccountDeleteConsensus(height) {} + protected: + ConsensusValidateResult EnableTransaction() override + { + return Success; + } + }; + + /******************************************************************************************************************* + * Factory for select actual rules version + *******************************************************************************************************************/ + class AccountDeleteConsensusFactory + { + private: + const vector> m_rules = { + { 0, -1, [](int height) { return make_shared(height); }}, + { 9999999, 0, [](int height) { return make_shared(height); }}, // TODO (brangr): set fork height + }; + public: + shared_ptr Instance(int height) + { + int m_height = (height > 0 ? height : 0); + return (--upper_bound(m_rules.begin(), m_rules.end(), m_height, + [&](int target, const ConsensusCheckpoint& itm) + { + return target < itm.Height(Params().NetworkIDString()); + } + ))->m_func(m_height); + } + }; + +} // namespace PocketConsensus + +#endif // POCKETCONSENSUS_ACCOUNT_DELETE_HPP diff --git a/src/pocketdb/consensus/social/AccountSetting.hpp b/src/pocketdb/consensus/social/AccountSetting.hpp index 00df1342d..036d1273c 100644 --- a/src/pocketdb/consensus/social/AccountSetting.hpp +++ b/src/pocketdb/consensus/social/AccountSetting.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_ACCOUNT_SETTING_HPP #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/AccountSetting.h" +#include "pocketdb/models/dto/account/Setting.h" namespace PocketConsensus { @@ -22,15 +22,11 @@ namespace PocketConsensus AccountSettingConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const AccountSettingRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Check payload size if (auto[ok, code] = ValidatePayloadSize(ptx); !ok) return {false, code}; - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const AccountSettingRef& ptx) override { diff --git a/src/pocketdb/consensus/social/User.hpp b/src/pocketdb/consensus/social/AccountUser.hpp similarity index 64% rename from src/pocketdb/consensus/social/User.hpp rename to src/pocketdb/consensus/social/AccountUser.hpp index 3b93ba86c..3b2639c93 100644 --- a/src/pocketdb/consensus/social/User.hpp +++ b/src/pocketdb/consensus/social/AccountUser.hpp @@ -8,7 +8,7 @@ #include #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/User.h" +#include "pocketdb/models/dto/account/User.h" namespace PocketConsensus { @@ -16,17 +16,18 @@ namespace PocketConsensus typedef shared_ptr UserRef; /******************************************************************************************************************* - * User consensus base class + * AccountUser consensus base class *******************************************************************************************************************/ - class UserConsensus : public SocialConsensus + class AccountUserConsensus : public SocialConsensus { public: - UserConsensus(int height) : SocialConsensus(height) {} + AccountUserConsensus(int height) : SocialConsensus(height) {} + ConsensusValidateResult Validate(const CTransactionRef& tx, const UserRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; + // Check payload size + if (auto[ok, code] = ValidatePayloadSize(ptx); !ok) + return {false, code}; // Duplicate name if (ConsensusRepoInst.ExistsAnotherByName(*ptx->GetAddress(), *ptx->GetPayloadName())) @@ -35,12 +36,14 @@ namespace PocketConsensus return {false, SocialConsensusResult_NicknameDouble}; } - // Check payload size - if (auto[ok, code] = ValidatePayloadSize(ptx); !ok) - return {false, code}; + // The deleted account cannot be restored + if (auto[ok, type] = ConsensusRepoInst.GetLastAccountType(*ptx->GetAddress()); ok) + if (type == TxType::ACCOUNT_DELETE) + return {false, SocialConsensusResult_AccountDeleted}; - return ValidateEdit(ptx); + return SocialConsensus::Validate(tx, ptx, block); } + ConsensusValidateResult Check(const CTransactionRef& tx, const UserRef& ptx) override { if (auto[baseCheck, baseCheckCode] = SocialConsensus::Check(tx, ptx); !baseCheck) @@ -62,18 +65,20 @@ namespace PocketConsensus return Success; } + ConsensusValidateResult CheckOpReturnHash(const CTransactionRef& tx, const UserRef& ptx) override { return Success; } protected: + ConsensusValidateResult ValidateBlock(const UserRef& ptx, const PocketBlockRef& block) override { // Only one transaction allowed in block for (auto& blockTx: *block) { - if (!TransactionHelper::IsIn(*blockTx->GetType(), {ACCOUNT_USER})) + if (!TransactionHelper::IsIn(*blockTx->GetType(), { ACCOUNT_USER, ACCOUNT_DELETE })) continue; if (*blockTx->GetHash() == *ptx->GetHash()) @@ -95,9 +100,10 @@ namespace PocketConsensus return Success; } + ConsensusValidateResult ValidateMempool(const UserRef& ptx) override { - if (ConsensusRepoInst.CountMempoolUser(*ptx->GetAddress()) > 0) + if (ConsensusRepoInst.ExistsInMempool(*ptx->GetAddress(), { ACCOUNT_USER, ACCOUNT_DELETE })) return {false, SocialConsensusResult_ChangeInfoDoubleInMempool}; if (GetChainCount(ptx) > GetConsensusLimit(ConsensusLimit_edit_user_daily_count)) @@ -107,34 +113,7 @@ namespace PocketConsensus } vector GetAddressesForCheckRegistration(const UserRef& ptx) override { - return {}; - } - - virtual ConsensusValidateResult ValidateEdit(const UserRef& ptx) - { - // First user account transaction allowed without next checks - if (auto[ok, prevTxHeight] = ConsensusRepoInst.GetLastAccountHeight(*ptx->GetAddress()); !ok) - return Success; - - // Check editing limits - if (auto[ok, code] = ValidateEditLimit(ptx); !ok) - return {false, code}; - - return Success; - } - - virtual ConsensusValidateResult ValidateEditLimit(const UserRef& ptx) - { - // First user account transaction allowed without next checks - auto[prevOk, prevTime] = ConsensusRepoInst.GetLastAccountTime(*ptx->GetAddress()); - if (!prevOk) - return Success; - - // We allow edit profile only with delay - if ((*ptx->GetTime() - prevTime) <= GetConsensusLimit(ConsensusLimit_edit_user_depth)) - return {false, SocialConsensusResult_ChangeInfoLimit}; - - return Success; + return { }; } virtual int GetChainCount(const UserRef& ptx) @@ -181,40 +160,11 @@ namespace PocketConsensus } }; - /******************************************************************************************************************* - * Start checkpoint at 1180000 block - *******************************************************************************************************************/ - class UserConsensus_checkpoint_1180000 : public UserConsensus + class AccountUserConsensus_checkpoint_chain_count : public AccountUserConsensus { public: - UserConsensus_checkpoint_1180000(int height) : UserConsensus(height) {} + AccountUserConsensus_checkpoint_chain_count(int height) : AccountUserConsensus(height) {} protected: - ConsensusValidateResult ValidateEditLimit(const UserRef& ptx) override - { - // First user account transaction allowed without next checks - auto[ok, prevTxHeight] = ConsensusRepoInst.GetLastAccountHeight(*ptx->GetAddress()); - if (!ok) return Success; - - // We allow edit profile only with delay - if ((Height - prevTxHeight) <= GetConsensusLimit(ConsensusLimit_edit_user_depth)) - return {false, SocialConsensusResult_ChangeInfoLimit}; - - return Success; - } - }; - - /******************************************************************************************************************* - * Start checkpoint at 1381841 block - *******************************************************************************************************************/ - class UserConsensus_checkpoint_1381841 : public UserConsensus_checkpoint_1180000 - { - public: - UserConsensus_checkpoint_1381841(int height) : UserConsensus_checkpoint_1180000(height) {} - protected: - ConsensusValidateResult ValidateEditLimit(const UserRef& ptx) override - { - return Success; - } int GetChainCount(const UserRef& ptx) override { return ConsensusRepoInst.CountChainAccount( @@ -225,13 +175,10 @@ namespace PocketConsensus } }; - /******************************************************************************************************************* - * Limitations for username - *******************************************************************************************************************/ - class UserConsensus_checkpoint_login_limitation : public UserConsensus_checkpoint_1381841 + class AccountUserConsensus_checkpoint_login_limitation : public AccountUserConsensus_checkpoint_chain_count { public: - UserConsensus_checkpoint_login_limitation(int height) : UserConsensus_checkpoint_1381841(height) {} + AccountUserConsensus_checkpoint_login_limitation(int height) : AccountUserConsensus_checkpoint_chain_count(height) {} protected: ConsensusValidateResult CheckLogin(const UserRef& ptx) override @@ -250,7 +197,8 @@ namespace PocketConsensus return Success; } - // TODO (brangr): move to base class after this checkpoint + + // TODO (brangr): move to base class after this checkpoint - set test checkpoint records ConsensusValidateResult ValidateBlockDuplicateName(const UserRef& ptx, const UserRef& blockPtx) override { auto ptxName = *ptx->GetPayloadName(); @@ -260,11 +208,13 @@ namespace PocketConsensus boost::algorithm::to_lower(blockPtxName); if (ptxName == blockPtxName) - return {false, SocialConsensusResult_NicknameDouble}; + if (!CheckpointRepoInst.IsSocialCheckpoint(*ptx->GetHash(), *ptx->GetType(), SocialConsensusResult_NicknameDouble)) + return {false, SocialConsensusResult_NicknameDouble}; return Success; } - // TODO (brangr): move to base class after this checkpoint + + // TODO (brangr): move to base class after this checkpoint - set test checkpoint records ConsensusValidateResult CheckOpReturnHash(const CTransactionRef& tx, const UserRef& ptx) override { auto ptxORHash = ptx->BuildHash(); @@ -280,24 +230,20 @@ namespace PocketConsensus }; - /******************************************************************************************************************* - * Factory for select actual rules version - *******************************************************************************************************************/ - class UserConsensusFactory + class AccountUserConsensusFactory { private: - const vector> m_rules = { - { 0, -1, [](int height) { return make_shared(height); }}, - { 1180000, 0, [](int height) { return make_shared(height); }}, - { 1381841, 162000, [](int height) { return make_shared(height); }}, - { 1647000, 650000, [](int height) { return make_shared(height); }}, // ~ 03/25/2022 + const vector> m_rules = { + { 0, -1, [](int height) { return make_shared(height); }}, + { 1381841, 162000, [](int height) { return make_shared(height); }}, + { 1647000, 650000, [](int height) { return make_shared(height); }}, }; public: - shared_ptr Instance(int height) + shared_ptr Instance(int height) { int m_height = (height > 0 ? height : 0); return (--upper_bound(m_rules.begin(), m_rules.end(), m_height, - [&](int target, const ConsensusCheckpoint& itm) + [&](int target, const ConsensusCheckpoint& itm) { return target < itm.Height(Params().NetworkIDString()); } diff --git a/src/pocketdb/consensus/social/Article.hpp b/src/pocketdb/consensus/social/Article.hpp index afa28ede2..9344acee7 100644 --- a/src/pocketdb/consensus/social/Article.hpp +++ b/src/pocketdb/consensus/social/Article.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_ARTICLE_H #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/Article.h" +#include "pocketdb/models/dto/content/Article.h" namespace PocketConsensus { @@ -23,10 +23,6 @@ namespace PocketConsensus ArticleConsensus(int height) : SocialConsensus
(height) {} tuple Validate(const CTransactionRef& tx, const ArticleRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Check payload size if (auto[ok, code] = ValidatePayloadSize(ptx); !ok) return {false, code}; @@ -34,7 +30,7 @@ namespace PocketConsensus if (ptx->IsEdit()) return ValidateEdit(ptx); - return Success; + return SocialConsensus::Validate(tx, ptx, block); } tuple Check(const CTransactionRef& tx, const ArticleRef& ptx) override { diff --git a/src/pocketdb/consensus/social/Blocking.hpp b/src/pocketdb/consensus/social/Blocking.hpp index 738bcc0dd..286e7f592 100644 --- a/src/pocketdb/consensus/social/Blocking.hpp +++ b/src/pocketdb/consensus/social/Blocking.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_BLOCKING_HPP #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/Blocking.h" +#include "pocketdb/models/dto/action/Blocking.h" namespace PocketConsensus { @@ -22,10 +22,6 @@ namespace PocketConsensus BlockingConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const BlockingRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Double blocking in chain if (auto[existsBlocking, blockingType] = PocketDb::ConsensusRepoInst.GetLastBlockingType( *ptx->GetAddress(), @@ -36,7 +32,7 @@ namespace PocketConsensus return {false, SocialConsensusResult_DoubleBlocking}; } - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const BlockingRef& ptx) override { diff --git a/src/pocketdb/consensus/social/BlockingCancel.hpp b/src/pocketdb/consensus/social/BlockingCancel.hpp index 5c68ce9de..0534df750 100644 --- a/src/pocketdb/consensus/social/BlockingCancel.hpp +++ b/src/pocketdb/consensus/social/BlockingCancel.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_BLOCKINGCANCEL_HPP #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/BlockingCancel.h" +#include "pocketdb/models/dto/action/BlockingCancel.h" namespace PocketConsensus { @@ -22,10 +22,6 @@ namespace PocketConsensus BlockingCancelConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const BlockingCancelRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - if (auto[existsBlocking, blockingType] = PocketDb::ConsensusRepoInst.GetLastBlockingType( *ptx->GetAddress(), *ptx->GetAddressTo() @@ -35,7 +31,7 @@ namespace PocketConsensus return {false, SocialConsensusResult_InvalidBlocking}; } - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const BlockingCancelRef& ptx) override { diff --git a/src/pocketdb/consensus/social/BoostContent.hpp b/src/pocketdb/consensus/social/BoostContent.hpp index e6e9ff8f2..95665f15d 100644 --- a/src/pocketdb/consensus/social/BoostContent.hpp +++ b/src/pocketdb/consensus/social/BoostContent.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_BOOSTCONTENT_HPP #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/BoostContent.h" +#include "pocketdb/models/dto/action/BoostContent.h" namespace PocketConsensus { @@ -23,10 +23,6 @@ namespace PocketConsensus ConsensusValidateResult Validate(const CTransactionRef& tx, const BoostContentRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Check exists content transaction auto[contentOk, contentTx] = PocketDb::ConsensusRepoInst.GetLastContent(*ptx->GetContentTxHash(), { CONTENT_POST, CONTENT_VIDEO, CONTENT_ARTICLE, CONTENT_DELETE }); if (!contentOk) @@ -39,7 +35,7 @@ namespace PocketConsensus if (auto[ok, result] = ValidateBlocking(*contentTx->GetString1(), ptx); !ok) return {false, result}; - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const BoostContentRef& ptx) override { diff --git a/src/pocketdb/consensus/social/Comment.hpp b/src/pocketdb/consensus/social/Comment.hpp index 88253c07e..bf85e4a10 100644 --- a/src/pocketdb/consensus/social/Comment.hpp +++ b/src/pocketdb/consensus/social/Comment.hpp @@ -8,7 +8,7 @@ #include "util/html.h" #include "pocketdb/consensus/Reputation.h" #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/Comment.h" +#include "pocketdb/models/dto/content/Comment.h" namespace PocketConsensus { @@ -24,14 +24,9 @@ namespace PocketConsensus CommentConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const CommentRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Parent comment if (!IsEmpty(ptx->GetParentTxHash())) { - // TODO (brangr): replace to check exists not deleted comment auto[ok, parentTx] = ConsensusRepoInst.GetLastContent(*ptx->GetParentTxHash(), { CONTENT_COMMENT, CONTENT_COMMENT_EDIT }); if (!ok) @@ -41,11 +36,7 @@ namespace PocketConsensus // Answer comment if (!IsEmpty(ptx->GetAnswerTxHash())) { - // TODO (brangr): replace to check exists not deleted comment - auto[ok, answerTx] = ConsensusRepoInst.GetLastContent( - *ptx->GetAnswerTxHash(), - { CONTENT_COMMENT, CONTENT_COMMENT_EDIT } - ); + auto[ok, answerTx] = ConsensusRepoInst.GetLastContent(*ptx->GetAnswerTxHash(), { CONTENT_COMMENT, CONTENT_COMMENT_EDIT }); if (!ok) return {false, SocialConsensusResult_InvalidParentComment}; @@ -74,7 +65,7 @@ namespace PocketConsensus if (auto[ok, code] = ValidatePayloadSize(ptx); !ok) return {false, code}; - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const CommentRef& ptx) override { diff --git a/src/pocketdb/consensus/social/CommentDelete.hpp b/src/pocketdb/consensus/social/CommentDelete.hpp index c0dc0c336..7f881295c 100644 --- a/src/pocketdb/consensus/social/CommentDelete.hpp +++ b/src/pocketdb/consensus/social/CommentDelete.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_COMMENT_DELETE_HPP #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/CommentDelete.h" +#include "pocketdb/models/dto/content/CommentDelete.h" namespace PocketConsensus { @@ -23,10 +23,6 @@ namespace PocketConsensus ConsensusValidateResult Validate(const CTransactionRef& tx, const CommentDeleteRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Actual comment not deleted auto[actuallTxOk, actuallTx] = ConsensusRepoInst.GetLastContent( *ptx->GetRootTxHash(), @@ -80,7 +76,7 @@ namespace PocketConsensus if (auto[ok, result] = CheckAuthor(ptx, originalPtx, contentTx); !ok) return {false, result}; - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const CommentDeleteRef& ptx) override { diff --git a/src/pocketdb/consensus/social/CommentEdit.hpp b/src/pocketdb/consensus/social/CommentEdit.hpp index 9d55a2dbd..bc51ce159 100644 --- a/src/pocketdb/consensus/social/CommentEdit.hpp +++ b/src/pocketdb/consensus/social/CommentEdit.hpp @@ -8,7 +8,7 @@ #include "util/html.h" #include "pocketdb/consensus/Reputation.h" #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/CommentEdit.h" +#include "pocketdb/models/dto/content/CommentEdit.h" namespace PocketConsensus { @@ -24,10 +24,6 @@ namespace PocketConsensus CommentEditConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const CommentEditRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Actual comment not deleted auto[actuallTxOk, actuallTx] = ConsensusRepoInst.GetLastContent( *ptx->GetRootTxHash(), @@ -57,7 +53,6 @@ namespace PocketConsensus if (!origParentTxHash.empty()) { - // TODO (brangr): replace to check exists not deleted comment if (auto[ok, origParentTx] = ConsensusRepoInst.GetLastContent( origParentTxHash, { CONTENT_COMMENT, CONTENT_COMMENT_EDIT }); !ok) return {false, SocialConsensusResult_InvalidParentComment}; @@ -74,7 +69,6 @@ namespace PocketConsensus if (!origAnswerTxHash.empty()) { - // TODO (brangr): replace to check exists not deleted comment if (auto[ok, origAnswerTx] = ConsensusRepoInst.GetLastContent( origAnswerTxHash, { CONTENT_COMMENT, CONTENT_COMMENT_EDIT }); !ok) return {false, SocialConsensusResult_InvalidAnswerComment}; @@ -94,9 +88,6 @@ namespace PocketConsensus if (*contentTx->GetType() == CONTENT_DELETE) return {false, SocialConsensusResult_CommentDeletedContent}; - - // TODO (brangr): convert to Content base class - // Check Blocking if (auto[existsBlocking, blockingType] = PocketDb::ConsensusRepoInst.GetLastBlockingType( @@ -109,7 +100,10 @@ namespace PocketConsensus return {false, code}; // Check edit limit - return ValidateEditOneLimit(ptx); + if (auto[checkResult, checkCode] = ValidateEditOneLimit(ptx); !checkResult) + return {false, checkCode}; + + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const CommentEditRef& ptx) override { diff --git a/src/pocketdb/consensus/social/Complain.hpp b/src/pocketdb/consensus/social/Complain.hpp index b4734092b..565c5f896 100644 --- a/src/pocketdb/consensus/social/Complain.hpp +++ b/src/pocketdb/consensus/social/Complain.hpp @@ -7,7 +7,7 @@ #include "pocketdb/consensus/Reputation.h" #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/Complain.h" +#include "pocketdb/models/dto/action/Complain.h" namespace PocketConsensus { @@ -23,10 +23,6 @@ namespace PocketConsensus ComplainConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const ComplainRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Author or post must be exists auto[lastContentOk, lastContent] = PocketDb::ConsensusRepoInst.GetLastContent( *ptx->GetPostTxHash(), @@ -63,7 +59,7 @@ namespace PocketConsensus if (PocketDb::ConsensusRepoInst.ExistsComplain(*ptx->GetPostTxHash(), *ptx->GetAddress(), false)) return {false, SocialConsensusResult_DoubleComplain}; - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const ComplainRef& ptx) override { diff --git a/src/pocketdb/consensus/social/ContentDelete.hpp b/src/pocketdb/consensus/social/ContentDelete.hpp index 5fe2622d8..e20c1757a 100644 --- a/src/pocketdb/consensus/social/ContentDelete.hpp +++ b/src/pocketdb/consensus/social/ContentDelete.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_CONTENT_DELETE_HPP #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/ContentDelete.h" +#include "pocketdb/models/dto/content/ContentDelete.h" namespace PocketConsensus { @@ -22,10 +22,6 @@ namespace PocketConsensus ContentDeleteConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const ContentDeleteRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Actual content not deleted auto[ok, actuallTx] = ConsensusRepoInst.GetLastContent( *ptx->GetRootTxHash(), @@ -43,7 +39,7 @@ namespace PocketConsensus if (*ptx->GetAddress() != *actuallTx->GetString1()) return {false, SocialConsensusResult_ContentDeleteUnauthorized}; - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const ContentDeleteRef& ptx) override { diff --git a/src/pocketdb/consensus/social/Post.hpp b/src/pocketdb/consensus/social/Post.hpp index f9d9d19b7..6e673ef39 100644 --- a/src/pocketdb/consensus/social/Post.hpp +++ b/src/pocketdb/consensus/social/Post.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_POST_H #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/Post.h" +#include "pocketdb/models/dto/content/Post.h" namespace PocketConsensus { @@ -26,10 +26,6 @@ namespace PocketConsensus PostConsensus(int height) : SocialConsensus(height) {} tuple Validate(const CTransactionRef& tx, const PostRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Check if this post relay another if (!IsEmpty(ptx->GetRelayTxHash())) { @@ -60,7 +56,7 @@ namespace PocketConsensus if (ptx->IsEdit()) return ValidateEdit(ptx); - return Success; + return SocialConsensus::Validate(tx, ptx, block); } tuple Check(const CTransactionRef& tx, const PostRef& ptx) override { diff --git a/src/pocketdb/consensus/social/ScoreComment.hpp b/src/pocketdb/consensus/social/ScoreComment.hpp index ba92b08b0..bc6bc4394 100644 --- a/src/pocketdb/consensus/social/ScoreComment.hpp +++ b/src/pocketdb/consensus/social/ScoreComment.hpp @@ -5,9 +5,9 @@ #ifndef POCKETCONSENSUS_SCORECOMMENT_HPP #define POCKETCONSENSUS_SCORECOMMENT_HPP -#include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/ScoreComment.h" #include "pocketdb/consensus/Reputation.h" +#include "pocketdb/consensus/Social.h" +#include "pocketdb/models/dto/action/ScoreComment.h" namespace PocketConsensus { @@ -24,10 +24,6 @@ namespace PocketConsensus ConsensusValidateResult Validate(const CTransactionRef& tx, const ScoreCommentRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Check already scored content if (PocketDb::ConsensusRepoInst.ExistsScore( *ptx->GetAddress(), *ptx->GetCommentTxHash(), ACTION_SCORE_COMMENT, false)) @@ -86,7 +82,7 @@ namespace PocketConsensus return {false, SocialConsensusResult_FailedOpReturn}; } - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const ScoreCommentRef& ptx) override { diff --git a/src/pocketdb/consensus/social/ScoreContent.hpp b/src/pocketdb/consensus/social/ScoreContent.hpp index 4e0391484..931e69483 100644 --- a/src/pocketdb/consensus/social/ScoreContent.hpp +++ b/src/pocketdb/consensus/social/ScoreContent.hpp @@ -7,7 +7,7 @@ #include "pocketdb/consensus/Reputation.h" #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/ScoreContent.h" +#include "pocketdb/models/dto/action/ScoreContent.h" namespace PocketConsensus { @@ -24,10 +24,6 @@ namespace PocketConsensus ConsensusValidateResult Validate(const CTransactionRef& tx, const ScoreContentRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Check already scored content if (PocketDb::ConsensusRepoInst.ExistsScore(*ptx->GetAddress(), *ptx->GetContentTxHash(), ACTION_SCORE_CONTENT, false)) return {false, SocialConsensusResult_DoubleScore}; @@ -79,7 +75,7 @@ namespace PocketConsensus return {false, SocialConsensusResult_FailedOpReturn}; } - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const ScoreContentRef& ptx) override { diff --git a/src/pocketdb/consensus/social/Subscribe.hpp b/src/pocketdb/consensus/social/Subscribe.hpp index 476806a5f..fcadd1cd1 100644 --- a/src/pocketdb/consensus/social/Subscribe.hpp +++ b/src/pocketdb/consensus/social/Subscribe.hpp @@ -7,7 +7,7 @@ #include "pocketdb/consensus/Social.h" #include "pocketdb/models/base/Transaction.h" -#include "pocketdb/models/dto/Subscribe.h" +#include "pocketdb/models/dto/action/Subscribe.h" namespace PocketConsensus { @@ -23,10 +23,6 @@ namespace PocketConsensus SubscribeConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const SubscribeRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - auto[subscribeExists, subscribeType] = PocketDb::ConsensusRepoInst.GetLastSubscribeType( *ptx->GetAddress(), *ptx->GetAddressTo()); @@ -41,7 +37,7 @@ namespace PocketConsensus if (auto[ok, result] = ValidateBlocking(ptx); !ok) return {false, result}; - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const SubscribeRef& ptx) override { diff --git a/src/pocketdb/consensus/social/SubscribeCancel.hpp b/src/pocketdb/consensus/social/SubscribeCancel.hpp index c4b2b8a6c..5eef40df8 100644 --- a/src/pocketdb/consensus/social/SubscribeCancel.hpp +++ b/src/pocketdb/consensus/social/SubscribeCancel.hpp @@ -7,7 +7,7 @@ #include "pocketdb/consensus/Social.h" #include "pocketdb/models/base/Transaction.h" -#include "pocketdb/models/dto/SubscribeCancel.h" +#include "pocketdb/models/dto/action/SubscribeCancel.h" namespace PocketConsensus { @@ -23,10 +23,6 @@ namespace PocketConsensus SubscribeCancelConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const SubscribeCancelRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Last record not valid subscribe auto[subscribeExists, subscribeType] = PocketDb::ConsensusRepoInst.GetLastSubscribeType( *ptx->GetAddress(), @@ -38,7 +34,7 @@ namespace PocketConsensus return {false, SocialConsensusResult_InvalideSubscribe}; } - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const SubscribeCancelRef& ptx) override { diff --git a/src/pocketdb/consensus/social/SubscribePrivate.hpp b/src/pocketdb/consensus/social/SubscribePrivate.hpp index cb0dc9997..fcf29b234 100644 --- a/src/pocketdb/consensus/social/SubscribePrivate.hpp +++ b/src/pocketdb/consensus/social/SubscribePrivate.hpp @@ -6,7 +6,7 @@ #define POCKETCONSENSUS_SUBSCRIBEPRIVATE_HPP #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/SubscribePrivate.h" +#include "pocketdb/models/dto/action/SubscribePrivate.h" namespace PocketConsensus { @@ -22,10 +22,6 @@ namespace PocketConsensus SubscribePrivateConsensus(int height) : SocialConsensus(height) {} ConsensusValidateResult Validate(const CTransactionRef& tx, const SubscribePrivateRef& ptx, const PocketBlockRef& block) override { - // Base validation with calling block or mempool check - if (auto[baseValidate, baseValidateCode] = SocialConsensus::Validate(tx, ptx, block); !baseValidate) - return {false, baseValidateCode}; - // Check double subscribe auto[subscribeExists, subscribeType] = PocketDb::ConsensusRepoInst.GetLastSubscribeType( *ptx->GetAddress(), @@ -41,7 +37,7 @@ namespace PocketConsensus if (auto[ok, result] = ValidateBlocking(ptx); !ok) return {false, result}; - return Success; + return SocialConsensus::Validate(tx, ptx, block); } ConsensusValidateResult Check(const CTransactionRef& tx, const SubscribePrivateRef& ptx) override { diff --git a/src/pocketdb/consensus/social/Video.hpp b/src/pocketdb/consensus/social/Video.hpp index 35969a7ae..e77441d5b 100644 --- a/src/pocketdb/consensus/social/Video.hpp +++ b/src/pocketdb/consensus/social/Video.hpp @@ -7,7 +7,7 @@ #include "pocketdb/consensus/Reputation.h" #include "pocketdb/consensus/Social.h" -#include "pocketdb/models/dto/Video.h" +#include "pocketdb/models/dto/content/Video.h" namespace PocketConsensus { @@ -23,10 +23,6 @@ namespace PocketConsensus VideoConsensus(int height) : SocialConsensus