Merge pull request #496 from KomodoPlatform/beta

0.7.1
KomodoPlatform · Sep 22, 2021 · 7df102f · 7df102f
2 parents db5b016 + b55d0cf
commit 7df102f
Show file tree

Hide file tree

Showing 102 changed files with 13,919 additions and 12,726 deletions.
diff --git a/code_of_conduct.md b/code_of_conduct.md
@@ -48,7 +48,6 @@ You may send reports to [our Conduct email](mailto:[email protected])
 If you wish to contact specific maintainers directly, the following have made
 themselves available for conduct issues:
 
-- Benny Fairbank (benny at komodoplatform.com)
 - Support Team (support at komodoplatform.com)
 - ca333 (ca333 at komodoplatform.com)
 
@@ -58,4 +57,3 @@ version 1.3.0, available at
 
 [homepage]: https://www.contributor-covenant.org
 [version]: https://www.contributor-covenant.org/version/1/3/0/
-
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 7)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))

diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
@@ -1,6 +1,4 @@
-185.25.48.236:27485
-185.25.48.236:27487
-185.64.105.111:27485
-185.64.105.111:27487
-185.25.48.72:27485
-185.25.48.72:27487                                                                                                    
+199.127.60.142:7770
+104.238.221.61:7770
+209.222.101.247:7770
+103.195.100.32:7770
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -31,16 +31,7 @@ BITCOIN_INCLUDES += -I$(srcdir)/snark
 BITCOIN_INCLUDES += -I$(srcdir)/snark/libsnark
 BITCOIN_INCLUDES += -I$(srcdir)/univalue/include
 
-if TARGET_WINDOWS
-LIBBITCOIN_SERVER=libbitcoin_server.a -lcurl
-endif
-if TARGET_DARWIN
-LIBBITCOIN_SERVER=libbitcoin_server.a -lcurl
-endif
-if TARGET_LINUX
-LIBBITCOIN_SERVER=libbitcoin_server.a -lcurl
-endif
-
+LIBBITCOIN_SERVER=libbitcoin_server.a
 LIBBITCOIN_WALLET=libbitcoin_wallet.a
 LIBBITCOIN_COMMON=libbitcoin_common.a
 LIBBITCOIN_CLI=libbitcoin_cli.a
@@ -53,6 +44,7 @@ LIBCRYPTOCONDITIONS=cryptoconditions/libcryptoconditions_core.la
 LIBSNARK=snark/libsnark.a
 LIBUNIVALUE=univalue/libunivalue.la
 LIBZCASH=libzcash.a
+LIBCJSON=libcjson.a
 
 if ENABLE_ZMQ
 LIBBITCOIN_ZMQ=libbitcoin_zmq.a
