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

tumbler option to start from lowest used mix depth #262

Open
wants to merge 520 commits into
base: master
Choose a base branch
from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 6, 2015

  1. added instructions on how to run with mainnet

    Belcher committed May 6, 2015
    Configuration menu
    Copy the full SHA
    659df43 View commit details
    Browse the repository at this point in the history
  2. added link to the wiki in the joinmarket.cfg

    Belcher committed May 6, 2015
    Configuration menu
    Copy the full SHA
    ed5ed14 View commit details
    Browse the repository at this point in the history
  3. removed the word seed from documentation of wallet-tool because thats…

    … only used for testnet
    Belcher committed May 6, 2015
    Configuration menu
    Copy the full SHA
    9a5dad2 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2015

  1. Implemented socks5 proxy

    abitfan committed May 7, 2015
    Configuration menu
    Copy the full SHA
    fe535a9 View commit details
    Browse the repository at this point in the history
  2. yield generator takes into account dust_threshold when announcing ord…

    …er maxsize
    Belcher committed May 7, 2015
    Configuration menu
    Copy the full SHA
    45ca1cd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8e240f0 View commit details
    Browse the repository at this point in the history
  4. slightly clearer error message

    Belcher committed May 7, 2015
    Configuration menu
    Copy the full SHA
    c2f32c8 View commit details
    Browse the repository at this point in the history
  5. added donation address to readme

    Belcher committed May 7, 2015
    Configuration menu
    Copy the full SHA
    05be93d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    93dfad1 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2015

  1. Configuration menu
    Copy the full SHA
    6b3a945 View commit details
    Browse the repository at this point in the history
  2. added --pre to instructions for pip install

    Belcher committed May 8, 2015
    Configuration menu
    Copy the full SHA
    d53bc4e View commit details
    Browse the repository at this point in the history

Commits on May 9, 2015

  1. sendpayment now displays chosen orders and asks for confirmation befo…

    …re starting, --yes will skip
    Belcher committed May 9, 2015
    Configuration menu
    Copy the full SHA
    a068d70 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2015

  1. bug fix, would crash on unconfirmed or already spent utxos instead of…

    … sending error to taker
    Belcher committed May 11, 2015
    Configuration menu
    Copy the full SHA
    e74c384 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2015

  1. Configuration menu
    Copy the full SHA
    6fdc00d View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#65 from abitfan/socks5proxy

    Implemented socks5 proxy
    chris-belcher committed May 13, 2015
    Configuration menu
    Copy the full SHA
    d3c40ea View commit details
    Browse the repository at this point in the history
  3. threading lock the debug file writes

    Belcher committed May 13, 2015
    Configuration menu
    Copy the full SHA
    3b89d91 View commit details
    Browse the repository at this point in the history
  4. socks5 proxy off by default

    Belcher committed May 13, 2015
    Configuration menu
    Copy the full SHA
    7a179d0 View commit details
    Browse the repository at this point in the history
  5. bugfix with other commit, whoops

    Belcher committed May 13, 2015
    Configuration menu
    Copy the full SHA
    e6739bd View commit details
    Browse the repository at this point in the history
  6. fixed bug in socks5 debug line

    Belcher committed May 13, 2015
    Configuration menu
    Copy the full SHA
    9fce906 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d02167f View commit details
    Browse the repository at this point in the history
  8. add options to choose cheapest orders or manually pick orders (only w…

    …orks while not sweeping)
    anduck committed May 13, 2015
    Configuration menu
    Copy the full SHA
    8638268 View commit details
    Browse the repository at this point in the history
  9. Merge pull request JoinMarket-Org#68 from anduck/master

    Add an option to choose the cheapest or manually pick orders
    chris-belcher committed May 13, 2015
    Configuration menu
    Copy the full SHA
    49aa610 View commit details
    Browse the repository at this point in the history
  10. tweaked order choosing parameters

    Belcher committed May 13, 2015
    Configuration menu
    Copy the full SHA
    326bb8d View commit details
    Browse the repository at this point in the history

