Commit Graph
17485 Commits
Author SHA1 Message Date
Simon 618206c7d5 Rename GetNoteNullifier to GetSproutNoteNullifier. 2018-08-08 11:37:38 -07:00
Simon 57faf44e61 Rename FindMyNotes to FindMySproutNotes. 2018-08-08 11:37:38 -07:00
Homu 40f320e0ee Auto merge of #3443 - daira:testnet-rollback, r=str4d
Support testnet rollback.

Part of #1302. Closes #2905.
2018-08-08 05:28:08 -07:00
jl777 aca80695b1 -print 2018-08-08 00:10:51 -11:00
Jack Grigg 13751895c7 Move RewindBlockIndex log message inside rewindLength check 2018-08-08 12:08:29 +01:00
jl777 112803d8e1 Require sbits/fundingtxid matches for rewards vins 2018-08-07 21:25:51 -11:00
Homu 0c5733fc22 Auto merge of #3448 - ebfull:sapling-params, r=bitcartel
Switch to use the official Sapling parameters
2018-08-07 11:20:10 -07:00
jl777 d587c96cfc Minimum rewardsfunding 2018-08-07 04:46:54 -11:00
Jonathan "Duke" Leto 25709e3078 These %lli/%li formats are platform-dependent 2018-08-06 22:50:38 +02:00
Michael Toutonghi 5034d1c134 Sync with latest Komodo changes 2018-08-06 12:52:22 -07:00
Jonathan "Duke" Leto 6358342934 debug valid pubkey error 2018-08-06 10:59:33 -07:00
Eirik Ogilvie-Wigley 7929851626 Only include the change field if we have a spending key 2018-08-06 09:58:40 -06:00
jl777 eea3a3cdb1 N 2018-08-05 23:39:57 -11:00
jl777 6facc0ea06 Syntax 2018-08-05 23:39:16 -11:00
jl777 718255b3fd smart utxo selection without press release to coin telegraph 2018-08-05 23:36:00 -11:00
jl777 b24e0ff44e ) 2018-08-05 20:49:12 -11:00
jl777 8a78bd9d8c Test 2018-08-05 20:47:51 -11:00
jl777 6deb8c09eb Disable FSM, auction, lotto and add some error checks 2018-08-05 20:43:35 -11:00
Jonathan "Duke" Leto 8e5de27a67 Fix some compile issues on os x 2018-08-05 23:53:07 -07:00
Jack Grigg d0372cff5e Adjust Makefile so that common can be used by the wallet 2018-08-05 10:41:06 +01:00
Jack Grigg 0ecdd0f30a chainparams: Add BIP 44 coin type (as registered in SLIP 44) 2018-08-05 10:41:06 +01:00
Jonas Schnelli 4922d1c19a Fix test_bitcoin circular dependency issue 2018-08-05 10:41:06 +01:00
Cory Fields 6a753e4f9c crypter: shuffle Makefile so that crypto can be used by the wallet
Wallet must come before crypto, otherwise linking fails on some platforms.

Includes a tangentially-related general cleanup rather than making the Makefile
sloppier.
2018-08-05 10:41:07 +01:00
jl777 79a3b761c2 Change regrets address prefix 2018-08-04 22:25:00 -11:00
Sean Bowe 198dfd3c36 Switch to use the official Sapling parameters. 2018-08-04 16:28:39 -06:00
jl777 407085fddb Merge pull request #802 from jl777/jl777
Combat/endian.h
2018-08-04 06:23:39 -11:00
jl777 dec9218b77 Combat/endian.h 2018-08-03 22:57:45 -11:00
jl777 d3a712920e Merge pull request #800 from jl777/jl777
sync branches
2018-08-03 07:01:58 -11:00
Homu aa32786576 Auto merge of #3396 - arcalinea:3389_sapling_crypter, r=str4d
Update CCryptoKeyStore with Sapling support

Sapling crypter overrides for various `CCryptoKeyStore` functions such as:
- `HaveSaplingSpendingKey()`
- `GetSaplingSpendingKey()`

Also includes some changes to prepare for diversified addresses and ZIP 32.

Closes #3389
2018-08-03 09:48:22 -07:00
jl777 99c090d95e Fix edge case for maxodds 2018-08-03 03:07:01 -11:00
jl777 ebe7e27ada Fix timeout claim 2018-08-03 01:51:05 -11:00
jl777 035095bc5a Merge pull request #799 from jl777/jl777
Get current CC to a stable release:

disable asset swap
implement dice timeout claims

Tokens, faucet, rewards and dice now have no reproducible bugs
2018-08-03 00:12:12 -11:00
jl777 ac8b2c68d2 Disable assets swap 2018-08-03 00:09:53 -11:00
jl777 b0becd6e7c Test 2018-08-02 23:32:03 -11:00
jl777 8e3c66caf9 Test 2018-08-02 23:09:42 -11:00
jl777 da07d84b84 Implement dice timeout 2018-08-02 23:02:51 -11:00
Jack Grigg 25d5e80cbe Rename *SpendingKey -> *SproutSpendingKey
Also GetPaymentAddresses -> GetSproutPaymentAddresses
2018-08-03 10:10:26 +01:00
jl777 d84c86336e Merge pull request #798 from jl777/jl777
initial stable dice CC
2018-08-02 22:07:16 -11:00
jl777 8132e08781 Add back join split in decoderawtransaction 2018-08-02 21:33:06 -11:00
Jack Grigg f84cf5f817 Formatting nits 2018-08-03 02:25:51 +01:00
Jack Grigg 4c77517772 Rename *ViewingKey* -> *SproutViewingKey* 2018-08-03 02:23:38 +01:00
Jack Grigg 74f5b010df Rename Serialized*Size -> SerializedSprout*Size 2018-08-03 01:57:40 +01:00
Jack Grigg 93fcf892d4 Rename SpendingKeyMap -> SproutSpendingKeyMap 2018-08-03 01:47:30 +01:00
Jack Grigg 5175a7f07b Pass SaplingPaymentAddress to store through the CKeyStore 2018-08-03 01:01:45 +01:00
Jack Grigg bc6344b350 Add CWallet::AddCryptedSaplingSpendingKey() hook
To be filled in when we implement Sapling persistence to disk.
2018-08-03 00:23:08 +01:00
Jack Grigg 9c9258c4f8 Remove outdated comment 2018-08-03 00:23:08 +01:00
Jack Grigg 4a89221ffc Check for unencrypted Sapling keys in CCryptoKeyStore::SetCrypted() 2018-08-03 00:23:08 +01:00
Jack Grigg 0adba6789b Add Sapling decryption check to CCryptoKeyStore::Unlock() 2018-08-03 00:23:08 +01:00
Jack Grigg e8a949c153 Rename CryptedSpendingKeyMap -> CryptedSproutSpendingKeyMap 2018-08-03 00:23:08 +01:00
Jack Grigg adf2eadba2 Rename DecryptSpendingKey -> DecryptSproutSpendingKey 2018-08-03 00:23:08 +01:00