Merge branch 'pluswave-bsip0038'

Author: svk31

examples/callOrderUpdate.js

@@ -0,0 +1,40 @@
+import {Apis} from "bitsharesjs-ws";
+import {TransactionBuilder, PrivateKey} from "../lib";
+
+const wifKey = "5KBuq5WmHvgePmB7w3onYsqLM8ESomM2Ae7SigYuuwg8MDHW7NN";
+const pKey = PrivateKey.fromWif(wifKey);
+
+Apis.instance("wss://node.testnet.bitshares.eu", true).init_promise.then(
+    res => {
+        console.log("connected to:", res[0].network_name, "network");
+
+        let tr = new TransactionBuilder();
+        tr.add_type_operation("call_order_update", {
+            funding_account: "1.2.680",
+            delta_collateral: {
+                amount: 1000000,
+                asset_id: "1.3.0"
+            },
+            delta_debt: {
+                amount: 0,
+                asset_id: "1.3.1003"
+            },
+            extensions: {
+                target_collateral_ratio: 250
+            }
+        });
+
+        tr.set_required_fees().then(() => {
+            tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
+            console.log("serialized transaction:", tr.serialize().operations);
+            tr
+                .broadcast()
+                .then(() => {
+                    console.log("Call order update success!");
+                })
+                .catch(err => {
+                    console.error(err);
+                });
+        });
+    }
+);

examples/publishFeed.js

@@ -0,0 +1,53 @@
+import {Apis} from "bitsharesjs-ws";
+import {TransactionBuilder, PrivateKey} from "../lib";
+
+const wifKey = "5KBuq5WmHvgePmB7w3onYsqLM8ESomM2Ae7SigYuuwg8MDHW7NN";
+const pKey = PrivateKey.fromWif(wifKey);
+
+Apis.instance("wss://node.testnet.bitshares.eu", true).init_promise.then(
+    res => {
+        console.log("connected to:", res[0].network_name, "network");
+        let tr = new TransactionBuilder();
+        tr.add_type_operation("asset_publish_feed", {
+            publisher: "1.2.680",
+            asset_id: "1.3.1003",
+            feed: {
+                settlement_price: {
+                    quote: {
+                        amount: 10,
+                        asset_id: "1.3.0"
+                    },
+                    base: {
+                        amount: 5,
+                        asset_id: "1.3.1003"
+                    }
+                },
+                maintenance_collateral_ratio: 1750,
+                maximum_short_squeeze_ratio: 1200,
+                core_exchange_rate: {
+                    quote: {
+                        amount: 10,
+                        asset_id: "1.3.0"
+                    },
+                    base: {
+                        amount: 5,
+                        asset_id: "1.3.1003"
+                    }
+                }
+            }
+        });
+
+        tr.set_required_fees().then(() => {
+            tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
+            console.log("serialized transaction:", tr.serialize().operations);
+            tr
+                .broadcast()
+                .then(() => {
+                    console.log("Publish feed success!");
+                })
+                .catch(err => {
+                    console.error(err);
+                });
+        });
+    }
+);

lib/serializer/src/operations.js

@@ -23,7 +23,9 @@ var {
     public_key,
     address,
     time_point_sec,
-    optional
+    optional,
+    indexed_optional,
+    extension
 } = types;
 
 future_extensions = types.void;
@@ -485,12 +487,19 @@ export const limit_order_cancel = new Serializer("limit_order_cancel", {
     extensions: set(future_extensions)
 });
 
+export const call_order_update_options = new Serializer(
+    "call_order_update_options",
+    {
+        target_collateral_ratio: indexed_optional(uint16, 0)
+    }
+);
+
 export const call_order_update = new Serializer("call_order_update", {
     fee: asset,
     funding_account: protocol_id_type("account"),
     delta_collateral: asset,
     delta_debt: asset,
-    extensions: set(future_extensions)
+    extensions: extension(call_order_update_options)
 });
 
 export const fill_order = new Serializer("fill_order", {

lib/serializer/src/types.js

@@ -684,6 +684,100 @@ Types.optional = function(st_operation) {
     };
 };
 
+Types.indexed_optional = function(st_operation, index) {
+    v.required(st_operation, "st_operation");
+    return {
+        fromByteBuffer(b) {
+            if (!(b.readVarint32() === index)) {
+                return undefined;
+            }
+            return st_operation.fromByteBuffer(b);
+        },
+        appendByteBuffer(b, object) {
+            if (object !== null && object !== undefined) {
+                b.writeVarint32(index);
+                st_operation.appendByteBuffer(b, object);
+            }
+            return;
+        },
+        fromObject(object) {
+            if (object === undefined) {
+                return undefined;
+            }
+            return st_operation.fromObject(object);
+        },
+        toObject(object, debug = {}) {
+            // toObject is only null save if use_default is true
+            var result_object = (() => {
+                if (!debug.use_default && object === undefined) {
+                    return undefined;
+                } else {
+                    return st_operation.toObject(object, debug);
+                }
+            })();
+
+            if (debug.annotate) {
+                if (typeof result_object === "object") {
+                    result_object.__optional = "parent is optional";
+                } else {
+                    result_object = {__optional: result_object};
+                }
+            }
+            return result_object;
+        }
+    };
+};
+
+Types.extension = function(st_operation) {
+    v.required(st_operation, "st_operation");
+    return {
+        fromByteBuffer(b) {
+            if (!(b.readVarint32() === 1)) {
+                return undefined;
+            }
+            return st_operation.fromByteBuffer(b);
+        },
+        appendByteBuffer(b, object) {
+            if (
+                object !== null &&
+                object !== undefined &&
+                !(typeof object == "object" && Object.keys(object).length == 0)
+            ) {
+                b.writeVarint32(1);
+                st_operation.appendByteBuffer(b, object);
+            } else {
+                b.writeVarint32(0);
+            }
+            return;
+        },
+        fromObject(object) {
+            if (object === undefined) {
+                return undefined;
+            }
+            return st_operation.fromObject(object);
+        },
+        toObject(object, debug = {}) {
+            // toObject is only null save if use_default is true
+            var result_object = (() => {
+                if (!debug.use_default && object === undefined) {
+                    return undefined;
+                } else {
+                    return st_operation.toObject(object, debug);
+                }
+            })();
+
+            if (debug.annotate) {
+                if (typeof result_object === "object") {
+                    result_object.__optional = "parent is optional";
+                } else {
+                    result_object = {__optional: result_object};
+                }
+            }
+            return result_object;
+        }
+    };
+};
+
 Types.static_variant = function(_st_operations) {
     return {
         nosort: true,

package.json

@@ -26,6 +26,8 @@
         "prepublish": "npm run build && npm run test",
         "doc": "esdoc -c esdoc.json",
         "example:transfer": "babel-node examples/transfer",
+        "example:feed": "babel-node examples/publishFeed",
+        "example:co-update": "babel-node examples/callOrderUpdate",
         "example:chainStore": "babel-node examples/chainStore",
         "example:privKey": "babel-node examples/privKey"
     },