From c4689180ffff4a19c64dbdbc54270f8a99574174 Mon Sep 17 00:00:00 2001 From: lehnberg Date: Tue, 2 Apr 2019 08:01:35 +0100 Subject: [PATCH 1/4] add Bminer Jan 28 shared dev fee to income log --- financials/income_log.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/financials/income_log.csv b/financials/income_log.csv index 19969d9..ef8137d 100644 --- a/financials/income_log.csv +++ b/financials/income_log.csv @@ -9,3 +9,4 @@ income_id,date,type,source,currency,amount,exchange_rate,USD_equivalent,to_addre 14,20180314,donation,GGM,GRIN,630.965700337,2.70,1703.61,https://donations.grin-tech.org,a1ef9ba5-4fd8-4ffb-bcde-19c26e21b366,Dev miner fee on Grinmint grincouncil account (mostly or only GGM), 15,20190313,donation,Daisuke Shosaki,BTC,0.03939,3906.72,153.89,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,https://live.blockcypher.com/btc/tx/fcc646fa3d97af9d80dbecf5812d023c2edfd31b99f9cf592076554b7ac01496/,Japanese Grin supporter, 16,20190330,donation,Liu Jie,GRIN,500,3.24,1620,https://donations.grin-tech.org,refer the prize of Grin Chinese Naming event as the donation to Grin Fund,https://www.grin-forum.org/t/give-grin-a-chinese-name-grin/4376/105, +17,20190128,donation,Bminer,BTC,4.41,3470.45,15304.68,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,8b931ad0553b0e05ca8f52dd7c15ba53ed2374638686a152a94047ed7cb868f0,Shared miner dev fees, From c83ee4f50b7a12594d4974b514f33f42039f0c7b Mon Sep 17 00:00:00 2001 From: lehnberg Date: Tue, 2 Apr 2019 08:02:38 +0100 Subject: [PATCH 2/4] fix: Bminer march donation description --- financials/income_log.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/financials/income_log.csv b/financials/income_log.csv index ef8137d..e2e85a0 100644 --- a/financials/income_log.csv +++ b/financials/income_log.csv @@ -4,7 +4,7 @@ income_id,date,type,source,currency,amount,exchange_rate,USD_equivalent,to_addre 3,20190303,donation,Sparkpool,GRIN,5500,3.63,20000.29,https://donations.grin-tech.org,817e0a69-5ab0-421f-afc3-406f61dd2bb4,Sparkpool & anonymous miner donation, 4,20190304,donation,BlockCypher,USD,3600,1,3600,Discourse,-,BlockCypher financing last 6 months and next 2 years (so 30 months) of Discourse subscription (120 USD/month), 5,20190301,donation,Grin-pool.org,GRIN,17.087656585,3.27,55.88,https://donations.grin-tech.org,-,Mining pool february donation,https://hendi.io/february-2019-our-first-donation-to-grin/ -6,20190309,donation,Bminer,BTC,3.2336,4017.3,12990.34,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,ce86a17cfa256efc9a72190aee223ec75a38e03fc86ba2858c7c2d10d6dddfc3,Donation, +6,20190309,donation,Bminer,BTC,3.2336,4017.3,12990.34,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,ce86a17cfa256efc9a72190aee223ec75a38e03fc86ba2858c7c2d10d6dddfc3,Shared miner dev fees, 8,20181220,donation,Aurel,BTC,6.1169,4134.44,25289.96,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,https://www.blockchain.com/btc/tx/85251acf39fb801d04bd285ce91c115b875edc29a36103975212043f5e5ff2c4,Security audit funding campaign, https://www.grin-forum.org/t/security-audit-funding-campaign/962 14,20180314,donation,GGM,GRIN,630.965700337,2.70,1703.61,https://donations.grin-tech.org,a1ef9ba5-4fd8-4ffb-bcde-19c26e21b366,Dev miner fee on Grinmint grincouncil account (mostly or only GGM), 15,20190313,donation,Daisuke Shosaki,BTC,0.03939,3906.72,153.89,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,https://live.blockcypher.com/btc/tx/fcc646fa3d97af9d80dbecf5812d023c2edfd31b99f9cf592076554b7ac01496/,Japanese Grin supporter, From 1ee7872fa4c6998b59480dd4647a9b55da5000e2 Mon Sep 17 00:00:00 2001 From: lehnberg Date: Tue, 2 Apr 2019 08:06:03 +0100 Subject: [PATCH 3/4] fix: formatting of entry id 16 --- financials/income_log.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/financials/income_log.csv b/financials/income_log.csv index e2e85a0..a244f7a 100644 --- a/financials/income_log.csv +++ b/financials/income_log.csv @@ -5,8 +5,8 @@ income_id,date,type,source,currency,amount,exchange_rate,USD_equivalent,to_addre 4,20190304,donation,BlockCypher,USD,3600,1,3600,Discourse,-,BlockCypher financing last 6 months and next 2 years (so 30 months) of Discourse subscription (120 USD/month), 5,20190301,donation,Grin-pool.org,GRIN,17.087656585,3.27,55.88,https://donations.grin-tech.org,-,Mining pool february donation,https://hendi.io/february-2019-our-first-donation-to-grin/ 6,20190309,donation,Bminer,BTC,3.2336,4017.3,12990.34,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,ce86a17cfa256efc9a72190aee223ec75a38e03fc86ba2858c7c2d10d6dddfc3,Shared miner dev fees, -8,20181220,donation,Aurel,BTC,6.1169,4134.44,25289.96,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,https://www.blockchain.com/btc/tx/85251acf39fb801d04bd285ce91c115b875edc29a36103975212043f5e5ff2c4,Security audit funding campaign, https://www.grin-forum.org/t/security-audit-funding-campaign/962 +8,20181220,donation,Aurel,BTC,6.1169,4134.44,25289.96,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,https://www.blockchain.com/btc/tx/85251acf39fb801d04bd285ce91c115b875edc29a36103975212043f5e5ff2c4,Security audit funding campaign,https://www.grin-forum.org/t/security-audit-funding-campaign/962 14,20180314,donation,GGM,GRIN,630.965700337,2.70,1703.61,https://donations.grin-tech.org,a1ef9ba5-4fd8-4ffb-bcde-19c26e21b366,Dev miner fee on Grinmint grincouncil account (mostly or only GGM), 15,20190313,donation,Daisuke Shosaki,BTC,0.03939,3906.72,153.89,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,https://live.blockcypher.com/btc/tx/fcc646fa3d97af9d80dbecf5812d023c2edfd31b99f9cf592076554b7ac01496/,Japanese Grin supporter, -16,20190330,donation,Liu Jie,GRIN,500,3.24,1620,https://donations.grin-tech.org,refer the prize of Grin Chinese Naming event as the donation to Grin Fund,https://www.grin-forum.org/t/give-grin-a-chinese-name-grin/4376/105, +16,20190330,donation,Liu Jie,GRIN,500,3.24,1620,https://donations.grin-tech.org,-,Donation as part of the prize of Grin Chinese Naming event,https://www.grin-forum.org/t/give-grin-a-chinese-name-grin/4376/105 17,20190128,donation,Bminer,BTC,4.41,3470.45,15304.68,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,8b931ad0553b0e05ca8f52dd7c15ba53ed2374638686a152a94047ed7cb868f0,Shared miner dev fees, From b490a465ad9565511a2d32db7be7632482cd87ce Mon Sep 17 00:00:00 2001 From: lehnberg Date: Tue, 2 Apr 2019 08:10:17 +0100 Subject: [PATCH 4/4] fix: remove urls from tx_reference fields --- financials/income_log.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/financials/income_log.csv b/financials/income_log.csv index a244f7a..ccf81a0 100644 --- a/financials/income_log.csv +++ b/financials/income_log.csv @@ -5,8 +5,8 @@ income_id,date,type,source,currency,amount,exchange_rate,USD_equivalent,to_addre 4,20190304,donation,BlockCypher,USD,3600,1,3600,Discourse,-,BlockCypher financing last 6 months and next 2 years (so 30 months) of Discourse subscription (120 USD/month), 5,20190301,donation,Grin-pool.org,GRIN,17.087656585,3.27,55.88,https://donations.grin-tech.org,-,Mining pool february donation,https://hendi.io/february-2019-our-first-donation-to-grin/ 6,20190309,donation,Bminer,BTC,3.2336,4017.3,12990.34,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,ce86a17cfa256efc9a72190aee223ec75a38e03fc86ba2858c7c2d10d6dddfc3,Shared miner dev fees, -8,20181220,donation,Aurel,BTC,6.1169,4134.44,25289.96,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,https://www.blockchain.com/btc/tx/85251acf39fb801d04bd285ce91c115b875edc29a36103975212043f5e5ff2c4,Security audit funding campaign,https://www.grin-forum.org/t/security-audit-funding-campaign/962 +8,20181220,donation,Aurel,BTC,6.1169,4134.44,25289.96,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,85251acf39fb801d04bd285ce91c115b875edc29a36103975212043f5e5ff2c4,Security audit funding campaign,https://www.grin-forum.org/t/security-audit-funding-campaign/962 14,20180314,donation,GGM,GRIN,630.965700337,2.70,1703.61,https://donations.grin-tech.org,a1ef9ba5-4fd8-4ffb-bcde-19c26e21b366,Dev miner fee on Grinmint grincouncil account (mostly or only GGM), -15,20190313,donation,Daisuke Shosaki,BTC,0.03939,3906.72,153.89,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,https://live.blockcypher.com/btc/tx/fcc646fa3d97af9d80dbecf5812d023c2edfd31b99f9cf592076554b7ac01496/,Japanese Grin supporter, +15,20190313,donation,Daisuke Shosaki,BTC,0.03939,3906.72,153.89,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,fcc646fa3d97af9d80dbecf5812d023c2edfd31b99f9cf592076554b7ac01496,Japanese Grin supporter, 16,20190330,donation,Liu Jie,GRIN,500,3.24,1620,https://donations.grin-tech.org,-,Donation as part of the prize of Grin Chinese Naming event,https://www.grin-forum.org/t/give-grin-a-chinese-name-grin/4376/105 17,20190128,donation,Bminer,BTC,4.41,3470.45,15304.68,3ChVP627KU5w4zu2rieFPF3wGXWQgmhvrs,8b931ad0553b0e05ca8f52dd7c15ba53ed2374638686a152a94047ed7cb868f0,Shared miner dev fees,