Merge pull request #315 from lehnberg/logs

Update spending & income logs
mimblewimble · Jul 13, 2020 · d61a130 · d61a130
2 parents aa46d13 + 0e3263b
commit d61a130
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/financials/grin-wallet-txs.md b/financials/grin-wallet-txs.md
@@ -4,7 +4,7 @@ This is a snapshot of the `grin-wallet txs` command for `https://council-donatio
 
 Discrepancies between this log and the [income log](income_log.csv) and [spending log](spending_log.csv) can be corrected via pull requests.
 
-**Last update:** May 18 2020
+**Last update:** Jun 22 2020
 
 ## Command output
 ```
@@ -105,4 +105,9 @@ Discrepancies between this log and the [income log](income_log.csv) and [spendin
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  45  Received Tx  89813f2f-2f8e-4ecd-ad7f-5f73b2b51f77  2020-05-10 14:38:52  None               true        2020-05-18 12:48:55  0       1        2.0             0.0             None   2.0            None      099430a377b4dc3989cd294854ec1e3fa8df1b631427931c961cb8ca30e928aa58  None 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ 46  Received Tx  f2ebc89e-9e76-4b45-99d0-8f46358cb4b3  2020-05-29 09:15:02  None               true        2020-06-22 16:30:35  0       1        20.0            0.0             None   20.0           None      08ab01040926588bd4b2a01a7f8a1d7f1a445331ce63697ea3bcb1e88a4d0e17ea  None 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ 47  Received Tx  ce40f8a8-af14-4d42-ae70-8dad570cb03f  2020-06-04 07:20:41  None               true        2020-06-22 16:30:35  0       1        100.0           0.0             None   100.0          None      09dd93f4ea6a1e602eb8f4fb3a00fa445b00278e489881c520669b95de162dbe2d  None 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ```
diff --git a/financials/income_log.csv b/financials/income_log.csv
@@ -184,6 +184,8 @@ income_id,date,type,source,currency,amount,exchange_rate,USD_equivalent,to_addre
 189,20200204,donation,unknown,GRIN,5,1.09,5.45,https://council-donations.yeastplume.org,29ac2c50-4f9f-4d56-98e3-151c0a4b8469,,
 190,20200324,donation,unknown,BTC,0.00129731,6734.80,8.74,bc1qecw954uappnwhle6tmafqskn6vxmpr6lmmuwfwldphfxplcshgnssy9kmx,9a6b963bff1b894f4621e0f557af778b1fb201bb1631060014a8dd15816a0a64,,
 191,20200503,donation,unknown,GRIN,0.05,0.551762,0.03,https://council-donations.yeastplume.org,720709b6-f6d2-4fb2-b90e-3266dd3c5faa,,
-191,20200503,donation,unknown,GRIN,0.05,0.551762,0.03,https://council-donations.yeastplume.org,ab866a25-48d8-400d-8673-b474704810b2,,
-191,20200503,donation,unknown,GRIN,0.05,0.551762,0.03,https://council-donations.yeastplume.org,ed44e81e-8d6f-4a49-8443-b845ffc1f583,,
-191,20200510,donation,unknown,GRIN,2,0.458742,0.92,https://council-donations.yeastplume.org,89813f2f-2f8e-4ecd-ad7f-5f73b2b51f77,,
+192,20200503,donation,unknown,GRIN,0.05,0.551762,0.03,https://council-donations.yeastplume.org,ab866a25-48d8-400d-8673-b474704810b2,,
+193,20200503,donation,unknown,GRIN,0.05,0.551762,0.03,https://council-donations.yeastplume.org,ed44e81e-8d6f-4a49-8443-b845ffc1f583,,
+194,20200510,donation,unknown,GRIN,2,0.458742,0.92,https://council-donations.yeastplume.org,89813f2f-2f8e-4ecd-ad7f-5f73b2b51f77,,
+195,20200529,donation,unknown,GRIN,20,0.494470,9.89,https://council-donations.yeastplume.org,f2ebc89e-9e76-4b45-99d0-8f46358cb4b3,,
+196,20200604,donation,Grinnode.live,GRIN,100,0.574386,57.44,https://council-donations.yeastplume.org,f2ebc89e-9e76-4b45-99d0-8f46358cb4b3,Donation from node challenge,https://forum.grin.mw/t/grin-node-challenge-2020-win-over-800-grin-coins-and-free-grin-merchandise/7166/33
diff --git a/financials/spending_log.csv b/financials/spending_log.csv
@@ -23,3 +23,6 @@ spend_id,date,spend_description,decision_log_id,currency,amount,exchange_rate,US
 22,20200402,lehnberg Q2 2020 funding,59,BTC,1.50,6793.62,10190.43,bc1qecw954uappnwhle6tmafqskn6vxmpr6lmmuwfwldphfxplcshgnssy9kmx,1N6S5xxMLhV1QTNZX8iakfPxyun3zJWQcY,4bf828130eb9da400e09ff304a14d8385c338141d28bf2732738f3d8e75aa2ae,full payment
 23,20200409,yeastplume Q2 2020 funding,58,BTC,4.37,7302.09,31910.14,bc1qecw954uappnwhle6tmafqskn6vxmpr6lmmuwfwldphfxplcshgnssy9kmx,37NWmCVUEmBWwx1VFb1Q2boYmtza6kRCYw,8d9c9dfd0edb6175ccea1c0f7b52d194e702daeb9b340defb13c5a7faff64eba,full payment
 24,20200409,antiochp Q2 2020 funding,61,BTC,4.51,7302.09,32932.43,bc1qecw954uappnwhle6tmafqskn6vxmpr6lmmuwfwldphfxplcshgnssy9kmx,bc1q6q08k8n0k6cgl6asq8gekpxntxuu5h3p2stlr3,7a695b7a61d7df006b20bdcb7e29e9f79fca991d4e41a045418328acbe2da5f3,full payment
+25,20200630,yeastplume Q2 2020 funding,63,BTC,3.75,9123.41,34212.79,bc1qecw954uappnwhle6tmafqskn6vxmpr6lmmuwfwldphfxplcshgnssy9kmx,36uMQfzKNmL2goz56iGD2pQUhSVYzk9sGE,f3687374825754d7e475cecb9ab805dd2f8215c2fabd92e545ca4dca32335129,full payment
+26,20200630,lehnberg Q2 2020 funding,64,BTC,0.96,9123.41,8758.47,39hgKkhfPFpwKRQ6yARGwU2uuVay69NKu4,1PubBmTZKknDeytVk8b18C4YGaV23Hzccz,152f8e52c3445a95fe2a6128aff6a62dde5e00c829100eb59837ed85860751c7,full payment (less GBP 542.77 for previous discrepancies) 
+27,20200630,antiochp Q2 2020 funding,65,BTC,3.73,9123.41,34030.32,bc1qecw954uappnwhle6tmafqskn6vxmpr6lmmuwfwldphfxplcshgnssy9kmx,bc1qmgmazdq70sx46nj799exq4ly2xwytxx953mp5v,e9b6da06f5b429d42d1bbff3a3e448c8a90cbcbd3587c1b99cae6dfd15f3e185,full payment