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

Merge develop to beatrice 2022-04 #660

Merged
serkixenos merged 79 commits from develop into beatrice 2022-04-14 08:38:52 +00:00
Conversation 23 Commits 79 Files changed 66 +3960 -1822
serkixenos commented 2022-03-08 23:05:09 +00:00 (Migrated from gitlab.com)
Copy link
No description provided.
serkixenos commented 2022-03-08 23:05:09 +00:00 (Migrated from gitlab.com)
Copy link

assigned to @serkixenos

assigned to @serkixenos
bobinson (Migrated from gitlab.com) approved these changes 2022-03-08 23:05:09 +00:00
serkixenos commented 2022-03-08 23:21:30 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • f169e7a7 - #313 son deposit manually
  • d347d3d0 - Merge branch 'feature/313-son-deposit-manually' into 'develop'

Compare with previous version

added 2 commits <ul><li>f169e7a7 - #313 son deposit manually</li><li>d347d3d0 - Merge branch &#39;feature/313-son-deposit-manually&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=347008148&start_sha=0740bceb745c73c715bf834a693dd510099cf9ce)
serkixenos commented 2022-03-08 23:23:45 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • 7729c09c - Add constraints in changing global parameters
  • 21e13ac4 - Merge branch 'bug/149/prevent_misconfiguration_of_blockchain_parameters' into 'develop'

Compare with previous version

added 2 commits <ul><li>7729c09c - Add constraints in changing global parameters</li><li>21e13ac4 - Merge branch &#39;bug/149/prevent_misconfiguration_of_blockchain_parameters&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=347009050&start_sha=d347d3d01b7bbf0ceeebbdff96d44b8942637be5)
serkixenos commented 2022-03-16 14:35:57 +00:00 (Migrated from gitlab.com)
Copy link

mentioned in issue #323

mentioned in issue #323
serkixenos commented 2022-03-16 14:50:39 +00:00 (Migrated from gitlab.com)
Copy link

added 3 commits

  • f3666d74 - sidechain_withdrawal_transaction
  • a5a8d6c6 - sidechain_withdraw_transaction_test
  • 237889f6 - Merge branch 'feature/314-sidechain_withdrawal_transaction' into 'develop'

Compare with previous version

added 3 commits <ul><li>f3666d74 - sidechain_withdrawal_transaction</li><li>a5a8d6c6 - sidechain_withdraw_transaction_test</li><li>237889f6 - Merge branch &#39;feature/314-sidechain_withdrawal_transaction&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=352731615&start_sha=21e13ac4d4049d6856bf8268dba3a8973463d5cc)
serkixenos commented 2022-03-18 22:36:33 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • d1e425e3 - Fix update son parameters on maintenance
  • f4a0b3fb - Merge branch 'bug/315/remove_hardcoded_chain_parameters' into 'develop'

Compare with previous version

added 2 commits <ul><li>d1e425e3 - Fix update son parameters on maintenance</li><li>f4a0b3fb - Merge branch &#39;bug/315/remove_hardcoded_chain_parameters&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=354863904&start_sha=237889f6219f731077ed69acd7ff326ba3052d90)
serkixenos commented 2022-03-18 23:30:15 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 23e40e10 - Update wallet library Doxygen file, for cleaner build output

Compare with previous version

added 1 commit <ul><li>23e40e10 - Update wallet library Doxygen file, for cleaner build output</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=354875412&start_sha=f4a0b3fb6dbb20e180bb50775058f85dcb394417)
serkixenos commented 2022-03-21 14:50:04 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • ee018cf5 - #325 Refactor importing BTC addresses into son-wallet
  • a408ed0d - Merge branch 'feature/325-import-btc-addresses' into 'develop'

Compare with previous version

added 2 commits <ul><li>ee018cf5 - #325 Refactor importing BTC addresses into son-wallet</li><li>a408ed0d - Merge branch &#39;feature/325-import-btc-addresses&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=355713965&start_sha=23e40e1004c11d04e6f18e253e2a3837f4c0dcd5)
serkixenos commented 2022-03-21 15:19:26 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 7f5a92fb - Remove deposit/withdrawal cli tests

Compare with previous version

