Jack Grigg
|
70420ff34f
|
Test calling z_mergetoaddress to merge notes while a note merge is ongoing
|
2018-04-10 00:44:26 -07:00 |
|
Jack Grigg
|
67b849d7d4
|
Fix z_importviewingkey startHeight parameter
Closes #2937.
|
2018-04-10 00:39:52 -07:00 |
|
Jonathan "Duke" Leto
|
f08e247d57
|
jl777 rebased so now we have viewing keys
|
2018-04-10 00:33:49 -07:00 |
|
jl777
|
83eae67b08
|
Merge pull request #555 from libscott/cryptoconditions
Various cleanups
|
2018-04-09 18:57:14 +03:00 |
|
Scott Sadler
|
8a29624f4c
|
remove stray printf
|
2018-04-09 12:36:43 -03:00 |
|
Scott Sadler
|
fde202ff64
|
Merge remote-tracking branch 'james/dev' into cryptoconditions
|
2018-04-09 11:53:48 -03:00 |
|
Scott Sadler
|
8a8e10f02f
|
cleanups
|
2018-04-09 11:53:13 -03:00 |
|
jl777
|
53db65421e
|
Merge pull request #538 from libscott/cryptoconditions
Crypto-Conditions
|
2018-04-08 13:18:26 +03:00 |
|
Scott Sadler
|
e36af93bab
|
update cryptoconditions
|
2018-04-07 21:46:29 -03:00 |
|
Scott Sadler
|
39c9911e9c
|
change Eval data structure to single code blob
|
2018-04-07 18:07:52 -03:00 |
|
Scott Sadler
|
4729632250
|
* make interface for getting tx safer in Eval
* restrict lengths in cryptoconditions to avoid ridiculous situations
|
2018-04-06 14:35:46 -03:00 |
|
Scott Sadler
|
56cf273faf
|
various tweaks, combine payloads in ImportTx
|
2018-04-06 13:37:56 -03:00 |
|
jl777
|
68e3066973
|
Merge pull request #554 from jl777/jl777
Jl777
|
2018-04-06 19:17:46 +03:00 |
|
jl777
|
cf7f440296
|
Test
|
2018-04-06 18:29:45 +03:00 |
|
jl777
|
dc836ee40c
|
Test
|
2018-04-06 18:18:55 +03:00 |
|
jl777
|
882ad91524
|
Test
|
2018-04-06 17:56:26 +03:00 |
|
jl777
|
6b30b27c1c
|
Test
|
2018-04-06 17:44:47 +03:00 |
|
jl777
|
b0bd536aad
|
Test
|
2018-04-06 17:25:31 +03:00 |
|
jl777
|
4614c6c903
|
Test
|
2018-04-06 15:11:10 +03:00 |
|
jl777
|
17b29c639e
|
Test
|
2018-04-06 14:00:56 +03:00 |
|
jl777
|
09a3e8c285
|
Test
|
2018-04-06 13:25:11 +03:00 |
|
jl777
|
5ba45a00f1
|
Test
|
2018-04-06 13:23:39 +03:00 |
|
jl777
|
0b652b660a
|
Test
|
2018-04-06 13:22:26 +03:00 |
|
jl777
|
5c079fa330
|
Test
|
2018-04-06 13:18:38 +03:00 |
|
jl777
|
858a837fc8
|
Test
|
2018-04-06 12:46:08 +03:00 |
|
jl777
|
54ecb7e4e6
|
Test
|
2018-04-06 12:45:36 +03:00 |
|
jl777
|
bd08718ae8
|
Test
|
2018-04-06 12:41:48 +03:00 |
|
jl777
|
88d4a95ae7
|
Test
|
2018-04-06 12:40:00 +03:00 |
|
Scott Sadler
|
aa9eec4522
|
make log messages more useful
|
2018-04-06 03:59:03 -03:00 |
|
Scott Sadler
|
9bf132a5a8
|
tests for getting MoM in Eval and fixes
|
2018-04-06 03:52:30 -03:00 |
|
Scott Sadler
|
e625be68a9
|
allow larger PUSHDATA for CC fulfillment
|
2018-04-06 02:55:47 -03:00 |
|
jl777
|
acb93848cd
|
Tweak notarization checks
|
2018-04-05 14:39:07 +03:00 |
|
Scott Sadler
|
561f3e18c1
|
tests for bet protocol done; verify notarisation still to test
|
2018-04-05 05:06:22 -03:00 |
|
jl777
|
a3bf7b967a
|
Enable KMD validation for KMD
|
2018-04-04 19:36:16 +03:00 |
|
jl777
|
50045b3671
|
Disable cross chain checking of notarization, libscott says it is ok
|
2018-04-04 18:59:09 +03:00 |
|
jl777
|
c6c94006d9
|
Merge pull request #551 from KomodoPlatform/dev
add BNTN
|
2018-04-04 10:09:48 +03:00 |
|
ca333
|
ee5d694632
|
add BNTN
|
2018-04-04 03:28:48 +02:00 |
|
ca333
|
a6e91bef81
|
Merge pull request #5 from jl777/dev
dev update
|
2018-04-03 23:50:47 +02:00 |
|
Scott Sadler
|
92df780015
|
Merge remote-tracking branch 'james/dev' into cryptoconditions
|
2018-04-03 14:43:19 -03:00 |
|
Scott Sadler
|
375927407b
|
betprotocol functions
|
2018-04-03 04:48:24 -03:00 |
|
Scott Sadler
|
660b32c300
|
cryptoconditions functions to create conditions
|
2018-04-02 20:44:10 -03:00 |
|
Scott Sadler
|
4c121ffdb0
|
cpp test suite for cryptoconditions integration
|
2018-04-01 21:18:01 -03:00 |
|
Scott Sadler
|
563581aff4
|
many changes: * fix CC malleability * extra validations for CCs such as requiring a signature and limiting types * different SIGHASH types for CC
|
2018-03-31 23:20:03 -03:00 |
|
Scott Sadler
|
9ef101bc21
|
mock up DisputePayout
|
2018-03-30 17:20:02 -03:00 |
|
Scott Sadler
|
2c8d8268dd
|
ImportPayout cc eval code and alot of general cc polish. tests to write
|
2018-03-30 15:46:41 -03:00 |
|
Scott Sadler
|
991c422a9d
|
fix CC
|
2018-03-28 15:02:20 -03:00 |
|
jl777
|
b65fbf346c
|
Merge pull request #548 from jl777/jl777
Jl777
|
2018-03-28 14:25:54 +03:00 |
|
jl777
|
1d5c7ffa29
|
-googlemock
|
2018-03-28 14:22:39 +03:00 |
|
jl777
|
8a0b06f603
|
Test
|
2018-03-27 20:22:23 +03:00 |
|
jl777
|
e1501755a4
|
Test
|
2018-03-27 19:30:33 +03:00 |
|