Merge pull request #967 from cyberway/witness-last-update

Witness last update

Author: soft-bagel-93

golos.ctrl/golos.ctrl.abi

@@ -137,7 +137,8 @@
                 {"name": "url", "type": "string"}, 
                 {"name": "active", "type": "bool"}, 
                 {"name": "total_weight", "type": "uint64"}, 
-                {"name": "counter_votes", "type": "uint64"}
+                {"name": "counter_votes", "type": "uint64"}, 
+                {"name": "last_update", "type": "time_point_sec$"}
             ]
         }, {
             "name": "witness_voter", "base": "", 
@@ -150,7 +151,8 @@
             "fields": [
                 {"name": "witness", "type": "name"}, 
                 {"name": "weight", "type": "uint64"}, 
-                {"name": "active", "type": "bool"}
+                {"name": "active", "type": "bool"}, 
+                {"name": "last_update", "type": "time_point_sec"}
             ]
         }
     ], 

golos.ctrl/include/golos.ctrl/config.hpp

@@ -5,4 +5,6 @@ namespace golos { namespace config {
 
 static const auto witness_max_url_size = 256;
 
+static const auto witness_expiration_sec = 30*24*60*60;
+
 } } // golos::config

golos.ctrl/include/golos.ctrl/golos.ctrl.hpp

@@ -7,6 +7,7 @@
 #include <eosio/asset.hpp>
 #include <eosio/singleton.hpp>
 #include <eosio/crypto.hpp>
+#include <eosio/binary_extension.hpp>
 #include <vector>
 #include <string>
 #include <common/dispatchers.hpp>
@@ -25,6 +26,10 @@ struct witness_info {
     uint64_t total_weight;
     uint64_t counter_votes;
 
+    // binary_extension is for compatibility with old DB before contract upgraded
+    // note: it can be added only to end of table
+    eosio::binary_extension<time_point_sec, eosio::write_strategy::no_value> last_update;
+
     uint64_t primary_key() const {
         return name.value;
     }
@@ -125,10 +130,10 @@ class [[eosio::contract("golos.ctrl")]] control: public contract {
         name witness;
         uint64_t weight;
         bool active;
+        time_point_sec last_update;
     };
 
     void send_witness_event(const witness_info& wi);
-    void active_witness(golos::name witness, bool flag);
 };
 
 

golos.ctrl/src/golos.ctrl.cpp

@@ -144,6 +144,7 @@ void control::regwitness(name witness, string url) {
             w.name = witness;
             w.url = url;
             w.active = true;
+            w.last_update.emplace(eosio::current_time_point());
         };
     });
 
@@ -166,15 +167,38 @@ void control::unregwitness(name witness) {
 
 void control::stopwitness(name witness) {
     assert_started();
-    require_auth(witness);
-    active_witness(witness, false);
+    const auto now = eosio::current_time_point();
+
+    // TODO: simplify upsert to allow passing just inner lambda
+    bool exists = upsert_tbl<witness_tbl>(witness, [&](bool) {
+        return [&](witness_info& w) {
+            eosio::check(w.active, "active flag not updated");
+            if (!has_auth(witness)) {
+                eosio::check(now - w.last_update.value_or() > eosio::seconds(config::witness_expiration_sec), "recently updated witness can be stopped only by itself");
+            }
+            w.active = false;
+            send_witness_event(w);
+        };
+    }, false);
+    eosio::check(exists, "witness not found");
+    update_auths();
 }
 
 void control::startwitness(name witness) {
     eosio::check(!control::is_blocking(config::control_name, witness), "You are blocked.");
     assert_started();
     require_auth(witness);
-    active_witness(witness, true);
+
+    // TODO: simplify upsert to allow passing just inner lambda
+    bool exists = upsert_tbl<witness_tbl>(witness, [&](bool) {
+        return [&](witness_info& w) {
+            w.active = true;
+            w.last_update.emplace(eosio::current_time_point());
+            send_witness_event(w);
+        };
+    }, false);
+    eosio::check(exists, "witness not found");
+    update_auths();
 }
 
 // Note: if not weighted, it's possible to pass all witnesses in vector like in BP actions
@@ -386,25 +410,10 @@ void control::update_auths() {
 }
 
 void control::send_witness_event(const witness_info& wi) {
-    witnessstate data{wi.name, wi.total_weight, wi.active};
+    witnessstate data{wi.name, wi.total_weight, wi.active, wi.last_update.value_or()};
     eosio::event(_self, "witnessstate"_n, data).send();
 }
 
-void control::active_witness(name witness, bool flag) {
-    // TODO: simplify upsert to allow passing just inner lambda
-    bool exists = upsert_tbl<witness_tbl>(witness, [&](bool) {
-        return [&](witness_info& w) {
-            eosio::check(flag != w.active, "active flag not updated");
-            w.active = flag;
-
-            send_witness_event(w);
-        };
-    }, false);
-    eosio::check(exists, "witness not found");
-
-    update_auths();
-}
-
 vector<witness_info> control::top_witness_info() {
     vector<witness_info> top;
     const auto l = props().witnesses.max;