added 1 commit <ul><li>7f5a92fb - Remove deposit/withdrawal cli tests</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=355747815&start_sha=a408ed0dda9a4f4259aa7db86f4800bca9678af4)
serkixenos commented 2022-03-23 12:12:39 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • bfa7b131 - issue 327 fixed, add block_num
  • ddd0d2fd - Merge branch 'feature/314-sidechain_withdrawal_transaction' into 'develop'

Compare with previous version

added 2 commits <ul><li>bfa7b131 - issue 327 fixed, add block_num</li><li>ddd0d2fd - Merge branch &#39;feature/314-sidechain_withdrawal_transaction&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=357538564&start_sha=7f5a92fb1ef9a6b29237dc69ad12cd4e01055af0)
serkixenos commented 2022-03-23 13:04:02 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 65ba17ad - HARDFORK_SON3_TIME to 2022-04-01T00:00:00, limit wallet rescan from 2022-01-01

Compare with previous version

added 1 commit <ul><li>65ba17ad - HARDFORK_SON3_TIME to 2022-04-01T00:00:00, limit wallet rescan from 2022-01-01</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=357592862&start_sha=ddd0d2fd1676c9b1af4d36f181ccbfd983af010e)
serkixenos commented 2022-03-23 13:25:09 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 4ef0163b - Add missing cli wallet command parameter descriptions

Compare with previous version

added 1 commit <ul><li>4ef0163b - Add missing cli wallet command parameter descriptions</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=357617493&start_sha=65ba17adb0a6a80681f781bfdecf94653c80b1a2)
serkixenos commented 2022-03-23 17:32:20 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • c0bbcca0 - Update clang format config to clang-format 10

Compare with previous version

added 1 commit <ul><li>c0bbcca0 - Update clang format config to clang-format 10</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=357891998&start_sha=4ef0163bf2d6663ebdda759ffc7d77433c1b3496)
serkixenos commented 2022-03-23 17:37:34 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • d07c343b - Support parsing addresses for bitcoin v21 and v22
  • d39f838e - Merge branch 'bug/324/refactor_Bitcoin_block_parsing_v0.21_v0.22' into 'develop'

Compare with previous version

added 2 commits <ul><li>d07c343b - Support parsing addresses for bitcoin v21 and v22</li><li>d39f838e - Merge branch &#39;bug/324/refactor_Bitcoin_block_parsing_v0.21_v0.22&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=357896803&start_sha=c0bbcca0cf0f4d8cf3a677b5cfbefd96f70d9827)
serkixenos commented 2022-03-23 21:47:03 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 0e5d599f - Improved error checks and messages for BTC transfer fees

Compare with previous version

added 1 commit <ul><li>0e5d599f - Improved error checks and messages for BTC transfer fees</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=358069188&start_sha=d39f838eb8e3a01a0c88ee720967e1d139a3be82)
serkixenos commented 2022-04-01 12:21:02 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • ad0b5afb - #337 lock/unlock importmulti
  • 48096198 - Merge branch 'feature/337-lock-importmulti-unlock' into 'develop'

Compare with previous version

added 2 commits <ul><li>ad0b5afb - #337 lock/unlock importmulti</li><li>48096198 - Merge branch &#39;feature/337-lock-importmulti-unlock&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=364684517&start_sha=0e5d599fdd4208f1064c2d354c055b962fdbc975)
serkixenos commented 2022-04-04 19:48:29 +00:00 (Migrated from gitlab.com)
Copy link

changed title from Merge develop to beatrice 2022-0{-3-} to Merge develop to beatrice 2022-0{+4+}

changed title from **Merge develop to beatrice 2022-0{-3-}** to **Merge develop to beatrice 2022-0{+4+}**
serkixenos commented 2022-04-05 12:47:35 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • 03836d37 - Sidechain API, SONs listener log
  • 44b2d21d - Merge branch 'feature/sidechain-api' into 'develop'

Compare with previous version

added 2 commits <ul><li>03836d37 - Sidechain API, SONs listener log</li><li>44b2d21d - Merge branch &#39;feature/sidechain-api&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=366846766&start_sha=480961989240557bc645383fb3d4c820ec676353)
serkixenos commented 2022-04-05 22:34:37 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 6ee37d09 - Set HARDFORK_SON3_TIME to 2022-04-24T00:00:00

Compare with previous version

