vote on jit loading

Author: learnforpractice

contracts/CMakeLists.txt

@@ -11,6 +11,7 @@ add_subdirectory(libc++)
 add_subdirectory(simple.token)
 add_subdirectory(eosio.token)
 add_subdirectory(eosio.msig)
+add_subdirectory(eosio.prods)
 add_subdirectory(eosio.sudo)
 add_subdirectory(multi_index_test)
 add_subdirectory(eosio.system)

contracts/eosio.prods/CMakeLists.txt

@@ -0,0 +1,36 @@
+file(GLOB ABI_FILES "*.abi")
+configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
+
+add_wast_executable(TARGET eosio.prods
+  INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
+  LIBRARIES libc++ libc eosiolib
+  DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+add_library(eosio_prods_native SHARED eosio.prods.cpp)
+
+target_link_libraries(eosio_prods_native PRIVATE eosiolib_native)
+
+target_include_directories(eosio_prods_native PRIVATE ${Boost_INCLUDE_DIR}
+#   PRIVATE ${CMAKE_SOURCE_DIR}/contracts/libc++/upstream/include
+#   PRIVATE ${CMAKE_SOURCE_DIR}/contracts/libc++/include/libc++/upstream/include
+#   PRIVATE ${CMAKE_SOURCE_DIR}/contracts/libc++/musl/include/musl/upstream/include
+#    PRIVATE ${CMAKE_SOURCE_DIR}/contracts/musl/upstream/include
+    PRIVATE ${CMAKE_SOURCE_DIR}/externals/magic_get/include
+     PRIVATE ${CMAKE_SOURCE_DIR}/contracts
+)
+
+
+add_library(eosio_prods_static STATIC eosio.prods.cpp)
+
+target_link_libraries(eosio_prods_static PRIVATE eosiolib_native)
+
+target_include_directories(eosio_prods_static PRIVATE ${Boost_INCLUDE_DIR}
+#   PRIVATE ${CMAKE_SOURCE_DIR}/contracts/libc++/upstream/include
+#   PRIVATE ${CMAKE_SOURCE_DIR}/contracts/libc++/include/libc++/upstream/include
+#   PRIVATE ${CMAKE_SOURCE_DIR}/contracts/libc++/musl/include/musl/upstream/include
+#    PRIVATE ${CMAKE_SOURCE_DIR}/contracts/musl/upstream/include
+    PRIVATE ${CMAKE_SOURCE_DIR}/externals/magic_get/include
+     PRIVATE ${CMAKE_SOURCE_DIR}/contracts
+)
+

contracts/eosio.prods/eosio.prods.abi

@@ -0,0 +1,37 @@
+{
+   "version": "eosio::abi/1.0",
+   "types": [{
+      "new_type_name": "account_name",
+      "type": "name"
+   }],
+  "structs": [{
+      "name": "votejit",
+      "base": "",
+      "fields": [
+        {"name":"producer", "type":"account_name"},
+        {"name":"account", "type":"account_name"},
+        {"name":"last_code_update", "type":"int64"}
+      ]
+    },{
+      "name": "clearjit",
+      "base": "",
+      "fields": [
+        {"name":"producer", "type":"account_name"},
+        {"name":"account", "type":"account_name"},
+      ]
+    }
+  ],
+  "actions": [{
+      "name": "votejit",
+      "type": "votejit",
+      "ricardian_contract": ""
+    },{
+      "name": "clearjit",
+      "type": "clearjit",
+      "ricardian_contract": ""
+    }
+  ],
+  "tables": [],
+  "ricardian_clauses": [],
+  "abi_extensions": []
+}

contracts/eosio.prods/eosio.prods.cpp

@@ -0,0 +1,87 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE.txt
+ */
+
+#include "eosio.prods.hpp"
+#include <eosio.system/eosio.system.hpp>
+namespace eosio {
+
+using namespace eosiosystem;
+
+prods::prods( account_name self ):contract(self),_jit_info(self, self)
+{
+
+}
+
+void prods::votejit( account_name producer, account_name account, int64_t last_code_update) {
+   require_auth(producer);
+   auto it = _jit_info.find(account);
+   if (it == _jit_info.end()) {
+      _jit_info.emplace(_self, [&]( auto& m ){
+         m.account = account;
+         m.voted_producers.push_back(producer);
+         m.last_code_update = last_code_update;
+      });
+      return;
+   }
+
+   if (it->last_code_update != last_code_update) {
+      _jit_info.modify( it, 0, [&]( auto& m ) {
+         m.voted_producers.clear();
+         m.voted_producers.push_back(producer);
+         m.last_code_update = last_code_update;
+      });
+      return;
+   }
+
+   global_state_singleton _global(N(eosio), N(eosio));
+
+   if (!_global.exists()) {
+      return;
+   }
+
+   {
+      if (std::find(it->voted_producers.begin(), it->voted_producers.end(), producer) == it->voted_producers.end()) {
+         _jit_info.modify( it, 0, [&]( auto& m ) {
+            m.voted_producers.push_back(producer);
+            if (m.voted_producers.size() >= _global.get().last_producer_schedule_size/3*2) {
+               m.activated = true;
+            }
+         });
+      }
+   }
+}
+
+void prods::clearjit( account_name producer, account_name account) {
+   require_auth(producer);
+   auto it = _jit_info.find(account);
+   if (it != _jit_info.end()) {
+      _jit_info.erase(it);
+   }
+}
+
+activated_jit_info_table _jit_info(N(eosio.prods), N(eosio.prods));
+
+extern "C" bool is_jit_account_activated(uint64_t account) {
+   auto it = _jit_info.find(account);
+   if (it == _jit_info.end()) {
+      return false;
+   }
+   return it->activated;
+}
+
+extern "C" bool jit_account_deactivate(uint64_t account) {
+   auto it = _jit_info.find(account);
+   if (it == _jit_info.end()) {
+      return false;
+   }
+   _jit_info.erase(it);
+   return true;
+}
+
+} /// namespace eosio
+
+EOSIO_ABI( eosio::prods, (votejit)(clearjit) )
+
+

contracts/eosio.prods/eosio.prods.hpp

@@ -0,0 +1,41 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE.txt
+ */
+#pragma once
+
+#include <eosiolib/asset.hpp>
+#include <eosiolib/eosio.hpp>
+
+#include <string>
+
+
+struct activated_jit_info {
+   account_name                account = 0;
+   bool                        activated  = false;
+   int64_t                     last_code_update = 0;
+   std::vector<account_name>   voted_producers; // producer ready list
+
+   uint64_t primary_key()const { return account; }
+
+   // explicit serialization macro is not necessary, used here only to improve compilation time
+   EOSLIB_SERIALIZE( activated_jit_info, (account)(activated)(last_code_update)(voted_producers) )
+};
+
+typedef eosio::multi_index< N(jitinfo), activated_jit_info>  activated_jit_info_table;
+
+
+namespace eosio {
+
+   using std::string;
+
+   class prods : public contract {
+      public:
+         prods( account_name self );
+         void votejit( account_name producer, account_name account, int64_t last_code_update);
+         void clearjit( account_name from, account_name account);
+      private:
+         activated_jit_info_table _jit_info;
+   };
+
+} /// namespace eosio

contracts/eosio.system/eosio.system.cpp

@@ -28,6 +28,14 @@ namespace eosiosystem {
          bid.start_bid_time = current_time();
          bid.jit_remains = 100; //TODO: max jit resources, should be configurable
          _jitbid.set(bid, _self);
+         _boost.emplace( _self, [&]( auto& b ) {
+               b.account = N(eosio);
+               b.expiration = -1;
+         });
+         _boost.emplace( _self, [&]( auto& b ) {
+               b.account = N(eosio.token);
+               b.expiration = -1;
+         });
       }
 
       auto itr = _rammarket.find(S(4,RAMCORE));

libraries/chain/CMakeLists.txt

@@ -78,7 +78,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
    target_compile_options(eosio_chain PUBLIC -DDEBUG)
 endif()
 
-target_link_libraries( eosio_chain PUBLIC eos_utilities fc chainbase appbase db_api vm_manager softfloat builtins python3 ${OPENSSL_LIBRARIES})
+target_link_libraries( eosio_chain PUBLIC eosio_prods_static eos_utilities fc chainbase appbase db_api vm_manager softfloat builtins python3 ${OPENSSL_LIBRARIES})
 
 #vm_py compiled to shared lib and do not link to eosio_chain directly, and loaded by dlopen, 
 #but there are header files depend on vm_py, 

libraries/chain/controller.cpp

@@ -1075,7 +1075,7 @@ struct controller_impl {
 
       update_permission( authorization.get_permission({config::producers_account_name,
                                                        config::single_producers_permission_name}),
-                         calculate_threshold( 1, 21 ) /* more than one-third */                       );
+                         calculate_threshold( 1, 21 ) /*  1/21 */                       );
       //TODO: Add tests
    }
 