Commits on May 14, 2015

  1. Configuration menu
    Copy the full SHA
    074846e View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#72 from AdamISZ/master

    bugfix, option gaplimit type set to int
    chris-belcher committed May 14, 2015
    Configuration menu
    Copy the full SHA
    86bd5fc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f1f64ca View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    157b046 View commit details
    Browse the repository at this point in the history
  5. Merge pull request JoinMarket-Org#66 from adlai/master

    Separate Log Directories, and active_orders Maintenance
    chris-belcher committed May 14, 2015
    Configuration menu
    Copy the full SHA
    e0c0317 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2015

  1. Configuration menu
    Copy the full SHA
    b613f16 View commit details
    Browse the repository at this point in the history
  2. convert to float

    abitfan committed May 15, 2015
    Configuration menu
    Copy the full SHA
    cc7b77d View commit details
    Browse the repository at this point in the history

Commits on May 17, 2015

  1. Reverted changes

    abitfan committed May 17, 2015
    Configuration menu
    Copy the full SHA
    99d94ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0fe0168 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. Configuration menu
    Copy the full SHA
    3af5879 View commit details
    Browse the repository at this point in the history
  2. wrong branch

    abitfan committed May 18, 2015
    Configuration menu
    Copy the full SHA
    0c2b473 View commit details
    Browse the repository at this point in the history
  3. Update comment

    abitfan committed May 18, 2015
    Configuration menu
    Copy the full SHA
    9eb66d7 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2015

  1. added update_cache_index() code, which stores the pointers of the add…

    …resses we're up to in the HD wallet
    chris-belcher committed May 19, 2015
    Configuration menu
    Copy the full SHA
    b3dc7c7 View commit details
    Browse the repository at this point in the history
  2. Revert "added update_cache_index() code, which stores the pointers of…

    … the addresses we're up to in the HD wallet"
    
    This reverts commit b3dc7c7.
    chris-belcher committed May 19, 2015
    Configuration menu
    Copy the full SHA
    cfe7d24 View commit details
    Browse the repository at this point in the history
  3. Revert "Revert "added update_cache_index() code, which stores the poi…

    …nters of the addresses we're up to in the HD wallet""
    
    This reverts commit cfe7d24.
    chris-belcher committed May 19, 2015
    Configuration menu
    Copy the full SHA
    7bff63e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4487d2b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a3e8c4c View commit details
    Browse the repository at this point in the history

Commits on May 20, 2015

  1. Use itertools.combinations when sweeping

    github magic: fixes JoinMarket-Org#48
    adlai committed May 20, 2015
    Configuration menu
    Copy the full SHA
    c0a8b74 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aaec24e View commit details
    Browse the repository at this point in the history

Commits on May 21, 2015

  1. Merge pull request JoinMarket-Org#81 from adlai/master

    Use itertools.combinations when sweeping
    chris-belcher committed May 21, 2015
    Configuration menu
    Copy the full SHA
    9dcc04e View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#75 from abitfan/sanitychecks

    Sanity check for relorder params
    chris-belcher committed May 21, 2015
    Configuration menu
    Copy the full SHA
    4368957 View commit details
    Browse the repository at this point in the history
  3. merged pull request

    Belcher committed May 21, 2015
    Configuration menu
    Copy the full SHA
    ee79642 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'abitfan-defaultconfig'

    Belcher committed May 21, 2015
    Configuration menu
    Copy the full SHA
    96b494b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3ca698a View commit details
    Browse the repository at this point in the history

Commits on May 23, 2015

  1. Configuration menu
    Copy the full SHA
    9b99309 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e3728e8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6dbe42b View commit details
    Browse the repository at this point in the history

Commits on May 24, 2015

  1. Configuration menu
    Copy the full SHA
    c780aa7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ca368ca View commit details
    Browse the repository at this point in the history
  3. fixed bug in sasl code

    chris-belcher committed May 24, 2015
    Configuration menu
    Copy the full SHA
    900a57a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    04902c0 View commit details
    Browse the repository at this point in the history
  5. Revert "fixed bug in sasl code", actually wasnt a bug

    This reverts commit 900a57a.
    chris-belcher committed May 24, 2015
    Configuration menu
    Copy the full SHA
    fde0b9e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    68756a2 View commit details
    Browse the repository at this point in the history
  7. removed duplicate check for utxos being spent, required to remove ref…

    …erences to wallet.unspent
    chris-belcher committed May 24, 2015
    Configuration menu
    Copy the full SHA
    52dd847 View commit details
    Browse the repository at this point in the history
  8. Merge pull request JoinMarket-Org#87 from adlai/master

    fix depth charts for the case of a lone applicable offer
    chris-belcher committed May 24, 2015
    Configuration menu
    Copy the full SHA
    b53e930 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    03634ff View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2f82933 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2015

  1. Configuration menu
    Copy the full SHA
    7a82abc View commit details
    Browse the repository at this point in the history

