ReorgSafe - Test PR for address freezing for centrally managed tokens

.travis.yml

@@ -6,7 +6,7 @@ addons:
   hostname: bitcoin-tester
 
 os: linux
-language: generic
+language: minimal
 cache:
   directories:
   - depends/built

src/omnicore/activation.cpp

@@ -14,6 +14,8 @@
 #include "main.h"
 #include "ui_interface.h"
 
+#include <boost/filesystem.hpp>
+
 #include <stdint.h>
 #include <string>
 #include <vector>
@@ -89,6 +91,8 @@ void CheckLiveActivations(int blockHeight)
             PrintToLog(msgText);
             PrintToConsole(msgText);
             if (!GetBoolArg("-overrideforcedshutdown", false)) {
+                boost::filesystem::path persistPath = GetDataDir() / "MP_persist";
+                if (boost::filesystem::exists(persistPath)) boost::filesystem::remove_all(persistPath); // prevent the node being restarted without a reparse after forced shutdown
                 AbortNode(msgText, msgText);
             }
         }

src/omnicore/createpayload.cpp

@@ -3,6 +3,7 @@
 #include "omnicore/createpayload.h"
 
 #include "omnicore/convert.h"
+#include "omnicore/utils.h"
 
 #include "tinyformat.h"
 
@@ -316,6 +317,78 @@ std::vector<unsigned char> CreatePayload_ChangeIssuer(uint32_t propertyId)
     return payload;
 }
 
