 jl777
|
12a3d56205
|
Merge branch 'master' into beta
|
2019-05-22 22:05:20 -11:00 |
|
|
jl777
|
fbda899304
|
Merge pull request #1492 from jl777/dev
Dev
|
2019-05-19 23:31:14 -11:00 |
|
|
jl777
|
c41090127f
|
Merge pull request #1491 from chainmakers/dev
add K64
|
2019-05-19 23:29:28 -11:00 |
|
|
jl777
|
08743db95e
|
Merge pull request #1490 from chainmakers/beta
add K64
|
2019-05-19 23:29:05 -11:00 |
|
|
jl777
|
8eb4baf3ff
|
Merge pull request #1488 from himu007/patch-2
Update README.md
|
2019-05-17 06:30:46 -11:00 |
|
|
jl777
|
c7f0f89c94
|
Merge pull request #1487 from blackjok3rtt/beta
bug fixes
|
2019-05-16 02:39:35 -11:00 |
|
|
jl777
|
31c8388abe
|
Merge pull request #1485 from jl777/kolo
remove MGNX coin
|
2019-05-15 17:09:09 -11:00 |
|
|
jl777
|
1e7e0e4fd1
|
Merge pull request #1477 from jl777/dev
Dev
|
2019-05-13 07:55:12 -11:00 |
|
|
jl777
|
29c5b8936a
|
Merge pull request #1476 from Alrighttt/dev
remove ZEX, add ZEXO
|
2019-05-13 07:02:16 -11:00 |
|
|
jl777
|
cb6bfed655
|
Merge pull request #1461 from jl777/dev
Dev
|
2019-04-28 18:41:40 -11:00 |
|
|
jl777
|
566d101d31
|
Merge pull request #1460 from blackjok3rtt/dev
fix wallet bug
|
2019-04-28 18:39:02 -11:00 |
|
|
jl777
|
e4d7b9f616
|
Merge pull request #1459 from blackjok3rtt/dev
add extr print for new fix
|
2019-04-27 01:39:26 -11:00 |
|
|
jl777
|
1b3bb3a0a0
|
Merge pull request #1458 from jl777/dev
Dev
|
2019-04-26 22:52:24 -11:00 |
|
|
jl777
|
b2c8247e76
|
Merge pull request #1457 from blackjok3rtt/dev
Fix possible not being able to sync after node crashes, add dpow to BEER
|
2019-04-26 22:51:19 -11:00 |
|
|
jl777
|
fe3386f6a7
|
Merge pull request #1439 from jl777/dev
Dev
|
2019-04-18 21:19:15 -11:00 |
|
|
jl777
|
c8fe029487
|
Merge pull request #1438 from KomodoPlatform/dev
[add] KOIN
|
2019-04-18 17:51:08 -11:00 |
|
|
jl777
|
15377f2fea
|
Merge pull request #1427 from jl777/dev
Dev
|
2019-04-15 18:28:24 -11:00 |
|
|
jl777
|
c6a58be7f2
|
Merge pull request #1426 from jl777/jl777
fixin staking wallet issue
|
2019-04-15 18:26:39 -11:00 |
|
|
jl777
|
d341e1670c
|
Merge pull request #1425 from blackjok3rtt/jl777
wallet code fix
|
2019-04-15 18:23:49 -11:00 |
|
|
jl777
|
c5e89091a6
|
Merge pull request #1424 from jl777/dev
Dev
|
2019-04-15 04:08:49 -11:00 |
|
|
jl777
|
189355399a
|
Merge pull request #1423 from jl777/FSM
FSM
|
2019-04-15 04:04:07 -11:00 |
|
|
jl777
|
9b76745f12
|
Merge pull request #1422 from jl777/jl777
Jl777
|
2019-04-15 04:03:12 -11:00 |
|
|
jl777
|
4219408809
|
Merge pull request #1421 from blackjok3rtt/jl777
fix wallet crash
|
2019-04-15 03:52:30 -11:00 |
|
|
jl777
|
74125f9cf3
|
Merge pull request #1420 from Mixa84/FSM
Fix looking for wrong type marker in Oracles CC
|
2019-04-15 03:14:12 -11:00 |
|
|
jl777
|
8e47705d50
|
Merge pull request #1419 from jl777/dev
Dev
|
2019-04-14 18:21:35 -11:00 |
|
|
jl777
|
201f1e86c0
|
Merge pull request #1418 from jl777/FSM
FSM
|
2019-04-14 18:20:02 -11:00 |
|
|
jl777
|
65b6cf85bc
|
Merge pull request #1413 from jl777/jl777
automatically rejoin a prices chain after being stranded
fix OUR staking
|
2019-04-14 18:18:46 -11:00 |
|
|
jl777
|
31eb126876
|
Merge pull request #1417 from blackjok3rtt/jl777
revert miner change
|
2019-04-14 18:16:47 -11:00 |
|
|
jl777
|
35c7165a02
|
Merge pull request #1416 from phm87/patch-1
init.cpp : Help message for -whitelistaddress=
|
2019-04-14 06:48:45 -11:00 |
|
|
jl777
|
2b16669e64
|
Merge pull request #1415 from jl777/kolo
VOTE2019
|
2019-04-14 05:09:35 -11:00 |
|
|
jl777
|
a0136724b0
|
Merge pull request #1414 from blackjok3rtt/jl777
try wallet fix
|
2019-04-13 20:56:53 -11:00 |
|
|
jl777
|
bd4a51154d
|
Merge pull request #1412 from jl777/jl777
Dont fetch ahead if cbopret chain, yes it will slow it down
|
2019-04-11 23:06:55 -11:00 |
|
|
jl777
|
73ce7cda24
|
Merge pull request #1411 from blackjok3rtt/jl777
fix RPC calls
|
2019-04-11 23:06:16 -11:00 |
|
|
jl777
|
e985b6eede
|
Merge pull request #1410 from jl777/dev
Dev
|
2019-04-11 22:42:56 -11:00 |
|
|
jl777
|
3fb8cba0b5
|
Merge pull request #1409 from jl777/FSM
FSM
|
2019-04-11 22:42:21 -11:00 |
|
|
jl777
|
993f91fbd4
|
Merge pull request #1408 from jl777/jl777
fix CCaddress calcs
|
2019-04-11 22:41:17 -11:00 |
|
|
jl777
|
79db859357
|
Merge pull request #1407 from blackjok3rtt/jl777
fix address type
|
2019-04-11 22:39:35 -11:00 |
|
|
jl777
|
db3b3de75d
|
Merge pull request #1406 from jl777/dev
Dev
|
2019-04-11 20:06:30 -11:00 |
|
|
jl777
|
3069976877
|
Merge pull request #1405 from jl777/FSM
FSM
|
2019-04-11 20:06:02 -11:00 |
|
|
jl777
|
8a17bc9dd9
|
Merge pull request #1404 from jl777/jl777
revert qsort changes
|
2019-04-11 20:05:29 -11:00 |
|
|
jl777
|
cf6dd0a8f9
|
Merge pull request #1403 from jl777/dev
Dev
|
2019-04-11 19:05:51 -11:00 |
|
|
jl777
|
27a06b1cc1
|
Merge branch 'beta' into dev
|
2019-04-11 19:05:43 -11:00 |
|
|
jl777
|
5cb4297219
|
Merge pull request #1402 from jl777/FSM
FSM
|
2019-04-11 19:04:48 -11:00 |
|
|
jl777
|
11cc404050
|
Merge branch 'dev' into FSM
|
2019-04-11 19:04:36 -11:00 |
|
|
jl777
|
0a898c31b5
|
Merge pull request #1401 from jl777/jl777
Jl777
|
2019-04-11 19:03:14 -11:00 |
|
|
jl777
|
2a31c4558a
|
Merge pull request #1400 from blackjok3rtt/jl777
fix bug with dpow update
|
2019-04-11 19:02:37 -11:00 |
|
|
jl777
|
d73d1fd6ff
|
Merge pull request #1399 from jl777/jl777
Jl777
|
2019-04-11 08:12:00 -11:00 |
|
|
jl777
|
e8c49b0157
|
Merge pull request #1398 from jl777/dev
Dev
|
2019-04-11 03:05:53 -11:00 |
|
|
jl777
|
c7035d3105
|
Merge pull request #1397 from jl777/FSM
FSM
|
2019-04-11 03:05:04 -11:00 |
|
|
jl777
|
ed3707cf27
|
Merge pull request #1396 from jl777/jl777
Jl777
|
2019-04-11 03:04:23 -11:00 |
|
|
jl777
|
daf8da4460
|
Merge pull request #1395 from blackjok3rtt/dpow_test
update to add peer banning for attacking chain
|
2019-04-11 03:03:21 -11:00 |
|
|
jl777
|
59f4f326e6
|
Merge pull request #1394 from blackjok3rtt/dpow_test
Dpow test
|
2019-04-11 00:30:50 -11:00 |
|
|
jl777
|
0695fd9cd9
|
Merge pull request #1392 from jl777/dev
sync with dev
|
2019-04-10 19:49:05 -11:00 |
|
|
jl777
|
c00aaa32c2
|
Merge pull request #1391 from jl777/FSM
sync with FSM
|
2019-04-10 19:48:01 -11:00 |
|
|
jl777
|
13b863937f
|
Merge pull request #1390 from jl777/jl777
sync with jl777
|
2019-04-10 19:46:40 -11:00 |
|
|
jl777
|
26c7135e37
|
Merge pull request #1389 from blackjok3rtt/jl777
notarystats.py update to official regions/stop height.
|
2019-04-10 19:42:59 -11:00 |
|
|
jl777
|
b1b8a235b3
|
Merge pull request #1388 from Mixa84/FSM
Fix broken build
|
2019-04-10 05:21:08 -11:00 |
|
|
jl777
|
1fe6eeec74
|
Merge pull request #1387 from Mixa84/FSM
Adding dual daemon import and gateway import. (#21)
|
2019-04-10 00:32:09 -11:00 |
|
|
jl777
|
87ed680d3b
|
Merge pull request #1386 from blackjok3rtt/jl777
fix getsnapshot2
|
2019-04-09 22:03:52 -11:00 |
|
|
jl777
|
a3f3151d10
|
Merge pull request #1385 from blackjok3rtt/notastats2
notaryt stats RPC
|
2019-04-09 19:31:26 -11:00 |
|
|
jl777
|
9d58ce6a04
|
Merge pull request #1384 from zatJUM/dev
Updates returned strings for cleanwallettransactions
|
2019-04-09 06:02:03 -11:00 |
|
|
jl777
|
bb0de29c7e
|
Merge pull request #1383 from blackjok3rtt/walletfilter
Wallet filter and LABS code cleanup
|
2019-04-09 00:06:52 -11:00 |
|
|
jl777
|
90afbc5485
|
Merge pull request #1381 from blackjok3rtt/jl777
Snapshot2 changes.
|
2019-04-07 06:12:49 -11:00 |
|
|
jl777
|
d02edd2d77
|
Merge pull request #1379 from jl777/jl777
Jl777
|
2019-04-06 00:40:53 -11:00 |
|
|
jl777
|
fb797bc8b8
|
Merge branch 'FSM' into jl777
|
2019-04-06 00:40:45 -11:00 |
|
|
jl777
|
6607f8bc67
|
Merge pull request #1378 from jl777/jl777
Revert incompatible changes
|
2019-04-03 00:28:48 -11:00 |
|
|
jl777
|
a8fc2c00b3
|
Merge pull request #1377 from jl777/jl777
Jl777
|
2019-04-03 00:18:23 -11:00 |
|
|
jl777
|
6061e0a275
|
Merge pull request #1376 from jl777/jl777
stable initial release for PRICES testchain
|
2019-04-02 22:46:19 -11:00 |
|
|
jl777
|
4b08854acb
|
Merge pull request #1374 from MyHush/clientname2
Client name is not a consensus-related option, it can be configured by any node
|
2019-04-02 05:05:52 -11:00 |
|
|
jl777
|
6e54aa184f
|
Merge pull request #1372 from blackjok3rtt/jl777
contextual check flag to speed up sync
|
2019-04-02 00:25:00 -11:00 |
|
|
jl777
|
37e421e015
|
Merge pull request #1371 from jl777/jl777
225k activation
|
2019-04-01 05:40:21 -11:00 |
|
|
jl777
|
443c717856
|
Merge pull request #1370 from jl777/jl777
Jl777
|
2019-04-01 05:37:22 -11:00 |
|
|
jl777
|
616a8752ec
|
Merge pull request #1369 from jl777/dev
Dev
|
2019-04-01 04:14:31 -11:00 |
|
|
jl777
|
01a6690baa
|
Merge branch 'beta' into dev
|
2019-04-01 04:14:04 -11:00 |
|
|
jl777
|
9c196c8a56
|
Merge pull request #1368 from tonymorony/patch-3
Revert
|
2019-03-30 19:37:34 -11:00 |
|
|
jl777
|
d90f50c652
|
Merge pull request #1367 from tonymorony/patch-2
looking for keystrokes.log in the right place
|
2019-03-29 08:36:04 -11:00 |
|
|
jl777
|
d74b7af91b
|
Merge pull request #1366 from tonymorony/jl777
fixing block fit on blocks swap from both ends now and not making unnecessary moves
|
2019-03-29 06:56:34 -11:00 |
|
|
jl777
|
7e6af1f059
|
Merge pull request #1365 from tonymorony/jl777
moving block from buffer horizontally if it not fit game field on swap
|
2019-03-29 05:19:14 -11:00 |
|
|
jl777
|
5666a5ea84
|
Merge pull request #1364 from tonymorony/jl777
tetris tweaks
|
2019-03-28 19:32:57 -11:00 |
|
|
jl777
|
0f0fc5e5a6
|
Merge pull request #1363 from tonymorony/jl777
Added Komodoku GUI
|
2019-03-28 06:45:37 -11:00 |
|
|
jl777
|
00b4eb3dd8
|
Merge pull request #1362 from tonymorony/jl777
Added python TUIs
|
2019-03-28 05:54:51 -11:00 |
|
|
jl777
|
0aaf91802e
|
Merge pull request #1361 from Mixa84/FSM
Fix CC change calculation for channelspayment
|
2019-03-28 05:48:33 -11:00 |
|
|
jl777
|
f57e6c94c2
|
Merge pull request #1360 from Mixa84/FSM
Updated ChannelsCC validation (#20)
|
2019-03-28 04:00:32 -11:00 |
|
|
jl777
|
81b256e544
|
Merge pull request #1358 from tonymorony/patch-1
Create cryptoconditions.py
|
2019-03-27 05:38:47 -11:00 |
|
|
jl777
|
985d323333
|
Merge pull request #1357 from Mixa84/FSM
Correct GatewaysCC validation to check spending from global CC address
|
2019-03-26 03:39:35 -11:00 |
|
|
jl777
|
6e9c9cc0e5
|
Merge pull request #1356 from blackjok3rtt/jl777
small fix
|
2019-03-26 03:39:10 -11:00 |
|
|
jl777
|
e549dc111c
|
Merge pull request #1355 from blackjok3rtt/jl777
new util function to check txfee
|
2019-03-26 03:09:52 -11:00 |
|
|
jl777
|
16b6c54140
|
Merge pull request #1354 from jl777/jl777
Jl777
|
2019-03-25 22:13:35 -11:00 |
|
|
jl777
|
05d376cddf
|
Merge pull request #1353 from blackjok3rtt/jl777
possible fix for stealing coins
|
2019-03-25 20:49:04 -11:00 |
|
|
jl777
|
71d9c553e3
|
Merge pull request #1352 from jl777/jl777
Jl777
|
2019-03-25 07:58:57 -11:00 |
|
|
jl777
|
aac1223757
|
Merge pull request #1351 from jl777/jl777
Jl777
|
2019-03-25 05:59:10 -11:00 |
|
|
jl777
|
a0911d297d
|
Merge pull request #1350 from smk762/smk-patch-ccs
Fixed keys used for address validation
|
2019-03-25 01:15:53 -11:00 |
|
|
jl777
|
92c4470248
|
Merge pull request #1349 from blackjok3rtt/jl777
change allocations to int64
|
2019-03-24 23:40:52 -11:00 |
|
|
jl777
|
bd3457cb47
|
Merge pull request #1348 from blackjok3rtt/jl777
clean up code, and add op_return validation
|
2019-03-24 23:07:08 -11:00 |
|
|
jl777
|
18c541a885
|
Merge pull request #1347 from blackjok3rtt/jl777
validation to sync PAY
|
2019-03-22 22:54:30 -11:00 |
|
|
jl777
|
c696f5941d
|
Merge pull request #1346 from smk762/patch-10
Update cryptoconditions.py
|
2019-03-22 22:53:14 -11:00 |
|
|
jl777
|
fc0450dd05
|
Merge pull request #1345 from DeckerSU/patch-rogue-msvc
fix rogue "player lose focus with max inventory" issue
|
2019-03-22 01:08:56 -11:00 |
|
|
jl777
|
d09c3c646d
|
Merge pull request #1344 from jl777/FSM
FSM
|
2019-03-21 02:43:05 -11:00 |
|
|
jl777
|
75e27ba2a5
|
Merge pull request #1343 from jl777/jl777
Jl777
|
2019-03-21 02:40:55 -11:00 |
|
|
jl777
|
05977b8af6
|
Jl777 (#1333)
* Slow down clock
* Faster and slower
* A0/50
* Fix dilithium inputs scan to compare for the voutpubtxids[vout]
* Prevent use of uninitialized ignoredAddresses
* Filter out amount=0 UTXOs from getsnapshot results
* rogue msvc build (#1327)
* + msvc 2015 deps headers
* + msvc deps build script
this script builds only deps, to build rogue binary, open
*.sln file in MSVC 2015 and build x64 Release version.
* + msvc solution (*.sln) update
* + msvc build fix
* fix libcurl deps install (msvc)
* Fix wrong dilithium compare
* Port getchaintxstats from BTC master (#1328)
This will allow explorers to present interesting analytics about
transaction volume in various time frames.
* customcc
* Make custom
* Syntax
* update
* Patch rogue msvc (#1330)
* + msvc 2015 deps headers
* + msvc deps build script
this script builds only deps, to build rogue binary, open
*.sln file in MSVC 2015 and build x64 Release version.
* + msvc solution (*.sln) update
* + msvc build fix
* fix libcurl deps install (msvc)
* [msvc] fix seed str -> uint64 conversion
* [msvc] fix config file name issue
+ debug print for send raw tx
* + comment debug printouts
* [ msvc ] display compiler version and build date on startup
* +pritns
* +prints
* I,
* Print hex
* Allow gold mismatch for validate
* Stricter player data validation
* Change data source
* Allow claiming less than cashout value
* 50902 exemption
* Taxied
* Print
* Debug file
* Log seed
* Potion file
* ;
* Log seed
* Commands log
* Fp
* Test
* Prints
* static FILE *fp;
* Fp2
* Daemons or fuses
* Fuse prints
* All funcs
* Logfp
* turn_see is a daemon!
* 'void (*)(struct rogue_state *, int)
* -prints
* -file fp
* -potions file
* Test
* -log
* -print replay2 gold
* Test
* D'oh!
|
2019-03-13 22:58:20 -11:00 |
|