Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release] v0.8.0 #586

Merged
merged 297 commits into from
Jun 8, 2023
Merged
Changes from 1 commit
Commits
Show all changes
297 commits
Select commit Hold shift + click to select a range
9eb2eb1
comment komodo_validate_interest
jmjatlanta Oct 7, 2021
e8735fe
Document globals in komodo_globals.h
jmjatlanta Oct 7, 2021
69dc615
Switch to assetchain class
jmjatlanta Oct 8, 2021
2ba0a9d
reformat help msgs
jmjatlanta Oct 11, 2021
255153d
properly initialize event_pubkeys
jmjatlanta Oct 14, 2021
1faaf68
Document crosschain
jmjatlanta Oct 22, 2021
ef80962
Document Checkpoints
jmjatlanta Oct 25, 2021
c2c1b2b
Clean up importcoin
jmjatlanta Oct 25, 2021
f1d9d5c
Document MakeCodaImportTx
jmjatlanta Oct 25, 2021
42859e5
Add alert tests
jmjatlanta Oct 26, 2021
bc97c3b
fix pub key
jmjatlanta Oct 26, 2021
037d902
Merge branch 'jmj_test_cleanup' into jmj_testutils
jmjatlanta Oct 27, 2021
948988c
Remove temp file
jmjatlanta Oct 28, 2021
bae9e3a
properly shutdown tests
jmjatlanta Oct 28, 2021
324a3dd
Move zcash tests to komodo
jmjatlanta Oct 28, 2021
fad7afb
serialize block header size test
jmjatlanta Oct 28, 2021
42bec82
mempool tests
jmjatlanta Oct 28, 2021
6e1257d
PoW tests
jmjatlanta Oct 28, 2021
defe10d
PoW min difficulty test
jmjatlanta Oct 28, 2021
6a331b8
Remove unnecessary header
jmjatlanta Oct 28, 2021
58aeb73
add txid tests
jmjatlanta Oct 28, 2021
abe48f6
Add coin_tests
jmjatlanta Oct 28, 2021
e8d9f80
Begin tests of ConnectBlock
jmjatlanta Nov 3, 2021
432c57f
fix for running all tests
jmjatlanta Nov 3, 2021
e46aae1
make static adjustable for unit testing
jmjatlanta Nov 3, 2021
399f9fb
Merge branch 'jmj_build_fix' into jmj_testutils
jmjatlanta Nov 3, 2021
fc14310
More ConnectBlock tests
jmjatlanta Nov 4, 2021
528d8f6
fix mempool nullptr
jmjatlanta Nov 4, 2021
16291af
Replace ptr with ref
jmjatlanta Nov 5, 2021
cfe4608
test double-spend in same block
jmjatlanta Nov 5, 2021
11991b3
Document mempool funcs
jmjatlanta Nov 9, 2021
4d1376d
Merge branch 'jmj_build_fix' into jmj_testutils
jmjatlanta Nov 9, 2021
c096f6e
const in myAddtomempool
jmjatlanta Nov 9, 2021
4cf000a
reverse iterate
jmjatlanta Nov 10, 2021
6d62418
More block tests
jmjatlanta Nov 15, 2021
fd12fe5
one solution for testnet
jmjatlanta Nov 26, 2021
8c15474
Remove LastTip(), Remove GetTipWIthLock()
jmjatlanta Jan 14, 2022
56d57d4
addrman no lock in ctor
jmjatlanta Jan 14, 2022
fc4bfbc
DEBUG_LOCKORDER off
jmjatlanta Jan 20, 2022
95c9364
testnet currency unit
jmjatlanta Jan 20, 2022
cc589ab
set ASSETCHAINS_P2PPORT default
jmjatlanta Jan 20, 2022
13a149c
Adjust testnet genesis solution
jmjatlanta Jan 21, 2022
1b09677
Correct solution for testnet
jmjatlanta Jan 21, 2022
1981900
no checkpoint data for testnet
jmjatlanta Jan 21, 2022
b6a7cf4
added seed for testnet
jmjatlanta Jan 24, 2022
6d87cce
Notary tests
jmjatlanta Feb 2, 2022
24ddfca
nspv json resp buffer malloc'ed
dimxy Feb 3, 2022
d54fbe2
hardforks in own object
jmjatlanta Oct 13, 2021
ba97fc7
consolidate network differences
jmjatlanta Feb 15, 2022
bdedbd4
move genesis notaries to chainparams
jmjatlanta Feb 15, 2022
29b19ef
remove testnet checkpoint
jmjatlanta Feb 18, 2022
a7dea2d
Merge 'dev' into jmj_issue_483
jmjatlanta Feb 21, 2022
750628b
merge dev into jmj_assetchains_symbol
jmjatlanta Feb 21, 2022
a20e98e
Merge dev into jmj_assetchains_symbol
jmjatlanta Feb 21, 2022
fe35f42
merge dev into jmj_notary
jmjatlanta Feb 22, 2022
ee02430
allow debug builds
jmjatlanta Sep 21, 2021
a121375
make clean .a files
jmjatlanta Oct 8, 2021
0eaff09
hardforks in own object
jmjatlanta Oct 13, 2021
5da51a3
adjust hardfork defines
jmjatlanta Oct 14, 2021
03229d5
Handle cryptoconditions changes
jmjatlanta Oct 15, 2021
10cbee9
Rebuild libcc.so when dependencies change
jmjatlanta Oct 22, 2021
960fa3a
build cryptoconditions as static (incl Windows)
jmjatlanta Nov 5, 2021
4373f34
addrman no lock in ctor
jmjatlanta Jan 14, 2022
cb8c132
enable-debug script param
jmjatlanta Jan 14, 2022
7ecad6a
switch from -O3 to -O2
jmjatlanta Feb 22, 2022
634c1b2
clean komodo_state
jmjatlanta Feb 23, 2022
a7d20f8
merge dev into jmj_testutils
jmjatlanta Apr 12, 2022
d47d2c2
Merge dev into issue_519
jmjatlanta Apr 27, 2022
433a2f5
merge dev into jmj_build_debug3
jmjatlanta May 10, 2022
7e09f1d
avoid comparing ptr to int
jmjatlanta May 10, 2022
e4c6605
Merge branch 'jmj_build_debug3' into jmj_testutils
jmjatlanta May 16, 2022
cf6af36
Fix locking cs_main in tests
jmjatlanta May 16, 2022
76bad69
Make TestWallet derive from CWallet
jmjatlanta May 20, 2022
770f6eb
Merge pull request #22 from jmjatlanta/jmj_testutils_wallet
jmjatlanta May 20, 2022
9d6a343
adde malloc result check
dimxy Jun 11, 2022
bcc5248
correctly serialize komodostate records
jmjatlanta Jun 13, 2022
175ef13
correctly serialize komodostate records
jmjatlanta Jun 13, 2022
60035ca
clean up memory on shutdown
jmjatlanta Jun 13, 2022
e22e9aa
refactor to reduce casting
jmjatlanta Jun 14, 2022
86fa7b9
refactor to reduce casting
jmjatlanta Jun 14, 2022
876e824
remove dynamic cast from events
jmjatlanta Jun 14, 2022
38f8555
remove dynamic cast from events
jmjatlanta Jun 14, 2022
d70d2a1
Remove unnecessary test
jmjatlanta Jun 14, 2022
0d8e72d
komodo_disconnect no longer used
jmjatlanta Jun 15, 2022
8db798b
Set max witness cache in wallet
jmjatlanta Jun 15, 2022
4c9039c
Merge s6 changes into testutils
jmjatlanta Jun 15, 2022
57df13d
add tests for writing each event type
jmjatlanta Jun 15, 2022
6a73510
test serialization of all event types
jmjatlanta Jun 15, 2022
e0752ad
event_u never used in stateupdate
jmjatlanta Jun 15, 2022
9ded975
fix miner fee in test
jmjatlanta Jun 15, 2022
18c57a0
remove PAX
jmjatlanta Jun 16, 2022
20428c0
removal of prices and pegs cc
jmjatlanta Jun 16, 2022
43eab4a
remove RT from komodo_state
jmjatlanta Jun 20, 2022
8a9ab99
code cleanup
jmjatlanta Jun 20, 2022
e5022eb
reduce komodo_passport_iteration
jmjatlanta Jun 20, 2022
9bc7b33
Remove jumblr
jmjatlanta Jun 21, 2022
f7a1a51
clean up and document KV
jmjatlanta Jun 21, 2022
39fdf46
Get correct config file
jmjatlanta Jun 27, 2022
fe25d9a
Get correct config file
jmjatlanta Jun 27, 2022
d4624fd
add test
jmjatlanta Jun 27, 2022
8828c0e
add test
jmjatlanta Jun 27, 2022
4a1e2a3
clean up komodo_utils
jmjatlanta Jun 28, 2022
8247539
more cleanup komodo_gateway.h
jmjatlanta Jun 29, 2022
407d717
More cleanup of header files
jmjatlanta Jun 29, 2022
d9a4421
Revert header changes
jmjatlanta Jul 5, 2022
0fd2cc2
Remove CURRENCIES array
jmjatlanta Jul 5, 2022
dcbf657
Update src/miner.cpp
dimxy Jul 5, 2022
16a6d83
Merge 'dev' into jmj_issue_483
jmjatlanta Jul 5, 2022
0c6ed24
Merge 'dev' into jmj_clang_warnings
jmjatlanta Jul 5, 2022
902ddb8
Merge 'dev' into jmj_notary
jmjatlanta Jul 5, 2022
91ea37b
Merge pull request #549 from jmjatlanta/jmj_mem_cleanup_mac
ca333 Jul 6, 2022
a164f4f
Merge dev into jmj_header_declarations
jmjatlanta Jul 8, 2022
ca2290a
hardfork extern const
jmjatlanta Jul 8, 2022
0f25f1e
Merge branch 'dev' into jmj_chainparams_doc
jmjatlanta Jul 12, 2022
5c9e3c8
properly delete pnotarisations on shutdown
jmjatlanta Jul 12, 2022
962d8a7
Merge branch 'dev' into jmj_issue_482
jmjatlanta Jul 12, 2022
a978e33
Merge branch 'dev' into jmj_komodo_interest
jmjatlanta Jul 12, 2022
0dfafbf
Merge branch 'dev' into jmj_crosschain_doc
jmjatlanta Jul 12, 2022
f8c17ce
add interruption_point in komodo_waituntilelegible
dimxy Jul 12, 2022
12261b9
change sleeps to interruptible in miner
dimxy Jul 14, 2022
fafe04d
added constructor to NSPV_remoterpcresp to init as null
dimxy Jul 14, 2022
106c9d3
Merge branch 'dev' into dimxy-fix-staking-array
dimxy Jul 14, 2022
9a48190
avoid SIGSEGV in tromp solver
jmjatlanta Jul 18, 2022
7f89ac3
Add test
jmjatlanta Jul 19, 2022
ef907db
Handle Windows wchar paths
jmjatlanta Jul 19, 2022
2481de2
fix mac tests
jmjatlanta Jul 19, 2022
630a521
fix notary dest ltc root path
dimxy Aug 2, 2022
c31919d
Merge pull request #497 from KomodoPlatform/cd-ubuntu-eol
tonymorony Aug 4, 2022
5b88d76
added GetAppDir() to access ltc config
dimxy Aug 4, 2022
75bf07d
fixed TestParseNotarisation, FilePaths for ltc config
dimxy Aug 4, 2022
a63acc9
Merge branch 'jmj_dev_help' of https://github.com/jmjatlanta/komodo i…
dimxy Aug 9, 2022
9e1d572
Merge branch 'jmj_testutils' of https://github.com/jmjatlanta/komodo …
dimxy Aug 9, 2022
5587810
Merge branch 'jmj_chainparams_doc' of https://github.com/jmjatlanta/k…
dimxy Aug 9, 2022
c3c0b01
Merge branch 'jmj_issue_482' of https://github.com/jmjatlanta/komodo …
dimxy Aug 9, 2022
8e05af3
Merge branch 'jmj_issue_483' of https://github.com/jmjatlanta/komodo …
dimxy Aug 9, 2022
3c98866
Merge branch 'jmj_clang_warnings' of https://github.com/jmjatlanta/ko…
dimxy Aug 9, 2022
c21939d
Merge branch 'dimxy-fix-staking-array' into dev-dimxy-test-4
dimxy Aug 9, 2022
9e1548e
Merge branch 'jmj_notary' of https://github.com/jmjatlanta/komodo int…
dimxy Aug 9, 2022
121e1c3
Merge branch 'jmj_header_declarations' of https://github.com/jmjatlan…
dimxy Aug 10, 2022
fa2ba93
Merge branch 'jmj_komodo_interest' of https://github.com/jmjatlanta/k…
dimxy Aug 10, 2022
7f74319
Merge branch 'jmj_assetchains_symbol' of https://github.com/jmjatlant…
dimxy Aug 10, 2022
ab0c3d0
Merge branch 'jmj_event_init' of https://github.com/jmjatlanta/komodo…
dimxy Aug 11, 2022
57980c9
fix uninit nStart var
dimxy Aug 11, 2022
520ade1
after merge fix dup HF vars
dimxy Aug 11, 2022
2dec69a
Merge branch 'jmj_crosschain_doc' of https://github.com/jmjatlanta/ko…
dimxy Aug 11, 2022
7c3d3b1
added targetSymbol non empty check for import
dimxy Aug 11, 2022
fe7d4b8
Merge branch 'jmj_checkpoint_doc' of https://github.com/jmjatlanta/ko…
dimxy Aug 11, 2022
5dae2bd
Merge branch 'jmj_issue_519' of https://github.com/jmjatlanta/komodo …
dimxy Aug 11, 2022
cd8b9f8
Merge branch 'nspv-json-resp-fix' into dev-dimxy-test-4
dimxy Aug 11, 2022
431029b
fixed LTC dir, added GetAppDir to get coin root dir, fixed test for L…
dimxy Aug 15, 2022
6e61b35
more nota func defs to .h; fixed var init in tests; eliminated donein…
dimxy Aug 15, 2022
625a253
in haraka removal test the protocol ver fixed
dimxy Aug 15, 2022
28b787e
deleted invalid komodo_statefname() def
dimxy Aug 15, 2022
f3cfc0f
Merge branch 'jmj_event_fix3' of https://github.com/jmjatlanta/komodo…
dimxy Aug 15, 2022
2042beb
Merge branch 'jmj_pax' of https://github.com/jmjatlanta/komodo into d…
dimxy Aug 15, 2022
b2868f6
Merge branch 'jmj_datadir_fix' of https://github.com/jmjatlanta/komod…
dimxy Aug 16, 2022
061d306
Merge branch 'jmj_tromp_maxsols' of https://github.com/jmjatlanta/kom…
dimxy Aug 16, 2022
9d18f95
add chainName in komodo-tx
dimxy Aug 16, 2022
230cf00
fix duplicate komodo_current_supply
dimxy Aug 16, 2022
11a4480
test_event improved (used original write_event for 'M', height change…
dimxy Sep 5, 2022
6cd6ed9
warning and shutdown if komodostate invalid
dimxy Sep 5, 2022
00af1af
extra debug print removed
dimxy Sep 5, 2022
a34d577
restored missed longestchain periodic update
dimxy Sep 5, 2022
6345ed4
remove unused 'passport' print
dimxy Sep 5, 2022
a0947f3
eliminated lock debug CMultiThreadedChain object
dimxy Sep 5, 2022
065831f
removed ResetCoinbaseMaturity
dimxy Sep 5, 2022
56b59da
removed ref to deleted unused test rpc table
dimxy Sep 5, 2022
8295377
deleted py tests for kv service (removed)
dimxy Sep 5, 2022
614bf7b
return false if shutdown on import genesis, changed flag to function …
dimxy Sep 5, 2022
3824a2b
allowed 'B' record in komodostate (never processed on reading though)
dimxy Sep 5, 2022
b6f4eea
test notarisation: komodostate inited with a valid record
dimxy Sep 5, 2022
c83ea69
info comment to long test
dimxy Sep 5, 2022
1e9833d
asserts added in test events to prevent bad mem access
dimxy Sep 5, 2022
11779e9
remove 'virtual' def in CChain (no need anymore)
dimxy Sep 6, 2022
4c69fde
undo / revert WITNESS_CACHE_SIZE related changes in CWallet
DeckerSU Sep 12, 2022
b5cd131
configure libgmp on Linux with --with-pic=yes
DeckerSU Sep 12, 2022
61c7d78
remove unused sources from repo (after #559)
DeckerSU Sep 12, 2022
1245cca
komodo_hardfork: avoid build error with CXXFLAGS='-g -O0'
DeckerSU Sep 13, 2022
0ecfdf9
temporary disable test_events write_test
DeckerSU Sep 13, 2022
5283ea9
get rid of LibTomCrypt derived hash implementations
DeckerSU Sep 13, 2022
65cad44
report about komodostate parse error in messagebox, instead of console
DeckerSU Sep 13, 2022
fa2d133
Pr559 add (#128)
DeckerSU Sep 15, 2022
979abb1
more old marmara code removed
dimxy Sep 16, 2022
005df66
hush net commission code removed
dimxy Sep 16, 2022
ba73fd3
more pegs code removed
dimxy Sep 16, 2022
3760fa7
Merge pull request #129 from dimxy/dev-dimxy-rm-pegs-hush
dimxy Sep 19, 2022
09fda4f
add tests for komodo_validate_interest
dimxy Sep 21, 2022
ad5c378
fix test chain clear
dimxy Sep 21, 2022
1f930c3
restore printtoconsole state in test
dimxy Sep 22, 2022
13c7b0e
added tests for komodo_interest and komodo_interestnew
dimxy Sep 23, 2022
af4b24e
add interest calculations via CCoinsViewCache::GetValueIn test
DeckerSU Sep 26, 2022
f6ed1cb
Merge pull request #133 from DeckerSU/patch-interest-test
dimxy Sep 27, 2022
633fa36
del unused test txid
dimxy Sep 27, 2022
d98ae09
Merge pull request #559 from dimxy/dev-dimxy-combined-jmj
ca333 Jan 29, 2023
f06f06d
add z_gettreestate rpc
DeckerSU Jan 30, 2023
9197739
remove orchard related output from z_gettreestate help
DeckerSU Jan 30, 2023
4675eaa
Merge pull request #563 from DeckerSU/patch-z-gettreestate
ca333 Jan 31, 2023
38e877c
change komodostate file name to komodoevents; fix param to const char…
dimxy Feb 7, 2023
f202b86
fix komodo_eventadd_notarized for KMD symbol proper check, add loggin…
dimxy Feb 7, 2023
086c3df
fix event tests (cleat state for each case), add check for last nota …
dimxy Feb 8, 2023
df942ee
add a couple of missing commas
smk762 Feb 13, 2023
b755ec4
missing t
smk762 Feb 13, 2023
ab47f37
update deps for 20.04
smk762 Feb 14, 2023
6c933a4
use py3, ubuntu 20, allow brew update errors to continue
smk762 Feb 15, 2023
014abfb
bump libevent to 2.1.12
DeckerSU Feb 21, 2023
6a97ba3
fix tests for windows: repair komodo-test.exe wallet-utility.exe buil…
dimxy Feb 22, 2023
6f48833
Merge pull request #565 from KomodoPlatform/commas
smk762 Feb 24, 2023
c625230
Merge pull request #566 from KomodoPlatform/update_deps
smk762 Feb 24, 2023
70abb65
Merge pull request #567 from KomodoPlatform/CI-update
smk762 Feb 24, 2023
3255a01
update bug disclosure pgp key
ca333 Feb 27, 2023
24339be
secp256k1: fix possible read from uninitialized memory (tmpj)
DeckerSU Mar 1, 2023
2a023c9
Merge pull request #564 from dimxy/fix-komodoevents-fname-2
ca333 Mar 12, 2023
467928a
Merge pull request #569 from DeckerSU/patch-bump-libevent
ca333 Mar 12, 2023
61026ea
Merge pull request #570 from dimxy/patch-komodo-test-win
ca333 Mar 12, 2023
94a0e1a
Merge pull request #572 from DeckerSU/patch-secp256k1-uninitialized-tmpj
ca333 Mar 12, 2023
41b6891
Remove mapRequest tracking that just effects Qt display.
DeckerSU Mar 15, 2023
2bec279
Rate limit the processing of incoming addr messages
DeckerSU Mar 15, 2023
152e1f9
Randomize the order of addr processing
DeckerSU Mar 15, 2023
1d933a8
Add logging and addr rate limiting statistics
DeckerSU Mar 15, 2023
ea20e1d
move logging outside the adddresses loop
DeckerSU Mar 15, 2023
5e0dd38
rust: speed up build by disabling rust docs
DeckerSU Mar 17, 2023
7204ea9
Merge pull request #574 from DeckerSU/patch-hotfixes-back-merge
ca333 Mar 17, 2023
68a4f52
Merge pull request #576 from DeckerSU/patch-rust-disable-docs
ca333 Mar 25, 2023
510c610
remove debug sleep on darwin platform
DeckerSU Mar 28, 2023
76213ce
backport zcash PR6192 memory optimizations
Alrighttt Mar 30, 2023
9156f90
update copyright & fix nspv nsolution
Alrighttt Mar 30, 2023
ad5065f
latest zcash blockindex Write/Erase
Alrighttt Mar 30, 2023
bb595ac
temporarily disable haraka tests
Alrighttt Mar 30, 2023
3aa80e6
fix test haraka
dimxy Mar 31, 2023
25b7eb1
Add S7 pubkeys and HF estimate
smk762 May 17, 2023
3f7d055
reduce AUR 5% -> 0.01% after nS7HardforkHeight
DeckerSU Apr 24, 2023
e2e97b2
change unit-tests releted to komodo interest reduce
DeckerSU Apr 24, 2023
3d74ae9
update DEPRECATION_HEIGHT to 4320000 (S8 approximated time + extra)
DeckerSU Apr 24, 2023
d36c24d
update actual KIP-0001 heights to nS7HardforkHeight
DeckerSU May 25, 2023
46c237a
Error handling improvements.
DeckerSU May 25, 2023
3115f20
Declare CBlockTreeDB::Read* methods as const when they are trivially so.
DeckerSU May 25, 2023
688de60
txdb: get rid of consistency checks
DeckerSU May 25, 2023
bf0b713
Merge pull request #42 from DeckerSU/patch-add-error-handling
Alrighttt May 26, 2023
b416d47
[ca333] update S7 key
ca333 May 29, 2023
fb141ab
Merge pull request #580 from DeckerSU/patch-mac-sleep
ca333 May 29, 2023
64efc07
Merge branch 's7-pubkeys' of git@github.com:KomodoPlatform/komodo.git…
DeckerSU May 29, 2023
1ac4453
Merge pull request #585 from KomodoPlatform/s7-pubkeys
ca333 May 29, 2023
35da539
bump version [0.8.0]
ca333 May 29, 2023
e94c666
bump (min) protocol version
ca333 May 29, 2023
ac466df
Merge pull request #584 from DeckerSU/patch-kip-0001
ca333 May 30, 2023
6a427cf
disable failing haraka removal test
dimxy May 30, 2023
e065ddf
fix and add tests for season 7
dimxy May 30, 2023
8d0cc33
split test for kmd and assetchain
dimxy May 30, 2023
4651e28
Merge pull request #582 from Alrighttt/zcash-6192-backport
ca333 May 31, 2023
9e4d543
Merge pull request #587 from dimxy/bugfix-season7-tests
ca333 May 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/assetchain.h
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
class assetchain
{
public:
assetchain() {}
assetchain() : symbol_("") {}
assetchain(const std::string& symbol) : symbol_(symbol)
{
if (symbol_.size() > 64)
10 changes: 5 additions & 5 deletions src/komodo_utils.cpp
Original file line number Diff line number Diff line change
@@ -1427,7 +1427,7 @@ int8_t equihash_params_possible(uint64_t n, uint64_t k)

void komodo_args(char *argv0)
{
std::string name,addn,hexstr,symbol; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4],extrabuf[32756],disablebits[32],*extraptr=0;
std::string addn,hexstr,symbol; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4],extrabuf[32756],disablebits[32],*extraptr=0;
FILE *fp; uint64_t val; uint16_t port, dest_rpc_port; int32_t i,nonz=0,baseid,len,n,extralen = 0; uint64_t ccenables[256], ccEnablesHeight[512] = {0}; CTransaction earlytx; uint256 hashBlock;

std::string ntz_dest_path;
@@ -1476,7 +1476,7 @@ void komodo_args(char *argv0)
fprintf(stderr, "Cannot be STAKED and KMD notary at the same time!\n");
StartShutdown();
}
name = GetArg("-ac_name","");
std::string name = GetArg("-ac_name","");
if ( argv0 != 0 )
{
len = (int32_t)strlen(argv0);
@@ -1491,6 +1491,7 @@ void komodo_args(char *argv0)
}
}
}
chain = assetchain(name);
KOMODO_STOPAT = GetArg("-stopat",0);
MAX_REORG_LENGTH = GetArg("-maxreorg",MAX_REORG_LENGTH);
WITNESS_CACHE_SIZE = MAX_REORG_LENGTH+10;
@@ -1530,7 +1531,8 @@ void komodo_args(char *argv0)
}
KOMODO_EARLYTXID = Parseuint256(GetArg("-earlytxid","0").c_str());
ASSETCHAINS_EARLYTXIDCONTRACT = GetArg("-ac_earlytxidcontract",0);
if ( name.c_str()[0] != 0 )

