jl777
d2b906160e
Merge pull request #1523 from jl777/dev
...
Dev
2019-06-03 21:15:53 -11:00
jl777
166fdd7c8b
Merge pull request #1522 from jl777/FSM
...
FSM
2019-06-03 21:14:44 -11:00
jl777
3f2a0584e8
Merge pull request #1521 from jl777/jl777
...
Jl777
2019-06-03 21:14:11 -11:00
jl777
ee3aef5066
Define getacseason
2019-06-03 21:10:49 -11:00
jl777
37a2889b24
Merge branch 'FSM' into jl777
2019-06-03 19:23:28 -11:00
jl777
d1c16ee705
Merge branch 'dev' into FSM
2019-06-03 19:23:05 -11:00
jl777
52ff4a9cfc
Merge branch 'beta' into dev
2019-06-03 19:22:45 -11:00
jl777
2dde049863
Merge pull request #1520 from blackjok3rtt/beta
...
sorry messed it up this works, have tested it.
2019-06-03 19:22:26 -11:00
blackjok3r
17dd062fee
woops
2019-06-04 14:10:15 +08:00
jl777
bfd191585b
Merge branch 'FSM' into jl777
2019-06-03 18:53:26 -11:00
jl777
dc28597e30
Merge branch 'dev' into FSM
2019-06-03 18:52:57 -11:00
jl777
bff1694a08
Merge branch 'beta' into dev
2019-06-03 18:52:26 -11:00
jl777
cf4c055f99
Merge pull request #1519 from blackjok3rtt/beta
...
fix PIRATE wallet forcing rescan
2019-06-03 18:51:57 -11:00
blackjok3r
86926e33f0
fix uint
2019-06-04 13:34:50 +08:00
blackjok3r
b29c95a26d
fix PIRATE forced rescan.
2019-06-04 11:53:38 +08:00
blackjok3rtt
e49c63d6e4
Merge pull request #93 from jl777/beta
...
Beta
2019-06-04 11:12:23 +08:00
jl777
a38a0b2031
Merge pull request #1518 from jl777/kolo-jl
...
Notaries
2019-06-03 03:38:24 -11:00
Mihail Fedorov
c62ddda360
Notaries 2019
2019-06-03 17:36:28 +03:00
Mihail Fedorov
f5d4ff421e
Notaries 2019
2019-06-03 02:04:54 +03:00
jl777
7730dfbf6d
Merge branch 'FSM' into jl777
2019-05-30 22:14:04 -11:00
jl777
2a3dffbb5d
Merge pull request #1516 from MyHush/zdupes2
...
Allow duplicate receivers in z_sendmany
2019-05-30 22:13:23 -11:00
Jonathan "Duke" Leto
01fb676782
Allow duplicate receivers in z_sendmany
2019-05-31 10:54:16 +02:00
jl777
06e60194dc
Merge pull request #1515 from ca333/patch-4
...
fix OSX
2019-05-30 19:26:32 -11:00
jl777
ed2406172c
Merge pull request #1514 from ca333/patch-3
...
fix OSX
2019-05-30 19:26:21 -11:00
jl777
5c7d67962a
Merge pull request #1513 from ca333/patch-2
...
fix OSX
2019-05-30 19:26:08 -11:00
jl777
6a7a7e3a2d
Merge pull request #1512 from ca333/patch-1
...
fix OSX
2019-05-30 19:25:55 -11:00
ca333
df7f46285a
fix OSX
2019-05-31 03:14:38 +02:00
ca333
2d5a95ca88
fix OSX
2019-05-31 03:12:58 +02:00
ca333
43d3043d34
fix OSX
...
this fixes the faulty OSX patch
2019-05-31 03:12:33 +02:00
ca333
5e6d7bad4b
fix OSX
...
this fixes the faulty OSX patch
2019-05-31 03:11:54 +02:00
jl777
b2e10b00f1
Merge branch 'FSM' into jl777
2019-05-29 19:12:21 -11:00
jl777
e032898c39
Merge pull request #1511 from DeckerSU/patch-fsm-gcc8
...
fix fsm build gcc8
2019-05-29 23:11:54 -07:00
DeckerSU
4f989b26eb
fix notarisationTx type
2019-05-30 00:23:38 +03:00
DeckerSU
33a0059a18
gcc-8: fix komodo_connectblock reaches end of non-void function error
2019-05-30 00:11:50 +03:00
DeckerSU
9a5de83ebc
sort64 / revsort64s has void return-type
2019-05-29 23:14:15 +03:00
jl777
0f9c7ed3cd
Merge branch 'FSM' into jl777
2019-05-29 08:06:00 -07:00
jl777
5ad8d9310c
Merge pull request #1509 from smk762/patch-3
...
Update cryptoconditions_oracles.py
2019-05-29 08:05:32 -07:00
smk762
b04b41e19d
Update cryptoconditions_oracles.py
...
-change tests to use baton address instead of baton utxo
-update samples results reference index
-add test for oraclesfund
-modify test loop flow to avoid spent utxo errors.
Note: Successful test requires timestamp after July 15th 2019, or changing PUBKEY_SPOOFING_FIX_ACTIVATION value in oracles.cpp
2019-05-29 16:41:15 +08:00
jl777
70636f83df
Merge branch 'FSM' into jl777
2019-05-28 02:47:00 -11:00
jl777
9fa0d914cf
Merge pull request #1507 from Mixa84/FSM
...
Oracles pubkey spoofing in register tx fix
2019-05-28 02:46:35 -11:00
Mihailo Milenkovic
01f597a2c8
Oracles pubkey spoofing in register tx fix
...
- Fix activation on July 15th 2019 00:00
- Added oraclesfund tx to fund Oracles CC address of pubkey that will register, and spend it in register tx
- oraclessamples gets baton address as input instead of txid to show all data from publisher
2019-05-28 15:40:43 +02:00
jl777
034746aa82
Merge pull request #1506 from MyHush/helpdocs2
...
Give correct CLI asset name and RPC ports in RPC examples
2019-05-27 22:18:36 -11:00
Jonathan "Duke" Leto
0f24aec587
Give correct CLI asset name and RPC ports in rpc examples
2019-05-27 21:36:25 -07:00
jl777
93a3c1e9cf
Merge pull request #1505 from jl777/dev
...
Dev
2019-05-27 04:23:06 -11:00
jl777
bd1408c795
Merge pull request #1504 from jl777/FSM
...
FSM
2019-05-27 04:22:21 -11:00
jl777
e7ae10303a
Merge branch 'FSM' into jl777
2019-05-27 04:20:49 -11:00
jl777
eb20b33718
Merge pull request #1503 from DeckerSU/patch-osx-gcc8-static
...
Patch osx gcc8 static
2019-05-27 04:19:17 -11:00
jl777
3070b90746
Merge branch 'FSM' into patch-osx-gcc8-static
2019-05-27 04:18:27 -11:00
jl777
e36488682e
Merge pull request #1502 from jl777/dev
...
Dev
2019-05-25 22:02:06 -11:00
jl777
99b03d9965
Merge branch 'beta' into dev
2019-05-25 22:01:28 -11:00
