Merge branch 'master' into 3638-fix-check-actor-list

contracts/eosio.system/eosio.system.abi

@@ -383,6 +383,21 @@
       "fields": [
         {"name":"params", "type":"blockchain_parameters"}
       ]
+    },{
+      "name": "connector",
+      "base": "",
+      "fields": [
+        {"name":"balance", "type":"asset"},
+        {"name":"weight", "type":"float64"}
+      ]
+    },{
+      "name": "exchange_state",
+      "base": "",
+      "fields": [
+        {"name":"supply", "type":"asset"},
+        {"name":"base", "type":"connector"},
+        {"name":"quote", "type":"connector"}
+      ]
     }
    ],
    "actions": [{
@@ -532,6 +547,12 @@
       "index_type": "i64",
       "key_names" : ["to"],
       "key_types" : ["uint64"]
+    },{
+      "name": "rammarket",
+      "type": "exchange_state",
+      "index_type": "i64",
+      "key_names" : ["supply"],
+      "key_types" : ["uint64"]
     },{
       "name": "refunds",
       "type": "refund_request",