if ( !chain.isKMD() )
{
std::string selectedAlgo = GetArg("-ac_algo", std::string(ASSETCHAINS_ALGORITHMS[0]));

@@ -1952,8 +1954,6 @@ void komodo_args(char *argv0)
if ( strlen(addn.c_str()) > 0 )
ASSETCHAINS_SEED = 1;

chain = assetchain(name);

MAX_MONEY = komodo_max_money();

if ( (baseid = komodo_baseid(chain.symbol().c_str())) >= 0 && baseid < 32 )
2 changes: 1 addition & 1 deletion src/rpc/blockchain.cpp
Original file line number Diff line number Diff line change
@@ -962,7 +962,7 @@ UniValue kvsearch(const UniValue& params, bool fHelp, const CPubKey& mypk)
LOCK(cs_main);
if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 )
{
ret.push_back(Pair("coin",(char*)chain.ToString().c_str()));
ret.push_back(Pair("coin",chain.ToString()));
ret.push_back(Pair("currentheight", (int64_t)chainActive.LastTip()->GetHeight()));
ret.push_back(Pair("key",params[0].get_str()));
ret.push_back(Pair("keylen",keylen));
4 changes: 2 additions & 2 deletions src/rpc/crosschain.cpp
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ UniValue height_MoM(const UniValue& params, bool fHelp, const CPubKey& mypk)
}
//fprintf(stderr,"height_MoM height.%d\n",height);
depth = komodo_MoM(&notarized_height,&MoM,&kmdtxid,height,&MoMoM,&MoMoMoffset,&MoMoMdepth,&kmdstarti,&kmdendi);
ret.push_back(Pair("coin", (char*)chain.ToString().c_str()));
ret.push_back(Pair("coin", chain.ToString()));
ret.push_back(Pair("height",height));
ret.push_back(Pair("timestamp",(uint64_t)timestamp));
if ( depth > 0 )
@@ -153,7 +153,7 @@ UniValue calc_MoM(const UniValue& params, bool fHelp, const CPubKey& mypk)
throw runtime_error("calc_MoM illegal height or MoMdepth\n");
//fprintf(stderr,"height_MoM height.%d\n",height);
MoM = komodo_calcMoM(height,MoMdepth);
ret.push_back(Pair("coin", (char*)chain.ToString().c_str()));
ret.push_back(Pair("coin", chain.ToString()));
ret.push_back(Pair("height",height));
ret.push_back(Pair("MoMdepth",MoMdepth));
ret.push_back(Pair("MoM",MoM.GetHex()));
4 changes: 2 additions & 2 deletions src/rpc/misc.cpp
Original file line number Diff line number Diff line change
@@ -287,7 +287,7 @@ UniValue getinfo(const UniValue& params, bool fHelp, const CPubKey& mypk)
}
if ( ASSETCHAINS_CC != 0 )
obj.push_back(Pair("CCid", (int)ASSETCHAINS_CC));
obj.push_back(Pair("name", (char*)chain.ToString().c_str()));
obj.push_back(Pair("name", chain.ToString()));