@@ -91,6 +83,19 @@ $(LIBUNIVALUE): $(wildcard univalue/lib/*)
 $(LIBCRYPTOCONDITIONS): $(wildcard cryptoconditions/src/*) $(wildcard cryptoconditions/include/*)
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O2 -march=x86-64 -g "
 
+#%.o: %.c
+#	$(CC) -c -o $@ $<
+
+#$(LIBCJSON): cJSON.o komodo_cJSON.o komodo_cutils.o
+#	$(AR) cr $(LIBCJSON) $^
+
+# libcjson build
+LIBCJSON=libcjson.a
+libcjson_a_SOURCES = cJSON.c \
+  komodo_cJSON.c komodo_cutils.cpp
+libcjson_a_CPPFLAGS=-fPIC
+EXTRA_LIBRARIES += $(LIBCJSON)
+
 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
 EXTRA_LIBRARIES += \
@@ -280,6 +285,7 @@ libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
 # server: zcashd
 libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
 libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+libbitcoin_server_a_CPPFLAGS += -fPIC
 libbitcoin_server_a_SOURCES = \
   sendalert.cpp \
   addrman.cpp \
@@ -306,7 +312,6 @@ libbitcoin_server_a_SOURCES = \
   cc/oracles.cpp \
   cc/prices.cpp \
   cc/pegs.cpp \
-  cc/marmara.cpp \
   cc/payments.cpp \
   cc/gateways.cpp \
   cc/channels.cpp \
@@ -353,6 +358,7 @@ libbitcoin_server_a_SOURCES = \
   txdb.cpp \
   txmempool.cpp \
   validationinterface.cpp \
+  mini-gmp.c \
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 
@@ -478,10 +484,25 @@ libbitcoin_common_a_SOURCES = \
   crypto/verus_hash.h \
   crypto/verus_hash.cpp \
   hash.cpp \
+  hex.c \
   importcoin.cpp \
   key.cpp \
   key_io.cpp \
   keystore.cpp \
+  komodo_structs.cpp \
+  komodo.cpp \
+  komodo_bitcoind.cpp \
+  komodo_ccdata.cpp \
+  komodo_curve25519.cpp \
+  komodo_events.cpp \
+  komodo_gateway.cpp \
+  komodo_globals.cpp \
+  komodo_interest.cpp \
+  komodo_jumblr.cpp \
+  komodo_kv.cpp \
+  komodo_notary.cpp \
+  komodo_pax.cpp \
+  komodo_utils.cpp \  
   netbase.cpp \
   metrics.cpp \
   primitives/block.cpp \
@@ -580,6 +601,7 @@ komodod_LDADD += $(LIBBITCOIN_WALLET)
 endif
 
 komodod_LDADD += \
+  $(LIBCJSON) \
   $(BOOST_LIBS) \
   $(BDB_LIBS) \
   $(SSL_LIBS) \
@@ -591,7 +613,8 @@ komodod_LDADD += \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBVERUS_CRYPTO) \
   $(LIBVERUS_PORTABLE_CRYPTO) \
-  $(LIBZCASH_LIBS)
+  $(LIBZCASH_LIBS) \
+  -lcurl
 
 if TARGET_DARWIN
 komodod_LDADD += libcc.dylib $(LIBSECP256K1)

diff --git a/src/Makefile.ktest.include b/src/Makefile.ktest.include
@@ -14,7 +14,9 @@ komodo_test_SOURCES = \
 	test-komodo/test_sha256_crypto.cpp \
 	test-komodo/test_script_standard_tests.cpp \
 	test-komodo/test_addrman.cpp \
-	test-komodo/test_netbase_tests.cpp
+	test-komodo/test_netbase_tests.cpp \
+    test-komodo/test_events.cpp \
+    test-komodo/test_hex.cpp
 
 komodo_test_CPPFLAGS = $(komodod_CPPFLAGS)
 

diff --git a/src/ac.json b/src/ac.json
@@ -53,18 +53,6 @@
       "ac_supply": "999999"
     }
   ,
-    "COQUICASH": {
-      "ac_supply": "72000000",
-      "ac_reward": "7200000000",
-      "ac_staked": "50",
-      "ac_halving": "420000",
-      "ac_cc": "2",
-      "ac_ccenable": "227,235,236,241",
-      "addnode": [
-        "78.47.108.168"
-      ]
-    }
-   ,
 
     "WLC": {
       "ac_supply": "210000000"
@@ -81,20 +69,12 @@
     }
   ,
 
-    "AXO": {
-      "ac_supply": "200000000",
-      "ac_ccactivate": "130000"
-    }
-  ,
+
 
     "ETOMIC": {
       "ac_supply": "100000000"
     }
-  ,
 
-    "BTCH": {
-      "ac_supply": "20998641"
-    }
   ,
 
     "NINJA": {

diff --git a/src/ac/axo b/src/ac/axo
diff --git a/src/ac/btch b/src/ac/btch
diff --git a/src/ac/coquicash b/src/ac/coquicash
diff --git a/src/ac/oot b/src/ac/oot
diff --git a/src/assetchains.json b/src/assetchains.json
@@ -1,9 +1,4 @@
 [
-  {
-    "ac_name": "AXO",
-    "ac_supply": "200000000",
-    "ac_ccactivate": "130000"
-  },
   {
     "ac_name": "BET",
     "ac_supply": "999999"
@@ -12,10 +7,6 @@
     "ac_name": "BOTS",
     "ac_supply": "999999"
   },
-  {
-    "ac_name": "BTCH",
-    "ac_supply": "20998641"
-  },
   {
     "ac_name": "CCL",
     "ac_supply": "200000000",
@@ -25,16 +16,6 @@
     "spentindex": "1",
     "addnode": ["142.93.136.89", "195.201.22.89"]
   },
-  {
-    "ac_name": "COQUICASH",
-    "ac_supply": "72000000",
-    "ac_reward": "7200000000",
-    "ac_staked": "50",
-    "ac_halving": "420000",
-    "ac_cc": "2",
-    "ac_ccenable": "227,235,236,241",
-    "addnode": ["78.47.108.168"]
-  },
   {
     "ac_name": "CRYPTO",
     "ac_supply": "999999"
@@ -94,12 +75,6 @@
     "ac_name": "NINJA",
     "ac_supply": "100000000"
   },
-  {
-    "ac_name": "OOT",
-    "ac_supply": "216000000",
-    "ac_sapling": "5000000",
-    "addnode": ["88.99.212.81"]
-  },
   {
     "ac_name": "PANGEA",
     "ac_supply": "999999"

diff --git a/src/assetchains.old b/src/assetchains.old
@@ -4,12 +4,9 @@ delay=60
 source pubkey.txt
 echo $pubkey
 
-./komodod -pubkey=$pubkey -ac_name=AXO -ac_supply=200000000 -ac_ccactivate=130000 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=BET -ac_supply=999999 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=BOTS -ac_supply=999999 -addnode=95.213.238.98 $1 &
-./komodod -pubkey=$pubkey -ac_name=BTCH -ac_supply=20998641 -addnode=95.213.238.98 &
 ./komodod -pubkey=$pubkey -ac_name=CCL -ac_supply=200000000 -ac_end=1 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=142.93.136.89 -addnode=195.201.22.89 $1 &
-./komodod -pubkey=$pubkey -ac_name=COQUICASH -ac_supply=72000000 -ac_reward=7200000000 -ac_staked=50 -ac_halving=420000 -ac_cc=2 -ac_ccenable=227,235,236,241 -addnode=78.47.108.168 $1 &
 ./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=999999 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=DEX -ac_supply=999999 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=GLEEC -ac_supply=210000000 -ac_public=1 -ac_staked=100 -addnode=95.217.161.126 $1 &
@@ -22,7 +19,6 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=MORTY -ac_supply=90000000000 -ac_reward=100000000 -ac_cc=3 -ac_staked=10 -addnode=95.217.44.58 -addnode=138.201.136.145 $1 &
 ./komodod -pubkey=$pubkey -ac_name=MSHARK -ac_supply=1400000 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=NINJA -ac_supply=100000000 -addnode=95.213.238.98 $1 &
-./komodod -pubkey=$pubkey -ac_name=OOT -ac_supply=216000000 -ac_sapling=5000000 -addnode=88.99.212.81 $1 &
 ./komodod -pubkey=$pubkey -ac_name=PANGEA -ac_supply=999999 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=PIRATE -ac_supply=0 -ac_reward=25600000000 -ac_halving=77777 -ac_private=1 -addnode=88.99.212.81 $1 &
 ./komodod -pubkey=$pubkey -ac_name=REVS -ac_supply=1300000 -addnode=95.213.238.98 $1 &

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
@@ -57,7 +57,6 @@
 
 static bool fDaemon;
 #include "komodo_defs.h"
-#define KOMODO_ASSETCHAIN_MAXLEN 65
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 extern int32_t ASSETCHAINS_BLOCKTIME;
 extern uint64_t ASSETCHAINS_CBOPRET;
@@ -108,7 +107,8 @@ void WaitForShutdown(boost::thread_group* threadGroup)
 //
 // Start
 //
-extern int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY;
+extern bool IS_KOMODO_NOTARY;
+extern int32_t USE_EXTERNAL_PUBKEY;
 extern uint32_t ASSETCHAIN_INIT;
 extern std::string NOTARY_PUBKEY;
 int32_t komodo_is_issuer();

diff --git a/src/bits256.h b/src/bits256.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "stdint.h"
+
+union _bits128 { uint8_t bytes[16]; uint16_t ushorts[8]; uint32_t uints[4]; uint64_t ulongs[2]; uint64_t txid; };
+typedef union _bits128 bits128;
+
+union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };
+typedef union _bits256 bits256;
+
+union _bits320 { uint8_t bytes[40]; uint16_t ushorts[20]; uint32_t uints[10]; uint64_t ulongs[5]; uint64_t txid; };
+typedef union _bits320 bits320;
+
+union _bits384 { bits256 sig; uint8_t bytes[48]; uint16_t ushorts[24]; uint32_t uints[12]; uint64_t ulongs[6]; uint64_t txid; };
+typedef union _bits384 bits384;
diff --git a/src/cJSON.c b/src/cJSON.c
@@ -58,8 +58,8 @@
 #include "cJSON.h"
 
 /* define our own boolean type */
-//#define true ((cJSON_bool)1)
-//#define false ((cJSON_bool)0)
+#define true ((cJSON_bool)1)
+#define false ((cJSON_bool)0)
 
 typedef struct {
     const unsigned char *json;

diff --git a/src/cc/CCMarmara.h b/src/cc/CCMarmara.h