Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For Cycle 30 #939

Closed
ripcurlx opened this issue Nov 10, 2021 · 5 comments
Closed

For Cycle 30 #939

ripcurlx opened this issue Nov 10, 2021 · 5 comments
Assignees
Labels
parsed:valid https://bisq.wiki/Compensation#Ensure_your_request_is_valid team:dev https://bisq.wiki/Dev_Team team:ops https://bisq.wiki/Ops_Team was:accepted Indicates that a compensation request was accepted by DAO voting
Milestone

Comments

@ripcurlx
Copy link
Contributor

ripcurlx commented Nov 10, 2021

Summary

Specify the total amount of BSQ you are requesting, along with the USD total and BSQ/USD rate (don't include the brackets!):

  • BSQ requested: 3537
  • USD requested: 6262
  • BSQ rate: 1.77 USD per BSQ
  • Previous compensation request (if applicable): For Cycle 28 #904

As I missed to submit my PR in time for Cycle 29 voting (#931), this is a compound CR for Cycle 29 and Cycle 30.

Contributions delivered

Add contributions you have delivered and roles you have performed here as new rows in the table below. Role line-items should include an asterisk (*) in the team column.

Title Team USD Link Notes
Bisq Desktop Maintainer (Cycle 29) dev* 1110 bisq-network/roles#63 (comment)
Bisq Desktop Maintainer (Cycle 30) dev* 2000 bisq-network/roles#63 (comment)
Bitcoin Fullnode Operator (Cycle 29) ops* 50 bisq-network/roles#67 (comment)
Bitcoin Fullnode Operator (Cycle 30) ops* 50 bisq-network/roles#67 (comment)
GitHub Admin (Cycle 29) ops* 25 bisq-network/roles#16 (comment)
GitHub Admin (Cycle 30) ops* 25 bisq-network/roles#16 (comment)
Release preparations (Cycle 29) dev* 300 v1.7.4
Release preparations (Cycle 30) dev* 600 v1.7.5 - Release process created more effort because of different infrastructure updates and changes
Testing (Cycle 29) dev 180 Test reports for v1.7.4
Testing (Cycle 30) dev 60 Test reports for v1.7.5
PR Review #5127 dev 44 bisq-network/bisq#5127
PR Review #5680 dev 106 bisq-network/bisq#5680
PR Review #5696 dev 12 bisq-network/bisq#5696
PR Review #5704 dev 4 bisq-network/bisq#5704
PR Review #5721 dev 4 bisq-network/bisq#5721
PR Review #5723 dev 4 bisq-network/bisq#5723
PR Review #5735 dev 20 bisq-network/bisq#5735
PR Review #5740 dev 8 bisq-network/bisq#5740
PR Review #5741 dev 36 bisq-network/bisq#5741
PR Review #5742 dev 26 bisq-network/bisq#5742
PR Review #5745 dev 14 bisq-network/bisq#5745
PR Review #5747 dev 48 bisq-network/bisq#5747
PR Review #5055 - Add "Buy BSQ" button dev 360 bisq-network/bisq#5055 This is not only about review efforts, but also lots of additional changes on top to make it work
PR Review #5775 dev 60 bisq-network/bisq#5775
PR Review #5782 dev 240 bisq-network/bisq#5782
PR Review #5790 dev 120 bisq-network/bisq#5790
PR Review #5794 dev 240 bisq-network/bisq#5794
PR Review #5819 dev 156 bisq-network/bisq#5819
PR Review #5824 dev 100 bisq-network/bisq#5824
PR Review #5826 dev 100 bisq-network/bisq#5826
PR Review #5827 dev 160 bisq-network/bisq#5827

I'm not putting up my team lead efforts up for compensation (~8% of my time).

Contributions in progress

Provide links to work you're involved with that is still in progress. This section is optional (the linter ignores it), and is for your own benefit in keeping track of what you're doing and keeping other contributors up to date with the same.

Cycle 29

I'm working right now on completing bisq-network/bisq#5055 and will continue afterwards to help testing and reviewing the UI parts of the BSQ <-> BTC swap.

Cycle 30

I tried to sync our bitcoinj fork to current master, but failed as it move quite a bit off which makes cherry-picking and conflict merging a very error prone process. I'm currently working on getting monitor.bisq.network into a working state again.

@ripcurlx ripcurlx changed the title [WIP] For Cycle 30 For Cycle 30 Nov 16, 2021
@ghost
Copy link

ghost commented Nov 16, 2021

Info

Read BSQ amount from summary: 3503
Read USD amount from summary: 6202
Read BSQ rate from summary: 1.77
Parsed lineitem: {"team":"dev","amount":1110}
Parsed lineitem: {"team":"dev","amount":2000}
Parsed lineitem: {"team":"ops","amount":50}
Parsed lineitem: {"team":"ops","amount":50}
Parsed lineitem: {"team":"ops","amount":25}
Parsed lineitem: {"team":"ops","amount":25}
Parsed lineitem: {"team":"dev","amount":300}
Parsed lineitem: {"team":"dev","amount":600}
Parsed lineitem: {"team":"dev","amount":180}
Parsed lineitem: {"team":"dev","amount":60}
Parsed lineitem: {"team":"dev","amount":44}
Parsed lineitem: {"team":"dev","amount":106}
Parsed lineitem: {"team":"dev","amount":12}
Parsed lineitem: {"team":"dev","amount":4}
Parsed lineitem: {"team":"dev","amount":4}
Parsed lineitem: {"team":"dev","amount":4}
Parsed lineitem: {"team":"dev","amount":20}
Parsed lineitem: {"team":"dev","amount":8}
Parsed lineitem: {"team":"dev","amount":36}
Parsed lineitem: {"team":"dev","amount":26}
Parsed lineitem: {"team":"dev","amount":14}
Parsed lineitem: {"team":"dev","amount":48}
Parsed lineitem: {"team":"dev","amount":360}
Parsed lineitem: {"team":"dev","amount":60}
Parsed lineitem: {"team":"dev","amount":240}
Parsed lineitem: {"team":"dev","amount":120}
Parsed lineitem: {"team":"dev","amount":240}
Parsed lineitem: {"team":"dev","amount":156}
Parsed lineitem: {"team":"dev","amount":100}
Parsed lineitem: {"team":"dev","amount":100}
Parsed lineitem: {"team":"dev","amount":160}

Errors

ERROR: Total USD does not match the sum of line items:

  • Summary total: 6202.00 USD
  • Calculated total: 6262.00 USD

@ghost ghost added parsed:invalid https://bisq.wiki/Compensation#Ensure_your_request_is_valid team:dev https://bisq.wiki/Dev_Team team:ops https://bisq.wiki/Ops_Team parsed:valid https://bisq.wiki/Compensation#Ensure_your_request_is_valid and removed parsed:invalid https://bisq.wiki/Compensation#Ensure_your_request_is_valid labels Nov 16, 2021
@MwithM MwithM added this to the Cycle 30 milestone Nov 16, 2021
@Emzy
Copy link

Emzy commented Nov 17, 2021

As ops team lead I approve this compensation request for ops.

@ripcurlx
Copy link
Contributor Author

TXID: 23a9594485b31e792c2c557f685d6b62735f640edf5d74a7284bf1826f626629

@MwithM MwithM added the was:accepted Indicates that a compensation request was accepted by DAO voting label Dec 2, 2021
@ghost
Copy link

ghost commented Dec 2, 2021

Issuance by Team:

team amount BSQ amount USD
dev 3452.27 6112.00
ops 84.73 150.00

Total Issuance: 3537.00 BSQ (equivalent to: 6262.00 USD)

@MwithM
Copy link
Contributor

MwithM commented Dec 2, 2021

Closed as accepted

@MwithM MwithM closed this as completed Dec 2, 2021
@ripcurlx ripcurlx mentioned this issue Dec 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
parsed:valid https://bisq.wiki/Compensation#Ensure_your_request_is_valid team:dev https://bisq.wiki/Dev_Team team:ops https://bisq.wiki/Ops_Team was:accepted Indicates that a compensation request was accepted by DAO voting
Projects
Archived in project
Development

No branches or pull requests

4 participants