obj.push_back(Pair("p2pport", ASSETCHAINS_P2PPORT));
obj.push_back(Pair("rpcport", ASSETCHAINS_RPCPORT));
@@ -427,7 +427,7 @@ UniValue coinsupply(const UniValue& params, bool fHelp, const CPubKey& mypk)
if ( (supply= komodo_coinsupply(&zfunds,&sproutfunds,height)) > 0 )
{
result.push_back(Pair("result", "success"));
result.push_back(Pair("coin", (char*)chain.ToString().c_str()));
result.push_back(Pair("coin", chain.ToString()));
result.push_back(Pair("height", (int)height));
result.push_back(Pair("supply", ValueFromAmount(supply)));
result.push_back(Pair("zfunds", ValueFromAmount(zfunds)));
2 changes: 2 additions & 0 deletions src/wallet-utility.cpp
Original file line number Diff line number Diff line change
@@ -9,8 +9,10 @@
#include <boost/foreach.hpp>

#include "komodo_defs.h"

#include "assetchain.h"
assetchain chain;

int64_t MAX_MONEY = 200000000 * 100000000LL;
uint64_t ASSETCHAINS_SUPPLY;
uint16_t BITCOIND_RPCPORT = 7771;
132 changes: 62 additions & 70 deletions src/wallet/rpcwallet.cpp

Large diffs are not rendered by default.