Merge pull request #33 from MarathonDH/fix-image-prune

add asset type 2, remove blob node storage outside of block, and add block blob storage along with TX blob storage.

Author: portlandhodl

Dockerfile

@@ -3,7 +3,7 @@
 
     LABEL maintainer="michael.casey@mara.com"
     LABEL version="0.1"
-    LABEL description="Docker file for mara federation"
+    LABEL description="Docker file for anduro"
 
     ARG DEBIAN_FRONTEND=noninteractive
 
@@ -27,13 +27,13 @@
 
 
     #Setup base directory
-    RUN mkdir -p /opt/marachain
-    WORKDIR /opt/marachain
+    RUN mkdir -p /opt/coordinate
+    WORKDIR /opt/coordinate
 
     COPY . ./
 
     #Configure sidechain node
-    WORKDIR /opt/marachain
+    WORKDIR /opt/coordinate
     RUN ./autogen.sh \
      && ./configure --without-gui \
      && make

entrypoint.sh

@@ -122,8 +122,9 @@ BITCOIN_CORE_H = \
   addrman_impl.h \
   attributes.h \
   auxpow.h \
-  federation_deposit.h \
-  chroma_assets.h \
+  anduro_deposit.h \
+  coordinate_assets.h \
+  coordinate_mempool_entry.h \
   banman.h \
   base58.h \
   bech32.h \
@@ -249,7 +250,7 @@ BITCOIN_CORE_H = \
   rpc/server.h \
   rpc/server_util.h \
   rpc/util.h \
-  rpc/marachainrpc.h \
+  rpc/coordinaterpc.h \
   scheduler.h \
   script/descriptor.h \
   script/keyorigin.h \
@@ -420,7 +421,7 @@ libbitcoin_node_a_SOURCES = \
   rpc/blockchain.cpp \
   rpc/fees.cpp \
   rpc/mempool.cpp \
-  rpc/marachainrpc.cpp \
+  rpc/coordinaterpc.cpp \
   rpc/mining.cpp \
   rpc/net.cpp \
   rpc/node.cpp \
@@ -643,9 +644,10 @@ libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLA
 libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_common_a_SOURCES = \
   auxpow.cpp \
-  federation_deposit.cpp \
-  chroma/chroma_assets.cpp \
-  federation_validator.cpp \
+  anduro_deposit.cpp \
+  coordinate/coordinate_assets.cpp \
+  coordinate/coordinate_mempool_entry.cpp \
+  anduro_validator.cpp \
   base58.cpp \
   bech32.cpp \
   chainparams.cpp \
@@ -905,9 +907,10 @@ libbitcoinkernel_la_SOURCES = \
   kernel/bitcoinkernel.cpp \
   arith_uint256.cpp \
   auxpow.cpp \
-  federation_deposit.cpp \
-  chroma/chroma_assets.cpp \
-  federation_validator.cpp \
+  anduro_deposit.cpp \
+  coordinate/coordinate_assets.cpp \
+  coordinate/coordinate_mempool_entry.cpp \
+  anduro_validator.cpp \
   chain.cpp \
   chainparamsbase.cpp \
   chainparams.cpp \

src/Makefile.am

@@ -9,46 +9,46 @@
 #include <node/blockstorage.h>
 #include <rpc/util.h>
 #include <rpc/client.h>
-#include <federation_deposit.h>
-#include <federation_validator.h>
+#include <anduro_deposit.h>
+#include <anduro_validator.h>
 
 using node::BlockManager;
 using node::ReadBlockFromDisk;
 // temporary storage for including presigned signature on next block
-std::vector<FederationTxOut> tDeposits;
-// check blocks are fully synced to active federation presign validation
+std::vector<AnduroTxOut> tDeposits;
+// check blocks are fully synced to active anduro presign validation
 bool isValidationActivate = false;
 // temporary storage for deposit address
 std::string depositAddress = "";
 // temporary storage for withdraw address
 std::string burnAddress = "";
 
 /**
- * Include presigned signature from federation.
+ * Include presigned signature from anduro.
  */