Commits on May 26, 2015

  1. Configuration menu
    Copy the full SHA
    f73aae9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e7737c1 View commit details
    Browse the repository at this point in the history
  3. made the irc client ping less often and with a longer timeout, for lo…

    …wer latetncy networks like tor and i2p
    chris-belcher committed May 26, 2015
    Configuration menu
    Copy the full SHA
    dbe4f07 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    feacc78 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2015

  1. Configuration menu
    Copy the full SHA
    e57b88e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8767127 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. Sort the orderbook by cjfee

    Martino committed May 28, 2015
    Configuration menu
    Copy the full SHA
    fc238e6 View commit details
    Browse the repository at this point in the history
  2. Sork the orderbook by cjfee

    Martino committed May 28, 2015
    Configuration menu
    Copy the full SHA
    117d098 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' of github.com:the9ull/joinmarket

    Conflicts:
    	ob-watcher.py
    Martino committed May 28, 2015
    Configuration menu
    Copy the full SHA
    590c6d7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    39531b3 View commit details
    Browse the repository at this point in the history
  5. Merge pull request JoinMarket-Org#94 from K1773R/fix-log-buffering

    enable line buffering for the logfile
    chris-belcher committed May 28, 2015
    Configuration menu
    Copy the full SHA
    282b50c View commit details
    Browse the repository at this point in the history
  6. created BitcoinCoreWallet for coinjoining by querying bitcoin core in…

    …stead of the joinmarket internal wallet
    chris-belcher committed May 28, 2015
    2 Configuration menu
    Copy the full SHA
    3d66769 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a0eaacb View commit details
    Browse the repository at this point in the history

Commits on May 29, 2015

  1. Put absorders first. I confess: I didn't test

    Martino Salvetti committed May 29, 2015
    Configuration menu
    Copy the full SHA
    47e737a View commit details
    Browse the repository at this point in the history
  2. bugfix for pick_order (-P)

    anduck committed May 29, 2015
    Configuration menu
    Copy the full SHA
    3bf8fba View commit details
    Browse the repository at this point in the history

