Merge develop branch into master branch

lib/chain/src/ChainTypes.js

@@ -135,7 +135,10 @@ ChainTypes.operations = {
     credit_offer_update: 71,
     credit_offer_accept: 72,
     credit_deal_repay: 73,
-    credit_deal_expired: 74    // VIRTUAL
+    credit_deal_expired: 74,    // VIRTUAL
+    liquidity_pool_update: 75,
+    credit_deal_update: 76,
+    limit_order_update: 77
 };
 
 ChainTypes.ticket_type = {

lib/chain/src/TransactionBuilder.js

@@ -422,14 +422,11 @@ class TransactionBuilder {
             if (isProposal(op)) {
                 op[1].proposed_ops.forEach(proposal => {
                     proposed_ops.push(proposal);
-                    if (
-                        proposalFeeAssets.indexOf(
-                            proposal.op[1].fee.asset_id
-                        ) === -1
-                    )
-                        proposalFeeAssets.push(
-                            "1.3." + proposal.op[1].fee.asset_id
-                        );
+                    const _feeID = proposal.op[1].fee.asset_id;
+                    if (proposalFeeAssets.indexOf(_feeID) === -1) {
+                        const formattedFeeID = _feeID.includes("1.3.") ? _feeID : `1.3.${_feeID}`;
+                        proposalFeeAssets.push(formattedFeeID);
+                    }
                 });
             }
             if (!isDuplicate) {

lib/serializer/src/SerializerValidation.js

@@ -109,10 +109,20 @@ var _my = {
         }
 
         this.no_overflow64(value, field_name, unsigned);
+        // BigInteger#isBigInteger https://github.com/cryptocoinjs/bigi/issues/20
+        // (code copied from no_overflow64)
+        if (value.t !== undefined && value.s !== undefined) {
+            value = value.toString();
+        }
         if (typeof value === "number") {
             value = "" + value;
         }
-        return Long.fromString(value, unsigned);
+        value = value.trim();
+        var long_value = Long.fromString(value, unsigned);
+        if (long_value.toString() !== value) {
+            throw new Error(`Unable to safely convert ${field_name} ${value} to long`);
+        }
+        return long_value;
     },
 
     to_string(value, field_name = "") {

lib/serializer/src/operations.js

@@ -472,6 +472,25 @@ export const credit_deal_expired_operation_fee_parameters = new Serializer(
     {}
 );
 
+export const liquidity_pool_update_operation_fee_parameters = new Serializer(
+    "liquidity_pool_update_operation_fee_parameters",
+    {
+        fee: uint64,
+    }
+);
+
+export const credit_deal_update_operation_fee_parameters = new Serializer(
+    "credit_deal_update_operation_fee_parameters",
+    {
+        fee: uint64,
+    }
+);
+
+export const limit_order_update_operation_fee_parameters = new Serializer(
+    "limit_order_update_operation_fee_parameters",
+    { fee: uint64 }
+);
+
 
 var fee_parameters = static_variant([
     transfer_operation_fee_parameters,
@@ -548,7 +567,10 @@ var fee_parameters = static_variant([
     credit_offer_update_operation_fee_parameters,
     credit_offer_accept_operation_fee_parameters,
     credit_deal_repay_operation_fee_parameters,
-    credit_deal_expired_operation_fee_parameters
+    credit_deal_expired_operation_fee_parameters,
+    liquidity_pool_update_operation_fee_parameters,
+    credit_deal_update_operation_fee_parameters,
+    limit_order_update_operation_fee_parameters,
 ]);
 
 export const fee_schedule = new Serializer("fee_schedule", {
@@ -618,14 +640,30 @@ export const transfer = new Serializer("transfer", {
     extensions: set(future_extensions)
 });
 
+export const create_take_profit_order_action = new Serializer("create_take_profit_order_action", {
+    fee_asset_id: protocol_id_type("asset"),
+    spread_percent: uint16,
+    size_percent: uint16,
+    expiration_seconds: uint32,
+    repeat: bool,
+    extensions: set(future_extensions)
+});
+
+var limit_order_auto_action = static_variant([create_take_profit_order_action]);
+
 export const limit_order_create = new Serializer("limit_order_create", {
     fee: asset,
     seller: protocol_id_type("account"),
     amount_to_sell: asset,
     min_to_receive: asset,
     expiration: time_point_sec,
     fill_or_kill: bool,
-    extensions: set(future_extensions)
+    extensions: extension([
+        {
+            name: "on_fill",
+            type: array(limit_order_auto_action),
+        },
+    ]),
 });
 
 export const limit_order_cancel = new Serializer("limit_order_cancel", {
@@ -1553,6 +1591,37 @@ export const credit_deal_expired = new Serializer("credit_deal_expired", {
     fee_rate: uint32
 });
 
+// Op 75: liquidity_pool_update_operation
+export const liquidity_pool_update = new Serializer("liquidity_pool_update", {
+    fee: asset,
+    account: protocol_id_type("account"),
+    pool: protocol_id_type("liquidity_pool"),
+    taker_fee_percent: optional(uint16),
+    withdrawal_fee_percent: optional(uint16),
+    extensions: set(future_extensions),
+});
+
+// Op 76: credit_deal_update_operation
+export const credit_deal_update = new Serializer("credit_deal_update", {
+    fee: asset,
+    account: protocol_id_type("account"),
+    deal_id: protocol_id_type("credit_deal"),
+    auto_repay: uint8,
+    extensions: set(future_extensions),
+});
+
+// Op 77: limit_order_update_operation
+export const limit_order_update = new Serializer("limit_order_update", {
+    fee: asset,
+    seller: protocol_id_type("account"),
+    order: protocol_id_type("limit_order"),
+    new_price: optional(price),
+    delta_amount_to_sell: optional(asset),
+    new_expiration: optional(time_point_sec),
+    on_fill: optional(array(limit_order_auto_action)),
+    extensions: set(future_extensions)
+});
+
 operation.st_operations = [
     transfer,
     limit_order_create,
@@ -1628,7 +1697,10 @@ operation.st_operations = [
     credit_offer_update,
     credit_offer_accept,
     credit_deal_repay,
-    credit_deal_expired
+    credit_deal_expired,
+    liquidity_pool_update,
+    credit_deal_update,
+    limit_order_update,
 ];
 
 export const transaction = new Serializer("transaction", {