Skip to content

sync beta#370

Merged
ca333 merged 2559 commits intobetafrom
dev
Jun 21, 2020
Merged

sync beta#370
ca333 merged 2559 commits intobetafrom
dev

Conversation

@ca333
Copy link
Copy Markdown

@ca333 ca333 commented Jun 13, 2020

No description provided.

@ca333 ca333 requested review from Alrighttt, gcharang and smk762 June 14, 2020 08:29
gcharang
gcharang previously approved these changes Jun 14, 2020
Copy link
Copy Markdown

@gcharang gcharang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have reviewed the changes related to dPoW viz., the assetchains* files, files removed from src/ac/ and src/fiat

Copy link
Copy Markdown

@tonymorony tonymorony left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dev branch build fails on all platforms at the moment:

In file included from komodo_nSPV_superlite.h:20:0,
                 from main.cpp:7156:
komodo_DEX.h: In function ‘void komodo_DEXpoll(CNode*)’:
komodo_DEX.h:3154:49: error: ‘class CNode’ has no member named ‘dexlastping’
     if ( (now == Got_Recent_Quote && now > pto->dexlastping) || now >= pto->dexlastping+KOMODO_DEX_LOCALHEARTBEAT )
                                                 ^~~~~~~~~~~
komodo_DEX.h:3154:77: error: ‘class CNode’ has no member named ‘dexlastping’
     if ( (now == Got_Recent_Quote && now > pto->dexlastping) || now >= pto->dexlastping+KOMODO_DEX_LOCALHEARTBEAT )
                                                                             ^~~~~~~~~~~
komodo_DEX.h:3159:18: error: ‘class CNode’ has no member named ‘dexlastping’
             pto->dexlastping = now;
                  ^~~~~~~~~~~
komodo_DEX.h:3165:22: error: ‘class CNode’ has no member named ‘dexlastping’
                 pto->dexlastping = now;
                      ^~~~~~~~~~~
komodo_DEX.h:3169:14: error: ‘class CNode’ has no member named ‘dexlastping’
         pto->dexlastping = now;
              ^~~~~~~~~~~
Makefile:4067: recipe for target 'libbitcoin_server_a-main.o' failed
make[2]: *** [libbitcoin_server_a-main.o] Error 1
make[2]: *** Waiting for unfinished jobs....
mv -f rpc/.deps/libbitcoin_server_a-rawtransaction.Tpo rpc/.deps/libbitcoin_server_a-rawtransaction.Po
mv -f rpc/.deps/libbitcoin_server_a-blockchain.Tpo rpc/.deps/libbitcoin_server_a-blockchain.Po
mv -f rpc/.deps/libbitcoin_server_a-crosschain.Tpo rpc/.deps/libbitcoin_server_a-crosschain.Po
mv -f rpc/.deps/libbitcoin_server_a-tokensrpc.Tpo rpc/.deps/libbitcoin_server_a-tokensrpc.Po
mv -f rpc/.deps/libbitcoin_server_a-server.Tpo rpc/.deps/libbitcoin_server_a-server.Po
mv -f rpc/.deps/libbitcoin_server_a-pricesrpc.Tpo rpc/.deps/libbitcoin_server_a-pricesrpc.Po
mv -f rpc/.deps/libbitcoin_server_a-marmararpc.Tpo rpc/.deps/libbitcoin_server_a-marmararpc.Po
make[2]: Leaving directory '/home/tonyl/komodo/src'
Makefile:5504: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/home/tonyl/komodo/src'
Makefile:659: recipe for target 'all-recursive' failed
make: *** [all-recursive] Error 1

@satindergrewal
Copy link
Copy Markdown

@ca333 you can give the jl777/komodo dev branch merge with komodoplatform/komodo's dev branch another try.
Yesterday @jl777 pushed the fix (jl777@8bac71e and jl777@6056fdf) which seems to be compiling fine in Github CI builds: https://github.com/jl777/komodo/actions/runs/135006511

@ca333 ca333 merged commit d98b51b into beta Jun 21, 2020
Alrighttt pushed a commit to Alrighttt/komodo that referenced this pull request Oct 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.