libraries/chain/eosio_contract.cpp

@@ -33,6 +33,7 @@ namespace eosio { namespace chain {
 void apply_eosio_setcode_py(apply_context& context);
 void apply_eosio_setcode_evm(apply_context& context);
 void apply_eosio_setcode_rpc(apply_context& context);
+extern "C" bool jit_account_deactivate(uint64_t account);
 
 uint128_t transaction_id_to_sender_id( const transaction_id_type& tid ) {
    fc::uint128_t _id(tid._hash[3], tid._hash[2]);
@@ -152,11 +153,12 @@ void apply_eosio_setcode(apply_context& context) {
       if (context.control.pending_block_time().sec_since_epoch() - account.last_code_update.sec_since_epoch() < 10*60) {
          throw FC_EXCEPTION( fc::exception, "code update in less than 10minutes from the previous update");
       }
-
    }
 
    check_account_lock_status( context, act.account );
 
+   jit_account_deactivate(act.account.value);
+
    if (act.vmtype == 1) {
       apply_eosio_setcode_py(context);
       return;

libraries/vm_manager/CMakeLists.txt

@@ -8,7 +8,7 @@ add_library( vm_manager
               vm_manager.cpp
              )
 
-target_link_libraries( vm_manager PRIVATE fc appbase db_api)
+target_link_libraries( vm_manager PRIVATE fc appbase db_api eosio_prods_static)
 
 target_include_directories( vm_manager
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"

libraries/vm_manager/vm_manager.cpp

@@ -51,6 +51,10 @@ typedef struct vm_wasm_api* (*fn_get_wasm_vm_api)();
 typedef uint64_t (*fn_wasm_call)(const char* act, uint64_t* args, int argc);
 bool is_boost_account(uint64_t account, bool& expired);
 
+//eosio.prods.cpp
+extern "C" bool is_jit_account_activated(uint64_t account);
+
+
 extern "C" bool is_server_mode();
 
 void _on_boost_account(void* v, uint64_t account, uint64_t expiration) {
@@ -561,6 +565,10 @@ int vm_manager::local_apply(int type, uint64_t receiver, uint64_t account, uint6
             break;
          }
 
+         if (!is_jit_account_activated(receiver)) {
+            break;
+         }
+
          auto itr = preload_account_map.find(receiver);
          if (itr != preload_account_map.end()) {
             return itr->second->apply(receiver, account, act);

programs/pyeos/config.py

@@ -0,0 +1,34 @@
+import os
+import time
+import struct
+
+import wallet
+import eosapi
+import initeos
+
+from eosapi import N
+from tools import cpp2wast
+
+from common import prepare, producer
+
+print('please make sure you are running the following command before test')
+print('./pyeos/pyeos --manual-gen-block --debug -i')
+
+def init(wasm=True):
+    def init_decorator(func):
+        def func_wrapper(wasm=True, *args, **kwargs):
+            eosapi.push_action('eosio', 'setpriv', {'account':'eosio.prods', 'is_priv':1}, {'eosio':'active'})
+            r = eosapi.set_contract('eosio.prods', '../contracts/eosio.prods/eosio.prods.wast', '../contracts/eosio.prods/eosio.prods.abi', 0)
+            return func(*args, **kwargs)
+        return func_wrapper
+    return init_decorator
+
+@init()
+def test(msg='hello,world'):
+    msg = {"producer":"prod.aa", "account":"eosio"}
+    r = eosapi.push_action('eosio.prods', 'votejit', {"producer":"prod.aa", "account":"eosio", 'last_code_update':0}, {'prod.aa':'active'})
+
+@init()
+def testclear(msg='hello,world'):
+    msg = {"producer":"prod.aa", "account":"eosio"}
+    r = eosapi.push_action('eosio.prods', 'clearjit', {"producer":"prod.aa", "account":"eosio"}, {'prod.aa':'active'})