Merge pull request #4 from dimxy/tokel-ccv2-coinbase-fix

More tokel token/assets fixes&improvements; dust fixed
jmjatlanta · Jul 2, 2021 · 6715e36 · 6715e36
2 parents f1eea82 + 6c7add8
commit 6715e36
Show file tree

Hide file tree

Showing 40 changed files with 2,572 additions and 907 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -318,7 +318,7 @@ libbitcoin_server_a_SOURCES = \
   cc/betprotocol.cpp \
   cc/pricesfeed.cpp \
   cc/priceslibs/cjsonpointer.cpp \
-  cc/CCNFTData.cpp \
+  cc/CCTokelData.cpp \
   chain.cpp \
   checkpoints.cpp \
   fs.cpp \
@@ -799,6 +799,7 @@ endif
 
 if ENABLE_TESTS
 include Makefile.ktest.include
+include Makefile.kcctest.include
 #include Makefile.test.include
 #include Makefile.gtest.include
 endif
diff --git a/src/Makefile.kcctest.include b/src/Makefile.kcctest.include
@@ -0,0 +1,13 @@
+TESTS += komodo-test-cc
+bin_PROGRAMS += komodo-test-cc
+
+# tool for generating our public parameters
+komodo_test_cc_SOURCES = \
+	test-komodo-cc/test-main.cpp \
+	test-komodo-cc/test-assets.cpp
+
+komodo_test_cc_CPPFLAGS = $(komodod_CPPFLAGS)
+
+komodo_test_cc_LDADD = -lgtest $(komodod_LDADD)
+
+komodo_test_cc_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
diff --git a/src/cc/CCNFTData.cpp b/src/cc/CCNFTData.cpp
diff --git a/src/cc/CCNFTData.h b/src/cc/CCNFTData.h