Skip to content

Conversation

@cfrogjump
Copy link
Contributor

Merge the release to master

underdarkskies and others added 30 commits July 30, 2018 15:39
This backports #12924 to our current implementation of the RPC-API

6249021d1 [docs] Add release notes for HD master key -> HD seed
rename (John Newbery)
79053a5f2 [rpc] [wallet] Add 'hdmasterkeyid' alias return values. (John Newbery)
c75c35141 [refactor] manually change remaining instances of master key to seed. (John Newbery)
131d4450b scripted-diff: Rename master key to seed (John Newbery)

Pull request description:

  This renames a couple of functions and members (no functional changes, expect log prints):

  - Rename CKey::SetMaster to CKey::SetSeed
  - Rename CHDChain::masterKeyId to CHDChain::seedID
  - Rename CHDChain::hdMasterKeyID to CHDChain::hdSeedID
  - Rename CWallet::SetHDMasterKey to CWallet::SetHDSeed

  As well it introduces a tiny API change:

  - RPC API change: Rename "hdmasterkeyid" to "hdseedid", rename "hdmaster" in wallet-dump output to "hdseed"

  -  use "s" instead of the incorrect "m" for the seed-key hd-keypath key metadata
…_4_miner_tests

Add -fPIC as default on Linux builds fixing build errors.  Add NONCE to miner_tests
MNEY - add $ to end of regex for better compatability
[BACKPORT] #12924: Fix hdmaster-key / seed-key confusion (scripted diff)
Update develop branch with latest commits from 2.1.0
Avoid redefining thread priority constants
Add functional test for mempool cleaning up after reorg
Update IPFS hash examples in placeholders
changed some words to keep translation more consist
edited spelling mistakes
suggested alternative translations
Fixing OSX cross compile build problem on Linux (static build pulling dynamic Boost library)
really did wish that listassets sorted by timestamp order though
TronBlack and others added 26 commits November 21, 2018 15:32
Update getassetdata network call to use correct cache
Update GUI with reissue quantity of 0 by default
Mainnet as of block 475,000
Testnet as of block 90,000
Fix Linux/Windows QT frames missing
* adding assets to addressindex.

* DisconnectBlock now updates addressIndex

* Added asset ability to getaddressutxos.

* Added includeAssets param to getaddresstxids

* Added includeAssets to getaddressmempool

* Added assetName param to getaddressdeltas

* Added asset info to getrawtransaction verbose JSON output.

* added support for retrieving all asset utxos from getaddressutxos using '*'..
Remove admin icon is asset isn't admin
Typo fix upspent -> unspent
add keywords to metadata example
[Translation] Update raven_de.ts
Copy link
Contributor

@cfox cfox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here we go

Copy link
Contributor

@spyder46n2 spyder46n2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@cfrogjump cfrogjump merged commit a01dd7b into master Dec 12, 2018
@cfrogjump cfrogjump deleted the release_2.2.0.0 branch December 12, 2018 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.