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

merge 0.2.0 into develop #608

Merged
merged 65 commits into from
Sep 9, 2016
Merged

merge 0.2.0 into develop #608

merged 65 commits into from
Sep 9, 2016

Conversation

AdamISZ
Copy link
Member

@AdamISZ AdamISZ commented Sep 9, 2016

Detailed development notes in #171

chris-belcher and others added 30 commits June 9, 2016 15:03
These are managed by a MessageChannelCollection object implemented in message_channel.py.
Broadcast messages are to all channels, private messaging occurs over one (per side).
Disconnects handled dynamically, optimistically switching to other viable channels where possible.
Another step added to callback chain for some callbacks to manage global state such as trigger
of on_welcome() or on_disconnect().
Added db lock to OrderbookWatch (applies in ultra-fast testing scenarios)
Testing features added to test with multiple message channels, and allowing injection
of disconnects during the run.
Has been tested successfully with multiple IRC servers but can allow other message channel
types with minimal changes.
Update user level scripts to use collection of IRC servers.
check for existence of callbacks
friendlier nick leave message
Conflicts:
	sendpayment.py
initial working version of PoDLE commitments by takers
…capsulation;

flexible design to allow other style of commit/reveal in future, with type byte as
part of serialization; commitments from external sources allowed; commitments
persisted in file commitments.json.
Add test_podle detailed tests
…er-channel basis, thus avoiding duplicate messages.

Make default testing utxo_retries 3 instead of 1.
…ck sig spills over into second line, it was previously sent out of order since the second line was on the normal Queue not the ObQueue.
…on from transaction utxos fails (but these are still preferred). Make the commitment getter function a property of the Maker for later inheritance, and use a callback in CoinjoinTx. Test added.
chris-belcher and others added 20 commits August 7, 2016 17:02
refactor yieldgenerator module into joinmarket, add yg-pe (privacy en…
…ing.

Fix bug in maker for reading of bad utxos from query_utxo_set.
Add showutxos method to wallet-tool.
…json. Tidy up sendtomany and add-utxos tools. Make the output

from showutxos method in wallet-tool optionally print in format suitable for input to add-utxos.py. Add an option to delete external commitments. Factor out utility functions in cmttools to separate commitment_utils.py module. Make the location of commitments.json a config variable.
Fix bug when nick's crypto box is not set
Read utxos for commitments directly from wallet in add-utxo.py, not store private keys in a file.
@AdamISZ AdamISZ force-pushed the 0.2.0 branch 2 times, most recently from 052c75d to 2c861a6 Compare September 9, 2016 14:01
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 88ad92d on 0.2.0 into * on develop*.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling d19c426 on 0.2.0 into * on develop*.

Refactor yg-basic to inherit from YieldGenerator, remove duplication
add update note to README
Travis updates
Remove miniircd
add podle tests
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 340b32b on 0.2.0 into * on develop*.

@AdamISZ AdamISZ merged commit e5be4d5 into develop Sep 9, 2016
@adlai adlai deleted the 0.2.0 branch September 17, 2016 01:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants