Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

Move yieldgen configuration to joinmarket.cfg #246

Closed
wants to merge 509 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
509 commits
Select commit Hold shift + click to select a range
7e39cdb
fixed links in readme
Apr 28, 2015
54b57be
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
Apr 28, 2015
2afd705
irc bots get their nickname from a random wikipedia article
Apr 29, 2015
2027b97
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
Apr 30, 2015
9364ed0
length limit to irc nick
May 1, 2015
2b0767a
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
May 4, 2015
b19ed26
rewrote irc alerts code, useful for getting people to update
May 4, 2015
c2a1a42
for non-testnet, using a seed is not supported
May 4, 2015
1888da6
moved pit to snoonet irc, it hides bots ip by default, has a tor onion
May 6, 2015
bd02ba1
made installation instructions slightly clearer and removed info whic…
May 6, 2015
5f8fe90
implemented the idea that the testnet channel is main channel + -test
May 6, 2015
659df43
added instructions on how to run with mainnet
May 6, 2015
ed5ed14
added link to the wiki in the joinmarket.cfg
May 6, 2015
9a5dad2
removed the word seed from documentation of wallet-tool because thats…
May 6, 2015
fe535a9
Implemented socks5 proxy
abitfan May 7, 2015
45ca1cd
yield generator takes into account dust_threshold when announcing ord…
May 7, 2015
8e240f0
added nicer error message when not enough liquidity
May 7, 2015
c2f32c8
slightly clearer error message
May 7, 2015
05be93d
added donation address to readme
May 7, 2015
93dfad1
added protection against coinjoin amounts below dust threshold
May 7, 2015
6b3a945
changed name of button in ob-watcher.py html to reduce confusion
May 8, 2015
d53bc4e
added --pre to instructions for pip install
May 8, 2015
a068d70
sendpayment now displays chosen orders and asks for confirmation befo…
May 9, 2015
e74c384
bug fix, would crash on unconfirmed or already spent utxos instead of…
May 11, 2015
6fdc00d
doesnt crash on /move/ transactions in the internal bitcoin core acco…
May 13, 2015
d3c40ea
Merge pull request #65 from abitfan/socks5proxy
chris-belcher May 13, 2015
3b89d91
threading lock the debug file writes
May 13, 2015
7a179d0
socks5 proxy off by default
May 13, 2015
e6739bd
bugfix with other commit, whoops
May 13, 2015
9fce906
fixed bug in socks5 debug line
May 13, 2015
d02167f
failed pushtx error is handled correctly instead of crashing the program
May 13, 2015
8638268
add options to choose cheapest orders or manually pick orders (only w…
anduck May 11, 2015
49aa610
Merge pull request #68 from anduck/master
chris-belcher May 13, 2015
326bb8d
tweaked order choosing parameters
May 13, 2015
074846e
option gaplimit type set to int
AdamISZ May 14, 2015
86bd5fc
Merge pull request #72 from AdamISZ/master
chris-belcher May 14, 2015
f1f64ca
separate directory for debug logs and income statement
adlai May 14, 2015
157b046
delete empty keys from Maker.active_orders
adlai May 14, 2015
e0c0317
Merge pull request #66 from adlai/master
chris-belcher May 14, 2015
b613f16
Sanity check for relorder params
abitfan May 15, 2015
cc7b77d
convert to float
abitfan May 15, 2015
99d94ab
Reverted changes
abitfan May 17, 2015
0fe0168
Added sanity checks in OrderbookWatch
abitfan May 17, 2015
3af5879
Remove joinmarket.cfg / create default config at first run
abitfan May 18, 2015
0c2b473
wrong branch
abitfan May 18, 2015
9eb66d7
Update comment
abitfan May 18, 2015
b3dc7c7
added update_cache_index() code, which stores the pointers of the add…
May 19, 2015
cfe7d24
Revert "added update_cache_index() code, which stores the pointers of…
May 19, 2015
7bff63e
Revert "Revert "added update_cache_index() code, which stores the poi…
chris-belcher May 19, 2015
4487d2b
prints generated nickname so it can be more easily found
chris-belcher May 19, 2015
a3e8c4c
added warning to yieldgen when using with blockr.io
chris-belcher May 19, 2015
c0a8b74
Use itertools.combinations when sweeping
adlai May 20, 2015
aaec24e
added more debug lines to the networking code to hopefully find the s…
chris-belcher May 20, 2015
9dcc04e
Merge pull request #81 from adlai/master
chris-belcher May 21, 2015
4368957
Merge pull request #75 from abitfan/sanitychecks
chris-belcher May 21, 2015
ee79642
merged pull request
May 21, 2015
96b494b
Merge branch 'abitfan-defaultconfig'
May 21, 2015
3ca698a
added comments to default config file
chris-belcher May 21, 2015
9b99309
handled the case where len(orders) == n
chris-belcher May 23, 2015
e3728e8
expanded the warning in yieldgen.py against not using bitcoin core
chris-belcher May 23, 2015
6dbe42b
changed irc network where the pit is
chris-belcher May 23, 2015
c780aa7
added MODE +B to mark bots as bots
chris-belcher May 24, 2015
ca368ca
fixed MODE bug, allowed unregistered nicks to private message
chris-belcher May 24, 2015
900a57a
fixed bug in sasl code
chris-belcher May 24, 2015
04902c0
added the joinmarket alert message to the html orderbook page
chris-belcher May 24, 2015
fde0b9e
Revert "fixed bug in sasl code", actually wasnt a bug
chris-belcher May 24, 2015
68756a2
fix depth charts for the case of a lone applicable offer
adlai May 24, 2015
52dd847
removed duplicate check for utxos being spent, required to remove ref…
chris-belcher May 24, 2015
b53e930
Merge pull request #87 from adlai/master
chris-belcher May 24, 2015
03634ff
fixed bug in issue #86, and for patientsendpayment
chris-belcher May 24, 2015
2f82933
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
chris-belcher May 24, 2015
7a82abc
included slowaes.py and socks.py in the repos for easier installation
chris-belcher May 25, 2015
f73aae9
irc lib now authenticates with SASL after redisconnection
chris-belcher May 26, 2015
e7737c1
enabled the irc ping thread, it has been mistakenly disabled
chris-belcher May 26, 2015
dbe4f07
made the irc client ping less often and with a longer timeout, for lo…
chris-belcher May 26, 2015
feacc78
fixed bug for when password=None
chris-belcher May 26, 2015
e57b88e
fixed subtle bug when unconfirmed utxo was spent
chris-belcher May 27, 2015
8767127
fixed bug where it wouldnt detect nick was already in use if halfway …
chris-belcher May 27, 2015
fc238e6
Sort the orderbook by cjfee
May 28, 2015
117d098
Sork the orderbook by cjfee
May 28, 2015
590c6d7
Merge branch 'master' of github.com:the9ull/joinmarket
May 28, 2015
39531b3
enable line buffering for the logfile
yhaenggi May 28, 2015
282b50c
Merge pull request #94 from K1773R/fix-log-buffering
chris-belcher May 28, 2015
3d66769
created BitcoinCoreWallet for coinjoining by querying bitcoin core in…
chris-belcher May 28, 2015
a0eaacb
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
chris-belcher May 28, 2015
47e737a
Put absorders first. I confess: I didn't test
May 29, 2015
3bf8fba
bugfix for pick_order (-P)
anduck May 29, 2015
c64f23c
Merge pull request #98 from anduck/master
chris-belcher May 31, 2015
0ad6388
removed irc connect_attempts limit
chris-belcher May 31, 2015
218b796
added comments to a confusing crypto part
chris-belcher May 31, 2015
3267b22
removed some debug statements to make the log less spammy
chris-belcher May 31, 2015
d79fbf8
fixed bugs in tumbler and made error messager clearer
chris-belcher Jun 3, 2015
fffc09c
changed prints to debugs so theyre saved to the log file
chris-belcher Jun 3, 2015
6940e11
fixed bug, whoops
chris-belcher Jun 4, 2015
c931dd6
more stupid typos
chris-belcher Jun 4, 2015
e641c5c
another stupid mistake of mine, i blame python although its mostly my…
Jun 4, 2015
0a4063b
added link to installing on windows in readme
Jun 4, 2015
cf5afa6
Merge pull request #93 from the9ull/master
chris-belcher Jun 5, 2015
b7aaa5b
Addcache support to make_request
Jun 6, 2015
774041b
x
abitfan Jun 12, 2015
e008f0f
Merge remote-tracking branch 'upstream/master'
abitfan Jun 12, 2015
4c82a56
Wrong password handling
abitfan Jun 12, 2015
009a582
Implement orderby (ASC only)
Jun 13, 2015
a86f7eb
Implement desc
Jun 13, 2015
a0046cf
Removed implementation of cache
Jun 13, 2015
7385ba4
cleanup & bugfix orderbook sorting
adlai Jun 14, 2015
46ada89
fix wallet-tool showseed bug by storing wallet seed
adlai Jun 14, 2015
6a9b8f0
Merge pull request #100 from abitfan/retrypassword
chris-belcher Jun 16, 2015
61e7bcf
added incorrect password message
chris-belcher Jun 16, 2015
c880eee
Merge pull request #1 from chris-belcher/master
abitfan Jun 19, 2015
8cc4240
Merge branch 'master' of https://github.com/the9ull/joinmarket into t…
chris-belcher Jun 25, 2015
d691c61
replaced space indenting with tab indenting in the latest PR
chris-belcher Jun 25, 2015
c073f0d
Merge branch 'the9ull-master'
chris-belcher Jun 25, 2015
1ee6c88
kept the showseed bugfix
chris-belcher Jun 25, 2015
c78b58c
Merge branch 'adlai-master'
chris-belcher Jun 25, 2015
cd52110
Update README.txt
CohibAA Jun 29, 2015
2f54ced
Connect to hidden service with ssl
Jun 29, 2015
b3f3e82
do not print out seed
chris-belcher Jun 29, 2015
bcde05c
Merge pull request #112 from CohibAA/patch-4
chris-belcher Jun 29, 2015
655f361
Merge pull request #113 from abitfan/torssl
chris-belcher Jun 29, 2015
220415c
Changed appearance and sortablility of table and website
Jun 30, 2015
aad5ea3
added debug information to attempt to fix weight not adding to 1 bug
chris-belcher Jul 1, 2015
77c11be
it was bugged Revert "added debug information to attempt to fix weigh…
chris-belcher Jul 1, 2015
0cc6914
properly added debug information to attempt to fix weight not adding …
chris-belcher Jul 1, 2015
c7572a2
added shuffling of the inputs to improve privacy
chris-belcher Jul 1, 2015
d0efc4c
Removed commented out lines in the style tag
Jul 1, 2015
6f4b4ec
Fix BitcoinCoreWallet's UTXO selection.
domob1812 Jul 2, 2015
e265f44
fixed bug when phi=0
chris-belcher Jul 3, 2015
168cc86
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
chris-belcher Jul 3, 2015
518c513
Change how random irc nicknames are generated.
CohibAA Jul 3, 2015
c710da0
Update irc.py
CohibAA Jul 3, 2015
a3671d5
fix DUST_THRESHOLD typo - Discuss Best Practices
CohibAA Jul 3, 2015
8bff836
Adds flags to specify host/port for ob-watcher.
haarts Jul 4, 2015
e56db2c
unquotes bitcoin core alerts passed by wget
chris-belcher Jul 4, 2015
44ce8ce
Merge pull request #115 from btcspry/master
chris-belcher Jul 4, 2015
37d0d6f
Merge pull request #126 from haarts/add_ob_flags
chris-belcher Jul 4, 2015
764768e
Merge pull request #119 from domob1812/fix-rpcwallet-from
chris-belcher Jul 4, 2015
3af3ab6
Prevents startup/testnet spam to log.
haarts Jul 4, 2015
85055c4
Merge pull request #123 from CohibAA/patch-7
chris-belcher Jul 5, 2015
fed79a5
bug fix
CohibAA Jul 6, 2015
58b6bd9
Merge pull request #135 from CohibAA/patch-11
chris-belcher Jul 6, 2015
1e52581
Merge pull request #125 from haarts/master
chris-belcher Jul 6, 2015
ac61e01
Display tx fee contribution when picking orders.
domob1812 Jul 6, 2015
7764eed
bug fix: 'statement_file' is not defined
Mikadily Jul 6, 2015
409fb74
Merge pull request #140 from Mikadily/master
chris-belcher Jul 6, 2015
544dd0c
alphabatize gitignore and ignore env for virtualenvs
BlinkyStitt Jul 11, 2015
197b402
fixed dos exploit against makers
chris-belcher Jul 11, 2015
38228e0
Merge pull request #136 from domob1812/display-fee
chris-belcher Jul 11, 2015
b04d616
fixed wrong information in help message
chris-belcher Jul 11, 2015
2de1dec
Revert "bug fix"
adlai Jul 12, 2015
b7d3f75
Merge pull request #151 from adlai/revert-135-patch-11
chris-belcher Jul 12, 2015
52dae5d
use curl instead of wget for maximal portability
adlai Jul 12, 2015
b994e10
Merge pull request #150 from adlai/master
chris-belcher Jul 18, 2015
f8a540d
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
chris-belcher Jul 18, 2015
e03e09b
remove all references to seed in tumbler.py
chris-belcher Jul 18, 2015
ad749d7
fixed a possible crash bug in the bitcoin core interface
chris-belcher Jul 19, 2015
be8b63f
added warning for sendpayment fees above 2% to make it harder for the…
chris-belcher Jul 20, 2015
56396fb
load transactions past the 1Kth
adlai Jul 22, 2015
00eb9ca
edited warning message to use less prescriptive language
chris-belcher Jul 22, 2015
fea82c1
made actual behaviour consistent with documentation
chris-belcher Jul 22, 2015
6a2fb96
update regtest script
AdamISZ Jul 23, 2015
f5615d1
Merge pull request #162 from AdamISZ/master
chris-belcher Jul 24, 2015
04a8448
Merge pull request #160 from adlai/master
chris-belcher Jul 24, 2015
40e6fa4
Add travis for testing, testing files in test directory
AdamISZ Jul 24, 2015
c2e07aa
more encryption test cases
AdamISZ Jul 26, 2015
562ced6
added simple wallet tests
AdamISZ Jul 27, 2015
027f3e1
kiss walletnotify listener
adlai Jul 27, 2015
fe52cde
Merge pull request #164 from adlai/master
chris-belcher Jul 27, 2015
bff3686
moved around the choose order function to make it easier for taker re…
chris-belcher Jul 29, 2015
b30be72
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
chris-belcher Jul 29, 2015
38f7bad
fix bip66 issue with signatures
AdamISZ Jul 29, 2015
d96b1ad
shifted the balance between price and randomness further towards rand…
chris-belcher Jul 30, 2015
1ddd19e
Merge pull request #163 from AdamISZ/master
chris-belcher Jul 30, 2015
3461c2d
Merge branch 'master' of https://github.com/chris-belcher/joinmarket
chris-belcher Jul 30, 2015
94ae340
Merge pull request #167 from AdamISZ/bip66
chris-belcher Jul 30, 2015
b3fb53b
Merge pull request #148 from WyseNynja/ignore_env
chris-belcher Jul 31, 2015
5eef8f4
Merge pull request #121 from CohibAA/patch-5
chris-belcher Aug 2, 2015
f71aa3d
replaced nick generation with one that makes pronouncable nicknames
chris-belcher Aug 3, 2015
516ff38
move query_utxo_set out of the loop
AdamISZ Aug 3, 2015
d9d627d
incremented version number for alert asking for upgrade to fix bip66
chris-belcher Aug 5, 2015
d910fed
add ?scale=log to /ordersize
adlai Aug 5, 2015
4a58865
fix common.debug calls in notifier
AdamISZ Aug 7, 2015
373d7d1
Merge pull request #176 from AdamISZ/debug_call_fix
chris-belcher Aug 7, 2015
609a195
Merge pull request #174 from adlai/logscale
chris-belcher Aug 7, 2015
9f5e3d6
validate cjfee in OrderbookWatch.on_order_seen
adlai Aug 9, 2015
8509156
Merge pull request #180 from adlai/garbage-in-garbage-out
chris-belcher Aug 9, 2015
ef5aa32
update default tor config
CohibAA Aug 9, 2015
644006b
Tor opens a socks proxy on port 9050 by default
CohibAA Aug 9, 2015
d6a544a
standardize satoshi_to_unit output
CohibAA Aug 9, 2015
3e53e77
Merge pull request #182 from CohibAA/patch-13
chris-belcher Aug 10, 2015
3d2df90
numpy removal
AdamISZ Aug 5, 2015
d233fee
tumbler test script
AdamISZ Aug 10, 2015
9922c6d
Implement JSON-RPC interface instead of CLI.
domob1812 Jul 7, 2015
ba07d06
Make new JSON-RPC optional, CLI still possible.
domob1812 Aug 4, 2015
24abb8f
refactor tests, small improvements
AdamISZ Aug 12, 2015
6c6c9ce
add shell script for more generic notifications
AdamISZ Aug 12, 2015
a6895bc
ensure correct password
AdamISZ Aug 14, 2015
60044d0
sanity check length of recovery seed
AdamISZ Aug 15, 2015
ef41e02
Merge pull request #192 from AdamISZ/recoveryseedsanitycheck
chris-belcher Aug 15, 2015
cb0e920
Merge pull request #191 from AdamISZ/pkcs7sanitycheck
chris-belcher Aug 15, 2015
d6656c9
Merge pull request #189 from AdamISZ/testrefactor
chris-belcher Aug 23, 2015
52eda57
Merge pull request #187 from AdamISZ/tumblertest
chris-belcher Aug 23, 2015
f5eea9c
Merge pull request #183 from CohibAA/patch-14
chris-belcher Aug 23, 2015
5d83122
Merge branch 'json-rpc' of https://github.com/domob1812/joinmarket in…
chris-belcher Aug 23, 2015
fc2e582
fixed problem by adding strip(), changed name from json-rpc-socket to…
chris-belcher Aug 23, 2015
e67f206
Merge branch 'domob1812-json-rpc'
chris-belcher Aug 23, 2015
730808d
Merge branch 'issue_85' of https://github.com/AdamISZ/joinmarket into…
Aug 28, 2015
f71483d
"(potentially) earned" phrasing change
CohibAA Aug 29, 2015
6c36a8d
Merge pull request #205 from CohibAA/patch-17
chris-belcher Aug 29, 2015
850e819
minus sign wrong in tumbler
chris-belcher Aug 31, 2015
dc88837
wrote tests for replacement numpy random functions
Sep 3, 2015
7fcd6e6
Merge branch 'AdamISZ-issue_85'
Sep 3, 2015
8f5dd39
Merge https://github.com/chris-belcher/joinmarket
Sep 3, 2015
1497447
Remove numpy, all links ssl.
tailsjoin Sep 4, 2015
ec35fc0
Merge pull request #217 from tailsjoin/master
chris-belcher Sep 4, 2015
e1bd0af
Bugfix: socks5 negotiation failure reporting
adlai Sep 5, 2015
e12a70e
combat dust thru utxo merge policy
adlai Aug 5, 2015
6f3a98c
Merge pull request #173 from adlai/mergy-police
chris-belcher Sep 5, 2015
b4514aa
Delete leftover print statement in select_greedy
adlai Sep 5, 2015
d3b7ce5
Merge pull request #222 from adlai/patch-1
chris-belcher Sep 7, 2015
00c9111
Merge pull request #172 from AdamISZ/issue104
chris-belcher Sep 7, 2015
36d5494
removed the debug lines on utxo policy which have confused some users
chris-belcher Sep 10, 2015
b0aa602
added an error message to jsonrpc
chris-belcher Sep 11, 2015
cf3bbf3
changed tumbler interface to be less confusing, -a flag now controls …
chris-belcher Sep 12, 2015
275a656
checked an error condition and printed message
chris-belcher Sep 12, 2015
07d679b
slightly moved the Connected message to reduce confusion
chris-belcher Sep 12, 2015
94b9fda
added comment in regtest_joinmarket.cfg to reduce confusion
chris-belcher Sep 12, 2015
a249b55
fixed bug, made documentation consistent with behavour in tumbler
chris-belcher Sep 12, 2015
472710a
fixed doc string
chris-belcher Sep 13, 2015
6b26fe8
Update readme and change .txt to .md
tailsjoin Sep 14, 2015
3c327e2
Merge pull request #232 from tailsjoin/master
chris-belcher Sep 14, 2015
f0724f8
edited message so people dont waste time rescanning empty unused wallets
chris-belcher Sep 17, 2015
029e421
Added taker code to timeout and recover from unresponsive makers
chris-belcher Sep 8, 2015
2f24c00
fixed bug from merge with #172, rearranged stuff so walletnotify
chris-belcher Sep 9, 2015
cd23795
fixed bug where tumbler didnt take into account fees
chris-belcher Sep 19, 2015
eaac40c
fixed subtle bug in rand_exp_array where lambda = 1/lambda
chris-belcher Sep 19, 2015
f877487
fixed problem with taker overwriting crypto_boxes after recovery from…
chris-belcher Sep 19, 2015
b69c322
changed how mincjfee works to stop it hanging on 500 satoshi fees tha…
chris-belcher Sep 20, 2015
79caac7
merged taker recovery into master
chris-belcher Sep 23, 2015
ac24975
Merge branch 'crude-taker-recovery2'
chris-belcher Sep 23, 2015
2769ee8
tumbler will silence all debug messages before asking for a new address
chris-belcher Sep 24, 2015
e5a666b
address to listen on for notify from bitcoin core can now be configured
chris-belcher Sep 24, 2015
aa319fb
rewrote choose_sweep_orders() to not use itertools.combinations and s…
chris-belcher Sep 27, 2015
f29707c
added support for sending to p2sh addresses by taker
chris-belcher Sep 27, 2015
f6bfe60
Add JS code to select specific orders with a single click. The select…
Sep 28, 2015
54e2532
Merge pull request #245 from the9ull/select-orders-js
chris-belcher Sep 28, 2015
c11229a
made an exiting procedure slightly cleaner
chris-belcher Sep 29, 2015
a436ebf
Move yieldgen configuration to joinmarket.cfg
Sep 30, 2015
06baba4
Move yieldgen conf to joinmarket.cfg
Sep 30, 2015
a0d305d
fixes
Sep 30, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
*.pyc
*.pyc
*.swp
blockchain.cache
env
joinmarket.cfg
38 changes: 38 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
language: python
python:
- "2.7_with_system_site_packages"
before_install:
- sudo apt-add-repository ppa:bitcoin/bitcoin -y
- sudo apt-get update -q
- sudo apt-get install --no-install-recommends --no-upgrade -qq bitcoind
- sudo apt-get install -y build-essential
- sudo apt-get install -y automake
install:
- pip install numpy
- pip install pexpect
script:
- git clone git://github.com/jedisct1/libsodium.git
- cd libsodium
- git checkout tags/1.0.3
- ./autogen.sh
- ./configure
- make check
- sudo make install
- cd ..
#set up joinmarket.cfg
- cp test/regtest_joinmarket.cfg joinmarket.cfg
#E2E encryption (libnacl) tests
- python lib/enc_wrapper.py
#start bitcoin regtest daemon and 101 blocks
- mkdir /home/travis/.bitcoin
- cp test/bitcoin.conf /home/travis/.bitcoin/.
- chmod 600 /home/travis/.bitcoin/bitcoin.conf
- bitcoind -regtest -daemon
- sleep 5
- bitcoin-cli -regtest setgenerate true 101
- cd test
- python regtest.py
- python wallet-test.py
branches:
only:
- master
45 changes: 45 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
##What is JoinMarket ?

The idea behind JoinMarket is that holders of bitcoin will allow their coins to be mixed with in return for a fee. The mixing will happen in coinjoin transactions. They form a kind of smart contract which means your private keys will never leave your computer so there is no risk of loss (barring malware or bug*)

Put simply, JoinMarket allows you to improve the privacy of your bitcoin transactions for low fees in a decentralized fashion Because of the fee paid, owners of bitcoin will be able to earn an income using JoinMarket.

As the risk is very low, the reward will also be low because of competition between fee-earners. It means that you will be eventually able to do a coinjoin very cheaply. We already see that holders of bitcoin are willing to earn very small amounts per day by lending on the bitfinex exchange, and that contains a substantial risk that bitfinex will go disappear.

##Installation

#####REQUIRED INSTALLATION DEPENDENCIES

+ You will need python 2.7

+ You will need libsodium installed

- You can get it here: http://doc.libsodium.org/ or through apt-get as `libsodium-dev`

- Use this line to check it was installed correctly: `python lib/enc_wrapper.py`

+ Matplotlib for displaying the graphs in orderbook-watcher (optional)

###DEBIAN / UBUNTU QUICK INSTALL:

1. `sudo apt-get update -y && sudo apt-get upgrade -y && sudo apt-get install python libsodium-dev -y`
2. `sudo apt-get install python-matplotlib -y` (optional)
3. `git clone https://github.com/chris-belcher/joinmarket.git`
4. Generating your first wallet will populate the configuration file: `joinmarket.cfg`.
Check if the default settings suit your needs.

###[WIKI PAGES FOR DETAILED ARTICLES/GUIDES](https://github.com/chris-belcher/joinmarket/wiki)

###[FOR WINDOWS](https://github.com/chris-belcher/joinmarket/wiki/Installing-JoinMarket-on-Windows-7-(temporary))

---

+ IRC: `#joinmarket` on irc.freenode.net https://webchat.freenode.net/?channels=%23joinmarket

+ Bitcointalk thread: https://bitcointalk.org/index.php?topic=919116.msg10096563

+ Subreddit: https://reddit.com/r/joinmarket

+ Twitter: https://twitter.com/joinmarket

+ Donation address: `1AZgQZWYRteh6UyF87hwuvyWj73NvWKpL`
101 changes: 0 additions & 101 deletions README.txt

This file was deleted.

93 changes: 0 additions & 93 deletions bip32-tool.py

This file was deleted.

6 changes: 0 additions & 6 deletions bitcoin/__init__.py

This file was deleted.

40 changes: 0 additions & 40 deletions bitcoin/composite.py

This file was deleted.

Loading