-void includePreSignedSignature(std::vector<FederationTxOut> txOuts) {
+void includePreSignedSignature(std::vector<AnduroTxOut> txOuts) {
    if (txOuts.size() == 0) {
       return;
    }
    if(!isSignatureAlreadyExist(txOuts[0])) {
-      for (const FederationTxOut& tx : txOuts) {
+      for (const AnduroTxOut& tx : txOuts) {
             tDeposits.push_back(tx);
             depositAddress = tx.depositAddress;
             burnAddress = tx.burnAddress;
       }
    }
 }
 
-bool isSignatureAlreadyExist(FederationTxOut txOut) {
+bool isSignatureAlreadyExist(AnduroTxOut txOut) {
    bool isExist = false;
-   std::vector<FederationTxOut> pending_deposits = listPendingDepositTransaction(txOut.block_height);
+   std::vector<AnduroTxOut> pending_deposits = listPendingDepositTransaction(txOut.block_height);
    if(pending_deposits.size() > 0) {
       isExist = true;
    }
    return isExist;
 }
 
-bool isSpecialTxoutValid(std::vector<FederationTxOut> txOuts, ChainstateManager& chainman) {
+bool isSpecialTxoutValid(std::vector<AnduroTxOut> txOuts, ChainstateManager& chainman) {
 
    if(txOuts.size()==0) {
       return false;
@@ -59,7 +59,7 @@ bool isSpecialTxoutValid(std::vector<FederationTxOut> txOuts, ChainstateManager&
    if(txOuts[0].block_height <= blockindex) {
       blockindex = blockindex - 1;
    }
-   // get block to find the eligible federation keys to be signed on presigned block
+   // get block to find the eligible anduro keys to be signed on presigned block
    CBlock block;
    if (!ReadBlockFromDisk(block, CHECK_NONFATAL(active_chain[blockindex]), Params().GetConsensus())) {
         LogPrintf("Error reading block from disk at index %d\n", CHECK_NONFATAL(active_chain[blockindex])->GetBlockHash().ToString());
@@ -68,7 +68,7 @@ bool isSpecialTxoutValid(std::vector<FederationTxOut> txOuts, ChainstateManager&
    UniValue messages(UniValue::VARR);
    int tIndex = 1;
    // preparing message for signature verification
-   for (const FederationTxOut& txOut : txOuts) {
+   for (const AnduroTxOut& txOut : txOuts) {
 
       CTxDestination address;
       ExtractDestination(txOut.scriptPubKey, address);
@@ -84,7 +84,7 @@ bool isSpecialTxoutValid(std::vector<FederationTxOut> txOuts, ChainstateManager&
       messages.push_back(message);
    }
    // check signature is valid
-   bool isValid = validateFederationSignature(txOuts[0].witness,messages.write(),block.currentKeys);
+   bool isValid = validateAnduroSignature(txOuts[0].witness,messages.write(),block.currentKeys);
 
    if (isValid) {
       return true;
@@ -96,13 +96,13 @@ bool isSpecialTxoutValid(std::vector<FederationTxOut> txOuts, ChainstateManager&
 /**
  * This function list all presigned pegin details for upcoming blocks by height
  */
-std::vector<FederationTxOut> listPendingDepositTransaction(uint32_t block_height) {
+std::vector<AnduroTxOut> listPendingDepositTransaction(uint32_t block_height) {
     if(block_height == -1) {
         return tDeposits;
     }
 
-    std::vector<FederationTxOut> tDepositsNew;
-    for (const FederationTxOut& tx_out : tDeposits) {
+    std::vector<AnduroTxOut> tDepositsNew;
+    for (const AnduroTxOut& tx_out : tDeposits) {
         if(tx_out.block_height == block_height) {
             tDepositsNew.push_back(tx_out);
         }
@@ -115,19 +115,19 @@ std::vector<FederationTxOut> listPendingDepositTransaction(uint32_t block_height
  * This function find total pegin amount for particular block
  */
 CAmount listPendingDepositTotal(uint32_t block_height) {
-    std::vector<FederationTxOut> tDepositsNew;
+    std::vector<AnduroTxOut> tDepositsNew;
     if(block_height == -1) {
         tDepositsNew = tDeposits;
     } else {
-        for (const FederationTxOut& tx_out : tDeposits) {
+        for (const AnduroTxOut& tx_out : tDeposits) {
             if(tx_out.block_height == block_height) {
                 tDepositsNew.push_back(tx_out);
             }
         }
     }
 
     CAmount totalDeposit = CAmount(0);
-    for (const FederationTxOut& txOut: tDepositsNew) {
+    for (const AnduroTxOut& txOut: tDepositsNew) {
         totalDeposit = totalDeposit + CAmount(txOut.nValue);
     }
 
@@ -138,17 +138,17 @@ CAmount listPendingDepositTotal(uint32_t block_height) {
  * Used to reset presigned signature for processed blocks
  */
 void resetDeposit(uint32_t block_height) {
-    std::vector<FederationTxOut> tDepositsNew;
+    std::vector<AnduroTxOut> tDepositsNew;
     bool hasDeposits = true;
     uint32_t currentHeight = block_height;
     while(hasDeposits) {
-        for (const FederationTxOut& tx_out : tDeposits) {
+        for (const AnduroTxOut& tx_out : tDeposits) {
             if(tx_out.block_height != block_height) {
                 tDepositsNew.push_back(tx_out);
             }
         }
         currentHeight = currentHeight - 1;
-        std::vector<FederationTxOut> pending_deposits = listPendingDepositTransaction(currentHeight);
+        std::vector<AnduroTxOut> pending_deposits = listPendingDepositTransaction(currentHeight);
         if(pending_deposits.size() == 0) {
             hasDeposits = false;
         }
@@ -188,36 +188,36 @@ int32_t getNextIndex(ChainstateManager& chainman) {
 }
 
 /**
- * Check block are fully synced to start validating federation new presigned signature for upcoming blocks
+ * Check block are fully synced to start validating anduro new presigned signature for upcoming blocks
  */
-bool isFederationValidationActive() {
+bool isAnduroValidationActive() {
    return isValidationActivate;
 }
 
 /**
- * Validate the federation signature on confirmed blocks
+ * Validate the anduro signature on confirmed blocks
  */
-bool verifyFederation(ChainstateManager& chainman, const CBlock& block) {
+bool verifyAnduro(ChainstateManager& chainman, const CBlock& block) {
    LOCK(cs_main);
    CChain& active_chain = chainman.ActiveChain();
    // activate presigned signature checker after blocks fully synced in node
    if(listPendingDepositTransaction(active_chain.Height()+1).size()>0) {
          isValidationActivate = true;
    }
 
-   if(!isFederationValidationActive()) {
+   if(!isAnduroValidationActive()) {
       return true;
    }
 
    // check coinbase should have three output
    //  0 - fee reward for merge mine
    //  1 - coinbase message
-   //  2 - signature by previous block federation current keys
+   //  2 - signature by previous block anduro current keys
    if(block.vtx[0]->vout.size() < 3) {
       return false;
    }
 
-   // check for current keys for federation
+   // check for current keys for anduro
    CBlock prevblock;
    if (!ReadBlockFromDisk(prevblock, CHECK_NONFATAL(active_chain[active_chain.Height()]), Params().GetConsensus())) {
       return false;
@@ -235,17 +235,17 @@ bool verifyFederation(ChainstateManager& chainman, const CBlock& block) {
 
    const std::string witnessStr = ScriptToAsmStr(witnessOut.scriptPubKey).replace(0,10,"");
 
-   std::vector<FederationTxOut> tOuts;
+   std::vector<AnduroTxOut> tOuts;
    if(block.vtx[0]->vout.size() == 3) {
       const CTxDestination coinbaseScript = DecodeDestination(find_value(witnessVal.get_obj(), "current_address").get_str());
       const CScript scriptPubKey = GetScriptForDestination(coinbaseScript);
-      FederationTxOut out(AmountFromValue(0), scriptPubKey, witnessStr, active_chain.Height() + 1,block.nextIndex,block.currentKeys, "", "");
+      AnduroTxOut out(AmountFromValue(0), scriptPubKey, witnessStr, active_chain.Height() + 1,block.nextIndex,block.currentKeys, "", "");
       tOuts.push_back(out);
    } else {
-      // if more than 3 output in coinbase should be considered as pegin and recreating presigned signature for pegin to verify with federation current keys
+      // if more than 3 output in coinbase should be considered as pegin and recreating presigned signature for pegin to verify with anduro current keys
       for (size_t i = 1; i < block.vtx[0]->vout.size()-2; i=i+1) {
          CTxOut pegTx = block.vtx[0]->vout[i];
-         FederationTxOut out(pegTx.nValue, pegTx.scriptPubKey, witnessStr, active_chain.Height() + 1,block.nextIndex,block.currentKeys, "", "");
+         AnduroTxOut out(pegTx.nValue, pegTx.scriptPubKey, witnessStr, active_chain.Height() + 1,block.nextIndex,block.currentKeys, "", "");
          tOuts.push_back(out);
       }
    }

src/federation_deposit.cpp src/anduro_deposit.cppsrc/federation_deposit.cpp renamed to src/anduro_deposit.cpp

@@ -20,21 +20,21 @@
 #include <util/message.h>
 
 /**
- *  This is call is used to receive or prepare federation presigned signature data along with federation deposit and withdrawal address
+ *  This is call is used to receive or prepare anduro presigned signature data along with anduro deposit and withdrawal address
  */
-class FederationTxOut
+class AnduroTxOut
 {
 public:
     CAmount nValue;  /*!< amount going to process as pegin in sidechain */
     CScript scriptPubKey; /*!< script pubkey to receive the pegin amount in sidechain */
     std::string witness;  /*!< presigned signature information  */
     int32_t block_height; /*!< block height where the presigned signature belong to */
     std::string currentKeys; /*!< next key going to be included in block header */
-    int32_t nextIndex; /*!< next derivation index going to be include in block header. This index is refer back by federation and identify the  current derivation path to be signed*/
+    int32_t nextIndex; /*!< next derivation index going to be include in block header. This index is refer back by anduro and identify the  current derivation path to be signed*/
     std::string depositAddress; /*!< hold current deposit address from bitcoin */
     std::string burnAddress; /*!< hold current withdrawal address from sidechain */
 
-    FederationTxOut()
+    AnduroTxOut()
     {
         SetNull();
     }
@@ -49,7 +49,7 @@ class FederationTxOut
      * @param[in] depositAddressIn  hold current deposit address from bitcoin
      * @param[in] burnAddressIn     hold current withdrawal address from sidechain
      */
-    FederationTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn, std::string witnessIn, int32_t block_heightIn, int32_t nextIndexIn, std::string currentKeysIn, std::string depositAddressIn, std::string burnAddressIn) {
+    AnduroTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn, std::string witnessIn, int32_t block_heightIn, int32_t nextIndexIn, std::string currentKeysIn, std::string depositAddressIn, std::string burnAddressIn) {
         nValue = nValueIn;
         scriptPubKey = scriptPubKeyIn;
         witness = witnessIn;
@@ -60,7 +60,7 @@ class FederationTxOut
         burnAddress = burnAddressIn;
     }
 
-    SERIALIZE_METHODS(FederationTxOut, obj) {
+    SERIALIZE_METHODS(AnduroTxOut, obj) {
         READWRITE(obj.nValue, obj.scriptPubKey, obj.witness, obj.block_height, obj.currentKeys, obj.nextIndex, obj.depositAddress, obj.burnAddress);
     }
 
@@ -88,35 +88,35 @@ std::string getDepositAddress();
 std::string getBurnAddress();
 
 /**
- * This function include presigned signature from federation
+ * This function include presigned signature from anduro
  * @param[in] txOuts hold three block presigned signature.
  */
-void includePreSignedSignature(std::vector<FederationTxOut> txOuts);
+void includePreSignedSignature(std::vector<AnduroTxOut> txOuts);
 
 /**
- * This function check block are fully synced to start validating federation new presigned signature for upcoming blocks
+ * This function check block are fully synced to start validating anduro new presigned signature for upcoming blocks
  */
-bool isFederationValidationActive();
+bool isAnduroValidationActive();
 
 /**
- * validate the federation signature on confirmed blocks
- * @param[in] chainman  used to find previous blocks based on active chain state to find federation current keys
+ * validate the anduro signature on confirmed blocks
+ * @param[in] chainman  used to find previous blocks based on active chain state to find anduro current keys
  * @param[in] block  current block received from connectblock
  */
-bool verifyFederation(ChainstateManager& chainman, const CBlock& block);
+bool verifyAnduro(ChainstateManager& chainman, const CBlock& block);
 
 /**
  * This function check presigned signatures are valid
  * @param[in] txOuts  presigned signature for validation
  * @param[in] chainman  used to find next block number and active chain state
  */
-bool isSpecialTxoutValid(std::vector<FederationTxOut> txOuts, ChainstateManager& chainman);
+bool isSpecialTxoutValid(std::vector<AnduroTxOut> txOuts, ChainstateManager& chainman);
 
 /**
  * This function list all presigned pegin details for upcoming blocks by height
  * @param[in] block_height  block height to find pending pegin
  */
-std::vector<FederationTxOut> listPendingDepositTransaction(uint32_t block_height);
+std::vector<AnduroTxOut> listPendingDepositTransaction(uint32_t block_height);
 
 /**
  * This function find total pegin amount for particular block
@@ -128,7 +128,7 @@ CAmount listPendingDepositTotal(uint32_t block_height);
  * This function used to check whether presigned signature already exist when received signature through peer message
  * @param[in] txOut  presigned signature details
  */
-bool isSignatureAlreadyExist(FederationTxOut txOut);
+bool isSignatureAlreadyExist(AnduroTxOut txOut);
 
 /**
  * This function used to reset presigned signature for processed blocks