DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
30,350 Commits 8 Branches 3 Tags
fd753569bf6c1961a2047716396ebffa3b495549
Commit Graph

2252 Commits

Author SHA1 Message Date
jl777
f9f8f4ec67 Fix gatewaysmarkdone 2018-09-25 00:38:11 -11:00
jl777
1513c37f65 Merge pull request #894 from jl777/jl777 
+print
 2018-09-24 05:54:55 -11:00
jl777
a5a8968a32 Merge branch 'beta' into dev 2018-09-24 05:49:30 -11:00
jl777
49adb58081 Merge branch 'master' into beta 2018-09-24 05:09:14 -11:00
jl777
10a5fd2cd0 Test 2018-09-24 00:37:09 -11:00
jl777
2ce154d60e Allow sendtoaddress for PIRATE to notary 2018-09-24 00:36:18 -11:00
jl777
a7e86f3a81 Revert 2018-09-23 04:28:04 -11:00
jl777
3372f7893c Test 2018-09-23 03:55:08 -11:00
Jonathan "Duke" Leto
92b42d287e Clarify in sendmany/z_sendmany rpc docs that amounts are not floating point 2018-09-23 06:18:22 -07:00
jl777
ca865ad2d4 -prints 2018-09-23 00:40:14 -11:00
Homu
fbbbb1cc82 Auto merge of #3537 - str4d:enable-sapling-features, r=bitcartel 
Enable Sapling features on mainnet

Reverts the last commit from #3458.
 2018-09-21 17:32:56 -07:00
Jack Grigg
34e222c18e Revert "Disable Sapling features on mainnet" 
This reverts commit 554e00e8f9.
 2018-09-21 23:43:31 +01:00
Simon
f1cb49ac86 For #3533. Replace asserts with JSON errors. 
This helps prevent users from triggering an assert if they pass in
Sapling addresses to RPC calls: z_mergetoaddress, z_importviewingkey
and z_exportviewingkey.
 2018-09-21 15:01:45 -07:00
jl777
88b5d9e46a Fix token convert 2018-09-21 03:34:39 -11:00
miketout
644c7445ec Latest Zcash updates 2018-09-20 13:32:57 -07:00
jl777
44d8e00a25 +print 2018-09-20 07:52:46 -11:00
jl777
71d6712d8d Test 2018-09-20 06:47:08 -11:00
miketout
b8deecdc09 Sapling transaction testing 2018-09-20 03:08:36 -07:00
jl777
541e5e9249 Token convert 2018-09-19 21:51:56 -11:00
jl777
a51c08d1a1 Test 2018-09-19 21:32:22 -11:00
jl777
06c4e87ff9 CCprices.h 2018-09-19 21:29:11 -11:00
jl777
f44cd67e82 Prices stub 2018-09-19 21:04:47 -11:00
Homu
25c3f903c1 Auto merge of #3491 - Eirik0:3218-sapling-import-export-wallet, r=str4d 
Add Sapling support to z_importwallet and z_exportwallet

Includes code adapted from upstream PR https://github.com/bitcoin/bitcoin/pull/8323

Closes #3218.
 2018-09-19 12:15:48 -07:00
Jack Grigg
bb4b6982e3 Generate an ovk to encrypt outCiphertext for t-addr senders 
Closes #3506.
 2018-09-19 00:51:30 +01:00
Jack Grigg
bd3c860cb4 Use ovk directly in the TransactionBuilder API instead of fvk 2018-09-18 23:26:31 +01:00
miketout
9feb4b9e08 Major updates integration from all upstreams 2018-09-18 14:33:53 -07:00
jl777
08d66385b3 Test 2018-09-18 04:13:43 -11:00
jl777
403b69675c 1of2 CC 2018-09-18 03:48:44 -11:00
jl777
4f80a29cc4 Test 2018-09-17 03:12:56 -11:00
jl777
7fccea1dab Msig suppport 2018-09-17 03:08:28 -11:00
jl777
d2bcb614c3 Merge branch 'dev' into jl777 2018-09-15 21:50:40 -11:00
Eirik Ogilvie-Wigley
b37dc4e22f Don't export empty zip32 metadata 2018-09-14 18:36:24 -06:00
Eirik Ogilvie-Wigley
2fe39561ec Export zip32 metadata with sapling keys 2018-09-14 17:27:20 -06:00
Eirik Ogilvie-Wigley
ae807af413 Export comment on HDSeed and fingerprint with wallet 2018-09-14 17:26:02 -06:00
Jonas Schnelli
002753ae64 [Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull() 
Zcash: modified for zip32
 2018-09-14 17:17:24 -06:00
Jonas Schnelli
82e71233b0 [Wallet] print hd masterkeyid in getwalletinfo 
Zcash: modified for zip32
 2018-09-14 16:59:56 -06:00
Jonas Schnelli
b6d1af89f2 [Wallet] extend CKeyMetadata with HD keypath 
Zcash: modified for zip32
 2018-09-14 16:59:51 -06:00
Eirik Ogilvie-Wigley
9bcf90e2de Add sapling support to z_importwallet 2018-09-14 16:16:03 -06:00
Eirik Ogilvie-Wigley
0f03de5536 Return more information when adding a spending key 2018-09-14 16:00:47 -06:00
Eirik Ogilvie-Wigley
fcab001b1e Move AddSpendingKeyToWallet 2018-09-14 15:44:03 -06:00
Eirik Ogilvie-Wigley
a0783bb957 Rename AddZKey to include sprout 2018-09-14 15:07:15 -06:00
Eirik Ogilvie-Wigley
5e360fb29f Add sapling spending keys to z_exportwallet 2018-09-14 15:07:15 -06:00
Eirik Ogilvie-Wigley
d6b31d59b5 Rename map to include sprout 2018-09-14 15:07:15 -06:00
Alrighttt
87f37301b4 build error, fix typo 2018-09-14 17:57:04 +02:00
Michael Toutonghi
0c8fa56a02 All latest updates, smart contracts, including oracle from KMD/jl777 2018-09-13 13:00:13 -07:00
jl777
518ae45859 Test 2018-09-12 22:59:28 -11:00
jl777
1968f72c0e Markdone with cointxid 2018-09-12 22:58:33 -11:00
jl777
6bde696a31 Gatewaysmarkdone 2018-09-12 08:36:01 -11:00
Homu
0e0f5e4ea7 Auto merge of #3496 - bitcartel:3442_sapling_note_locking, r=str4d 
Add Sapling note locking to the CWallet class

Closes #3442.
 2018-09-12 09:07:14 -07:00
jl777
5955955d18 gatewayspending 2018-09-12 03:49:09 -11:00