From 4b035c17f2d4ebd917b966870ac1eed595081f08 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Fri, 8 Jul 2016 12:18:26 -0700 Subject: [PATCH] donations.rst: add new expense addresses, resign Also adds docs/expenses.rst (unsigned) to record individual expenses and the transactions used to pay them. --- docs/donations.rst | 48 +++++++++++++---------- docs/expenses.rst | 98 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 21 deletions(-) create mode 100644 docs/expenses.rst diff --git a/docs/donations.rst b/docs/donations.rst index 550628bda..687f80df4 100644 --- a/docs/donations.rst +++ b/docs/donations.rst @@ -47,20 +47,26 @@ donation address until they are spent. Expenditure Addresses ===================== -* Initial testing / proof-of-spendability (warner) +This lists the public key used for each declared budget item. The individual +payments will be recorded in a separate file (see `docs/expenses.rst`), which +is not signed. All transactions from the main `1Pxi` key should be to some +key on this list. + +* Initial testing (warner) 1387fFG7Jg1iwCzfmQ34FwUva7RnC6ZHYG - 17-Mar-2016: deposit+withdrawal of 0.01 BTC + one-time 0.01 BTC deposit+withdrawal + +* tahoe-lafs.org DNS registration (paid by warner) + 1552pt6wpudVCRcJaU14T7tAk8grpUza4D + ~$15/yr for DNS + +* tahoe-lafs.org SSL certificates (paid by warner) + $0-$50/yr, probably ending 2015 + 1EkT8yLvQhnjnLpJ6bNFCfAHJrM9yDjsqa + * website/dev-server hosting (on Linode, paid by secorp) - address TBD - ~$20/mo, 2007-present -* tahoe-lafs.org DNS registration and SSL certificates (paid by warner) - address TBD - 21-Aug-2012: DNS (1 year, GANDI) $12.50 - 29-Oct-2012: SSL (RapidSSL) $49 - 20-Aug-2013: DNS (4 years, GANDI) $64.20 - 02-Nov-2013: SSL (GlobalSign, free for open source projects) $0 - 14-Nov-2014: SSL (GANDI) $16 - 28-Oct-2015: SSL (GANDI) $16 + 1MSWNt1R1fohYxgaMV7gJSWbYjkGbXzKWu + ~$20-$25/mo, 2007-present Historical Donation Addresses @@ -89,17 +95,17 @@ This document is signed by the Tahoe-LAFS Release-Signing Key (GPG keyid (https://github.com/tahoe-lafs/tahoe-lafs.git) as `docs/donations.rst`. Both actions require access to secrets held closely by Tahoe developers. -signed: Brian Warner, 21-Mar-2016 +signed: Brian Warner, 08-Jul-2016 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1 +Version: GnuPG v2 -iQEcBAEBCAAGBQJW76qNAAoJEL3g0x1oZmp6rXoIAIG6g3BdFNKjseWDbdKX90Mf -465M9WaqPAccNvGn/l/ob1AhWfgB5lrZa0asajh5noZ00UjRnUuEbDMcXGKDXy6f -0wg+JQdSLhTLEYlYEqqHnToiJwboY/WXnxtgaH19wfwdfuyUBSIKbFofYdX638+0 -qgpho35lWGuD17mCGKVdJy6N9U4W8uY/9eIoyrAId+4TLs4SJCRA4+vJlyvntsvb -+VJ74p1IGjrkudoJhiqqjSgxpcbAsyntWbssmBj3x7YdC6AcJRZQcrz2R4O1kyF7 -n62uDmtySXOam4ZQqKron5I4gJ+iPqggeBnn5Kt7LwB3e/gYxnSUInGlbSkv2Ao= -=Axmj +iQEcBAEBCAAGBQJXf/v7AAoJEL3g0x1oZmp6eQ8H/A3orFJiSQm1vyZgQWPneKqb +m7QaPIl5usKcZoGOtOcX4KlhvtOCHUcMjEHe1O+UbSWsKQfQQGiTMF+luwVh5DGZ +Gmn/gSVVPYYa6MGZaoai0lCE1zh4wMuWsTZWwtjCqvN+bnYud6fbrem6p9XSbcpK +bImMmig8/OJ0/Y0qhth6CBEqRm8LiALetibzcyEtWG2kwLTV/QYOqbfY3ZPI++bV +q4VmDP80dNDKDq2JT6ZNU377Biz2/z/oj1ILb11aAylJJ4BV/3L+hJmyLfr0rsMc +lSTzqAM2PUINnR4LnVdtDjJzBNRpcn535VxQFUc8e/jlOJo1rJse0Pt7WkDFsUA= +=fyOh -----END PGP SIGNATURE----- diff --git a/docs/expenses.rst b/docs/expenses.rst new file mode 100644 index 000000000..c3ced46d4 --- /dev/null +++ b/docs/expenses.rst @@ -0,0 +1,98 @@ +============================== + Expenses paid by donated BTC +============================== + +`docs/donations.rst` describes the "Transparent Accounting" that we use for +BTC that has been donated to the Tahoe project. That document lists the +budget items for which we intend to spend these funds, and a Bitcoin public +key for each one. It is signed by the Tahoe-LAFS Release Signing Key, and +gets re-signed each time a new budget item is added. + +For every expense that get paid, the BTC will first be moved from the primary +donation key into the budget-item -specific subkey, then moved from that +subkey to whatever vendor or individual is being paid. + +This document tracks the actual payments made to each vendor. This file +changes more frequently than `donations.rst`, hence it is *not* signed. +However this file should never reference a budget item or public key which is +not present in `donations.rst`. And every payment in this file should +correspond to a transaction visible on the Bitcoin block chain explorer: + + https://blockchain.info/address/1PxiFvW1jyLM5T6Q1YhpkCLxUh3Fw8saF3 + +Budget Items +============ + +Initial Testing +--------------- + +This was a small transfer to obtain proof-of-spendability for the new wallet. + +* Budget: trivial +* Recipient: warner +* Address: 1387fFG7Jg1iwCzfmQ34FwUva7RnC6ZHYG + +Expenses/Transactions: + +* 17-Mar-2016: deposit+withdrawal of 0.01 BTC +* bcad5f46ebf9fd5d2d7a6a9bed81acf6382cd7216ceddbb5b5f5d968718ec139 (in) +* 13c7f4abf9d6e7f2223c20fefdc47837779bebf3bd95dbb1f225f0d2a2d62c44 (out 1/2) +* 7ca0828ea11fa2f93ab6b8afd55ebdca1415c82c567119d9bd943adbefccce84 (out 2/2) + +DNS Registration +---------------- + +Yearly registration of the `tahoe-lafs.org` domain name. + +* Budget: ~$15/yr +* Recipient: warner +* Address: 1552pt6wpudVCRcJaU14T7tAk8grpUza4D + +Expenses/Transactions: + +* 21-Aug-2012: 1 year, GANDI: $12.50 +* 20-Aug-2013: 4 years, GANDI: $64.20 +* + + +TLS certificates +---------------- + +Yearly payment for TLS certificates from various vendors. We plan to move to +Lets Encrypt, so 2015 should be last time we pay for a cert. + +* Budget: $0-$50/yr +* Recipient: warner +* Address: 1EkT8yLvQhnjnLpJ6bNFCfAHJrM9yDjsqa + +Expenses/Transactions: + +* 29-Oct-2012: RapidSSL: $49 +* 02-Nov-2013: GlobalSign, free for open source projects: $0 +* 14-Nov-2014: GANDI: $16 +* 28-Oct-2015: GANDI: $16 +* + +Web/Developer Server Hosting +---------------------------- + +This pays for the rental of a VPS (currently from Linode) for tahoe-lafs.org, +running the project website, Trac, buildbot, and other development tools. + +* Budget: $20-$25/month, 2007-present +* Recipient: secorp +* Address: 1MSWNt1R1fohYxgaMV7gJSWbYjkGbXzKWu + +Expenses/Transactions: + +* Invoice 311312, 12 Feb 2010: $339.83 +* Invoice 607395, 05 Jan 2011: $347.39 +* Invoice 1183568, 01 Feb 2012: $323.46 +* Invoice 1973091, 01 Feb 2013: $323.46 +* Invoice 2899489, 01 Feb 2014: $324.00 +* Invoice 3387159, 05 July 2014: $6.54 (add backups) +* Multiple invoices monthly 01 Aug 2014 - 01 May 2016: $7.50*22 = $165.00 +* Invoice 4083422, 01 Feb 2015: $324.00 +* Invoice 5650991, 01 Feb 2016: $324.00 +* -- Total through 01 May 2016: $2477.68 +*