added 1 commit <ul><li>6ee37d09 - Set HARDFORK_SON3_TIME to 2022-04-24T00:00:00</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=367317143&start_sha=44b2d21d789a94d7123d6f022c3d1d7ea4400128)
serkixenos commented 2022-04-06 23:23:50 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

  • d49017ff - #336 exception parse json
  • d7c65450 - Merge branch 'bug/336-exception-parse-json' into 'develop'

Compare with previous version

added 2 commits <ul><li>d49017ff - #336 exception parse json</li><li>d7c65450 - Merge branch &#39;bug/336-exception-parse-json&#39; into &#39;develop&#39;</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=368339910&start_sha=6ee37d091618a7268f526828a3de53bcb58c17b1)
serkixenos commented 2022-04-13 14:43:12 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 6eccec2b - Set SON3 hardfork date to 2022-04-30T00:00:00

Compare with previous version

added 1 commit <ul><li>6eccec2b - Set SON3 hardfork date to 2022-04-30T00:00:00</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/80/diffs?diff_id=373066834&start_sha=d7c654500ec75710fcbf5f0cc0044362c63d4270)
bobinson commented 2022-04-14 08:36:47 +00:00 (Migrated from gitlab.com)
Copy link

approved this merge request

approved this merge request
bobinson commented 2022-04-14 08:38:50 +00:00 (Migrated from gitlab.com)
Copy link

mentioned in commit 93b60efba5

mentioned in commit 93b60efba5de9ee8385b3e54de3c0c6bffa39753
bobinson (Migrated from gitlab.com) merged commit 93b60efba5 into beatrice 2022-04-14 08:38:53 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
bobinson
Labels
Clear labels   
confirmed

   
DevOps

   
documentation

   
enhancement

   
incident

Denotes a disruption to IT services and the associated issues require immediate attention

  
Medium

   
priority::Critical

(optional) Issues that are marked as critical priority. Should be taken care of ASAP.

  
priority::High

(optional) Issues that are marked as high priority.

  
priority::Low

(optional) Issues that are marked as low priority.

  
priority::Medium

(optional) Issues that are marked as medium priority.

  
QA-TestCases::Done

QA-Labels

  
QA-TestCases::InProgress

QA-Labels

  
RNG

   
security

(optional) Issues that relate to the security of the project.

  
severity:: Critical

   
severity:: High

   
severity:: Low

   
severity:: Medium

   
state:: Accepted

Issues that are newly created and have been accepted after review.

  
state:: Blocked

Issues that cannot be worked on due to other factors linked to it.

  
state:: Done

Issues that are closed with a working solution.

  
state:: in progress

Issues that are currently being worked on.

  
state:: in review

Issues that require a proposed solution to be reviewed.

  
state:: on hold

Issues that were at least accepted, that should not be worked on at the moment.

  
state:: Pending

Issues that are newly created and haven't been reviewed.

  
state:: Pushed to Prod

Tickets are verified in the stage infra and needs to be deployed in the production

  
state:: Revision Needed

Issues that need to be revised before being accepted.

  
state::out-of-scope

Task and issues which are out of scope due to change in requirements

  
suggestion

   
support

   
To Do

   
type :: Discussion

   
type :: Duplicate

(optional) Issues that are duplicates of existing issues in the same project.

  
type:: interaction-design

   
type:: New Feature

Issues that bring new functionality to the project.

  
type::bug

BUG

  
type::documentation

Issues that relate to the documentation of the project.

  
type::incident

severe issues that require immediate response

  
type::maintenance

Issues that require maintenance on the project.

  
type::question

Issues that are questions related to the project.

  
type::recurring-tasks

This label is used to track recurring tasks which may repeat daily, weekly or monthly.

  
vulnerability
No labels
confirmed
DevOps
documentation
enhancement
incident
Medium
priority::Critical
priority::High
priority::Low
priority::Medium
QA-TestCases::Done
QA-TestCases::InProgress
RNG
security
severity:: Critical
severity:: High
severity:: Low
severity:: Medium
state:: Accepted
state:: Blocked
state:: Done
state:: in progress
state:: in review
state:: on hold
state:: Pending
state:: Pushed to Prod
state:: Revision Needed
state::out-of-scope
suggestion
support
To Do
type :: Discussion
type :: Duplicate
type:: interaction-design
type:: New Feature
type::bug
type::documentation
type::incident
type::maintenance
type::question
type::recurring-tasks
vulnerability
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Peerplays_Blockchain/peerplays_migrated#660
No description provided.
Delete branch "develop"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?