Commit Graph
100 Commits
Author SHA1 Message Date
jl777 53f288624e Merge pull request #1323 from MyHush/snapshot_fix
Filter out amount=0 UTXOs from getsnapshot results
2019-03-09 16:01:18 -11:00
jl777 1b11d1f06f Merge pull request #1324 from jl777/kolo
AXO -ac_ccenable=130000
2019-03-09 16:00:30 -11:00
jl777 beaada4cbb Merge pull request #1322 from MyHush/ignored_snapshot
Prevent use of uninitialized ignoredAddresses
2019-03-09 05:29:34 -11:00
jl777 408924d459 Merge pull request #1321 from ca333/patch-11
update gitlab conf
2019-03-07 20:04:37 -11:00
jl777 6d62ca7cc3 Merge pull request #1320 from jl777/kolo
MNZ so long and thanks for fish
2019-03-07 20:04:10 -11:00
jl777 c9c5ef4509 Merge pull request #1319 from jl777/jl777
bug fixes
2019-03-07 07:39:26 -11:00
jl777 7ccbdf09e0 Merge pull request #1318 from jl777/jl777
Jl777
2019-03-06 08:19:25 -11:00
jl777 07b9fe389f Jl777 (#1317)
* Remove voutsum check

* Teach RPC interface about dpow-enabled minconfs (#1231)

* Make minconfs dpow-aware in z_listunspent + z_listreceivedbyaddress

* Add dpow-related test files to test suite

* Add dpow simulation to regtest every 7 blocks

* Fix compiler errors

* Fix link error

* Fix stdout spam when running regtests

* Dpowminconfs for listreceivedbyaddress

* dpowconfs tests

* Start adding specific tests for dpowminconfs in listreceivedbyaddress

* Get dpowminconfs tests for listreceivedbyaddress working

* Add dpowminconfs to getreceivedbyaddress + listunspent

* Add test for listtransactions + getreceivedbyaddress support

* Reliably passing dpowminconf tests. We only check for notarized-ness now, not exact confirmation numbers, to avoid race conditions

* Poll for the expected notarization info before running further tests; add support for getbalance

* Migrate tx_height() to a place where asyncrpcoperation_sendmany.cpp can use it

* fix

* Teach GetFilteredNotes about dpowconfs

Many RPCs rely on this internal function, which now correctly uses
dpowconfs to filter by the minconf/maxconf parameters.

* Fix sendmany when using non-default minconf

* inline seems to make things happy

* cleanup

* Add some code to test z_sendmany, which points out https://github.com/jl777/komodo/issues/1247

* try this

* Use already calculated value of dpowconfs instead of calculating it again

* Cleanup .pack file

* Remove

* Remove .pack

* Disable passkeys

* Rvalidate

* Syntax

* Allow overwrite by same pub33

* Tx

* Declare variables

* Allow replacement handle

* Grandfather existing handles

* Test

* Handleinfo

* Char *

* Begin

* Add mutex

* CCaddr

* Casts for windows

* +debugs

* Syntax

* Item

* Skeet

* +print

* Error check things

* +prints

* -sleep

* Brute force inventory check

* Revert

* num_packitems

* Log file

* Test

* ABC

* Test

* Add help docs for all -ac_* params of komodod (#1313)

* Remove myAddress from roc

* +print

* Test

* Test

* Leave pack all

* Dont discard unless last o_count

* Prevent pack corruption

* -ddebugs

* Merge branch 'FSM' into jl777

# Conflicts:
#	src/cc/rogue/main.c

* Enable keystrokes test

* +debug

* Fix rogue results processing

* Resobj

* Enable keystrokes sending

* Test

* Print

* Sendrawtransaction result

* Resobj

* Fix crash
2019-03-06 06:00:54 -11:00
jl777 f5a34aa6cd Merge branch 'FSM' into jl777 2019-03-06 06:00:31 -11:00
jl777 100eac1654 Jl777 (#1315)
* Remove voutsum check

* Teach RPC interface about dpow-enabled minconfs (#1231)

* Make minconfs dpow-aware in z_listunspent + z_listreceivedbyaddress

* Add dpow-related test files to test suite

* Add dpow simulation to regtest every 7 blocks

* Fix compiler errors

* Fix link error

* Fix stdout spam when running regtests

* Dpowminconfs for listreceivedbyaddress

* dpowconfs tests

* Start adding specific tests for dpowminconfs in listreceivedbyaddress

* Get dpowminconfs tests for listreceivedbyaddress working

* Add dpowminconfs to getreceivedbyaddress + listunspent

* Add test for listtransactions + getreceivedbyaddress support

* Reliably passing dpowminconf tests. We only check for notarized-ness now, not exact confirmation numbers, to avoid race conditions

* Poll for the expected notarization info before running further tests; add support for getbalance

* Migrate tx_height() to a place where asyncrpcoperation_sendmany.cpp can use it

* fix

* Teach GetFilteredNotes about dpowconfs

Many RPCs rely on this internal function, which now correctly uses
dpowconfs to filter by the minconf/maxconf parameters.

* Fix sendmany when using non-default minconf

* inline seems to make things happy

* cleanup

* Add some code to test z_sendmany, which points out https://github.com/jl777/komodo/issues/1247

* try this

* Use already calculated value of dpowconfs instead of calculating it again

* Cleanup .pack file

* Remove

* Remove .pack

* Disable passkeys

* Rvalidate

* Syntax

* Allow overwrite by same pub33

* Tx

* Declare variables

* Allow replacement handle

* Grandfather existing handles

* Test

* Handleinfo

* Char *

* Begin

* Add mutex

* CCaddr

* Casts for windows

* +debugs

* Syntax

* Item

* Skeet

* +print

* Error check things

* +prints

* -sleep

* Brute force inventory check

* Revert

* num_packitems

* Log file

* Test

* ABC

* Test

* Add help docs for all -ac_* params of komodod (#1313)

* Remove myAddress from roc

* +print

* Test

* Test

* Leave pack all

* Dont discard unless last o_count

* Prevent pack corruption

* -ddebugs

* Merge branch 'FSM' into jl777

# Conflicts:
#	src/cc/rogue/main.c
2019-03-06 03:38:14 -11:00
jl777 3a62d2b5dc Merge branch 'FSM' into jl777 2019-03-06 03:37:49 -11:00
jl777 58cd849591 Jl777 (#1311)
* Remove voutsum check

* Teach RPC interface about dpow-enabled minconfs (#1231)

* Make minconfs dpow-aware in z_listunspent + z_listreceivedbyaddress

* Add dpow-related test files to test suite

* Add dpow simulation to regtest every 7 blocks

* Fix compiler errors

* Fix link error

* Fix stdout spam when running regtests

* Dpowminconfs for listreceivedbyaddress

* dpowconfs tests

* Start adding specific tests for dpowminconfs in listreceivedbyaddress

* Get dpowminconfs tests for listreceivedbyaddress working

* Add dpowminconfs to getreceivedbyaddress + listunspent

* Add test for listtransactions + getreceivedbyaddress support

* Reliably passing dpowminconf tests. We only check for notarized-ness now, not exact confirmation numbers, to avoid race conditions

* Poll for the expected notarization info before running further tests; add support for getbalance

* Migrate tx_height() to a place where asyncrpcoperation_sendmany.cpp can use it

* fix

* Teach GetFilteredNotes about dpowconfs

Many RPCs rely on this internal function, which now correctly uses
dpowconfs to filter by the minconf/maxconf parameters.

* Fix sendmany when using non-default minconf

* inline seems to make things happy

* cleanup

* Add some code to test z_sendmany, which points out https://github.com/jl777/komodo/issues/1247

* try this

* Use already calculated value of dpowconfs instead of calculating it again

* Cleanup .pack file

* Remove

* Remove .pack
2019-03-03 21:42:12 -11:00
jl777 7f0cadf5d2 Merge pull request #1309 from Mixa84/FSM
Fix channelslist RPC.
2019-03-03 08:19:15 -11:00
jl777 709c3e590f Merge pull request #1308 from jl777/jl777
skip revalidating already validated playerdata, ie. 't'
2019-03-03 06:10:33 -11:00
jl777 32496bcab2 Merge pull request #1307 from Alrighttt/jl777
remove libboost-dev as dependency
2019-03-03 05:00:52 -11:00
jl777 75f9fdfec9 Merge pull request #1306 from jl777/jl777
fix Qsend
2019-03-02 21:00:36 -11:00
jl777 f0e7dd73ae Merge pull request #1305 from jl777/jl777
Truncate next file
2019-03-02 09:22:48 -11:00
jl777 89fa6c20ac Merge pull request #1304 from jl777/jl777
fix maxmoney estimates
2019-03-02 08:09:34 -11:00
jl777 ccd07daece Merge pull request #1303 from jl777/jl777
Fix mempool acceptance bug
2019-03-02 05:45:44 -11:00
jl777 c07a5d8708 Merge pull request #1302 from jl777/jl777
fix MTST3 sync, support up to 90billion ac_supply
2019-03-02 05:33:41 -11:00
jl777 ce4e9bcc7c Merge pull request #1301 from jl777/jl777
latest rogue sync
2019-03-01 23:23:01 -11:00
jl777 02426cdbe9 Merge pull request #1300 from Alrighttt/jl777
add libboost-dev as dependency
2019-03-01 22:59:25 -11:00
jl777 f09977ecbc Merge pull request #1299 from tonymorony/patch-1
ensuring that rogue update
2019-03-01 21:47:51 -11:00
jl777 7934163db1 Merge pull request #1298 from jl777/jl777
bigfixes
2019-03-01 05:28:47 -11:00
jl777 79c574a316 Merge pull request #1297 from dimxy/tokens-opret-blobs
Tokens opret blobs - support for old-style assets opret blob
2019-02-28 17:35:41 -11:00
jl777 3a4e404569 Merge pull request #1296 from Mixa84/FSM
Fix token vout number for Gateways
2019-02-28 07:10:23 -11:00
jl777 b1d6351702 Merge pull request #1295 from blackjok3rtt/dev
Dev
2019-02-28 06:53:54 -11:00
jl777 360563eb42 Merge pull request #1294 from dimxy/tokens-opret-blobs
Tokens opret blobs support
2019-02-28 06:52:53 -11:00
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 acfa52a3f9 Merge pull request #1284 from jl777/kolo
ILN
2019-02-25 19:02:44 -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 e90131793e Merge pull request #1281 from igorvoltaic/master
edited OS X installation paragraph in README.md
2019-02-24 20:03:04 -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 80e74e0c8b Merge pull request #1267 from KomodoPlatform/zmq_update
update dependencies
2019-02-19 09:21:30 -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 8034f6bddf Merge pull request #1258 from KomodoPlatform/master
update ZMQ
2019-02-17 17:10:47 -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