From 7a20b02cf2f3a01b07e4127a79397b2d31e3b79d Mon Sep 17 00:00:00 2001 From: jagdeep sidhu Date: Mon, 29 May 2023 13:26:22 -0700 Subject: [PATCH 1/3] wip spt clean --- src/Makefile.am | 18 +- src/Makefile.test.include | 1 - src/coins.h | 1 + src/compressor.cpp | 192 + src/compressor.h | 118 + src/consensus/amount.h | 26 - src/consensus/params.h | 2 +- src/consensus/tx_verify.cpp | 52 +- src/consensus/tx_verify.h | 8 +- src/core_io.h | 3 +- src/core_write.cpp | 163 +- src/index/coinstatsindex.cpp | 47 - src/init.cpp | 5 +- src/kernel/chainparams.cpp | 6 +- src/kernel/coinstats.cpp | 6 - src/llmq/quorums_chainlocks.cpp | 2 +- src/nevm/nevm.cpp | 11 +- src/nevm/nevm.h | 2 +- src/node/chainstate.cpp | 32 +- src/node/miner.cpp | 8 - src/policy/policy.cpp | 5 +- src/policy/policy.h | 4 - src/policy/rbf.cpp | 35 +- src/policy/rbf.h | 4 - src/primitives/transaction.cpp | 533 +-- src/primitives/transaction.h | 555 +-- src/rpc/blockchain.cpp | 9 - src/rpc/client.cpp | 3 - src/rpc/mempool.cpp | 7 +- src/rpc/rawtransaction.cpp | 49 +- src/rpc/register.h | 6 +- src/rpc/util.cpp | 35 - src/rpc/util.h | 3 - src/services/asset.cpp | 155 - src/services/asset.h | 32 - src/services/assetconsensus.cpp | 1346 ------- src/services/assetconsensus.h | 94 - src/services/nevmconsensus.cpp | 513 +++ src/services/nevmconsensus.h | 60 + src/services/rpc/assetrpc.h | 14 - .../rpc/{assetrpc.cpp => nevmrpc.cpp} | 605 +-- src/services/rpc/nevmrpc.h | 12 + .../{assetwalletrpc.cpp => nevmwalletrpc.cpp} | 4 +- src/test/coins_tests.cpp | 19 +- src/test/compress_tests.cpp | 3 +- src/test/data/assetbalances.json | 3589 ----------------- src/test/fuzz/coins_view.cpp | 5 +- src/test/fuzz/deserialize.cpp | 2 +- src/test/fuzz/integer.cpp | 3 +- src/test/fuzz/rpc.cpp | 5 - src/test/fuzz/script.cpp | 2 +- src/test/nevm_tests.cpp | 5 +- src/test/rbf_tests.cpp | 16 +- src/test/util/setup_common.cpp | 4 +- src/txmempool.cpp | 148 +- src/txmempool.h | 2 - src/undo.h | 1 + src/validation.cpp | 171 +- src/validation.h | 6 +- src/wallet/interfaces.cpp | 2 +- src/wallet/rpc/wallet.h | 2 +- test/functional/test_framework/blocktools.py | 9 +- test/sanitizer_suppressions/ubsan | 5 +- 63 files changed, 1147 insertions(+), 7638 deletions(-) create mode 100644 src/compressor.cpp create mode 100644 src/compressor.h delete mode 100644 src/services/asset.cpp delete mode 100644 src/services/asset.h delete mode 100644 src/services/assetconsensus.cpp delete mode 100644 src/services/assetconsensus.h create mode 100644 src/services/nevmconsensus.cpp create mode 100644 src/services/nevmconsensus.h delete mode 100644 src/services/rpc/assetrpc.h rename src/services/rpc/{assetrpc.cpp => nevmrpc.cpp} (54%) create mode 100644 src/services/rpc/nevmrpc.h rename src/services/rpc/wallet/{assetwalletrpc.cpp => nevmwalletrpc.cpp} (99%) delete mode 100644 src/test/data/assetbalances.json diff --git a/src/Makefile.am b/src/Makefile.am index 93a8f81f5ed85..d4053b26e4b9b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -126,9 +126,8 @@ endif .PHONY: FORCE check-symbols check-security # syscoin core # SYSCOIN_CORE_H = \ - services/asset.h \ - services/assetconsensus.h \ - services/rpc/assetrpc.h \ + services/nevmconsensus.h \ + services/rpc/nevmrpc.h \ spork.h \ dsnotificationinterface.h \ governance/governance.h \ @@ -184,6 +183,7 @@ SYSCOIN_CORE_H = \ compat/compat.h \ compat/cpuid.h \ compat/endian.h \ + compressor.h \ node/connection_types.h \ consensus/consensus.h \ consensus/tx_check.h \ @@ -455,9 +455,8 @@ libsyscoin_util_a-clientversion.$(OBJEXT): obj/build.h libsyscoin_node_a_CPPFLAGS = $(AM_CPPFLAGS) $(SYSCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) libsyscoin_node_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libsyscoin_node_a_SOURCES = \ - services/asset.cpp \ - services/assetconsensus.cpp \ - services/rpc/assetrpc.cpp \ + services/nevmconsensus.cpp \ + services/rpc/nevmrpc.cpp \ core_write.cpp \ dsnotificationinterface.cpp \ governance/governance.cpp \ @@ -645,7 +644,7 @@ libsyscoin_wallet_a_SOURCES = \ rpc/rpcevo.cpp \ rpc/masternode.cpp \ rpc/auxpow_miner.cpp \ - services/rpc/wallet/assetwalletrpc.cpp \ + services/rpc/wallet/nevmwalletrpc.cpp \ wallet/rpcevo.cpp \ wallet/rpcgovernance.cpp \ wallet/rpcmasternode.cpp \ @@ -793,8 +792,7 @@ libsyscoin_consensus_a_SOURCES = \ libsyscoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(SYSCOIN_INCLUDES) $(BOOST_CPPFLAGS) libsyscoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libsyscoin_common_a_SOURCES = \ - services/asset.cpp \ - services/assetconsensus.cpp \ + services/nevmconsensus.cpp \ auxpow.cpp \ base58.cpp \ bech32.cpp \ @@ -806,6 +804,7 @@ libsyscoin_common_a_SOURCES = \ common/init.cpp \ common/interfaces.cpp \ common/run_command.cpp \ + compressor.cpp \ core_read.cpp \ core_write.cpp \ dbwrapper.cpp \ @@ -1067,6 +1066,7 @@ libsyscoinkernel_la_SOURCES = \ coins.cpp \ common/args.cpp \ common/config.cpp \ + compressor.cpp \ consensus/merkle.cpp \ consensus/tx_check.cpp \ consensus/tx_verify.cpp \ diff --git a/src/Makefile.test.include b/src/Makefile.test.include index f3b4b423fb60e..034ec856548f7 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -28,7 +28,6 @@ JSON_TEST_FILES = \ test/data/proposals_valid.json \ test/data/proposals_invalid.json \ test/data/utxo.json \ - test/data/assetbalances.json \ test/data/nevmspv_valid.json \ test/data/nevmspv_invalid.json \ test/data/tx_valid.json diff --git a/src/coins.h b/src/coins.h index 1a383a84b000c..40b1c9ca2d62a 100644 --- a/src/coins.h +++ b/src/coins.h @@ -6,6 +6,7 @@ #ifndef SYSCOIN_COINS_H #define SYSCOIN_COINS_H +#include #include #include #include diff --git a/src/compressor.cpp b/src/compressor.cpp new file mode 100644 index 0000000000000..32af8eab4940d --- /dev/null +++ b/src/compressor.cpp @@ -0,0 +1,192 @@ +// Copyright (c) 2009-2010 Satoshi Nakamoto +// Copyright (c) 2009-2021 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include + +#include +#include