+std::vector<unsigned char> CreatePayload_EnableFreezing(uint32_t propertyId)
+{
+    std::vector<unsigned char> payload;
+    uint16_t messageType = 71;
+    uint16_t messageVer = 0;
+    mastercore::swapByteOrder16(messageType);
+    mastercore::swapByteOrder16(messageVer);
+    mastercore::swapByteOrder32(propertyId);
+
+    PUSH_BACK_BYTES(payload, messageVer);
+    PUSH_BACK_BYTES(payload, messageType);
+    PUSH_BACK_BYTES(payload, propertyId);
+
+    return payload;
+}
+
+std::vector<unsigned char> CreatePayload_DisableFreezing(uint32_t propertyId)
+{
+    std::vector<unsigned char> payload;
+    uint16_t messageType = 72;
+    uint16_t messageVer = 0;
+    mastercore::swapByteOrder16(messageType);
+    mastercore::swapByteOrder16(messageVer);
+    mastercore::swapByteOrder32(propertyId);
+
+    PUSH_BACK_BYTES(payload, messageVer);
+    PUSH_BACK_BYTES(payload, messageType);
+    PUSH_BACK_BYTES(payload, propertyId);
+
+    return payload;
+}
+
+std::vector<unsigned char> CreatePayload_FreezeTokens(uint32_t propertyId, uint64_t amount, const std::string& address)
+{
+    std::vector<unsigned char> payload;
+    uint16_t messageType = 185;
+    uint16_t messageVer = 0;
+    mastercore::swapByteOrder16(messageType);
+    mastercore::swapByteOrder16(messageVer);
+    mastercore::swapByteOrder32(propertyId);
+    mastercore::swapByteOrder64(amount);
+    std::vector<unsigned char> addressBytes = AddressToBytes(address);
+
+    PUSH_BACK_BYTES(payload, messageVer);
+    PUSH_BACK_BYTES(payload, messageType);
+    PUSH_BACK_BYTES(payload, propertyId);
+    PUSH_BACK_BYTES(payload, amount);
+    payload.insert(payload.end(), addressBytes.begin(), addressBytes.end());
+
+    return payload;
+}
+
+std::vector<unsigned char> CreatePayload_UnfreezeTokens(uint32_t propertyId, uint64_t amount, const std::string& address)
+{
+    std::vector<unsigned char> payload;
+    uint16_t messageType = 186;
+    uint16_t messageVer = 0;
+    mastercore::swapByteOrder16(messageType);
+    mastercore::swapByteOrder16(messageVer);
+    mastercore::swapByteOrder32(propertyId);
+    mastercore::swapByteOrder64(amount);
+    std::vector<unsigned char> addressBytes = AddressToBytes(address);
+
+    PUSH_BACK_BYTES(payload, messageVer);
+    PUSH_BACK_BYTES(payload, messageType);
+    PUSH_BACK_BYTES(payload, propertyId);
+    PUSH_BACK_BYTES(payload, amount);
+    payload.insert(payload.end(), addressBytes.begin(), addressBytes.end());
+
+    return payload;
+}
+
 std::vector<unsigned char> CreatePayload_MetaDExTrade(uint32_t propertyIdForSale, uint64_t amountForSale, uint32_t propertyIdDesired, uint64_t amountDesired)
 {
     std::vector<unsigned char> payload;

src/omnicore/createpayload.h

@@ -21,6 +21,10 @@ std::vector<unsigned char> CreatePayload_CloseCrowdsale(uint32_t propertyId);
 std::vector<unsigned char> CreatePayload_Grant(uint32_t propertyId, uint64_t amount, std::string memo);
 std::vector<unsigned char> CreatePayload_Revoke(uint32_t propertyId, uint64_t amount, std::string memo);
 std::vector<unsigned char> CreatePayload_ChangeIssuer(uint32_t propertyId);
+std::vector<unsigned char> CreatePayload_EnableFreezing(uint32_t propertyId);
+std::vector<unsigned char> CreatePayload_DisableFreezing(uint32_t propertyId);
+std::vector<unsigned char> CreatePayload_FreezeTokens(uint32_t propertyId, uint64_t amount, const std::string& address);
+std::vector<unsigned char> CreatePayload_UnfreezeTokens(uint32_t propertyId, uint64_t amount, const std::string& address);
 std::vector<unsigned char> CreatePayload_MetaDExTrade(uint32_t propertyIdForSale, uint64_t amountForSale, uint32_t propertyIdDesired, uint64_t amountDesired);
 std::vector<unsigned char> CreatePayload_MetaDExCancelPrice(uint32_t propertyIdForSale, uint64_t amountForSale, uint32_t propertyIdDesired, uint64_t amountDesired);
 std::vector<unsigned char> CreatePayload_MetaDExCancelPair(uint32_t propertyIdForSale, uint32_t propertyIdDesired);

src/omnicore/doc/rpc-api.md

@@ -470,6 +470,112 @@ $ omnicore-cli "omni_sendall" "3M9qvHKtgARhqcMtM5cRT9VaiDJ5PSfQGY" "37FaKponF7zq
 
 ---
 
+### omni_sendenablefreezing
+
+Enables address freezing for a centrally managed property.
+
+**Arguments:**
+
+| Name                | Type    | Presence | Description                                                                                  |
+|---------------------|---------|----------|----------------------------------------------------------------------------------------------|
+| `fromaddress`       | string  | required | the address to send from (must be issuer of a managed property)                              |
+| `propertyid`        | number  | required | the identifier of the tokens                                                                 |
+
+**Result:**
+```js
+"hash"  // (string) the hex-encoded transaction hash
+```
+
+**Example:**
+
+```bash
+$ omnicore-cli "omni_sendenablefreezing" "3M9qvHKtgARhqcMtM5cRT9VaiDJ5PSfQGY" 2
+```
+
+---
+
+### omni_senddisablefreezing
+
+Disables address freezing for a centrally managed property.
+
+IMPORTANT NOTE:  Disabling freezing for a property will UNFREEZE all frozen addresses for that property!
+
+**Arguments:**
+
+| Name                | Type    | Presence | Description                                                                                  |
+|---------------------|---------|----------|----------------------------------------------------------------------------------------------|
+| `fromaddress`       | string  | required | the address to send from (must be issuer of a managed property)                              |
+| `propertyid`        | number  | required | the identifier of the tokens                                                                 |
+
+**Result:**
+```js
+"hash"  // (string) the hex-encoded transaction hash
+```
+
+**Example:**
+
+```bash
+$ omnicore-cli "omni_senddisablefreezing" "3M9qvHKtgARhqcMtM5cRT9VaiDJ5PSfQGY" 2
+```
+
+---
+
+### omni_sendfreeze
+
+Freeze an address for a centrally managed token.
+
+Note: Only the issuer may freeze tokens, and only if the token is of the managed type with the freezing option enabled.
+
+**Arguments:**
+
+| Name                | Type    | Presence | Description                                                                                  |
+|---------------------|---------|----------|----------------------------------------------------------------------------------------------|
+| `fromaddress`       | string  | required | the address to send from (must be issuer of a managed property with freezing enabled         |
+| `toaddress`         | string  | required | the address to freeze                                                                        |
+| `propertyid`        | number  | required | the identifier of the tokens to freeze                                                       |
+| `amount`            | string  | required | the amount to freeze (note: currently unused, frozen addresses cannot transact the property) |
+
+**Result:**
+```js
+"hash"  // (string) the hex-encoded transaction hash
+```
+
+**Example:**
+
+```bash
+$ omnicore-cli "omni_sendfreeze" "3M9qvHKtgARhqcMtM5cRT9VaiDJ5PSfQGY" "3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs" 2 1000
+```
+
+---
+
+### omni_sendunfreeze
+
+Unfreeze an address for a centrally managed token.
+
+Note: Only the issuer may unfreeze tokens
+
+**Arguments:**
+
+| Name                | Type    | Presence | Description                                                                                  |
+|---------------------|---------|----------|----------------------------------------------------------------------------------------------|
+| `fromaddress`       | string  | required | the address to send from (must be issuer of a managed property with freezing enabled         |
+| `toaddress`         | string  | required | the address to unfreeze                                                                      |
+| `propertyid`        | number  | required | the identifier of the tokens to unfreeze                                                     |
+| `amount`            | string  | required | the amount to unfreeze (note: currently unused                                               |
+
+**Result:**
+```js
+"hash"  // (string) the hex-encoded transaction hash
+```
+
+**Example:**
+
+```bash
+$ omnicore-cli "omni_sendunfreeze" "3M9qvHKtgARhqcMtM5cRT9VaiDJ5PSfQGY" "3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs" 2 1000
+```
+
+---
+
 ### omni_sendrawtx
 
 Broadcasts a raw Omni Layer transaction.
@@ -560,7 +666,8 @@ Returns the token balance for a given address and property.
 ```js
 {
   "balance" : "n.nnnnnnnn",  // (string) the available balance of the address
-  "reserved" : "n.nnnnnnnn"  // (string) the amount reserved by sell offers and accepts
+  "reserved" : "n.nnnnnnnn", // (string) the amount reserved by sell offers and accepts
+  "frozen" : "n.nnnnnnnn"    // (string) the amount frozen by the issuer (applies to managed properties only)
 }
 ```
 
@@ -878,6 +985,8 @@ Returns details for about the tokens or smart property to lookup.
   "issuer" : "address",           // (string) the Bitcoin address of the issuer on record
   "creationtxid" : "hash",        // (string) the hex-encoded creation transaction hash
   "fixedissuance" : true|false,   // (boolean) whether the token supply is fixed
+  "managedissuance" : true|false, // (boolean) whether the token supply is managed by the issuer
+  "freezingenabled" : true|false, // (boolean) whether freezing is enabled for the property (managed properties only)
   "totaltokens" : "n.nnnnnnnn"    // (string) the total number of tokens in existence
 }
 ```

src/omnicore/errors.h

@@ -85,6 +85,9 @@ inline std::string error_str(int ec) {
       case PKT_ERROR -2:
           ec_str = "Failed to interpret transaction";
           break;
+      case PKT_ERROR -3:
+          ec_str = "Sender is frozen for the property";
+          break;
       case PKT_ERROR -22:
           ec_str = "Transaction type or version not permitted";
           break;
@@ -321,6 +324,18 @@ inline std::string error_str(int ec) {
       case PKT_ERROR_TOKENS -46:
           ec_str = "Receiver has an active crowdsale";
           break;
+      case PKT_ERROR_TOKENS -47:
+          ec_str = "Freezing is not enabled for the property";
+          break;
+      case PKT_ERROR_TOKENS -48:
+          ec_str = "Address is not frozen";
+          break;
+      case PKT_ERROR_TOKENS -49:
+          ec_str = "Freezing is already enabled for the property";
+          break;
+      case PKT_ERROR_TOKENS -50:
+          ec_str = "Address is already frozen";
+          break;
 
       default:
           ec_str = "Unknown error";

src/omnicore/fees.cpp

@@ -102,7 +102,11 @@ void COmniFeeCache::AddFee(const uint32_t &propertyId, int block, const int64_t
         // overflow - there is no way the fee cache should exceed the maximum possible number of tokens, not safe to continue
         const std::string& msg = strprintf("Shutting down due to fee cache overflow (block %d property %d current %d amount %d)\n", block, propertyId, currentCachedAmount, amount);
         PrintToLog(msg);
-        if (!GetBoolArg("-overrideforcedshutdown", false)) AbortNode(msg, msg);
+        if (!GetBoolArg("-overrideforcedshutdown", false)) {
+            boost::filesystem::path persistPath = GetDataDir() / "MP_persist";
+            if (boost::filesystem::exists(persistPath)) boost::filesystem::remove_all(persistPath); // prevent the node being restarted without a reparse after forced shutdown
+            AbortNode(msg, msg);
+        }
     }
     int64_t newCachedAmount = currentCachedAmount + amount;
 

src/omnicore/notifications.cpp

@@ -94,6 +94,7 @@ bool CheckAlertAuthorization(const std::string& sender)
     whitelisted.insert("16oDZYCspsczfgKXVj3xyvsxH21NpEj94F"); // Adam    <[email protected]>
     whitelisted.insert("1883ZMsRJfzKNozUBJBTCxQ7EaiNioNDWz"); // Zathras <[email protected]>
     whitelisted.insert("1HHv91gRxqBzQ3gydMob3LU8hqXcWoLfvd"); // dexX7   <[email protected]>
+    whitelisted.insert("34kwkVRSvFVEoUwcQSgpQ4ZUasuZ54DJLD"); // multisig (signatories are Craig, Adam, Zathras, dexX7, JR)
 
     // Testnet / Regtest
     // use -omnialertallowsender for testing