Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Develop in Master #336

Merged
merged 284 commits into from
Oct 23, 2014
Merged

Merge Develop in Master #336

merged 284 commits into from
Oct 23, 2014
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 8, 2014

  1. another fatal bug in testnet on unpack failure

    PhantomPhreak committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    5b882a9 View commit details
    Browse the repository at this point in the history

  2. two more

    PhantomPhreak committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    15c7256 View commit details
    Browse the repository at this point in the history

  3. foo

    PhantomPhreak committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    7917d6f View commit details
    Browse the repository at this point in the history

  4. progress on sending

    PhantomPhreak committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    0139fc7 View commit details
    Browse the repository at this point in the history

  5. sort source array

    PhantomPhreak committed Aug 8, 2014
    Configuration menu
    Copy the full SHA
    9dca7b1 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2014

  1. signature capability

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    891c473 View commit details
    Browse the repository at this point in the history

  2. variable naming; progress

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    f8d6d2b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into multisig

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    24b1237 View commit details
    Browse the repository at this point in the history

  4. typo

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    618b253 View commit details
    Browse the repository at this point in the history

  5. progress!

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    b33b6f3 View commit details
    Browse the repository at this point in the history

  6. finishing up?!

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    f0cbd2b View commit details
    Browse the repository at this point in the history

  7. closer…

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    09b4bf0 View commit details
    Browse the repository at this point in the history

  8. version bump

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    1f7a5a9 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into multisig

    PhantomPhreak committed Aug 9, 2014
    Configuration menu
    Copy the full SHA
    9cf5e36 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2014

  1. finish unspent collection

    PhantomPhreak committed Aug 11, 2014
    Configuration menu
    Copy the full SHA
    1c0bb97 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2014

  1. comment; unrecognizable TX outputs

    PhantomPhreak committed Aug 23, 2014
    Configuration menu
    Copy the full SHA
    87c920b View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2014

  1. fatal bug in testnet

    PhantomPhreak committed Aug 24, 2014
    Configuration menu
    Copy the full SHA
    44b2efa View commit details
    Browse the repository at this point in the history

  2. updated API docs

    xnova committed Aug 24, 2014
    Configuration menu
    Copy the full SHA
    52d8d6e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd 

     into develop
    xnova committed Aug 24, 2014
    Configuration menu
    Copy the full SHA
    4d6bafc View commit details
    Browse the repository at this point in the history

  4. blockr API tweak

    xnova committed Aug 24, 2014
    Configuration menu
    Copy the full SHA
    1d12752 View commit details
    Browse the repository at this point in the history

  5. more doc tweaks with lock param for create_issuance

    xnova committed Aug 24, 2014
    Configuration menu
    Copy the full SHA
    4233a9f View commit details
    Browse the repository at this point in the history

  6. unit tests V2 step 1

    JahPowerBit committed Aug 24, 2014
    Configuration menu
    Copy the full SHA
    1b1907f View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2014

  1. Update wif prefixes for changes in pycoin interface

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    9d7d429 View commit details
    Browse the repository at this point in the history

  2. Initial asyncio implementation for talking to bitcoind

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    4d95ec0 View commit details
    Browse the repository at this point in the history

  3. yield from in all the right places

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    eb1eb18 View commit details
    Browse the repository at this point in the history

  4. updated API docs

    xnova authored and Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    c415180 View commit details
    Browse the repository at this point in the history

  5. more doc tweaks with lock param for create_issuance

    xnova authored and Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    6cae8a5 View commit details
    Browse the repository at this point in the history

  6. Missed a couple rpc calls and wip fix

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    de1fe52 View commit details
    Browse the repository at this point in the history

  7. aiohttp instead of requests, with aiorun() to emulate synchronicity

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    e5e5878 View commit details
    Browse the repository at this point in the history

  8. Update requirements requests->aiohttp, python 3.4

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    f328aa6 View commit details
    Browse the repository at this point in the history

  9. Yield from functions in bitcoin.py

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    c8afa25 View commit details
    Browse the repository at this point in the history

  10. Tests pass (excluding test_log and test_json_rpc)

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    89371c0 View commit details
    Browse the repository at this point in the history

  11. Use aiorun()

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    015410a View commit details
    Browse the repository at this point in the history

  12. Print block timing information

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    c7483fe View commit details
    Browse the repository at this point in the history

  13. Fix merge conflict

    Bob McElrath committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    d3507a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2014

  1. Rename aiorun to aio_wait_for

    Bob McElrath committed Aug 29, 2014
    Configuration menu
    Copy the full SHA
    2217102 View commit details
    Browse the repository at this point in the history

  2. Rename aio_wait_for to aio_run_synch

    Bob McElrath committed Aug 29, 2014
    Configuration menu
    Copy the full SHA
    c405127 View commit details
    Browse the repository at this point in the history

  3. Put wif prefixes in config

    Bob McElrath committed Aug 29, 2014
    Configuration menu
    Copy the full SHA
    adc3300 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #256 from JahPowerBit/develop 

    unit tests V2 step 1
    PhantomPhreak committed Aug 29, 2014
    Configuration menu
    Copy the full SHA
    9af16e4 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2014

  1. fix issuance.validate return

    JahPowerBit committed Aug 30, 2014
    Configuration menu
    Copy the full SHA
    09c146f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #269 from JahPowerBit/develop 

    fix issuance.validate return
    PhantomPhreak committed Aug 30, 2014
    Configuration menu
    Copy the full SHA
    4030c71 View commit details
    Browse the repository at this point in the history

  3. add event arg for all util.debit/credit

    JahPowerBit committed Aug 30, 2014
    Configuration menu
    Copy the full SHA
    e5779e8 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2014

  1. Merge branch 'develop' into multisig 

    Conflicts:
	CHANGELOG.md
	lib/blocks.py
	lib/broadcast.py
	lib/config.py
	lib/issuance.py
    PhantomPhreak committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    5a94059 View commit details
    Browse the repository at this point in the history

  2. tweak merge

    PhantomPhreak committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    7d90083 View commit details
    Browse the repository at this point in the history

  3. maj tests for previous commit

    JahPowerBit committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    43e45b8 View commit details
    Browse the repository at this point in the history

  4. force destination to be first output; comment

    PhantomPhreak committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    0d70c36 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #274 from JahPowerBit/develop 

    add event arg for all util.debit/credit
    PhantomPhreak committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    45035f3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into multisig

    PhantomPhreak committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    1c16bd4 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2014

  1. multiple sources

    PhantomPhreak committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    9d13775 View commit details
    Browse the repository at this point in the history

  2. multiple destinations; reorganise get_tx_info_2

    PhantomPhreak committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    f966fba View commit details
    Browse the repository at this point in the history

  3. bug fixes

    PhantomPhreak committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    db92bb2 View commit details
    Browse the repository at this point in the history

  4. cleanup

    PhantomPhreak committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    2d45b3e View commit details
    Browse the repository at this point in the history

  5. more minor cleanup

    PhantomPhreak committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    4610653 View commit details
    Browse the repository at this point in the history

  6. bug

    PhantomPhreak committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    b1fa013 View commit details
    Browse the repository at this point in the history

  7. tweak error message

    PhantomPhreak committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    4b28e4a View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2014

  1. Update pycoin version to 0.51

    Bob McElrath committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    27406df View commit details
    Browse the repository at this point in the history

  2. Merge pull request #261 from mcelrath/asyncio 

    Asyncio based on develop
    PhantomPhreak committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    a3c9236 View commit details
    Browse the repository at this point in the history

  3. foo

    PhantomPhreak committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    a8a3fc4 View commit details
    Browse the repository at this point in the history

  4. tweak dividend rules; fixes #254

    PhantomPhreak committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    a799ef5 View commit details
    Browse the repository at this point in the history

  5. update test suite

    PhantomPhreak committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    3e0d9ba View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2014

  1. Missing argument in the API doc for 'create_bet' 

    The RPC throws an error if `expiration` isn't provided.
    @Frozenlock
    Frozenlock committed Sep 5, 2014
    Configuration menu
    Copy the full SHA
    4054a11 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #276 from Frozenlock/patch-2 

    Missing argument in the API doc for 'create_bet'
    Robby Dermody committed Sep 5, 2014
    Configuration menu
    Copy the full SHA
    7b9ef31 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2014

  1. fix PRIVATEKEY_VERSION_TESTNET

    JahPowerBit committed Sep 7, 2014
    Configuration menu
    Copy the full SHA
    8f369fa View commit details
    Browse the repository at this point in the history

  2. fix test log: disable asyncio logging

    JahPowerBit committed Sep 7, 2014
    Configuration menu
    Copy the full SHA
    0eaae89 View commit details
    Browse the repository at this point in the history

  3. test suite V2 step 2

    JahPowerBit committed Sep 7, 2014
    Configuration menu
    Copy the full SHA
    2a2ff8c View commit details
    Browse the repository at this point in the history

  4. rebase test suite step 1

    JahPowerBit committed Sep 7, 2014
    Configuration menu
    Copy the full SHA
    62d266d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2014

  1. rebase test suite step 2

    JahPowerBit committed Sep 8, 2014
    Configuration menu
    Copy the full SHA
    3d5f948 View commit details
    Browse the repository at this point in the history

  2. temporary solution to run test in UTC everywhere

    JahPowerBit committed Sep 8, 2014
    Configuration menu
    Copy the full SHA
    9c65a9f View commit details
    Browse the repository at this point in the history

  3. update scenarios logs with utc time

    JahPowerBit committed Sep 8, 2014
    Configuration menu
    Copy the full SHA
    ba2f061 View commit details
    Browse the repository at this point in the history

  4. [#280] update book.testner for dividend new rules

    JahPowerBit committed Sep 8, 2014
    Configuration menu
    Copy the full SHA
    6b8d8e2 View commit details
    Browse the repository at this point in the history

  5. fix util_test.py

    JahPowerBit committed Sep 8, 2014
    Configuration menu
    Copy the full SHA
    48fbffe View commit details
    Browse the repository at this point in the history

  6. fix annoying printout about missing content-type header on version check

    xnova committed Sep 8, 2014
    Configuration menu
    Copy the full SHA
    2b325ae View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2014

  1. Merge pull request #282 from JahPowerBit/testsuite 

    Testsuite step2
    PhantomPhreak committed Sep 10, 2014
    Configuration menu
    Copy the full SHA
    c93e009 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #279 from JahPowerBit/develop 

    fix PRIVATEKEY_VERSION_TESTNET + fix tests (not all)
    PhantomPhreak committed Sep 10, 2014
    Configuration menu
    Copy the full SHA
    fd9df63 View commit details
    Browse the repository at this point in the history

  3. return specific error code on exit... refs #208

    xnova committed Sep 10, 2014
    3 Configuration menu
    Copy the full SHA
    d98b956 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/PhantomPhreak/counterpartyd 

     into develop
    xnova committed Sep 10, 2014
    Configuration menu
    Copy the full SHA
    4a2d254 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2014

  1. minor cleanup

    @adamkrellenstein
    adamkrellenstein committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    86e4640 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/CounterpartyXCP/counterp… 

    …artyd into develop
    @adamkrellenstein
    adamkrellenstein committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    2142381 View commit details
    Browse the repository at this point in the history

  3. trailing zeros

    @adamkrellenstein
    adamkrellenstein committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    2269119 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2014

  1. resolve tests conflict

    JahPowerBit committed Sep 13, 2014
    Configuration menu
    Copy the full SHA
    f0be7e7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #285 from JahPowerBit/testsuite 

    resolve tests conflict
    PhantomPhreak committed Sep 13, 2014
    Configuration menu
    Copy the full SHA
    f66d844 View commit details
    Browse the repository at this point in the history

  3. [#241] add movements_hash and checkpoints

    JahPowerBit committed Sep 13, 2014
    Configuration menu
    Copy the full SHA
    080bdbb View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2014

  1. clean code + change version + add testnet checkpoints

    JahPowerBit committed Sep 14, 2014
    Configuration menu
    Copy the full SHA
    bf4dec2 View commit details
    Browse the repository at this point in the history

  2. update tests

    JahPowerBit committed Sep 14, 2014
    Configuration menu
    Copy the full SHA
    7531d24 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2014

  1. fixes #232

    @adamkrellenstein
    adamkrellenstein committed Sep 15, 2014
    Configuration menu
    Copy the full SHA
    290410a View commit details
    Browse the repository at this point in the history

  2. remove unused import

    JahPowerBit committed Sep 15, 2014
    Configuration menu
    Copy the full SHA
    0fe19d7 View commit details
    Browse the repository at this point in the history

  3. tweaking

    JahPowerBit committed Sep 15, 2014
    Configuration menu
    Copy the full SHA
    4d46968 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #286 from JahPowerBit/develop 

    Proposition to ensure consensus
    PhantomPhreak committed Sep 15, 2014
    Configuration menu
    Copy the full SHA
    217c22d View commit details
    Browse the repository at this point in the history

  5. clean up asyncio stuff

    @adamkrellenstein
    adamkrellenstein committed Sep 15, 2014
    Configuration menu
    Copy the full SHA
    51a1133 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of https://github.com/CounterpartyXCP/counterp… 

    …artyd into develop
    @adamkrellenstein
    adamkrellenstein committed Sep 15, 2014
    Configuration menu
    Copy the full SHA
    cc0251b View commit details
    Browse the repository at this point in the history

  7. a little more clean up

    @adamkrellenstein
    adamkrellenstein committed Sep 15, 2014
    Configuration menu
    Copy the full SHA
    bea5880 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2014

  1. remove asyncio, aiohttp

    @adamkrellenstein
    adamkrellenstein committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    e6b34e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2014

  1. typo

    @adamkrellenstein
    adamkrellenstein committed Sep 19, 2014
    Configuration menu
    Copy the full SHA
    41cf127 View commit details
    Browse the repository at this point in the history

  2. typo causing Invalid Params

    @adamkrellenstein
    adamkrellenstein committed Sep 19, 2014
    Configuration menu
    Copy the full SHA
    a1019a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2014

  1. initial attempt

    @adamkrellenstein
    adamkrellenstein committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    a7f162d View commit details
    Browse the repository at this point in the history

  2. progress

    @adamkrellenstein
    adamkrellenstein committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    1f66b9e View commit details
    Browse the repository at this point in the history

  3. more progress

    @adamkrellenstein
    adamkrellenstein committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    aa49b86 View commit details
    Browse the repository at this point in the history

  4. [#263] 'callable' is also accepted + None as default value for missin… 

    …g parameters
    JahPowerBit committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    2c7a173 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #289 from JahPowerBit/develop 

    [#263] 'callable' is also accepted + None as default value for missing p...
    Robby Dermody committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    e75dea8 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2014

  1. [#19][#20] replace unittest tainting by mock functions

    JahPowerBit committed Sep 21, 2014
    Configuration menu
    Copy the full SHA
    11678c9 View commit details
    Browse the repository at this point in the history

  2. fixtures tweaks

    JahPowerBit committed Sep 21, 2014
    Configuration menu
    Copy the full SHA
    9ac1db9 View commit details
    Browse the repository at this point in the history

  3. spaces..

    JahPowerBit committed Sep 21, 2014
    Configuration menu
    Copy the full SHA
    69971f6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #290 from JahPowerBit/develop 

    [#19][#20] replace unittest tainting by mock functions
    PhantomPhreak committed Sep 21, 2014
    Configuration menu
    Copy the full SHA
    fbabdbe View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2014

  1. Add RPC API test support in unit test vector

    JahPowerBit committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    7315aba View commit details
    Browse the repository at this point in the history

  2. add timeout error for RPC server

    JahPowerBit committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    c3216c1 View commit details
    Browse the repository at this point in the history

  3. refactor timeout for RPC server

    JahPowerBit committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    d419dab View commit details
    Browse the repository at this point in the history

  4. Merge pull request #291 from JahPowerBit/develop 

    Add RPC API test support in unit test vector
    PhantomPhreak committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    3f0424a View commit details
    Browse the repository at this point in the history

  5. ARC4 decoding

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    1042b5f View commit details
    Browse the repository at this point in the history

  6. ARC4 encoding

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    7b64214 View commit details
    Browse the repository at this point in the history

  7. typo

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    0c6841d View commit details
    Browse the repository at this point in the history

  8. move first block, for testing

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    afb00a6 View commit details
    Browse the repository at this point in the history

  9. pycoin version bump

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    af342c4 View commit details
    Browse the repository at this point in the history

  10. tweak; bug fix

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    7880a4a View commit details
    Browse the repository at this point in the history

  11. simplify encryption

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    b5c0e86 View commit details
    Browse the repository at this point in the history

  12. fixed bug

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    3966b49 View commit details
    Browse the repository at this point in the history

  13. tweak CLI; process locking

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    a0eb704 View commit details
    Browse the repository at this point in the history

  14. improved error handling and exception catching (partially fixes #216)

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    3bbc474 View commit details
    Browse the repository at this point in the history

  15. fixed --force

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    3196d83 View commit details
    Browse the repository at this point in the history

  16. typo

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    f054c08 View commit details
    Browse the repository at this point in the history

  17. fix

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    978c069 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'develop' of https://github.com/CounterpartyXCP/counterp… 

    …artyd into develop

Conflicts:
	lib/api.py
	lib/bitcoin.py
	test/util_test.py
    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    7fd94cd View commit details
    Browse the repository at this point in the history

  19. incomplete merge

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    670f897 View commit details
    Browse the repository at this point in the history

  20. better exceptions

    @adamkrellenstein
    adamkrellenstein committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    307db34 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2014

  1. minor tweak to variable configuration

    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    69e27c7 View commit details
    Browse the repository at this point in the history

  2. bump python-bitcoinlib version

    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    e320197 View commit details
    Browse the repository at this point in the history

  3. bug in new force arg

    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    1327419 View commit details
    Browse the repository at this point in the history

  4. slightly stricter address encoding

    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    d0c790c View commit details
    Browse the repository at this point in the history

  5. function renaming

    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    a8551f1 View commit details
    Browse the repository at this point in the history

  6. bump testnet block for multisig

    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    9cfafbc View commit details
    Browse the repository at this point in the history

  7. Merge branch 'multisig' into develop 

    Conflicts:
	CHANGELOG.md
	README.md
	lib/api.py
	lib/bitcoin.py
	lib/blocks.py
	pip-requirements.txt
	version.json
    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    ef448aa View commit details
    Browse the repository at this point in the history

  8. Note that curl example NG for Windows 

    See #293 (comment)
    @Rippler
    Rippler committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    c75e6a7 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #297 from rippler/patch-1 

    Note that curl example NG for Windows
    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    a9f6358 View commit details
    Browse the repository at this point in the history

  10. change testnet block to 281000

    @adamkrellenstein
    adamkrellenstein committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    6ddf16a View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. lockfile does PID, too, with hardlinks

    @adamkrellenstein
    adamkrellenstein committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    fb66c3b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/CounterpartyXCP/counterp… 

    …artyd into develop
    @adamkrellenstein
    adamkrellenstein committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    9c06e7a View commit details
    Browse the repository at this point in the history

  3. fixes #253

    @adamkrellenstein
    adamkrellenstein committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    04d3d27 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2014

  1. add db param for transaction() test + fix typo

    JahPowerBit committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    d2bda25 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #300 from JahPowerBit/multisig 

    add db param for transaction() test + fix typo
    @adamkrellenstein
    adamkrellenstein committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    5f2777e View commit details
    Browse the repository at this point in the history

  3. typo

    @adamkrellenstein
    adamkrellenstein committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    354cab9 View commit details
    Browse the repository at this point in the history

  4. no need to specify a minimum testnet block number for new tx composition

    @adamkrellenstein
    adamkrellenstein committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    f538d62 View commit details
    Browse the repository at this point in the history

  5. rm whitespace

    @adamkrellenstein
    adamkrellenstein committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    b0f09e9 View commit details
    Browse the repository at this point in the history

  6. rm redundant network prefixes in test suite

    @adamkrellenstein
    adamkrellenstein committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    2cd80ab View commit details
    Browse the repository at this point in the history

  7. add missing 'db' param for bitcoin.transaction()

    JahPowerBit committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    740f3b0 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #301 from JahPowerBit/multisig 

    add missing 'db' param for bitcoin.transaction()
    @adamkrellenstein
    adamkrellenstein committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    37ff1bb View commit details
    Browse the repository at this point in the history

  9. fix test/unit_test.py

    JahPowerBit committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    6304a39 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2014

  1. fix test/integration_test.py

    JahPowerBit committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    533d4fd View commit details
    Browse the repository at this point in the history

  2. remove unused function

    JahPowerBit committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    4e12188 View commit details
    Browse the repository at this point in the history

  3. fix deps for lockfile

    local committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    be984e1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #303 from JahPowerBit/multisig 

    fix test/unit_test.py and fix test/integration_test.py
    @adamkrellenstein
    adamkrellenstein committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    a811d1f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into multisig

    @adamkrellenstein
    adamkrellenstein committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    d79db52 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'multisig' of https://github.com/CounterpartyXCP/counter… 

    …partyd into multisig
    @adamkrellenstein
    adamkrellenstein committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    eea010c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2014

  1. fix merge + remove hard coded address

    JahPowerBit committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    e033844 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #304 from JahPowerBit/multisig 

    fix merge + remove hard coded address
    @adamkrellenstein
    adamkrellenstein committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    b674503 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into multisig 

    Conflicts:
	pip-requirements.txt
    @adamkrellenstein
    adamkrellenstein committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    5ede771 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'multisig' of https://github.com/CounterpartyXCP/counter… 

    …partyd into multisig
    @adamkrellenstein
    adamkrellenstein committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    90bd39e View commit details
    Browse the repository at this point in the history

  5. fix test/_test.py

    JahPowerBit committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    51638cb View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2014

  1. Merge pull request #305 from JahPowerBit/multisig 

    fix test/_test.py
    @adamkrellenstein
    adamkrellenstein committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    84f71e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2014

  1. Merge pull request #298 from CounterpartyXCP/multisig 

    Bring support for multisig and multiple sources, destinations into develop
    @adamkrellenstein
    adamkrellenstein committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    3120827 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2014

  1. fix testnet fee on reissuance

    JahPowerBit committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    8d4149e View commit details
    Browse the repository at this point in the history

  2. blockchain service don't manage balance for multisig addresses

    JahPowerBit committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    417fa3e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #310 from JahPowerBit/develop2 

    blockchain service don't manage balance for multisig addresses
    @adamkrellenstein
    adamkrellenstein committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    7b9ba38 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #309 from JahPowerBit/develop 

    fix testnet fee on reissuance
    @adamkrellenstein
    adamkrellenstein committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    f84fd91 View commit details
    Browse the repository at this point in the history

  5. update unit tests fixture with multisig tx + fix issuance fixtures

    JahPowerBit committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    655903a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2014

  1. add multisig scenario

    JahPowerBit committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    e9197aa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #311 from JahPowerBit/develop 

    update unit tests fixture with multisig tx + fix issuance fixtures
    @adamkrellenstein
    adamkrellenstein committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    2322a81 View commit details
    Browse the repository at this point in the history

  3. get_unspent_txouts() edge case

    @adamkrellenstein
    adamkrellenstein committed Oct 3, 2014
    Configuration menu
    Copy the full SHA
    14b4572 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2014

  1. refactor getrawtransaction fixtures

    JahPowerBit committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    6a01232 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #313 from JahPowerBit/develop 

    refactor getrawtransaction fixtures
    @adamkrellenstein
    adamkrellenstein committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    d36d261 View commit details
    Browse the repository at this point in the history

  3. use service_url param to instanciate bitcoinlib_rpc.Proxy()

    JahPowerBit committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    d40b420 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #314 from JahPowerBit/develop 

    use service_url param to instanciate bitcoinlib_rpc.Proxy()
    @adamkrellenstein
    adamkrellenstein committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    d518a65 View commit details
    Browse the repository at this point in the history

  5. test files reorganization and tweaks

    JahPowerBit committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    e2c37af View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2014

  1. in integration tests compare also raw transaction outputs

    JahPowerBit committed Oct 5, 2014
    Configuration menu
    Copy the full SHA
    69c0b78 View commit details
    Browse the repository at this point in the history

  2. add test of base58_check_decode in unit tests vector

    JahPowerBit committed Oct 5, 2014
    Configuration menu
    Copy the full SHA
    74bbbf5 View commit details
    Browse the repository at this point in the history

  3. fix check movements_hash

    JahPowerBit committed Oct 5, 2014
    Configuration menu
    Copy the full SHA
    099499e View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2014

  1. add test books in integration tests

    JahPowerBit committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    b505b76 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #315 from JahPowerBit/develop2 

    fix check movements_hash
    @adamkrellenstein
    adamkrellenstein committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    0373cf7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #316 from JahPowerBit/develop 

    Full coverage of _test.py by unit_test.py and integration_test.py
    @adamkrellenstein
    adamkrellenstein committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    f89955d View commit details
    Browse the repository at this point in the history

  4. _test.py now redundant

    @adamkrellenstein
    adamkrellenstein committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    98a8b51 View commit details
    Browse the repository at this point in the history

  5. extra option for tests to allow for SSL with backend

    @adamkrellenstein
    adamkrellenstein committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    02c8a58 View commit details
    Browse the repository at this point in the history

  6. removed unused test files

    JahPowerBit committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    6ddd69a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #319 from JahPowerBit/develop 

    removed unused test files
    @adamkrellenstein
    adamkrellenstein committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    8c860e1 View commit details
    Browse the repository at this point in the history

  8. [#319] update .gitignore

    JahPowerBit committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    1a67fb9 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #321 from JahPowerBit/develop 

    [#319] update .gitignore
    @adamkrellenstein
    adamkrellenstein committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    b584e4b View commit details
    Browse the repository at this point in the history

  10. mock function for multisig_pubkeyhashes_to_pubkeys

    JahPowerBit committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    9811ce7 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2014

  1. add mock function for decoderawtransaction

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    eb69e31 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #322 from JahPowerBit/develop 

    add mock functions
    @adamkrellenstein
    adamkrellenstein committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    9cd35b3 View commit details
    Browse the repository at this point in the history

  3. scenario_1 and scenario_2 homogenization

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    64b276e View commit details
    Browse the repository at this point in the history

  4. generate scenario_1 and scenario_2 from scenario template

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    92056ff View commit details
    Browse the repository at this point in the history

  5. add multisig 2-of-2 scenario

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    b50a0bf View commit details
    Browse the repository at this point in the history

  6. add multisig 1-of-3 scenario

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    2df9c86 View commit details
    Browse the repository at this point in the history

  7. add multisig 2-of-3 scenario

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    e586e48 View commit details
    Browse the repository at this point in the history

  8. add multisig 3-of-3 scenario

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    67a5f89 View commit details
    Browse the repository at this point in the history

  9. rename scenarios

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    8909faa View commit details
    Browse the repository at this point in the history

  10. compare similarity between multisig scenario dump and base scenario dump

    JahPowerBit committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    b0f3fa7 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2014

  1. Merge pull request #325 from JahPowerBit/develop 

    [#296] more integration tests for multisig
    @adamkrellenstein
    adamkrellenstein committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    9c79da4 View commit details
    Browse the repository at this point in the history

  2. [#320] add .travis.yml

    JahPowerBit committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    4156fb9 View commit details
    Browse the repository at this point in the history

  3. [#320] no config file in travis env

    JahPowerBit committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    eefddb4 View commit details
    Browse the repository at this point in the history

  4. use constant for counterpartyd.set_options

    JahPowerBit committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    33e112d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #326 from JahPowerBit/develop 

    tests pass on Travis
    @adamkrellenstein
    adamkrellenstein committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    9926a59 View commit details
    Browse the repository at this point in the history

  6. Travis CI README icon

    @adamkrellenstein
    adamkrellenstein committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    c07c427 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2014

  1. fix books test + add console log when using -s param

    JahPowerBit committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    1af0f7a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #328 from JahPowerBit/develop 

    fix books test + add console log when using -s param
    @adamkrellenstein
    adamkrellenstein committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    7f8df23 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2014

  1. [#295] no sql query in generate_movement_hash

    JahPowerBit committed Oct 10, 2014
    Configuration menu
    Copy the full SHA
    b2933d2 View commit details
    Browse the repository at this point in the history

  2. updated build system docs link

    Robby Dermody committed Oct 10, 2014
    Configuration menu
    Copy the full SHA
    84de5ee View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2014

  1. Merge pull request #329 from JahPowerBit/develop 

    [#295] no sql query in generate_movement_hash
    @adamkrellenstein
    adamkrellenstein committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    1f10fb3 View commit details
    Browse the repository at this point in the history

  2. fixes #332

    @adamkrellenstein
    adamkrellenstein committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    18fa3cf View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2014

  1. add fee for dividend

    JahPowerBit committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    6bed748 View commit details
    Browse the repository at this point in the history

  2. update test for dividend fee

    JahPowerBit committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    d46fcfa View commit details
    Browse the repository at this point in the history

  3. Fix README markdown

    @khan-faiz
    khan-faiz committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    42ee44c View commit details
    Browse the repository at this point in the history

  4. add some unit tests for dividend

    JahPowerBit committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    ef47034 View commit details
    Browse the repository at this point in the history

  5. add version + fix start block for dividend fee

    JahPowerBit committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    20c78d4 View commit details
    Browse the repository at this point in the history

  6. in Testnet clean movements_hash in case of protocol change.

    JahPowerBit committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    a7cf255 View commit details
    Browse the repository at this point in the history

  7. typo

    JahPowerBit committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    fb69920 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #335 from JahPowerBit/develop 

    Add anti spam fee for dividend
    @adamkrellenstein
    adamkrellenstein committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    0fc5f33 View commit details
    Browse the repository at this point in the history

  9. version bumps for dividend fee

    @adamkrellenstein
    adamkrellenstein committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    8929528 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2014

  1. Merge master in develop

    JahPowerBit committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    46b35cc View commit details
    Browse the repository at this point in the history

  2. fix merge master in develop

    JahPowerBit committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    e462d97 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #337 from JahPowerBit/develop 

    Fix conflicts to merge Develop in master
    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    eb0455b View commit details
    Browse the repository at this point in the history

  4. disable multisig addresses on mainnet

    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    e364960 View commit details
    Browse the repository at this point in the history

  5. move dividend fee start block to 328000

    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    b56533c View commit details
    Browse the repository at this point in the history

  6. language tweak

    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    6af2633 View commit details
    Browse the repository at this point in the history

  7. made multisig on testnet take effect with 303000

    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    9705411 View commit details
    Browse the repository at this point in the history

  8. enable multisig encoding from block set in config.py

    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    f053411 View commit details
    Browse the repository at this point in the history

  9. typo

    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    7eeb406 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #342 from faizkhan00/develop-pipfix 

    Fix README markdown
    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    a96484a View commit details
    Browse the repository at this point in the history

  11. typo

    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    a339d5c View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop' of https://github.com/CounterpartyXCP/counterp… 

    …artyd into develop
    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    2753d85 View commit details
    Browse the repository at this point in the history

  13. use FIRST_MULTISIG_BLOCK_TESTNET=1 in test suite + add block_index in… 

    … validate_address()
    JahPowerBit committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    1a649de View commit details
    Browse the repository at this point in the history

  14. Merge pull request #343 from JahPowerBit/develop 

    use FIRST_MULTISIG_BLOCK_TESTNET=1 in test suite + add block_index in va...
    @adamkrellenstein
    adamkrellenstein committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    a64089a View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2014

  1. fix tesnet book test and unit tests vector

    JahPowerBit committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    85f95ff View commit details
    Browse the repository at this point in the history

  2. Merge pull request #344 from JahPowerBit/develop 

    fix tesnet book test and unit tests vector
    @adamkrellenstein
    adamkrellenstein committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    f451e79 View commit details
    Browse the repository at this point in the history

  3. one holder = one address to calculate dividend fee

    JahPowerBit committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    4f90387 View commit details
    Browse the repository at this point in the history

  4. add get_holder_count method in API

    JahPowerBit committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    4c5000f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #348 from JahPowerBit/develop 

    Fix holder_count for dividend fee + add get_holder_count in API
    @adamkrellenstein
    adamkrellenstein committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    200fb69 View commit details
    Browse the repository at this point in the history

  6. add transactions_hash generation and checkpoints

    JahPowerBit committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    ff878d8 View commit details
    Browse the repository at this point in the history

  7. update tests for transactions_hash

    JahPowerBit committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    5c4ac2c View commit details
    Browse the repository at this point in the history

  8. display differences between transactions in block when there is Conse… 

    …nsusError
    JahPowerBit committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    b55d3ae View commit details
    Browse the repository at this point in the history

  9. clear hashes if first block consensus hashes don't match with config.py

    JahPowerBit committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    8e3c414 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2014

  1. fix tests

    JahPowerBit committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    b099e03 View commit details
    Browse the repository at this point in the history

  2. mempool regression

    @adamkrellenstein
    adamkrellenstein committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    736b6f2 View commit details
    Browse the repository at this point in the history

  3. fix consensus verification wording

    JahPowerBit committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    3b7a317 View commit details
    Browse the repository at this point in the history

  4. tweaks

    JahPowerBit committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    ebeaf37 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #349 from JahPowerBit/develop 

    Check for consensus in list of transactions
    @adamkrellenstein
    adamkrellenstein committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    549df8d View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2014

  1. [#65] add unit tests for bounds values

    JahPowerBit committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    e4ab489 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #351 from JahPowerBit/develop 

    [#65] add unit tests for bounds values
    @adamkrellenstein
    adamkrellenstein committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    8b9a033 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2014

  1. Travis CI Slack integration

    @adamkrellenstein
    adamkrellenstein committed Oct 19, 2014
    Configuration menu
    Copy the full SHA
    e021e3a View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2014

  1. typo fix

    @khan-faiz
    khan-faiz committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    9af6e9d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #355 from faizkhan00/develop 

    typo fix
    @adamkrellenstein
    adamkrellenstein committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    cf055b9 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2014

  1. dividend fees from 330000

    @adamkrellenstein
    adamkrellenstein committed Oct 23, 2014
    Configuration menu
    Copy the full SHA
    326f3d4 View commit details
    Browse the repository at this point in the history

  2. correct release date for v9.45.0

    @adamkrellenstein
    adamkrellenstein committed Oct 23, 2014
    Configuration menu
    Copy the full SHA
    ff9d9a6 View commit details
    Browse the repository at this point in the history