From 0742b6afc81a39b2d3a399735fd974fcc388e332 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Mon, 25 May 2020 10:20:53 +0300
Subject: [PATCH] [+] Per chain mempool autoprocessing

---
 cellframe-sdk                                 |  2 +-
 dist/etc/network/core-t/chain-0.cfg           | 55 +++++++++--------
 dist/etc/network/core-t/chain-plasma.cfg      | 61 ++++++++++---------
 dist/etc/network/kelvin-testnet/chain-0.cfg   | 57 ++++++++---------
 .../network/kelvin-testnet/chain-plasma.cfg   | 55 +++++++++--------
 python-cellframe                              |  2 +-
 6 files changed, 118 insertions(+), 114 deletions(-)

diff --git a/cellframe-sdk b/cellframe-sdk
index d7122e0d7..bbb2163bd 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit d7122e0d7cab93b4ff20d9bbb8a99b5e47741d87
+Subproject commit bbb2163bd97b6f74058f325623cc815bae7e8cd2
diff --git a/dist/etc/network/core-t/chain-0.cfg b/dist/etc/network/core-t/chain-0.cfg
index 9b47dc811..4e27e94df 100644
--- a/dist/etc/network/core-t/chain-0.cfg
+++ b/dist/etc/network/core-t/chain-0.cfg
@@ -1,27 +1,28 @@
-[chain]
-id=0x0000000000000000
-shard_id=0x0000000000000000
-name=zerochain
-load_priority=1
-# Possible values [token, emission, transaction] 
-datum_types=[token,emission,shard,ca,transaction]
-consensus=dag_poa
-
-[files]
-storage_dir=/opt/cellframe-node/var/lib/network/core-t/zerochain/
-
-[dag]
-is_single_line=true
-is_celled=false
-is_add_directly=true
-datum_add_hashes_count=1
-
-is_static_genesis_event=true
-static_genesis_event=0x65D9E91CD08DBDEFAAF30AEC316DC87F8BEE482843B3EA128FF2566B53E5AFA8
-
-[dag-poa]
-auth_certs_prefix=core-t
-auth_certs_number=3
-auth_certs_number_verify=1 #4
-auth_certs_dir=/opt/cellframe-node/share/ca
-
+[chain]
+id=0x0000000000000000
+shard_id=0x0000000000000000
+name=zerochain
+load_priority=1
+# Possible values [token, emission, transaction] 
+datum_types=[token,emission,shard,ca,transaction]
+mempool_auto_types=[]
+consensus=dag_poa
+
+[files]
+storage_dir=/opt/cellframe-node/var/lib/network/core-t/zerochain/
+
+[dag]
+is_single_line=true
+is_celled=false
+is_add_directly=true
+datum_add_hashes_count=1
+
+is_static_genesis_event=true
+static_genesis_event=0x65D9E91CD08DBDEFAAF30AEC316DC87F8BEE482843B3EA128FF2566B53E5AFA8
+
+[dag-poa]
+auth_certs_prefix=core-t
+auth_certs_number=3
+auth_certs_number_verify=1 #4
+auth_certs_dir=/opt/cellframe-node/share/ca
+
diff --git a/dist/etc/network/core-t/chain-plasma.cfg b/dist/etc/network/core-t/chain-plasma.cfg
index f2340d1eb..ac5824e52 100644
--- a/dist/etc/network/core-t/chain-plasma.cfg
+++ b/dist/etc/network/core-t/chain-plasma.cfg
@@ -1,30 +1,31 @@
-[chain]
-id=0x0000000000000001
-name=plasma
-load_priority=2
-# Possible values [token, emission, transaction] 
-datum_types=[transaction,ca]
-consensus=dag_pos
-
-[dag]
-is_single_line=false
-is_celled=true
-is_add_directly=true
-datum_add_hashes_count=3
-
-is_static_genesis_event=true
-static_genesis_event=0x39827168F25185FFBD0A44A41AF43265EB85D6E4A92544E72364E536C9A29D87
-
-# Proof-of-State consensus config
-[dag-pos]
-# Tokens hold and hold_value must be equel size
-# KELT - test token, KEL - main tokem
-tokens_hold=[CFNT]
-# 1000 coins for both
-tokens_hold_value=[1000000000000]
-# Confirmations minimum
-confirmations_minimum=1
-
-[files]
-storage_dir=/opt/cellframe-node/var/lib/network/core-t/plasma
-
+[chain]
+id=0x0000000000000001
+name=plasma
+load_priority=2
+# Possible values [token, emission, transaction] 
+datum_types=[transaction,ca]
+mempool_auto_types=[transaction]
+consensus=dag_pos
+
+[dag]
+is_single_line=false
+is_celled=true
+is_add_directly=true
+datum_add_hashes_count=3
+
+is_static_genesis_event=true
+static_genesis_event=0x39827168F25185FFBD0A44A41AF43265EB85D6E4A92544E72364E536C9A29D87
+
+# Proof-of-State consensus config
+[dag-pos]
+# Tokens hold and hold_value must be equel size
+# KELT - test token, KEL - main tokem
+tokens_hold=[CFNT]
+# 1000 coins for both
+tokens_hold_value=[1000000000000]
+# Confirmations minimum
+confirmations_minimum=1
+
+[files]
+storage_dir=/opt/cellframe-node/var/lib/network/core-t/plasma
+
diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg
index c3b23117b..c1fb04f08 100644
--- a/dist/etc/network/kelvin-testnet/chain-0.cfg
+++ b/dist/etc/network/kelvin-testnet/chain-0.cfg
@@ -1,28 +1,29 @@
-[chain]
-id=0x0000000000000000
-shard_id=0x0000000000000000
-name=zerochain
-load_priority=1
-# Possible values [token, emission, transaction] 
-datum_types=[token,emission,shard,ca]
-consensus=dag_poa
-
-[files]
-storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/zerochain/
-
-[dag]
-is_single_line=true
-is_celled=false
-is_add_directly=true
-datum_add_hashes_count=1
-
-# Switched off to false because hash symbols below are not well recognized
-
-is_static_genesis_event=false 
-static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F6AEE7FF
-
-[dag-poa]
-auth_certs_prefix=kelvin.testnet.root
-auth_certs_number=5
-auth_certs_number_verify=1 #4
-auth_certs_dir=/opt/cellframe-node/share/ca
+[chain]
+id=0x0000000000000000
+shard_id=0x0000000000000000
+name=zerochain
+load_priority=1
+# Possible values [token, emission, transaction] 
+datum_types=[token,emission,shard,ca]
+mempool_auto_types=[]
+consensus=dag_poa
+
+[files]
+storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/zerochain/
+
+[dag]
+is_single_line=true
+is_celled=false
+is_add_directly=true
+datum_add_hashes_count=1
+
+# Switched off to false because hash symbols below are not well recognized
+
+is_static_genesis_event=false 
+static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F6AEE7FF
+
+[dag-poa]
+auth_certs_prefix=kelvin.testnet.root
+auth_certs_number=5
+auth_certs_number_verify=1 #4
+auth_certs_dir=/opt/cellframe-node/share/ca
diff --git a/dist/etc/network/kelvin-testnet/chain-plasma.cfg b/dist/etc/network/kelvin-testnet/chain-plasma.cfg
index fc6d71a5f..f01d32514 100644
--- a/dist/etc/network/kelvin-testnet/chain-plasma.cfg
+++ b/dist/etc/network/kelvin-testnet/chain-plasma.cfg
@@ -1,27 +1,28 @@
-[chain]
-id=0x0000000000000001
-name=plasma
-load_priority=2
-# Possible values [token, emission, transaction] 
-datum_types=[transaction,ca]
-consensus=dag_pos
-
-[dag]
-is_single_line=false
-is_celled=true
-is_add_directly=true
-datum_add_hashes_count=3
-
-# Proof-of-State consensus config
-[dag-pos]
-# Tokens hold and hold_value must be equel size
-# KELT - test token, KEL - main tokem
-tokens_hold=[KELT,KEL]
-# 1000 coins for both
-tokens_hold_value=[1000000000,1000000000]
-# Confirmations minimum
-confirmations_minimum=1
-
-[files]
-storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/plasma
-
+[chain]
+id=0x0000000000000001
+name=plasma
+load_priority=2
+# Possible values [token, emission, transaction] 
+datum_types=[transaction,ca]
+mempool_auto_types=[transaction]
+consensus=dag_pos
+
+[dag]
+is_single_line=false
+is_celled=true
+is_add_directly=true
+datum_add_hashes_count=3
+
+# Proof-of-State consensus config
+[dag-pos]
+# Tokens hold and hold_value must be equel size
+# KELT - test token, KEL - main tokem
+tokens_hold=[KELT,KEL]
+# 1000 coins for both
+tokens_hold_value=[1000000000,1000000000]
+# Confirmations minimum
+confirmations_minimum=1
+
+[files]
+storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/plasma
+
diff --git a/python-cellframe b/python-cellframe
index ce2cc96fe..fbb50e65f 160000
--- a/python-cellframe
+++ b/python-cellframe
@@ -1 +1 @@
-Subproject commit ce2cc96fe1b6405dada650bb0a992d58ee305a5e
+Subproject commit fbb50e65fec326cd6ea2b47ebebbe5aad8feba39
-- 
GitLab