 jl777
|
12c8edb473
|
Merge pull request #1293 from dimxy/tokens-opret-blobs
corr getting non-funglible data in rogue_highlanderopretdecode
|
2019-02-28 04:26:06 -11:00 |
|
|
jl777
|
ee11c051fc
|
Merge pull request #1292 from blackjok3rtt/FSM
fix is_STAKED
|
2019-02-28 03:18:34 -11:00 |
|
|
jl777
|
8e49220d0b
|
Merge pull request #1291 from dimxy/tokens-opret-blobs
Support for additional data blobs in token opret
|
2019-02-28 03:18:02 -11:00 |
|
|
jl777
|
ae352e2d71
|
Merge pull request #1290 from Mixa84/FSM
GatewaysCC small fixes
|
2019-02-27 04:34:22 -11:00 |
|
|
jl777
|
1da0a1710d
|
Merge pull request #1289 from Mixa84/FSM
Fix gatewaysbind
|
2019-02-27 01:35:20 -11:00 |
|
|
jl777
|
b012052427
|
Merge pull request #1288 from blackjok3rtt/FSM
fix bug.
|
2019-02-26 19:23:40 -11:00 |
|
|
jl777
|
8e67d4c317
|
Merge pull request #1287 from blackjok3rtt/FSMLABS
fix sync of labs chains. It cant enter here anyway.
|
2019-02-26 02:27:12 -11:00 |
|
|
jl777
|
6a1b6b2858
|
Merge pull request #1286 from blackjok3rtt/FSMLABS
fix & to &&!
|
2019-02-26 00:56:35 -11:00 |
|
|
jl777
|
d477dce865
|
Merge pull request #1285 from blackjok3rtt/FSMLABS
Merge from LABS.
|
2019-02-26 00:37:02 -11:00 |
|
|
jl777
|
37d5ea3558
|
Merge pull request #1283 from jl777/jl777
update with latest rogue fixes, musig support and dilithium initial version
|
2019-02-25 03:49:28 -11:00 |
|
|
jl777
|
2e2711e026
|
Merge pull request #1282 from blackjok3rtt/jl777
Update to musig.cpp to enable use of single node.
|
2019-02-24 22:26:23 -11:00 |
|
|
jl777
|
c401b765af
|
Merge pull request #1280 from blackjok3rtt/roguefix
fix ipaddress in conf file for Alright
|
2019-02-24 18:54:33 -11:00 |
|
|
jl777
|
342e44389d
|
Merge pull request #1279 from ca333/patch-8
fix build
|
2019-02-23 19:38:02 -11:00 |
|
|
jl777
|
145d05a625
|
Merge pull request #1277 from CHMEX/patch-1
OUR
|
2019-02-23 04:35:20 -11:00 |
|
|
jl777
|
d65ca1c426
|
Merge pull request #1276 from blackjok3rtt/jl777
fix musig and provide example.
|
2019-02-22 20:45:26 -11:00 |
|
|
jl777
|
40bbcfd690
|
Merge pull request #1275 from KomodoPlatform/rogue_nocurses
winify rogue
|
2019-02-21 18:52:24 -11:00 |
|
|
jl777
|
0db268b8d9
|
Merge pull request #1274 from jl777/jl777
Jl777
|
2019-02-21 05:52:27 -11:00 |
|
|
jl777
|
753914a11f
|
Merge pull request #1273 from KomodoPlatform/rogue_nocurses
add ncurses for rogue.exe
|
2019-02-21 05:51:56 -11:00 |
|
|
jl777
|
ce0b50849b
|
Merge pull request #1272 from jl777/jl777
win support
|
2019-02-21 05:11:55 -11:00 |
|
|
jl777
|
5a3a62cd17
|
Merge pull request #1271 from KomodoPlatform/rogue_nocurses
WINify rogue and roguecc
|
2019-02-21 05:11:02 -11:00 |
|
|
jl777
|
afd47e7723
|
Merge pull request #1270 from jl777/jl777
musig compatible
|
2019-02-21 03:30:12 -11:00 |
|
|
jl777
|
1a899ecb60
|
Merge pull request #1269 from jl777/jl777
Jl777
|
2019-02-20 23:36:23 -11:00 |
|
|
jl777
|
876cb2eafa
|
Merge pull request #1268 from jl777/jl777
Jl777
|
2019-02-19 09:22:02 -11:00 |
|
|
jl777
|
f8af813179
|
Merge pull request #1266 from KomodoPlatform/rogue_multiOS
rogue multi OS
|
2019-02-19 02:23:04 -11:00 |
|
|
jl777
|
c57f427eca
|
Merge pull request #1265 from ca333/patch-7
resolve conflict
|
2019-02-19 02:16:56 -11:00 |
|
|
jl777
|
185d2a5152
|
Merge pull request #1264 from jl777/jl777
fix newgame validation
|
2019-02-19 01:45:11 -11:00 |
|
|
jl777
|
fb326bb7e9
|
Merge pull request #1263 from jl777/jl777
Jl777
|
2019-02-19 00:07:40 -11:00 |
|
|
jl777
|
5d78775b53
|
Merge pull request #1262 from jl777/jl777
2x strength limit on items, ISMANY counts as 1
multiplayer lastman standing win is reduced by 5x to reduce fake multiplayer farming
|
2019-02-18 22:32:27 -11:00 |
|
|
jl777
|
334f6ca644
|
Merge pull request #1261 from jl777/jl777
Jl777
|
2019-02-18 06:14:52 -11:00 |
|
|
jl777
|
dfd9365666
|
Merge branch 'FSM' into jl777
|
2019-02-18 06:14:43 -11:00 |
|
|
jl777
|
f52de8347c
|
Merge pull request #1260 from jl777/jl777
Jl777
|
2019-02-18 01:15:54 -11:00 |
|
|
jl777
|
a30ed1916f
|
Merge branch 'FSM' into jl777
|
2019-02-18 01:15:45 -11:00 |
|
|
jl777
|
01a209ec17
|
Merge pull request #1259 from jl777/jl777
Jl777
|
2019-02-18 00:08:13 -11:00 |
|
|
jl777
|
82c311feb6
|
Merge pull request #1257 from dimxy/tokeninfo-vout-order
token marker changed to vout0
|
2019-02-17 09:13:52 -11:00 |
|
|
jl777
|
edf9908228
|
Merge pull request #1256 from letolabs/libzmq
Update zeromq to 4.3.1
|
2019-02-17 03:10:19 -11:00 |
|
|
jl777
|
4353f52928
|
Merge pull request #1255 from jl777/jl777
sync to Jl777
|
2019-02-16 23:34:59 -11:00 |
|
|
jl777
|
7e0e9cb3e7
|
Merge pull request #1254 from dimxy/importcoin-pubkey-fix-sq
Importcoin pubkey fix sq
|
2019-02-16 06:27:39 -11:00 |
|
|
jl777
|
3623f22e5f
|
Merge pull request #1253 from jl777/jl777
stable rogue
|
2019-02-16 02:11:27 -11:00 |
|
|
jl777
|
4cca11b213
|
Merge pull request #1252 from letolabs/mac
Fix building cclib on darwin
|
2019-02-15 18:14:11 -11:00 |
|
|
jl777
|
44cf226eb5
|
Merge pull request #1251 from Mixa84/FSM
Fix for new DecodeTokenOpRet
|
2019-02-15 01:10:32 -11:00 |
|
|
jl777
|
c843c1fa19
|
Merge pull request #1249 from dimxy/decode-token-unmarshal-fix
Decode token unmarshal fix
|
2019-02-14 07:51:39 -11:00 |
|
|
jl777
|
dd30368525
|
Merge pull request #1248 from ca333/patch-5
add depends
|
2019-02-14 00:06:06 -11:00 |
|
|
jl777
|
90fbeef954
|
Merge pull request #1246 from dimxy/tokenorders-fix
Tokenorders fix
|
2019-02-13 02:26:53 -11:00 |
|
|
jl777
|
7a8fafbb4a
|
Merge pull request #1245 from dimxy/tokenorders-fix
Tokenorders fix
|
2019-02-13 00:23:38 -11:00 |
|
|
jl777
|
f18a3224c9
|
Merge pull request #1244 from jl777/jl777
Disp playertxid for tokens for 'c' tx
|
2019-02-11 23:46:19 -11:00 |
|
|
jl777
|
7ca65d3fe7
|
Merge pull request #1243 from dimxy/non-existing-eval-fix-sq
check for non-existing eval
|
2019-02-11 23:45:53 -11:00 |
|
|
jl777
|
6c06834341
|
Merge pull request #1242 from jl777/jl777
initial rogue CC
|
2019-02-11 15:55:45 -11:00 |
|
|
jl777
|
89de224d59
|
Merge pull request #1241 from dimxy/nonfungible-opret-fix
Burn support for non-fungible tokens
|
2019-02-11 13:37:24 -11:00 |
|
|
jl777
|
13d4811a3d
|
Merge pull request #1240 from Mixa84/FSM
GatewaysCC code cleanup
|
2019-02-11 06:23:31 -11:00 |
|
|
jl777
|
e7d2b5744c
|
Merge pull request #1239 from Mixa84/FSM
Multi coin support for GatewaysCC (#18)
|
2019-02-11 04:42:21 -11:00 |
|
|
jl777
|
1c20ae134b
|
Merge pull request #1238 from dimxy/nonfungible-opret-fix
Nonfungible opret fix
|
2019-02-11 04:36:11 -11:00 |
|
|
jl777
|
deb3326e19
|
Merge pull request #1235 from dimxy/add-token-registertx
Add token for registertx
|
2019-02-10 08:27:53 -11:00 |
|
|
jl777
|
109498bc7e
|
Merge pull request #1234 from dimxy/add-nf-token-opret
token opret and vout added
|
2019-02-10 04:25:37 -11:00 |
|
|
jl777
|
5229df57d4
|
Merge branch 'jl777' into add-nf-token-opret
|
2019-02-10 04:25:29 -11:00 |
|
|
jl777
|
bcdae3fbb8
|
Merge pull request #1233 from dimxy/non-fungible-tokens-sq
Non fungible tokens support
|
2019-02-10 02:20:55 -11:00 |
|
|
jl777
|
1971525c5f
|
Merge pull request #1230 from Mixa84/FSM
Gateways fixes (#17)
|
2019-02-04 06:53:14 -11:00 |
|
|
jl777
|
74b39856dd
|
Merge pull request #1229 from dimxy/fix-SEC-old-tokens
Fix SEC & MGNX for old tokens validation skipping
|
2019-02-02 06:40:16 -11:00 |
|
|
jl777
|
2e543b4746
|
Merge pull request #1228 from Mixa84/FSM
Add support for dual opret with Token opret in RPC decodeccopret.
|
2019-02-01 02:19:20 -11:00 |
|
|
jl777
|
7f4efd6ba5
|
Merge pull request #1227 from jl777/jl777
fix memory overflow in addnormalinputs
|
2019-01-31 09:20:29 -11:00 |
|
|
jl777
|
f50c68b3ff
|
Merge pull request #1226 from Mixa84/FSM
Gateways validation (#16)
|
2019-01-31 06:52:17 -11:00 |
|
|
jl777
|
0402747d05
|
Merge pull request #1225 from jl777/jl777
initial sudoku validation
|
2019-01-31 02:55:08 -11:00 |
|
|
jl777
|
8deba75216
|
Merge pull request #1224 from jl777/jl777
Jl777
|
2019-01-30 04:18:43 -11:00 |
|
|
jl777
|
dada8d0082
|
Merge branch 'FSM' into jl777
|
2019-01-30 04:18:29 -11:00 |
|
|
jl777
|
d34e8c2439
|
Merge pull request #1223 from jl777/jl777
initial sudoku in cclib
|
2019-01-29 01:17:42 -11:00 |
|
|
jl777
|
424afde333
|
Merge pull request #1222 from Mixa84/FSM
Refactor CCaddress
|
2019-01-28 05:40:57 -11:00 |
|
|
jl777
|
32187f8e51
|
Merge pull request #1221 from Mixa84/FSM
Gateways with new TokensCC
|
2019-01-28 02:19:18 -11:00 |
|
|
jl777
|
77dba8ffe9
|
Merge pull request #1219 from tonymorony/FSM
Adjusted heir tests for heirCC JSON changes and added heirfund tokens case check
|
2019-01-28 02:18:42 -11:00 |
|
|
jl777
|
d4b0c5ee3b
|
Merge pull request #1215 from dimxy/heir-json-issues
Heir json issues
|
2019-01-27 04:57:12 -11:00 |
|
|
jl777
|
76024c356e
|
Merge pull request #1216 from jl777/jl777
Disable removeorphan
|
2019-01-27 04:52:32 -11:00 |
|
|
jl777
|
f5ac1e19d9
|
Merge pull request #1211 from jl777/jl777
Jl777
|
2019-01-26 01:29:35 -11:00 |
|
|
jl777
|
9484ddf59b
|
Merge pull request #1210 from KomodoPlatform/cclib_dyn
update linux makefile
|
2019-01-26 01:28:16 -11:00 |
|
|
jl777
|
b778dbef8e
|
Merge pull request #1207 from jl777/jl777
Jl777
|
2019-01-25 17:16:59 -11:00 |
|
|
jl777
|
fc515c1f4a
|
Merge pull request #1206 from DeckerSU/patch-gcc-8
Patch gcc 8
|
2019-01-25 16:37:17 -11:00 |
|
|
jl777
|
e4791f54e6
|
Merge branch 'FSM' into patch-gcc-8
|
2019-01-25 16:33:13 -11:00 |
|
|
jl777
|
3ea404eaf3
|
Merge pull request #1203 from jl777/jl777
Jl777
|
2019-01-25 01:28:50 -11:00 |
|
|
jl777
|
0097d0c870
|
Merge pull request #1200 from tonymorony/FSM
initial heir tests
|
2019-01-24 02:15:15 -11:00 |
|
|
jl777
|
d9e2156c3f
|
Merge pull request #1199 from blackjok3rtt/jl777
Auto purge of orphaned blocks from block DB and Index.
|
2019-01-23 22:19:47 -11:00 |
|
|
jl777
|
af8f3f4938
|
Merge pull request #1198 from KomodoPlatform/cclib_dyn
update cclib
|
2019-01-23 07:11:27 -11:00 |
|
|
jl777
|
3cc3cb20da
|
Merge pull request #1197 from dimxy/heir-fix-precision
Heir fix precision
|
2019-01-22 21:49:06 -11:00 |
|
|
jl777
|
dbdd6ea07e
|
Merge pull request #1196 from dimxy/heir-fix-donations
Heir fix donations
|
2019-01-22 07:42:17 -11:00 |
|
|
jl777
|
7937644f3e
|
Merge pull request #1195 from jl777/jl777
Jl777
|
2019-01-21 22:54:45 -11:00 |
|
|
jl777
|
b6753dc647
|
Merge pull request #1194 from tonymorony/FSM
More tests for channels and tokens
|
2019-01-21 22:54:33 -11:00 |
|
|
jl777
|
bd35ed03ba
|
Merge pull request #1193 from jl777/jl777
Jl777
|
2019-01-21 01:53:25 -11:00 |
|
|
jl777
|
3ad4ad82e2
|
Merge pull request #1192 from Mixa84/FSM
Channel close fix. Fix canceling partially filled orders by anyone.
|
2019-01-21 01:52:40 -11:00 |
|
|
jl777
|
1fcf1343f4
|
Merge pull request #1191 from jl777/jl777
Jl777
|
2019-01-20 00:22:41 -11:00 |
|
|
jl777
|
8828df32a9
|
Merge pull request #1190 from jl777/cclib
Cclib
|
2019-01-19 22:57:57 -11:00 |
|
|
jl777
|
f37f308edb
|
Merge pull request #1189 from KomodoPlatform/cclib
[add] cclib to makefile
|
2019-01-19 19:12:12 -11:00 |
|
|
jl777
|
37e7bc5721
|
Merge pull request #1188 from jl777/cclib
Height and from_mempool in club
|
2019-01-19 03:38:28 -11:00 |
|
|
jl777
|
b7fd17ac76
|
Merge pull request #1187 from jl777/cclib
Cclib
|
2019-01-19 02:44:39 -11:00 |
|
|
jl777
|
5ae5375a29
|
Merge pull request #1186 from jl777/cclib
Cclib
|
2019-01-19 01:07:18 -11:00 |
|
|
jl777
|
d13264a169
|
Merge pull request #1185 from tonymorony/FSM
fixed existing token tests
|
2019-01-18 00:02:41 -11:00 |
|
|
jl777
|
bfccd586f8
|
Merge pull request #1184 from Mixa84/FSM
Fix ChannelsPayment when destpub issues payment,add check_signing_pubkey
|
2019-01-17 23:21:48 -11:00 |
|
|
jl777
|
cd45dbdf25
|
Merge pull request #1182 from blackjok3rtt/FSM
Corrupt tx in wallet fix.
|
2019-01-17 22:10:22 -11:00 |
|
|
jl777
|
f5344fd3bd
|
Merge pull request #1181 from dimxy/heir-tokens-cherpick4
Heir tokens cherpick4
|
2019-01-17 20:21:33 -11:00 |
|
|
jl777
|
4582a08461
|
Merge pull request #1180 from jl777/jl777
Jl777
|
2019-01-15 04:33:49 -11:00 |
|
|
jl777
|
10fede5b1a
|
Merge pull request #1178 from jl777/jl777
Jl777
|
2019-01-13 08:55:15 -11:00 |
|
|
jl777
|
ca63bab5e6
|
Merge branch 'FSM' into jl777
|
2019-01-13 08:54:57 -11:00 |
|
|
jl777
|
6e92159a57
|
Merge pull request #1177 from tonymorony/FSM
oracles autotests passing now
|
2019-01-11 21:33:31 -11:00 |
|
|
jl777
|
07311c0fd3
|
Merge pull request #1174 from jl777/FSM
FSM
|
2019-01-11 04:30:43 -11:00 |
|
|
jl777
|
dac67400a4
|
Merge pull request #1173 from blackjok3rtt/FSM
fix miner lock when run out of utxo
|
2019-01-11 04:29:52 -11:00 |
|