Skip to content
This repository has been archived by the owner on Jan 14, 2020. It is now read-only.

merge from upstream #22

Merged
merged 42 commits into from
Jun 10, 2019
Merged

merge from upstream #22

merged 42 commits into from
Jun 10, 2019

Conversation

garyyu
Copy link

@garyyu garyyu commented Jun 9, 2019

No description provided.

yeastplume and others added 30 commits April 23, 2019 11:29
* fix for command line listener port override

* reduce parameter query size

* Add slate versioning

* rustfmt

* bump version number

* Add tests for slate version conversion

* rustfmt

* Updates and test addition based on bdap's review

* rustfmt
* move api deser types into separate types mod

* rustfmt

* missing types file

* make all exports from libwallet more explicit

* rustfmt

* add version check function to foreign api

* rustfmt

* change check_version return value to result, for consistency
This reverts commit a63f2c7, reversing
changes made to d774272.
Revert "Merge branch 'master' into master"
* basic invoiced tx working

* rustfmt

* teardown

* rustfmt

* rename, new struct for invoice args, begin to add new functions to RPC apis

* rustfmt

* add fns to rpc api

* rustfmt

* owner api functions RPC documentation in place

* rustfmt

* doctests for new invoicing functions

* rustfmt

* test fixes

* update documentation and doctests

* rustfmt

* invoice testing verification of tx log output

* rustfmt
* add issue_invoice_tx command

* rustfmt

* add first pass at process_invoice command

* start of process_invoice fn

* rustfmt

* rename issue invoice and process invoice to invoice and pay

* add prompting and display information to pay invoice command

* rustfmt

* support invoice transactions in finalize command

* rustfmt
* remove leftover wallet lmdb code

* rustfmt
* Simplify slate (de)serialization

* rustfmt

* Cleanup

* Fix slate version tests

* Another fix for tests

* Fix slate deser in http adapter
* bump version number and build from tag for beta 3 release

* update for latest grin tag
…xt data (mimblewimble#117)

* add participant_id to saved tranasction context data

* rustfmt?

* change participant id for command line pay command
…te (mimblewimble#123)

* change slate version function to return list of supported slate formats

* rustfmt

* remove min_compat_version
yeastplume and others added 12 commits May 31, 2019 08:33
…e#126)

* make slate v0 the default for regular sends

* add block_header_version to slate

* update doc tests for latest grin version

* rustfmt

* HACF if HF height detected

* rustfmt
cargo.lock update, and remove 3 build warning from cargo 1.35.0
* fix for api_secret when reading node height

* rustfmt

* remove macro export

* trigger ci again
…exist (mimblewimble#134)

* make recover error message when wallet doesn't exist more helpful

* rustfmt
@garyyu garyyu merged commit 8de59c0 into gottstech:master Jun 10, 2019
@garyyu garyyu deleted the gotts branch June 10, 2019 00:17
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