Rework tx creation + implement Class C & missing transactions

src/Makefile.am

@@ -166,7 +166,11 @@ OMNICORE_H = \
   mastercore_script.h \
   mastercore_sp.h \
   mastercore_tx.h \
-  mastercore_version.h
+  mastercore_version.h \
+  omnicore_encoding.h \
+  omnicore_createpayload.h \
+  omnicore_rpctx.h \
+  omnicore_utils.h
 
 OMNICORE_CPP = \
   mastercore.cpp \
@@ -180,7 +184,11 @@ OMNICORE_CPP = \
   mastercore_script.cpp \
   mastercore_sp.cpp \
   mastercore_tx.cpp \
-  mastercore_version.cpp
+  mastercore_version.cpp \
+  omnicore_encoding.cpp \
+  omnicore_createpayload.cpp \
+  omnicore_rpctx.cpp \
+  omnicore_utils.cpp
 
 BITCOIN_CORE_H += \
   $(OMNICORE_H)

src/Makefile.test.include

@@ -81,7 +81,13 @@ endif
 
 # Omni Core extensions
 OMNICORE_TESTS = \
+  test/mastercore_create_payload_tests.cpp \
+  test/mastercore_encoding_c_tests.cpp \
+  test/mastercore_obfuscation_tests.cpp \
   test/mastercore_rounduint64_tests.cpp \
+  test/mastercore_script_dust_tests.cpp \
+  test/mastercore_script_extraction_tests.cpp \
+  test/mastercore_script_solver_tests.cpp \
   test/mastercore_strtoint64_tests.cpp \
   test/mastercore_swapbyteorder_tests.cpp
 

src/mastercore.h

@@ -6,6 +6,7 @@
 #ifndef _MASTERCOIN
 #define _MASTERCOIN 1
 
+class CBitcoinAddress;
 class CBlockIndex;
 class CTransaction;
 
@@ -52,6 +53,14 @@ int const MAX_STATE_HISTORY = 50;
 #define FORMAT_BOOST_TXINDEXKEY "index-tx-%s"
 #define FORMAT_BOOST_SPKEY      "sp-%d"
 
+// Omni Layer Transaction Class
+#define OMNI_CLASS_A 1
+#define OMNI_CLASS_B 2
+#define OMNI_CLASS_C 3
+
+// Maximum number of keys supported in Class B
+#define CLASS_B_MAX_SENDABLE_PACKETS 2
+
 // Master Protocol Transaction (Packet) Version
 #define MP_TX_PKT_V0  0
 #define MP_TX_PKT_V1  1
@@ -61,6 +70,7 @@ int const MAX_STATE_HISTORY = 50;
 
 #define MAX_SHA256_OBFUSCATION_TIMES  255
 
+#define MIN_PAYLOAD_SIZE     8
 #define PACKET_SIZE_CLASS_A 19
 #define PACKET_SIZE         31
 #define MAX_PACKETS         64
@@ -114,6 +124,7 @@ enum BLOCKHEIGHTRESTRICTIONS {
   MSC_BET_BLOCK     = 999999,
   MSC_MANUALSP_BLOCK= 323230,
   P2SH_BLOCK        = 322000,
+  OP_RETURN_BLOCK   = 999999
 };
 
 enum FILETYPES {
@@ -153,7 +164,11 @@ std::string FormatMP(unsigned int, int64_t n, bool fSign = false);
 uint256 send_MP(const string &FromAddress, const string &ToAddress, const string &RedeemAddress, unsigned int PropertyID, uint64_t Amount);
 int64_t feeCheck(const string &address);
 
-const std::string ExodusAddress();
+/** Returns the Exodus address. */
+const CBitcoinAddress ExodusAddress();
+
+/** Used to indicate, whether to automatically commit created transactions. */
+extern bool autoCommit;
 
 extern CCriticalSection cs_tally;
 
@@ -392,6 +407,8 @@ extern uint64_t global_balance_reserved_testeco[100000];
 int64_t getMPbalance(const string &Address, unsigned int property, TallyType ttype);
 int64_t getUserAvailableMPbalance(const string &Address, unsigned int property);
 bool IsMyAddress(const std::string &address);
+bool isRangeOK(const uint64_t input);
+int pendingAdd(const uint256 &txid, const string &FromAddress, unsigned int propId, int64_t Amount, int64_t type, const string &txDesc);
 
 string getLabel(const string &address);
 
@@ -429,10 +446,8 @@ bool isCrowdsalePurchase(uint256 txid, string address, int64_t *propertyId = NUL
 bool isMPinBlockRange(int starting_block, int ending_block, bool bDeleteFound);
 std::string FormatIndivisibleMP(int64_t n);
 
-int ClassB_send(const string &senderAddress, const string &receiverAddress, const string &redemptionAddress, const std::vector<unsigned char> &data, uint256 & txid, int64_t additional = 0);
-
-uint256 send_INTERNAL_1packet(const string &FromAddress, const string &ToAddress, const string &RedeemAddress, unsigned int PropertyID, uint64_t Amount,
- unsigned int PropertyID_2, uint64_t Amount_2, unsigned int TransactionType, int64_t additional, int *error_code = NULL);
+int ClassAgnosticWalletTXBuilder(const string &senderAddress, const string &receiverAddress, const string &redemptionAddress,
+                 int64_t referenceAmount, const std::vector<unsigned char> &data, uint256 & txid, string &rawHex, bool commit);
 
 bool isTestEcosystemProperty(unsigned int property);
 bool isMainEcosystemProperty(unsigned int property);

src/mastercore_errors.h

@@ -10,8 +10,9 @@ enum MPRPCErrorCode
     MP_INSUF_FUNDS_APENDI =         -2,     // balance after pending
     MP_INPUT_NOT_IN_RANGE =         -11,    // input value larger than supported
 
-    //ClassB_send
+    //ClassAgnostic_send
     MP_INPUTS_INVALID =             -212,
+    MP_ENCODING_ERROR =             -250,
     MP_REDEMP_ILLEGAL =             -233,
     MP_REDEMP_BAD_KEYID =           -220,
     MP_REDEMP_FETCH_ERR_PUBKEY =    -221,