Skip to content

Commit

Permalink
Release: Prepare payments for FLORENCE release, EDO has been skipped (#…
Browse files Browse the repository at this point in the history 
…450)

* Fix Contributors.csv to be searchable again
* Added Nicolas to contributors
* added payment list for commits and calculations for xtz payout amouts
* add .vscode to .gitignore
* changed VERSION and updated copyright with link to contributors.csv
* Added sebuhbitcoin to contributors
* fixed tzstats testnet
* Contributor: jdsika, Effort=4h
* Reviewer: dansan566, Effort=0.5h
  • Loading branch information
@jdsika
jdsika authored Aug 2, 2021
1 parent f6052c9 commit eda4dad
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 6 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2019 Hüseyin ABANOZ
Copyright (C) 2021, see contributors.csv
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down
69 changes: 69 additions & 0 deletions contribution_payment_history.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,73 @@
Commit hash, Contributors, Effort (h), Rate (USD/h), Amount (USD), VWAP date, VWAP (USD/XTZ), Amount (XTZ), Tx hash
TBD,jdsika,4,62.5,250, 2021/07/19,2.364659,105.7234891,
TBD,dansan566,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
f6052c9b66f7c4297cf7c2df84c16c0640923d52,utdrmac,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
f6052c9b66f7c4297cf7c2df84c16c0640923d52,sebuhbitcoin,0.2,62.5,12.5, 2021/07/19,2.364659,5.286174455,
53693ab0942357fb9a88164d16c1dbd7197628c6,jdsika,10,62.5,625, 2021/07/19,2.364659,264.3087227,
53693ab0942357fb9a88164d16c1dbd7197628c6,dansan566,7,62.5,437.5, 2021/07/19,2.364659,185.0161059,
028b5934c537578194b6ae7b1fbec8c35eace616,jdsika,0.2,62.5,12.5, 2021/07/19,2.364659,5.286174455,
4d38b6c76f6605db485681436f866c7c2e46ec46,jdsika,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
1d67daaa59fde7cb4c73fef7fc91eb524fa39225,vkresch,0.2,62.5,12.5, 2021/07/19,2.364659,5.286174455,
14e47e0a7c74690397f25c09f4ba914b8ac667cb,denver-s,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
14e47e0a7c74690397f25c09f4ba914b8ac667cb,jdsika,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
a913df05d52d840d9c7792fcd405ff98a7e4c1e7,amzid,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
a913df05d52d840d9c7792fcd405ff98a7e4c1e7,jdsika,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
80e24fbd959e51dafbb80b4d51673cabc4657abe,denver-s,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
80e24fbd959e51dafbb80b4d51673cabc4657abe,amzid,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
32105af4ad7dfde949e66190ea401a965ee34119,jdsika,2,62.5,125, 2021/07/19,2.364659,52.86174455,
32105af4ad7dfde949e66190ea401a965ee34119,denver-s,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
e9225fea666d7b58c7476a48b9c2a7dfffaea8d1,denver-s,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
d5241e67d20332349df7196a5a892048403fee50,denver-s,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
d5241e67d20332349df7196a5a892048403fee50,jdsika,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
58a2529a2a3a5f600a07f89ea64534eabee6bc5d,jdsika,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
91d5e86253cf7f9e9b0b4815245047b3d19efa89,dansan566,0.2,62.5,12.5, 2021/07/19,2.364659,5.286174455,
7704db11c184fa68c2198f4b950d2bcc77a41fa5,denver-s,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
7704db11c184fa68c2198f4b950d2bcc77a41fa5,amzid,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
ca40686191d4c205ade54987d51b2eaeb54d012c,vkresch,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
9ea8fb80e34dccc9d625dbf4b2413bb66dde5040,amzid,4,62.5,250, 2021/07/19,2.364659,105.7234891,
9ea8fb80e34dccc9d625dbf4b2413bb66dde5040,habanoz,1.5,62.5,93.75, 2021/07/19,2.364659,39.64630841,
e194995a13cc044b4daaf0a07ec67b465fc531ee,vkresch,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
e194995a13cc044b4daaf0a07ec67b465fc531ee,nicolasochem,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,compensated
fbd8fecdfcad7b5bd30040d7efe1ae403c2823cf,vkresch,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
2b003820e9ee35ed71594c6c480206968879f3dd,amzid,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
00929dd516c2cdacaf5938fac5e81323e6879cee,amzid,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
4773def70a761cb953f2f4168991a8aef4b4c401,vkresch,2,62.5,125, 2021/07/19,2.364659,52.86174455,
4773def70a761cb953f2f4168991a8aef4b4c401,habanoz,1.5,62.5,93.75, 2021/07/19,2.364659,39.64630841,
9efd8ae9fa826ce071ec1d5640d20361e6885dbe,amzid,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
7381a10d99a9ac1de18cf6d3a4f01d8927768263,utdrmac,6,62.5,375, 2021/07/19,2.364659,158.5852336,
7381a10d99a9ac1de18cf6d3a4f01d8927768263,amzid,3,62.5,187.5, 2021/07/19,2.364659,79.29261682,
7381a10d99a9ac1de18cf6d3a4f01d8927768263,vkresch,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
37e42569adfe9aeb5a9edc257dd3004ecaaf3cf5,vkresch,2,62.5,125, 2021/07/19,2.364659,52.86174455,
9498c40f2e2eb7f88e2a9e0dbf281958052513ae,vkresch,8,62.5,500, 2021/07/19,2.364659,211.4469782,
9498c40f2e2eb7f88e2a9e0dbf281958052513ae,habanoz,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
48b28ec493fa63ad753ecfdb635776a18ec69d48,vkresch,11,62.5,687.5, 2021/07/19,2.364659,290.739595,
48b28ec493fa63ad753ecfdb635776a18ec69d48,habanoz,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
48b28ec493fa63ad753ecfdb635776a18ec69d48,jdsika,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
1cbf36f5b9ac0d59201be1d8c896166953f2ebc5,habanoz,27,62.5,1687.5, 2021/07/19,2.364659,713.6335514,
1cbf36f5b9ac0d59201be1d8c896166953f2ebc5,vkresch,4,62.5,250, 2021/07/19,2.364659,105.7234891,
90c97ef2f019dd52a253326874f4a517dce8e958,habanoz,6.5,62.5,406.25, 2021/07/19,2.364659,171.8006698,
eafb1f982e1cda8eeaaba08445b11be9bcc06b4f,vkresch,4,62.5,250, 2021/07/19,2.364659,105.7234891,
eafb1f982e1cda8eeaaba08445b11be9bcc06b4f,jdsika,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
39bfff87868fb4b583714bf3e352af155361995c,amzid,3,62.5,187.5, 2021/07/19,2.364659,79.29261682,
39bfff87868fb4b583714bf3e352af155361995c,dansan566,2,62.5,125, 2021/07/19,2.364659,52.86174455,
a9e182319a76e4cf91f04945033cb52903000ecb,habanoz,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
6736414952d5a44660d1ccc6fd912706bde495fc,utdrmac,4,62.5,250, 2021/07/19,2.364659,105.7234891,
6736414952d5a44660d1ccc6fd912706bde495fc,habanoz,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
0c2321a78676b3ff708e16b5121e024ac5f2c3b3,amzid,2,62.5,125, 2021/07/19,2.364659,52.86174455,
b90faaa2e98a26ed9921c3a0cb8245addde05c53,amzid,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
b90faaa2e98a26ed9921c3a0cb8245addde05c53,jdsika,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
4ea3fcc1637fe30f87b4c12b00994e54a32f7759,habanoz,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
895f7401d6e96569d5d4c0764c4234edd34db75b,habanoz,1.5,62.5,93.75, 2021/07/19,2.364659,39.64630841,
895f7401d6e96569d5d4c0764c4234edd34db75b,jdsika,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
ae34407da97dcd5f70e1af36dc5fbc85171a4a55,dansan566,10,62.5,625, 2021/07/19,2.364659,264.3087227,
ae34407da97dcd5f70e1af36dc5fbc85171a4a55,amzid,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
f75360145bb4170422f2fb9d1ef0a70b9d09e253,amzid,3,62.5,187.5, 2021/07/19,2.364659,79.29261682,
f75360145bb4170422f2fb9d1ef0a70b9d09e253,habanoz,0.5,62.5,31.25, 2021/07/19,2.364659,13.21543614,
526a9646253ce4c43024384fe40f3f32987fdf55,habanoz,7,62.5,437.5, 2021/07/19,2.364659,185.0161059,
526a9646253ce4c43024384fe40f3f32987fdf55,amzid,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
edd0d8b01859dbf0e5c4ed89e330363fa779443f,utdrmac,10,62.5,625, 2021/07/19,2.364659,264.3087227,
edd0d8b01859dbf0e5c4ed89e330363fa779443f,habanoz,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
edd0d8b01859dbf0e5c4ed89e330363fa779443f,jdsika,1,62.5,62.5, 2021/07/19,2.364659,26.43087227,
4dc0e75b98c4a41de69cd7495044c18222f5973b ,dansan566,3,62.5,187.5, 2021/01/30,2.899002,64.67743037, op8d6pWnWVXNmLapivQBkeT6kdW78fGoq3BXQ6DKDRmuGEYfbTP
4dc0e75b98c4a41de69cd7495044c18222f5973b ,jdsika,3,62.5,187.5, 2021/01/30,2.899002,64.67743037, oo6fZLMQHABi9wwjdew78LutJKNd7XBYWjqtHEm41uwsKodCwVe
e56dfffae00fbda83e298e70fdd82166f558bf2e,utdrmac,0.5,62.5,31.25, 2021/01/30,2.899002,10.77957173,oo7KwAyUreiDTzwk3Nf1HLrrAirWc7dve8Nf2LQ9GReEgdyq8pv
Expand Down
3 changes: 2 additions & 1 deletion contributors.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ SemElVik , tz..., Always there for valuable feedback
m-kus , tz..., Contributed the TzKT API
dansan566 , tz1Q86tz2HeTL6iwHVcYe7nGUN4zSU545nWf, Focusses on documentation in addition to feedback and reports
vkresch, tz2JrnsSXPkN3QHKsYm1bGijwVHc1vFaR5kU, Focus on CI/CD testing and software quality integrating FSM
nicolasochem, tz..., General application review and integration of Baeckerei features
nicolasochem, tz1RcaZ9HyGkDRx6cB1y8ViZpcMkbovaprtx, General application review and integration of Baeckerei features
denver-s, tz1XhZUHsJAFp4FHoeeQQ7auVBk5j6xoUKbS, Documentation and testing and improvements
sebuhbitcoin, tz1R664EP6wjcM1RSUVJ7nrJisTpBW9QyJzP, Documentation and testing and improvements
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

# General information about the project.
project = u'Tezos Reward Distributor (TRD)'
copyright = u'2021, habanoz, utdrmac, amzid, jdsika, dansan566'
copyright = u'2021, see contributors.csv'
author = u'TRD Organization'

# The version info for the project you're documenting, acts as replacement for
Expand Down
4 changes: 2 additions & 2 deletions src/Constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# TzStats
TZSTATS_PREFIX_API = {
'MAINNET': 'https://api.tzstats.com',
CURRENT_TESTNET: 'https://api.edo2net.tzstats.com'
CURRENT_TESTNET: 'https://api.florence.tzstats.com'
}

# TzKt
Expand All @@ -35,7 +35,7 @@

MUTEZ = 1e6

VERSION = 8.0
VERSION = 9.0


class RunMode(Enum):
Expand Down
2 changes: 1 addition & 1 deletion src/launch_common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def print_banner(args, script_name):
with open("./banner.txt", "rt") as file:
print(file.read())
print(LINER, flush=True)
print("Copyright Huseyin ABANOZ 2021")
print("TRD Organization: Copyright 2021, see contributors.csv")
print("[email protected]")
print("Please leave copyright information")
print(LINER, flush=True)
Expand Down

0 comments on commit eda4dad

Please sign in to comment.