Commits on May 31, 2015

  1. Merge pull request JoinMarket-Org#98 from anduck/master

    bugfix for pick_order (-P)
    chris-belcher committed May 31, 2015
    Configuration menu
    Copy the full SHA
    c64f23c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0ad6388 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    218b796 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3267b22 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2015

  1. Configuration menu
    Copy the full SHA
    d79fbf8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fffc09c View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2015

  1. fixed bug, whoops

    chris-belcher committed Jun 4, 2015
    Configuration menu
    Copy the full SHA
    6940e11 View commit details
    Browse the repository at this point in the history
  2. more stupid typos

    chris-belcher committed Jun 4, 2015
    Configuration menu
    Copy the full SHA
    c931dd6 View commit details
    Browse the repository at this point in the history
  3. another stupid mistake of mine, i blame python although its mostly my…

    … fault for not writing any tests
    chris belcher committed Jun 4, 2015
    Configuration menu
    Copy the full SHA
    e641c5c View commit details
    Browse the repository at this point in the history
  4. added link to installing on windows in readme

    chris belcher committed Jun 4, 2015
    Configuration menu
    Copy the full SHA
    0a4063b View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2015

  1. Merge pull request JoinMarket-Org#93 from the9ull/master

    Sort the orderbook
    chris-belcher committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    cf5afa6 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2015

  1. Addcache support to make_request

    Martino Salvetti committed Jun 6, 2015
    Configuration menu
    Copy the full SHA
    b7aaa5b View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2015

  1. x

    abitfan committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    774041b View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	joinmarket.cfg
    abitfan committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    e008f0f View commit details
    Browse the repository at this point in the history
  3. Wrong password handling

    abitfan committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    4c82a56 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2015

  1. Implement orderby (ASC only)

    Martino Salvetti committed Jun 13, 2015
    Configuration menu
    Copy the full SHA
    009a582 View commit details
    Browse the repository at this point in the history
  2. Implement desc

    Martino Salvetti committed Jun 13, 2015
    Configuration menu
    Copy the full SHA
    a86f7eb View commit details
    Browse the repository at this point in the history
  3. Removed implementation of cache

    Martino Salvetti committed Jun 13, 2015
    Configuration menu
    Copy the full SHA
    a0046cf View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2015

  1. cleanup & bugfix orderbook sorting

    One of the market participants has taken to serializing the fee in
    exponential notation, presumably in Murphy's honor. String comparison
    doomed such offers far lower in the order book depths than they deserved
    to swim, and we thus rescue them thru float coercion.
    adlai committed Jun 14, 2015
    Configuration menu
    Copy the full SHA
    7385ba4 View commit details
    Browse the repository at this point in the history
  2. fix wallet-tool showseed bug by storing wallet seed

    Although this does increase the amount of sensitive information stored in
    memory (since storing only child keys leaves one unable to reconstruct
    the master private key), this additional information is unlikely to secure
    additional funds (as the receiving addresses are always drawn from the
    reach of the already-known mixdepth keys).
    adlai committed Jun 14, 2015
    Configuration menu
    Copy the full SHA
    46ada89 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2015

  1. Configuration menu
    Copy the full SHA
    6a9b8f0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    61e7bcf View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2015

  1. Merge pull request JoinMarket-Org#1 from chris-belcher/master

    upstream sync
    abitfan committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    c880eee View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2015

  1. Configuration menu
    Copy the full SHA
    8cc4240 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d691c61 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c073f0d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1ee6c88 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c78b58c View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2015

  1. Update README.txt

    CohibAA committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    cd52110 View commit details
    Browse the repository at this point in the history
  2. Connect to hidden service with ssl

    A bit Fan committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    2f54ced View commit details
    Browse the repository at this point in the history
  3. do not print out seed

    chris-belcher committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    b3f3e82 View commit details
    Browse the repository at this point in the history
  4. Merge pull request JoinMarket-Org#112 from CohibAA/patch-4

    Update README.txt
    chris-belcher committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    bcde05c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    655f361 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2015

  1. Changed appearance and sortablility of table and website

    - Converted whole site to bootstrap
    - Added "GitHub" and "Getting Started" links in the menubar
    - Included "sortable.js" for sorting the table, client side
            - Removed server-side table sorting
    btcspry committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    220415c View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2015

  1. Configuration menu
    Copy the full SHA
    aad5ea3 View commit details
    Browse the repository at this point in the history
  2. it was bugged Revert "added debug information to attempt to fix weigh…

    …t not adding to 1 bug"
    
    This reverts commit aad5ea3.
    chris-belcher committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    77c11be View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0cc6914 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c7572a2 View commit details
    Browse the repository at this point in the history
  5. Removed commented out lines in the style tag

    btcspry committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    d0efc4c View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2015

  1. Fix BitcoinCoreWallet's UTXO selection.

    The UTXO selection of BitcoinCoreWallet with fromaccount set did accept
    also UTXO's without an account.  This is in direct contradiction to the
    user's wish for a specific account.  With this patch, we really only
    accept UTXO's that have the specified account set explicitly.
    domob1812 committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    6f4b4ec View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2015

  1. fixed bug when phi=0

    chris-belcher committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    e265f44 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    168cc86 View commit details
    Browse the repository at this point in the history
  3. Change how random irc nicknames are generated.

    I believe this is a more anonymous and random method and possibly more efficient way to generate random_nick for ircnick.  Thoughts?
    CohibAA committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    518c513 View commit details
    Browse the repository at this point in the history
  4. Update irc.py

    disallow digits in first position of nickname
    CohibAA committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    c710da0 View commit details
    Browse the repository at this point in the history
  5. fix DUST_THRESHOLD typo - Discuss Best Practices

    [reduced dust threshold to 543, in line with electrum](JoinMarket-Org@652ee06)
    
    At minimum, this should be [corrected to 546](https://github.com/bitcoin/bitcoin/blob/master/src/primitives/transaction.h#L146).  
    
    I think maybe it should be a maker cfg option, default set to match core default (546), but I would propose increasing it to approx. 5500 satoshis for these reasons;
    
    1) At today's prices, 546 satoshis is ~$0.0013 USD, and would only be $0.00546 if BTC went to $1000/BTC.  A dust limit of ~5500 would be about $0.01375 at current prices, and $0.055 at $1000/BTC.
    
    2) I think the typical use cases for joinmarket won't involve a lot of these low value ($) transactions.
    
    3) I wouldn't want my wallet cluttered with utxos holding ~546 satoshis, as this means even larger transaction sizes (kb) and potentially higher fees when I want to use those utxos in the future.
    
    I am sure there are different opinions on this, and I'd like to hear them while I continue my thoughts and research on this.
    CohibAA committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    a3671d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2015

  1. Configuration menu
    Copy the full SHA
    8bff836 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e56db2c View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#115 from btcspry/master

    Changed appearance and sortablility of table and website
    chris-belcher committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    44ce8ce View commit details
    Browse the repository at this point in the history
  4. Merge pull request JoinMarket-Org#126 from haarts/add_ob_flags

    Adds flags to specify host/port for ob-watcher.
    chris-belcher committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    37d0d6f View commit details
    Browse the repository at this point in the history
  5. Merge pull request JoinMarket-Org#119 from domob1812/fix-rpcwallet-from

    Fix BitcoinCoreWallet's UTXO selection.
    chris-belcher committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    764768e View commit details
    Browse the repository at this point in the history
  6. 1 Configuration menu
    Copy the full SHA
    3af3ab6 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2015

  1. Merge pull request JoinMarket-Org#123 from CohibAA/patch-7

    fix DUST_THRESHOLD typo - Discuss Best Practices
    chris-belcher committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    85055c4 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2015

  1. bug fix

        ----------------------------------------
        Exception happened during processing of request from ('127.0.0.1', 36796)
        Traceback (most recent call last):
          File "/usr/lib/python2.7/SocketServer.py", line 295, in _handle_request_noblock
            self.process_request(request, client_address)
          File "/usr/lib/python2.7/SocketServer.py", line 321, in process_request
            self.finish_request(request, client_address)
          File "/usr/lib/python2.7/SocketServer.py", line 334, in finish_request
            self.RequestHandlerClass(request, client_address, self)
          File "/home/redacted/joinmarket/lib/blockchaininterface.py", line 277, in __init__
            SimpleHTTPServer.SimpleHTTPRequestHandler.__init__(self, request, client_address, base_server)
          File "/usr/lib/python2.7/SocketServer.py", line 649, in __init__
            self.handle()
          File "/usr/lib/python2.7/BaseHTTPServer.py", line 340, in handle
            self.handle_one_request()
          File "/usr/lib/python2.7/BaseHTTPServer.py", line 328, in handle_one_request
            method()
          File "/home/redacted/joinmarket/lib/blockchaininterface.py", line 311, in do_HEAD
            confirmfun(txd, txid, txdata['confirmations'])
          File "/home/redacted/joinmarket/lib/maker.py", line 120, in confirm_callback
            confirmations, txid)
        TypeError: on_tx_confirmed() takes exactly 5 arguments (4 given)
        ----------------------------------------
    CohibAA committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    fed79a5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#135 from CohibAA/patch-11

    bug fix involving on_tx_confirmed()
    chris-belcher committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    58b6bd9 View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#125 from haarts/master

    Prevents startup spam to log.
    chris-belcher committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    1e52581 View commit details
    Browse the repository at this point in the history
  4. Display tx fee contribution when picking orders.

    In the 'pick orders' dialog, display the tx fee contribution in addition
    to the resulting CJ fee for each order.
    domob1812 committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    ac61e01 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7764eed View commit details
    Browse the repository at this point in the history
  6. Merge pull request JoinMarket-Org#140 from Mikadily/master

    bug fix: 'statement_file' is not defined
    chris-belcher committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    409fb74 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2015

  1. Configuration menu
    Copy the full SHA
    544dd0c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    197b402 View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#136 from domob1812/display-fee

    Display tx fee contribution when picking orders.
    chris-belcher committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    38228e0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b04d616 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2015

  1. Revert "bug fix"

    adlai committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    2de1dec View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#151 from adlai/revert-135-patch-11

    Revert "bug fix" (that just introduced another)
    chris-belcher committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    b7d3f75 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2015

  1. Configuration menu
    Copy the full SHA
    52dae5d View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#150 from adlai/master

    use curl instead of wget for maximal portability
    chris-belcher committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    b994e10 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f8a540d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e03e09b View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2015

  1. Configuration menu
    Copy the full SHA
    ad749d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2015

  1. added warning for sendpayment fees above 2% to make it harder for the…

    … bottom feeds who offer 50% fees
    chris-belcher committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    be8b63f View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2015

  1. load transactions past the 1Kth

    adlai committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    56396fb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    00eb9ca View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fea82c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2015

  1. update regtest script

    AdamISZ committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    6a2fb96 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2015

  1. Merge pull request JoinMarket-Org#162 from AdamISZ/master

    update regtest script
    chris-belcher committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    f5615d1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#160 from adlai/master

    bugfix: load transactions past the 1Kth
    chris-belcher committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    04a8448 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2015

  1. Configuration menu
    Copy the full SHA
    40e6fa4 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2015

  1. more encryption test cases

    AdamISZ committed Jul 26, 2015
    Configuration menu
    Copy the full SHA
    c2e07aa View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2015

  1. added simple wallet tests

    AdamISZ committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    562ced6 View commit details
    Browse the repository at this point in the history
  2. kiss walletnotify listener

    adlai committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    027f3e1 View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#164 from adlai/master

    kiss walletnotify listener
    chris-belcher committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    fe52cde View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2015

  1. moved around the choose order function to make it easier for taker re…

    …covering from unresponsive makers
    chris-belcher committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    bff3686 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b30be72 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    38f7bad View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2015

  1. shifted the balance between price and randomness further towards rand…

    …omness when choosing orders
    chris-belcher committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    d96b1ad View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#163 from AdamISZ/master

    Add travis for testing, testing files in test directory
    chris-belcher committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    1ddd19e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3461c2d View commit details
    Browse the repository at this point in the history
  4. Merge pull request JoinMarket-Org#167 from AdamISZ/bip66

    fix bip66 issue with signatures
    chris-belcher committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    94ae340 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. Merge pull request JoinMarket-Org#148 from WyseNynja/ignore_env

    alphabatize gitignore and ignore env for virtualenvs
    chris-belcher committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    b3fb53b View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2015

  1. Merge pull request JoinMarket-Org#121 from CohibAA/patch-5

    Change how random irc nicknames are generated.
    chris-belcher committed Aug 2, 2015
    Configuration menu
    Copy the full SHA
    5eef8f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2015

  1. Configuration menu
    Copy the full SHA
    f71aa3d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    516ff38 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2015

  1. Configuration menu
    Copy the full SHA
    d9d627d View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2015

  1. add ?scale=log to /ordersize

    adlai committed Aug 6, 2015
    Configuration menu
    Copy the full SHA
    d910fed View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2015

  1. Configuration menu
    Copy the full SHA
    4a58865 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#176 from AdamISZ/debug_call_fix

    fix common.debug calls in notifier
    chris-belcher committed Aug 7, 2015
    Configuration menu
    Copy the full SHA
    373d7d1 View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#174 from adlai/logscale

    add ?scale=log to /ordersize
    chris-belcher committed Aug 7, 2015
    Configuration menu
    Copy the full SHA
    609a195 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2015

  1. Configuration menu
    Copy the full SHA
    9f5e3d6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#180 from adlai/garbage-in-garbage-out

    validate cjfee in OrderbookWatch.on_order_seen
    chris-belcher committed Aug 9, 2015
    Configuration menu
    Copy the full SHA
    8509156 View commit details
    Browse the repository at this point in the history
  3. update default tor config

    update default tor config: 6dvj6v5imhny3anf.onion uses port 6697 and requires ssl authentication currently.
    CohibAA committed Aug 9, 2015
    Configuration menu
    Copy the full SHA
    ef5aa32 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    644006b View commit details
    Browse the repository at this point in the history
  5. standardize satoshi_to_unit output

    cleans up the display of units returned for the orderbook
    CohibAA committed Aug 9, 2015
    Configuration menu
    Copy the full SHA
    d6a544a View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2015

  1. Merge pull request JoinMarket-Org#182 from CohibAA/patch-13

    update default tor config
    chris-belcher committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    3e53e77 View commit details
    Browse the repository at this point in the history
  2. numpy removal

    AdamISZ committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    3d2df90 View commit details
    Browse the repository at this point in the history
  3. tumbler test script

    AdamISZ committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    d233fee View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2015

  1. Implement JSON-RPC interface instead of CLI.

    Replace the connection to Bitcoin Core via bitcoin-cli by a connection
    through its JSON-RPC interface.  This is cleaner, as it does not require
    to convert everything to/from strings.  It is also able to handle error
    codes.
    domob1812 committed Aug 11, 2015
    Configuration menu
    Copy the full SHA
    9922c6d View commit details
    Browse the repository at this point in the history
  2. Make new JSON-RPC optional, CLI still possible.

    Make the use of the new JSON-RPC interface optional.  The legacy
    interface via the CLI binary is still possible.
    
    See the discussion in:
      JoinMarket-Org#141
    
    To use the new interface, set:
      blockchain_source = json-rpc-socket
    domob1812 committed Aug 11, 2015
    Configuration menu
    Copy the full SHA
    ba07d06 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2015

  1. Configuration menu
    Copy the full SHA
    24abb8f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6c6c9ce View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2015

  1. ensure correct password

    properly check pkcs7 in slowaes
    AdamISZ committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    a6895bc View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2015

  1. Configuration menu
    Copy the full SHA
    60044d0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#192 from AdamISZ/recoveryseedsanity…

    …check
    
    sanity check length of recovery seed
    chris-belcher committed Aug 15, 2015
    Configuration menu
    Copy the full SHA
    ef41e02 View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#191 from AdamISZ/pkcs7sanitycheck

    ensure correct password
    chris-belcher committed Aug 15, 2015
    Configuration menu
    Copy the full SHA
    cb0e920 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2015

  1. Merge pull request JoinMarket-Org#189 from AdamISZ/testrefactor

    refactor tests, small improvements
    chris-belcher committed Aug 23, 2015
    Configuration menu
    Copy the full SHA
    d6656c9 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#187 from AdamISZ/tumblertest

    tumbler test script
    chris-belcher committed Aug 23, 2015
    Configuration menu
    Copy the full SHA
    52eda57 View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#183 from CohibAA/patch-14

    standardize satoshi_to_unit output
    chris-belcher committed Aug 23, 2015
    Configuration menu
    Copy the full SHA
    f5eea9c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5d83122 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fc2e582 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e67f206 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. Merge branch 'issue_85' of https://github.com/AdamISZ/joinmarket into…

    … AdamISZ-issue_85
    unknown committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    730808d View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2015

  1. "(potentially) earned" phrasing change

    if tx is not broadcast and confirmed on the network, no earnings are made.  "earned = " is more accurate after the tx is in a block.
    CohibAA committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    f71483d View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#205 from CohibAA/patch-17

    "(potentially) earned" phrasing change
    chris-belcher committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    6c36a8d View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2015

  1. Configuration menu
    Copy the full SHA
    850e819 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2015

  1. Configuration menu
    Copy the full SHA
    dc88837 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'AdamISZ-issue_85'

    unknown committed Sep 3, 2015
    Configuration menu
    Copy the full SHA
    7fcd6e6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8f5dd39 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2015

  1. Configuration menu
    Copy the full SHA
    1497447 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#217 from tailsjoin/master

    Remove numpy, standardize links to https.
    chris-belcher committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    ec35fc0 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2015

  1. Configuration menu
    Copy the full SHA
    e1bd0af View commit details
    Browse the repository at this point in the history
  2. combat dust thru utxo merge policy

    - adds an optional config section: [POLICY]
    - adds a merge_algorithm option in the new section
    - two sample merge algorithms are provided, beyond the default:
      + select_gradual still makes small transactions, clearing dust patiently
      + select_greedy collects dust as quickly as practical
    adlai committed Sep 5, 2015
    1 Configuration menu
    Copy the full SHA
    e12a70e View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#173 from adlai/mergy-police

    combat dust thru utxo merge policies
    chris-belcher committed Sep 5, 2015
    Configuration menu
    Copy the full SHA
    6f3a98c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b4514aa View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2015

  1. Merge pull request JoinMarket-Org#222 from adlai/patch-1

    Delete leftover print statement in select_greedy
    chris-belcher committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    d3b7ce5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#172 from AdamISZ/issue104

    move query_utxo_set out of the loop
    chris-belcher committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    00c9111 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2015

  1. Configuration menu
    Copy the full SHA
    36d5494 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2015

  1. Configuration menu
    Copy the full SHA
    b0aa602 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2015

  1. changed tumbler interface to be less confusing, -a flag now controls …

    …how many destination addresses in total there will be
    chris-belcher committed Sep 12, 2015
    1 Configuration menu
    Copy the full SHA
    cf3bbf3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    275a656 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    07d679b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    94b9fda View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a249b55 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2015

  1. fixed doc string

    chris-belcher committed Sep 13, 2015
    Configuration menu
    Copy the full SHA
    472710a View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2015

  1. Update readme and change .txt to .md

    - Copy/paste brief explanation of what JoinMarket is from wiki. Should be quickly explained on the landing page.
    
    - Change install dependencies from numbered list to bullets. With two numbered lists the steps look a bit daunting at first glance.
    
    - Added 4th step since we've had a few new people recently not realize that the config is populated on first run, causing some confusion. I believe this also eliminates the need for the note near the end about putting mainnet in the config.
    
    - Reformatted already existing information.
    tailsjoin committed Sep 14, 2015
    Configuration menu
    Copy the full SHA
    6b26fe8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#232 from tailsjoin/master

    Update readme and change .txt to .md
    chris-belcher committed Sep 14, 2015
    Configuration menu
    Copy the full SHA
    3c327e2 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2015

  1. Configuration menu
    Copy the full SHA
    f0724f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2015

  1. Added taker code to timeout and recover from unresponsive makers

    Waits 10 seconds by default, any nonrespondants after that
    are added to a local blacklist that persists until the taker
    is restarted.
    Changed sendpayment and tumbler so they recover, seems to work
    
    Sending of spent UTXO by maker no longer crashes taker, this is possible with the timeout recovery code
    chris-belcher committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    029e421 View commit details
    Browse the repository at this point in the history
  2. fixed bug from merge with JoinMarket-Org#172, rearranged stuff so wal…

    …letnotify
    
    could work, fixed some spelling mistakes
    chris-belcher committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    2f24c00 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cd23795 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eaac40c View commit details
    Browse the repository at this point in the history
  5. fixed problem with taker overwriting crypto_boxes after recovery from…

    … timeout, now irc code disregards messaged with unknown encryption
    chris-belcher committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    f877487 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b69c322 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    79caac7 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ac24975 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2015

  1. Configuration menu
    Copy the full SHA
    2769ee8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e5a666b View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2015

  1. rewrote choose_sweep_orders() to not use itertools.combinations and s…

    …o made it far more scalable
    chris-belcher committed Sep 27, 2015
    Configuration menu
    Copy the full SHA
    aa319fb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f29707c View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2015

  1. Add JS code to select specific orders with a single click. The select…

    …ion is persistent.
    Martino Salvetti committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    f6bfe60 View commit details
    Browse the repository at this point in the history
  2. Merge pull request JoinMarket-Org#245 from the9ull/select-orders-js

    orderbook.html: select specific orders with a single click
    chris-belcher committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    54e2532 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2015

  1. Configuration menu
    Copy the full SHA
    c11229a View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2015

  1. Configuration menu
    Copy the full SHA
    485773f View commit details
    Browse the repository at this point in the history
  2. Update README.md

    I rewrote the introduction because I found it to be hard to read and contained some grammatical errors.
    baurusdb committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    c420b8b View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#250 from baurusdb/patch-1

    Update README.md. Rewrote the introduction because was found hard to read and contained some grammatical errors
    chris-belcher committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    135d86a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2015

  1. Configuration menu
    Copy the full SHA
    21a8f81 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    04db451 View commit details
    Browse the repository at this point in the history
  3. Merge pull request JoinMarket-Org#249 from adlai/master

    Update regtest.py and regtest_joinmarket.cfg
    chris-belcher committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    90f4603 View commit details
    Browse the repository at this point in the history
  4. Add the /orderbook.json resource to the ob-watcher.py

    Martino Salvetti committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    408a2bb View commit details
    Browse the repository at this point in the history
  5. Add a link to orderbook.json to

    Martino Salvetti committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    a7bf053 View commit details
    Browse the repository at this point in the history
  6. Merge pull request JoinMarket-Org#257 from the9ull/master

    Add the /orderbook.json resource to the ob-watcher.py
    chris-belcher committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    95efeaf View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3a7e013 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d6add79 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2015

  1. Configuration menu
    Copy the full SHA
    f144d2c View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2015

  1. Configuration menu
    Copy the full SHA
    d686647 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2015

  1. simple implementation of starting from first non-empty level in joinm…

    …arket wallet for issue JoinMarket-Org#260
    
    fixed sorting of list of levels properly
    
    update options.mixdepthsrc instead of having new variable
    Dan Weatherill committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    b25cb65 View commit details
    Browse the repository at this point in the history