Merge pull request #25 from DECENTfoundation/develop

Develop
DECENTfoundation · Jun 28, 2018 · ddcc35f · ddcc35f
2 parents 3f93f88 + 5d929ee
commit ddcc35f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/chain/src/ChainTypes.js b/src/chain/src/ChainTypes.js
@@ -88,7 +88,7 @@ ChainTypes.operations= {
     asset_reserve_operation: 34,
     asset_claim_fees_operation: 35,
     update_user_issued_asset: 36,
-    update_monitored_asset: 37,
+    update_monitored_asset_operation: 37,
     ready_to_publish2: 38,
     transfer2: 39,
     disallow_automatic_renewal_of_subscription: 40,

diff --git a/src/serializer/src/operations.js b/src/serializer/src/operations.js
@@ -475,6 +475,12 @@ export const price = new Serializer(
     }
 );
 
+export const coreExchangeRate = new Serializer(
+    "core_exchange_rate", {
+        core_exchange_rate: price
+    }
+);
+
 export const account_update = new Serializer(
     "account_update", {
         fee: asset,
@@ -503,6 +509,9 @@ export const asset_options = new Serializer(
 
 export const monitored_asset_options = new Serializer(
     "monitored_asset_options", {
+        feeds: map((protocol_id_type("account")), (array(time_point_sec, coreExchangeRate))),
+        current_feed: coreExchangeRate,
+        current_feed_publication_time: time_point_sec,
         feed_lifetime_sec: uint32,
         minimum_feeds: uint8,
     }
@@ -554,7 +563,7 @@ export const update_monitored_asset_operation = new Serializer(
         new_description: string,
         new_feed_lifetime_sec: uint32,
         new_minimum_feeds: uint8,
-        extensions: optional(future_extensions)
+        extensions: set(future_extensions)
     }
 );