From aa63c2ddac0b8b2c5eef68f6de4a23131f24b1ab Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 21 Feb 2025 11:54:55 +0300 Subject: [PATCH 01/80] [*] subs update --- cellframe-sdk | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index f73ae7b90..fa571ca6e 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit f73ae7b909e548de1d3a82c1af481ee2c9f48aeb +Subproject commit fa571ca6ef5bbc8517bbd0fae9f218f2183c304b diff --git a/python-cellframe b/python-cellframe index 69d6c2c93..d03f00009 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 69d6c2c93f1e1d240382051c607a433b7cfa2703 +Subproject commit d03f00009df53eaef24b290ca7d8f67669e0dd50 -- GitLab From 6599e59bc2fa96aa7fa7d18aca00d55682004e4f Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 21 Feb 2025 16:45:57 +0300 Subject: [PATCH 02/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index fa571ca6e..a54879f29 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit fa571ca6ef5bbc8517bbd0fae9f218f2183c304b +Subproject commit a54879f29220043527c2ccb7e840aab5a3128805 -- GitLab From 345312b627a6591954d975db2e8192c900189778 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 21 Feb 2025 17:15:38 +0300 Subject: [PATCH 03/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index a54879f29..f38c60017 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit a54879f29220043527c2ccb7e840aab5a3128805 +Subproject commit f38c60017e97b067c560686e0e7e83fbe7c36bfd -- GitLab From fc09ac115d9c23a2bbb7b999b8da2ce2e7763bf4 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 21 Feb 2025 17:33:20 +0300 Subject: [PATCH 04/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index f38c60017..649af043a 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit f38c60017e97b067c560686e0e7e83fbe7c36bfd +Subproject commit 649af043ac48aa7109ea8da37b95519de994532e -- GitLab From afe43a17eef87b8c063bf5524162aa565d64c6f2 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 24 Feb 2025 08:35:38 +0300 Subject: [PATCH 05/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 649af043a..e2ccdb738 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 649af043ac48aa7109ea8da37b95519de994532e +Subproject commit e2ccdb738bc9374419d4c26091b4a5176b498fd8 -- GitLab From 601f80f48efdbc3ab80af4eb4853b490b3affe03 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 24 Feb 2025 08:41:11 +0300 Subject: [PATCH 06/80] [*] subs update --- python-cellframe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-cellframe b/python-cellframe index d03f00009..5a66e10d8 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit d03f00009df53eaef24b290ca7d8f67669e0dd50 +Subproject commit 5a66e10d8f2ab0e97f8517a95135efc67a699c37 -- GitLab From 1d5cb543c021e516e885a1b67a91e25ffa89f9a8 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 24 Feb 2025 09:02:52 +0300 Subject: [PATCH 07/80] [*] subs update --- cellframe-sdk | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index e2ccdb738..185f4fa0f 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit e2ccdb738bc9374419d4c26091b4a5176b498fd8 +Subproject commit 185f4fa0fa18868880d107143a399f7c027c8c8d diff --git a/python-cellframe b/python-cellframe index 5a66e10d8..83fc973cc 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 5a66e10d8f2ab0e97f8517a95135efc67a699c37 +Subproject commit 83fc973cc251752b1ec6e2366ba079eccaebbcdd -- GitLab From e41b6a4cecc84cd7e1fac072d77498fb8d3f8e42 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 24 Feb 2025 09:46:53 +0300 Subject: [PATCH 08/80] [*] subs update --- cellframe-sdk | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 185f4fa0f..b6d88c782 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 185f4fa0fa18868880d107143a399f7c027c8c8d +Subproject commit b6d88c7827da4587fadb41ad511fc5408e37d0b9 diff --git a/python-cellframe b/python-cellframe index 83fc973cc..b9020e25b 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 83fc973cc251752b1ec6e2366ba079eccaebbcdd +Subproject commit b9020e25bd4d1aa4ef31e2741ed1b38958896d4b -- GitLab From f2fce7ce0af158fb5c3a43db41c094bc62ccae64 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 11 Feb 2025 11:03:24 +0000 Subject: [PATCH 09/80] [*] port --- cellframe-sdk | 2 +- dap-sdk | 2 +- dist/share/configs/network/Backbone.cfg | 3 +++ dist/share/configs/network/KelVPN.cfg | 4 ++++ dist/share/configs/network/mileena.cfg | 4 ++++ dist/share/configs/network/raiden.cfg | 4 ++++ dist/share/configs/network/riemann.cfg | 4 ++++ dist/share/configs/network/subzero.cfg | 4 ++++ sources/cellframe-node.c | 6 ++++++ 9 files changed, 31 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index f73ae7b90..f9b621d5a 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit f73ae7b909e548de1d3a82c1af481ee2c9f48aeb +Subproject commit f9b621d5a7b3e65e4001336c720c2b6cb9394dfa diff --git a/dap-sdk b/dap-sdk index 3491640b7..95c3d684c 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 3491640b76de5715eb3936ccd377abd51d88b99e +Subproject commit 95c3d684c4e46a57c50dcf4c3ec363cf5c76d0b3 diff --git a/dist/share/configs/network/Backbone.cfg b/dist/share/configs/network/Backbone.cfg index fb67e61e3..a6abc54da 100755 --- a/dist/share/configs/network/Backbone.cfg +++ b/dist/share/configs/network/Backbone.cfg @@ -30,3 +30,6 @@ seed_nodes_hosts=[0.root.scorpion.cellframe.net:8079,1.root.scorpion.cellframe.n #collecting_level=10.0 #fee_addr=myaddr +[policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/KelVPN.cfg b/dist/share/configs/network/KelVPN.cfg index 0df743619..6dfa1d53c 100644 --- a/dist/share/configs/network/KelVPN.cfg +++ b/dist/share/configs/network/KelVPN.cfg @@ -25,3 +25,7 @@ seed_nodes_hosts=[0.root.kelvpn.com:8079,1.root.kelvpn.com:8079,2.root.kelvpn.co #blocks-sign-cert=mycert #collecting_level=10.0 #fee_addr=myaddr + +[policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/mileena.cfg b/dist/share/configs/network/mileena.cfg index 0de09143a..e1a6ed547 100755 --- a/dist/share/configs/network/mileena.cfg +++ b/dist/share/configs/network/mileena.cfg @@ -33,3 +33,7 @@ seed_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000 #[block-poa] #blocks-sign-cert=mycert + +[policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/raiden.cfg b/dist/share/configs/network/raiden.cfg index 07bc8d3b0..bfd246ab5 100644 --- a/dist/share/configs/network/raiden.cfg +++ b/dist/share/configs/network/raiden.cfg @@ -34,3 +34,7 @@ seed_nodes_hosts=[0.root.raiden.cellframe.net:8079, 1.root.raiden.cellframe.net: #blocks-sign-cert=mycert #collecting_level=10.0 #fee_addr=myaddr + +[policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/riemann.cfg b/dist/share/configs/network/riemann.cfg index 0264e674c..928d07d20 100644 --- a/dist/share/configs/network/riemann.cfg +++ b/dist/share/configs/network/riemann.cfg @@ -32,3 +32,7 @@ seed_nodes_hosts=[0.root.riemann.cellframe.net:8079, 1.root.riemann.cellframe.ne #blocks-sign-cert=mycert #collecting_level=10.0 #fee_addr=myaddr + +[policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/subzero.cfg b/dist/share/configs/network/subzero.cfg index 298158d71..3ca940f1a 100755 --- a/dist/share/configs/network/subzero.cfg +++ b/dist/share/configs/network/subzero.cfg @@ -32,3 +32,7 @@ seed_nodes_hosts=[0.root.subzero.cellframe.net:8190, 1.root.subzero.cellframe.ne #blocks-sign-cert=mycert #collecting_level=10.0 #fee_addr=myaddr + +[policy] +# activate=1 +# deactivate=[0,1] diff --git a/sources/cellframe-node.c b/sources/cellframe-node.c index 921960e89..4255a192b 100755 --- a/sources/cellframe-node.c +++ b/sources/cellframe-node.c @@ -114,6 +114,7 @@ #include "dap_chain_net_srv_emit_delegate.h" #include "dap_chain_wallet_cache.h" +#include "dap_chain_policy.h" #include "dap_events_socket.h" #include "dap_client.h" @@ -365,6 +366,11 @@ int main( int argc, const char **argv ) return -65; } + if( dap_chain_policy_init() ){ + log_it(L_CRITICAL,"Can't init dap chain policy module"); + return -66; + } + if( dap_chain_wallet_init() ) { log_it(L_CRITICAL,"Can't init dap chain wallet module"); return -61; -- GitLab From f3b644fbbdf01025b12e74f78cea631bbbf71940 Mon Sep 17 00:00:00 2001 From: Dmitry Pyzyrkov <dpuzyrkov@gmail.com> Date: Mon, 24 Feb 2025 18:08:18 +0700 Subject: [PATCH 10/80] [*] sdk up --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index b6d88c782..d12a47537 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit b6d88c7827da4587fadb41ad511fc5408e37d0b9 +Subproject commit d12a475370b8fd8eef3431c92401de3a3ac1ca58 -- GitLab From dd5851dea6b8398bd6680f54adae71cfb65024f8 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 25 Feb 2025 08:10:49 +0300 Subject: [PATCH 11/80] [*] subs update --- cellframe-sdk | 2 +- dap-sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index f9b621d5a..5c9bf8ec9 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit f9b621d5a7b3e65e4001336c720c2b6cb9394dfa +Subproject commit 5c9bf8ec987c746792d98c626727d02be3259db1 diff --git a/dap-sdk b/dap-sdk index 95c3d684c..59c43e0be 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 95c3d684c4e46a57c50dcf4c3ec363cf5c76d0b3 +Subproject commit 59c43e0be868aa09b9d04271899ffee3f1a0182e -- GitLab From 6d3ec0085837082880862facc0e46cebfb0a9655 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 25 Feb 2025 08:41:40 +0300 Subject: [PATCH 12/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 5c9bf8ec9..fb43d9782 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 5c9bf8ec987c746792d98c626727d02be3259db1 +Subproject commit fb43d9782471cc70d198220ad1a3beb786519481 -- GitLab From 47265a9d18ac15af430733045e71ca72c4ae6766 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 25 Feb 2025 10:05:44 +0300 Subject: [PATCH 13/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index b6d88c782..11d69d1e1 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit b6d88c7827da4587fadb41ad511fc5408e37d0b9 +Subproject commit 11d69d1e1b2682ba7e6e004ed78b4dd7070d95a3 -- GitLab From a4d7a238cdee8618a1fa30023d32bcfbc79ea9bd Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 25 Feb 2025 10:07:50 +0300 Subject: [PATCH 14/80] [*] subs update --- python-cellframe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-cellframe b/python-cellframe index b9020e25b..f2856ce81 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit b9020e25bd4d1aa4ef31e2741ed1b38958896d4b +Subproject commit f2856ce819493f0f9c42ec302041017a6d1e5087 -- GitLab From bf94112cc021d46b7dbd46c4d58aa9cf7abd019b Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 25 Feb 2025 13:44:30 +0300 Subject: [PATCH 15/80] [*] subs update --- cellframe-sdk | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 11d69d1e1..764e87103 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 11d69d1e1b2682ba7e6e004ed78b4dd7070d95a3 +Subproject commit 764e87103c834cf21c1d30063f9e3bcbbe47393a diff --git a/python-cellframe b/python-cellframe index f2856ce81..59ebba5d8 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit f2856ce819493f0f9c42ec302041017a6d1e5087 +Subproject commit 59ebba5d840d9cad1a91c89d44eb555ce67400e6 -- GitLab From 0ba0f9fc2b13531980400fe08285a9dc77fc31b6 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 25 Feb 2025 17:04:50 +0300 Subject: [PATCH 16/80] [*] subs update --- cellframe-sdk | 2 +- dap-sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index fb43d9782..ab8c3a281 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit fb43d9782471cc70d198220ad1a3beb786519481 +Subproject commit ab8c3a281dacf44e6a89a83211733be1a2f94a9e diff --git a/dap-sdk b/dap-sdk index 59c43e0be..5e6f70287 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 59c43e0be868aa09b9d04271899ffee3f1a0182e +Subproject commit 5e6f7028754b4788078b528abdfb204b2ca2a7f8 -- GitLab From 3f52556896f4b7e9ad7699f6ecd4b8f227b91ecf Mon Sep 17 00:00:00 2001 From: Pavel Uhanov <pavel.uhanov@demlabs.net> Date: Wed, 26 Feb 2025 07:55:35 +0000 Subject: [PATCH 17/80] [*] subs update --- cellframe-sdk | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 764e87103..f0bea8654 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 764e87103c834cf21c1d30063f9e3bcbbe47393a +Subproject commit f0bea86547fb10bd81c3683f843282824a16f6a1 diff --git a/python-cellframe b/python-cellframe index 59ebba5d8..c43094896 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 59ebba5d840d9cad1a91c89d44eb555ce67400e6 +Subproject commit c430948964c5363e6477eee919b5fb7bd7190a1c -- GitLab From 1f6aa07c02467c408b75c18fece78c37fdd9a877 Mon Sep 17 00:00:00 2001 From: Pavel Uhanov <pavel.uhanov@demlabs.net> Date: Wed, 26 Feb 2025 11:10:48 +0300 Subject: [PATCH 18/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index ab8c3a281..472d83c56 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit ab8c3a281dacf44e6a89a83211733be1a2f94a9e +Subproject commit 472d83c566abdce7d0a2a65ca73215a964be8547 -- GitLab From d17b904887cf84e0c6c7a4f6e84b765118701b55 Mon Sep 17 00:00:00 2001 From: Pavel Uhanov <pavel.uhanov@demlabs.net> Date: Wed, 26 Feb 2025 14:00:49 +0300 Subject: [PATCH 19/80] [*] subs update --- cellframe-sdk | 2 +- dap-sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 472d83c56..fe0083ff5 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 472d83c566abdce7d0a2a65ca73215a964be8547 +Subproject commit fe0083ff58453073f13cafae3ad937dbc8045175 diff --git a/dap-sdk b/dap-sdk index 5e6f70287..57e0a6afa 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 5e6f7028754b4788078b528abdfb204b2ca2a7f8 +Subproject commit 57e0a6afa1ef51685819580818ad4ffb211a7a07 -- GitLab From 6b79966610af1b511bc4ae5c320ab01c226b7e3b Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Thu, 27 Feb 2025 07:34:21 +0300 Subject: [PATCH 20/80] [*] config update --- cellframe-sdk | 2 +- dist/share/configs/network/Backbone.cfg | 2 +- dist/share/configs/network/KelVPN.cfg | 2 +- dist/share/configs/network/mileena.cfg | 2 +- dist/share/configs/network/raiden.cfg | 2 +- dist/share/configs/network/riemann.cfg | 2 +- dist/share/configs/network/subzero.cfg | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index fe0083ff5..ff337079d 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit fe0083ff58453073f13cafae3ad937dbc8045175 +Subproject commit ff337079d404d36401ab83fa400583e8230cf77e diff --git a/dist/share/configs/network/Backbone.cfg b/dist/share/configs/network/Backbone.cfg index a6abc54da..bb8094485 100755 --- a/dist/share/configs/network/Backbone.cfg +++ b/dist/share/configs/network/Backbone.cfg @@ -30,6 +30,6 @@ seed_nodes_hosts=[0.root.scorpion.cellframe.net:8079,1.root.scorpion.cellframe.n #collecting_level=10.0 #fee_addr=myaddr -[policy] +# [policy] # activate=1 # deactivate=[0,1] diff --git a/dist/share/configs/network/KelVPN.cfg b/dist/share/configs/network/KelVPN.cfg index 6dfa1d53c..6063a0fb7 100644 --- a/dist/share/configs/network/KelVPN.cfg +++ b/dist/share/configs/network/KelVPN.cfg @@ -26,6 +26,6 @@ seed_nodes_hosts=[0.root.kelvpn.com:8079,1.root.kelvpn.com:8079,2.root.kelvpn.co #collecting_level=10.0 #fee_addr=myaddr -[policy] +# [policy] # activate=1 # deactivate=[0,1] diff --git a/dist/share/configs/network/mileena.cfg b/dist/share/configs/network/mileena.cfg index e1a6ed547..8dc101fbc 100755 --- a/dist/share/configs/network/mileena.cfg +++ b/dist/share/configs/network/mileena.cfg @@ -34,6 +34,6 @@ seed_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000 #[block-poa] #blocks-sign-cert=mycert -[policy] +# [policy] # activate=1 # deactivate=[0,1] diff --git a/dist/share/configs/network/raiden.cfg b/dist/share/configs/network/raiden.cfg index bfd246ab5..0aa8df938 100644 --- a/dist/share/configs/network/raiden.cfg +++ b/dist/share/configs/network/raiden.cfg @@ -35,6 +35,6 @@ seed_nodes_hosts=[0.root.raiden.cellframe.net:8079, 1.root.raiden.cellframe.net: #collecting_level=10.0 #fee_addr=myaddr -[policy] +# [policy] # activate=1 # deactivate=[0,1] diff --git a/dist/share/configs/network/riemann.cfg b/dist/share/configs/network/riemann.cfg index 928d07d20..8c437d313 100644 --- a/dist/share/configs/network/riemann.cfg +++ b/dist/share/configs/network/riemann.cfg @@ -33,6 +33,6 @@ seed_nodes_hosts=[0.root.riemann.cellframe.net:8079, 1.root.riemann.cellframe.ne #collecting_level=10.0 #fee_addr=myaddr -[policy] +# [policy] # activate=1 # deactivate=[0,1] diff --git a/dist/share/configs/network/subzero.cfg b/dist/share/configs/network/subzero.cfg index 3ca940f1a..c8fe9e2c9 100755 --- a/dist/share/configs/network/subzero.cfg +++ b/dist/share/configs/network/subzero.cfg @@ -33,6 +33,6 @@ seed_nodes_hosts=[0.root.subzero.cellframe.net:8190, 1.root.subzero.cellframe.ne #collecting_level=10.0 #fee_addr=myaddr -[policy] +# [policy] # activate=1 # deactivate=[0,1] -- GitLab From 30f43fc419f40787f24b86b66270623c17ebf366 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Thu, 27 Feb 2025 07:45:43 +0300 Subject: [PATCH 21/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index ff337079d..a76ad7fee 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit ff337079d404d36401ab83fa400583e8230cf77e +Subproject commit a76ad7fee642cfefe8cd974bb82b9a8dcbb83c19 -- GitLab From 1db6729a028e9cc3f4f980ecd4dba0807f79b5e7 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Thu, 27 Feb 2025 08:18:01 +0300 Subject: [PATCH 22/80] [*] to pipe --- dist/share/configs/cellframe-node.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/share/configs/cellframe-node.cfg b/dist/share/configs/cellframe-node.cfg index 6de665769..0a0fe0fd2 100644 --- a/dist/share/configs/cellframe-node.cfg +++ b/dist/share/configs/cellframe-node.cfg @@ -188,7 +188,7 @@ driver= #pgsql conninfo array # pg_conninfo=[dbname=postgres] -# Plugins +# Plugins [plugins] enabled=true # Load Python-based plugins -- GitLab From 8b585590166dc75679673f5c0b90f9ed446650e1 Mon Sep 17 00:00:00 2001 From: Dmitry Puzyrkov <dmitry.puzyrkov@demlabs.net> Date: Thu, 27 Feb 2025 05:25:57 +0000 Subject: [PATCH 23/80] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cea2a824e..c7fb2a054 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_UPDATE_FLAGS: --force + workflow: rules: -- GitLab From 4dbf73af78dec8594bd866b26607b00491a8c26f Mon Sep 17 00:00:00 2001 From: Dmitry Puzyrkov <dmitry.puzyrkov@demlabs.net> Date: Thu, 27 Feb 2025 05:35:57 +0000 Subject: [PATCH 24/80] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7fb2a054..34f924a81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,7 @@ stages: allow_failure: true .fill_version_mk: &fill_version_mk - - PATCH_NUM_VAR_NAME=$(echo "${CI_COMMIT_REF_SLUG}" | tr "-" _)_PATCH_NUM + - PATCH_NUM_VAR_NAME=P_$(echo "${CI_COMMIT_REF_SLUG}" | tr "-" _)_PATCH_NUM - echo ${PATCH_NUM_VAR_NAME} - 'PATCH_NUM=$(curl -s --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/variables/${PATCH_NUM_VAR_NAME}" | jq -r ".value // empty")' - echo "Gitlab var patch number for ${PATCH_NUM_VAR_NAME} is ${PATCH_NUM}." -- GitLab From 6b0c8484bfddcbb6f7d0ca9f39c00ac763dac9c8 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Thu, 27 Feb 2025 12:28:32 +0300 Subject: [PATCH 25/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index a76ad7fee..6fac4b1ea 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit a76ad7fee642cfefe8cd974bb82b9a8dcbb83c19 +Subproject commit 6fac4b1eac2a1c99bda9ae4dfd76437b85f0e124 -- GitLab From acdaf0aa3a6102830787e5c7bdf9ad8bfb050612 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 28 Feb 2025 06:14:59 +0300 Subject: [PATCH 26/80] [*] subs update --- cellframe-sdk | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index f0bea8654..80ba2bae8 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit f0bea86547fb10bd81c3683f843282824a16f6a1 +Subproject commit 80ba2bae807dd9263ee449574defd453b00c5494 diff --git a/python-cellframe b/python-cellframe index c43094896..e7e2d6ba0 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit c430948964c5363e6477eee919b5fb7bd7190a1c +Subproject commit e7e2d6ba063b5f28752488bdf9680713f9d5c25f -- GitLab From 01a69bf9cdfb046581523403c9f5c2d4520f4a49 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 28 Feb 2025 08:32:40 +0300 Subject: [PATCH 27/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 6fac4b1ea..c9f6c790a 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 6fac4b1eac2a1c99bda9ae4dfd76437b85f0e124 +Subproject commit c9f6c790a421c5405fe52e43d87f4c723e64f585 -- GitLab From 27d08f5bcb133edf8867e727d2651ddb7a845399 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 28 Feb 2025 09:35:22 +0300 Subject: [PATCH 28/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 80ba2bae8..0f2446213 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 80ba2bae807dd9263ee449574defd453b00c5494 +Subproject commit 0f24462136e52cb6ed566e3f5bc5e4c9399e4f6e -- GitLab From 2ed69f3affd1f87db1845cf7f6ad34b630924e21 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 28 Feb 2025 09:36:45 +0300 Subject: [PATCH 29/80] [*] subs update --- python-cellframe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-cellframe b/python-cellframe index e7e2d6ba0..91cbfb22e 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit e7e2d6ba063b5f28752488bdf9680713f9d5c25f +Subproject commit 91cbfb22e977c102af14e08d69e084bbf942148a -- GitLab From 1e15cd210f89ebadd8a60ca782822558ef321aa0 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 4 Mar 2025 08:58:13 +0300 Subject: [PATCH 30/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index c9f6c790a..69944afa8 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit c9f6c790a421c5405fe52e43d87f4c723e64f585 +Subproject commit 69944afa89fbffce1474069ebc6dde828c39e30e -- GitLab From dfbaf79f1afcea46824b5f45057082c4cf6a470d Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Tue, 4 Mar 2025 15:53:31 +0700 Subject: [PATCH 31/80] [+] Non-native token voting --- cellframe-sdk | 2 +- prod_build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 6eb379dd9..680aaeeb2 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 6eb379dd9da15c4192deb41df681cd4f1bf1984f +Subproject commit 680aaeeb264c584be8f389934fb936900398eb3d diff --git a/prod_build b/prod_build index 2abae853b..18a73adca 160000 --- a/prod_build +++ b/prod_build @@ -1 +1 @@ -Subproject commit 2abae853b1e1e097154c411fa191816883b58249 +Subproject commit 18a73adcaeeafe2c75dc82b71c698ccdbada7116 -- GitLab From 5abb0cbec1e8f1ee9c1071116b70d02b33b76a50 Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Tue, 4 Mar 2025 16:10:49 +0700 Subject: [PATCH 32/80] [-] Debug code --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 680aaeeb2..4e9419467 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 680aaeeb264c584be8f389934fb936900398eb3d +Subproject commit 4e94194671c71d524645cf9b67b87842a455705b -- GitLab From fe33c55a041a9e324b277be063838e32b80521e5 Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Tue, 4 Mar 2025 16:16:02 +0700 Subject: [PATCH 33/80] [*] Sub update --- python-cellframe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-cellframe b/python-cellframe index 54f405e91..429359f23 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 54f405e91a7464f51dd40c3fe2209db37714e5d5 +Subproject commit 429359f230ec02fc365ce473dcf375b8ba499eff -- GitLab From 39d1a3c9b9355d3696b3c40ba0f74665e6e5fca9 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Tue, 4 Mar 2025 11:01:24 +0000 Subject: [PATCH 34/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 69944afa8..4664ebda1 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 69944afa89fbffce1474069ebc6dde828c39e30e +Subproject commit 4664ebda1ef990b3701084816d37867c860d7f59 -- GitLab From 80d290c1ca0b922ee51ec9dda50d7695d57a2f74 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Wed, 5 Mar 2025 04:30:25 +0000 Subject: [PATCH 35/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 4664ebda1..bfd2731ec 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 4664ebda1ef990b3701084816d37867c860d7f59 +Subproject commit bfd2731ec8335dfe256f16f30419cf115f30af2c -- GitLab From c5e22274db6f1e5f39e8191baa775452f1de68af Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Wed, 5 Mar 2025 13:42:45 +0700 Subject: [PATCH 36/80] [*] Cond out list compound fix --- cellframe-sdk | 2 +- dap-sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 4e9419467..ee46625e3 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 4e94194671c71d524645cf9b67b87842a455705b +Subproject commit ee46625e37570f59ba4c26202a78332d45be63be diff --git a/dap-sdk b/dap-sdk index 3491640b7..a7b6da64e 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 3491640b76de5715eb3936ccd377abd51d88b99e +Subproject commit a7b6da64ee24a3aba64dcbbd5f3f356069d853ad -- GitLab From f46ba377774cd2158bdb02f2e1076d969709da5d Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Wed, 5 Mar 2025 14:08:06 +0700 Subject: [PATCH 37/80] [+] Owner wallet address for delegation txs --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index ee46625e3..bdccd2ffe 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit ee46625e37570f59ba4c26202a78332d45be63be +Subproject commit bdccd2ffe867f59a5d72a34c50cab225353788e5 -- GitLab From 1423d628964f0a6ef42ae5bcbf525441673a645f Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Wed, 5 Mar 2025 14:20:45 +0700 Subject: [PATCH 38/80] [*] Onwage definition fix for delegation txs --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index bdccd2ffe..d8a622c72 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit bdccd2ffe867f59a5d72a34c50cab225353788e5 +Subproject commit d8a622c72189648642480fc2b64c2ccc2f9e6a18 -- GitLab From 807634b6d144b43e793efdcb354fd9928f657915 Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Wed, 5 Mar 2025 15:21:04 +0700 Subject: [PATCH 39/80] [-] Debug code --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index d8a622c72..07a967211 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit d8a622c72189648642480fc2b64c2ccc2f9e6a18 +Subproject commit 07a967211d7cc2812597629333c114fd513ce8d5 -- GitLab From 1c158df4f3a6414a458eac753a69a69f23c0ca24 Mon Sep 17 00:00:00 2001 From: "nikolay.panko" <nikolay.panko@demlabs.net> Date: Thu, 6 Mar 2025 15:35:36 +0700 Subject: [PATCH 40/80] [*] change link in updtr.sh ; gitlab pipe add manual job for updater build --- .gitlab-ci.yml | 2 ++ dist.linux/share/update.sh | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c364c615d..c658e57d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,4 @@ + variables: GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_UPDATE_FLAGS: --force @@ -343,3 +344,4 @@ version:up: - 'curl -s --request PUT --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/variables/$PATCH_NUM_VAR_NAME" --form "key=$PATCH_NUM_VAR_NAME" --form "value=${PATCH_NUM}" || true' + \ No newline at end of file diff --git a/dist.linux/share/update.sh b/dist.linux/share/update.sh index e15f4fe87..d772cc20e 100755 --- a/dist.linux/share/update.sh +++ b/dist.linux/share/update.sh @@ -1,6 +1,7 @@ - #! /bin/bash +#! /bin/bash set -e -STORAGE_URL=https://pub.cellframe.net/linux/cellframe-node/master/updates +#STORAGE_URL=https://pub.cellframe.net/linux/cellframe-node/master/updates +STORAGE_URL=https://internal-pub.cellframe.net/linux/cellframe-node/bugfix-13205 MACHINE=$(uname -m) @@ -45,13 +46,22 @@ CURRENT_REBUILD=$(echo $INSTALLED_VERSION | grep -Po "[0-9]([0-9]+)") echo "Available patch: $MAX_REBUILD | Current patch: $CURRENT_REBUILD" if (( MAX_REBUILD > CURRENT_REBUILD )); then - echo "Need update cellframe-node to 5.2-$MAX_REBUILD..." + # Determine the full version (e.g. 5.3-354) from AVAILABLE_VERSIONS by the patch we found + for ver in "${AVAILABLE_VERSIONS[@]}" + do + patch=$(echo $ver | cut -d'-' -f2) + if [ "$patch" = "$MAX_REBUILD" ]; then + NEW_VERSION=$ver + break + fi + done + echo "Need update cellframe-node to $NEW_VERSION..." else echo "No need to update cellframe-node" exit 0 fi -PACKAGE_NAME="cellframe-node-5.2-$MAX_REBUILD-updtr-amd64.deb" +PACKAGE_NAME="cellframe-node-$NEW_VERSION-updtr-${POSTFIX}.deb" echo "wget" mkdir -p /tmp/cfupd/ wget $STORAGE_URL/$PACKAGE_NAME -O /tmp/cfupd/$PACKAGE_NAME @@ -73,4 +83,4 @@ fi dpkg -i /tmp/cfupd/$PACKAGE_NAME -service cellframe-node restart \ No newline at end of file +service cellframe-node restart -- GitLab From a8def760e4272af5a679801f12eb2e46e411da44 Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Wed, 5 Mar 2025 15:21:04 +0700 Subject: [PATCH 41/80] [+] Printing unspent OUT_CONDs for wallet --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index d8a622c72..07a967211 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit d8a622c72189648642480fc2b64c2ccc2f9e6a18 +Subproject commit 07a967211d7cc2812597629333c114fd513ce8d5 -- GitLab From 789affb3cd079e5d67b9309ed67b62814d1109c6 Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Thu, 6 Mar 2025 17:17:52 +0700 Subject: [PATCH 42/80] [*] Sub update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 07a967211..d9ac93979 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 07a967211d7cc2812597629333c114fd513ce8d5 +Subproject commit d9ac93979d88c7145f1dac3ce136fee67a6fb666 -- GitLab From f57191c379d596636dbc4503e0b6990f169bbe9e Mon Sep 17 00:00:00 2001 From: "nikolay.panko" <nikolay.panko@demlabs.net> Date: Thu, 6 Mar 2025 17:57:43 +0700 Subject: [PATCH 43/80] [*] added to pipeline manual start updtr build --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c658e57d9..ce8e2ab88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,3 @@ - variables: GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_UPDATE_FLAGS: --force @@ -261,9 +260,14 @@ amd64:linux.tps: - ./prod_build/pack.sh --target linux release - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*.deb -.amd64:linux.updtr: +amd64:linux.updtr: extends: .build + stage: build image: demlabs/debian/amd64:qt5 + rules: + - when: manual + allow_failure: true + before_script: - /opt/buildtools/prepare_environment.sh amd64-linux - *fill_version_mk @@ -344,4 +348,3 @@ version:up: - 'curl -s --request PUT --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/variables/$PATCH_NUM_VAR_NAME" --form "key=$PATCH_NUM_VAR_NAME" --form "value=${PATCH_NUM}" || true' - \ No newline at end of file -- GitLab From 43db610d9dab8f5234a9e65f24ebbc3e69fda597 Mon Sep 17 00:00:00 2001 From: "nikolay.panko" <nikolay.panko@demlabs.net> Date: Thu, 6 Mar 2025 18:38:35 +0700 Subject: [PATCH 44/80] [*] sourse link in update.sh to master --- dist.linux/share/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist.linux/share/update.sh b/dist.linux/share/update.sh index d772cc20e..43710d300 100755 --- a/dist.linux/share/update.sh +++ b/dist.linux/share/update.sh @@ -1,7 +1,7 @@ #! /bin/bash set -e -#STORAGE_URL=https://pub.cellframe.net/linux/cellframe-node/master/updates -STORAGE_URL=https://internal-pub.cellframe.net/linux/cellframe-node/bugfix-13205 +STORAGE_URL=https://pub.cellframe.net/linux/cellframe-node/master + MACHINE=$(uname -m) -- GitLab From 2c85dc2eac51073027dfc7b7600a8732b23b753a Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Fri, 7 Mar 2025 14:14:29 +0700 Subject: [PATCH 45/80] [*] History assertion fix --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index d9ac93979..4a754aa1d 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit d9ac93979d88c7145f1dac3ce136fee67a6fb666 +Subproject commit 4a754aa1de646b23e0bdf3d37fec0a9b5f96d918 -- GitLab From 5b76e7cfeb5c64ee4b094f2d096983b4914bf505 Mon Sep 17 00:00:00 2001 From: Roman Khlopkov <roman.khlopkov@demlabs.net> Date: Fri, 7 Mar 2025 18:15:46 +0700 Subject: [PATCH 46/80] [*] HAL update for BB & riemann --- cellframe-sdk | 2 +- .../Backbone/chain-0.cfg.d/ledger_hal.cfg | 12 ++++++- .../network/riemann/main.cfg.d/ledger_hal.cfg | 34 ++++++++++++++++++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 4a754aa1d..730a53de6 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 4a754aa1de646b23e0bdf3d37fec0a9b5f96d918 +Subproject commit 730a53de647f429e3a4996734308297dd6337b69 diff --git a/dist/etc/network/Backbone/chain-0.cfg.d/ledger_hal.cfg b/dist/etc/network/Backbone/chain-0.cfg.d/ledger_hal.cfg index 65dad9477..877c9a19e 100644 --- a/dist/etc/network/Backbone/chain-0.cfg.d/ledger_hal.cfg +++ b/dist/etc/network/Backbone/chain-0.cfg.d/ledger_hal.cfg @@ -610,5 +610,15 @@ hard_accept_list=[0xED2CDC9BBE884E2C6A3D974F2191D204326D177C1B24E811D576E1C12174 0x37C5940801A5D655B4853CCCB26E100862BB2D4E07CE9FEA9DA04E3EDDB514DB, 0xB166BA0A7242E629C7437B4E9EED7488CAA85EF49E7238F599B8A40FB6D62527, 0x17DF1A96A36B95721BB7D47899B3DF0626D6993B9D31B2F4888760A02D8AA499, -0x6F537559DD59A8EA933A4A5DA76F221FB477F90556531B892824F0100E99AA56] +0x6F537559DD59A8EA933A4A5DA76F221FB477F90556531B892824F0100E99AA56, +0x92B1D7EAA7492FB204428CA63674811FA78F68F7E6DE05442D09CFA50B23843A, +0x8B66EA93472F6F8027974A9EC071CB5FD9637357B8D231B250E75D73F955F2B8, +0x9918EA7ACBB7502BC8CB239E313AF3F5FCA322AE2169DDCCE18D0CE76F09F001, +0xA2116DA12B29381B92D107350C9AA2CABA079007869ACA0D44055C21F3FC1530, +0x9344549FA0ACEF099171F7AFDFCE64A21E1BBDAC715B1BEF0AA9F561905B6433, +0x4348C6725D2FFDDDF0AD7661E351AFAEB28D020E6B2B93865A77C05639AE7223, +0xF5C5D99561A3511B902F0B92CF249ED2E69F86BE012B96EDAE1D678D5FCC8181, +0x0D2D19E4AE26AE233B7D7BEC564D96B642513FAB5C28464136334917DD87196B, +0x80B3F7E19A2032229C0AB6E36F9136A49BBAD7DD6EADDF3CC14657425E1403A7 +] diff --git a/dist/etc/network/riemann/main.cfg.d/ledger_hal.cfg b/dist/etc/network/riemann/main.cfg.d/ledger_hal.cfg index 849b6aecf..f7243d359 100644 --- a/dist/etc/network/riemann/main.cfg.d/ledger_hal.cfg +++ b/dist/etc/network/riemann/main.cfg.d/ledger_hal.cfg @@ -1,2 +1,34 @@ [ledger] -hard_accept_list = [ 0x794D1B0237E34BC06E957B1BAFE324F53EAF34E58943836E7C61A95676C9EEF8 ] +hard_accept_list = [ 0x794D1B0237E34BC06E957B1BAFE324F53EAF34E58943836E7C61A95676C9EEF8, +0xC5B7F025AE8B095FE0A63EA4F7BB561F1E050218EA1D19CFBAFA253922F4D4A5, +0xEBC69982445C285F79335A7FA9AD3A0311EB9A1BB77C18498D04BB317CD743B1, +0xF143D54AAF4741E7ADA26EAA5FBCC9B8CFDA1BC77CB6C247AF919D6E334CB055, +0x70D12C7A09861EB7A6825C47CE36E1CEA779C8F5A68C5AC31ECD7135941515B9, +0x76F1AEA4051E8F3E5B6E43E9CD793A410F0C0AE0AFF1ACE5A5647231FB52C397, +0x4B17E462A0A884DB47153C5F5822C5E832363A1C2B2340B0E30E230962DD5AAC, +0x2A181A1CBF7CEC347ED9251D4342C17A0FBF0055A158ADF2D5D3986888A9CD74, +0x91A46F7FB257FE752C9BCE5E24998F7971CE0F23A710AFB8F45D5284D9184039, +0x5D1548A8A88837834DED81DD2CB3582F608A9DF222189A258F1D48CC74CABADD, +0x2895F08C71AA0A2B90030C640064F027AA7D5901752A923D3F1EA6115A196535, +0x5D3986C201846CA9A31D7B919410293DD0E0B683F611428D552647EE681FC4E2, +0x4DF16A35BCEB1F590B9468B7B904CDAB77BCEE119CA744AB34E9CC870EAB8EDD, +0x61112BFA0F05930429AD3183A28F5134E204B2518038060E4DB91829268F9DE0, +0x716088FD76E9B3BF0E78E36AE44474A4C17B3FB4AD0762BE367D1E8E9217F48B, +0xCD12004FEB8551E3CB9DDCBD1BF1648F0F5389CECADFC77909408C1A8E937FCA, +0x9A9377E0B6990A32681B978307F6FAAA9FB4586A8CDE25EFA203D1E7D0CFAA35, +0xFA765FE27DD83BD0E5800E1468CB8C56E3C07F38BAD3E8111FB581F9C2D2D48F, +0xD55EB0E8B948BD85FF1F46C26EAA9CD24538A425E7A123817A0A9D6BE64B4211, +0x6269C2ACD3D499477C67D97E8976BD80E0CDD930840B7A447EDB8E6F9BB99956, +0x077BC808059E31F38F5C3E3E3D3F7B6FD5B40405488C27B28AD9CF684BE086B2, +0x77075B15C5DC20A2E9CA0AB3C7FAD69608B487BD724531BCE6044ED86DB8C6B1, +0x9FEC4CE00BC3228A511CEF606240EBF8BD06F11B2F94F13ED9F8A1812E3EDA7D, +0xE57866E969A118BFA6F896AF4261EB8DC7FFB28FEBC94C39E7B82A2CDDFE5A62, +0x08CA316B9AB2998F0BF36B86E689BB57DB4E72006CBBE377C7E4AF1284990A8C, +0xDC1B3FB847209F0692537404EF74966235462799EF0623CFE9F93E123A838435, +0x7BE1C24AF225CF02A953B60CCB35F5FA990D46F7F942297C297467FC5195BAEF, +0x365C0B7C36D75E518DFDF30D677B47B2E7DE7D5496AC70D47CFA14D456E9D604, +0xF0C9191B847A07C16F6DB231A1E3272F01FE74A6D7244871F35E244E30ED04C7, +0xC5AB6B89D6277925F603E25EBCCA0F0DA91B03FA49475F4EAA07A59B55CB5D28, +0x4D13C6B9C4F9FDA4CC5509975C243E1E375B52DB0E38DD80E871C6D114987113, +0xEB8862ADA8E9ABDCE4D28A1299889896270F663D863E7108F4974470223AA0BB +] -- GitLab From db454520fb81f1a64f277b608378f71141180b85 Mon Sep 17 00:00:00 2001 From: Dmitry Pyzyrkov <dpuzyrkov@gmail.com> Date: Sun, 9 Mar 2025 23:57:15 +0700 Subject: [PATCH 47/80] [+] macos python localbuild + forknotifier for python --- CMakeLists.txt | 42 ++++++++++++++++++++++++++++++++++++---- dist/share/default.setup | 2 +- python-cellframe | 2 +- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d1fa7294..75c867615 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_ENABLE_EXPORTS ON) set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_C_STANDARD 11) - + # Predefine project SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") ReadVariables(version.mk) @@ -304,6 +304,15 @@ if(UNIX AND NOT WIN32) add_definitions("-DPYTHON_VERSION=\"python3.10\"") endif() + if (DARWIN) + if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm") + set(PYTHON_URL "https://pub.cellframe.net/3rdparty/python/cpython-3.10.16+20250212-aarch64-apple-darwin-install_only.tar.gz") + else () + set(PYTHON_URL "https://pub.cellframe.net/3rdparty/python/cpython-3.10.16%2B20250205-x86_64-apple-darwin-install_only.tar.gz") + endif() + add_definitions("-DPYTHON_VERSION=\"python3.10\"") + endif() + message("[+] Build with python environment") message(" Downloading static prebuild cpython ${PYTHON_URL}") #this python was build by compiling and installing static python distrip to /opt/cellframe-node/ and @@ -327,9 +336,9 @@ if(UNIX AND NOT WIN32) list(APPEND CMAKE_PREFIX_PATH ${cpythonstatic_SOURCE_DIR}) if ( CPACK_DEBIAN_PACKAGE_ARCHITECTURE MATCHES "arm") - find_package(Python EXACT 3.11 COMPONENTS Interpreter Development REQUIRED) + find_package(Python EXACT 3.11 COMPONENTS Development REQUIRED) else() - find_package(Python EXACT 3.10 COMPONENTS Interpreter Development REQUIRED) + find_package(Python EXACT 3.10 COMPONENTS Development REQUIRED) endif() target_link_options(${NODE_TARGET} PUBLIC "-Wl,-rpath,${CMAKE_INSTALL_PREFIX}/python/lib/") @@ -359,8 +368,15 @@ if(UNIX AND NOT WIN32) include_directories(${Python_INCLUDE_DIRS} include/) add_subdirectory(python-cellframe) - + #this helps + #install_name_tool -change /install/lib/libpython3.10.dylib @executable_path/../../python/lib/libpython3.10.dylib ./build_osx_rwd/dist/Applications/CellframeNode.app/Contents/MacOS/cellframe-node list(APPEND NODE_LIBRARIES dap_plugins_python ${Python_LIBRARIES}) + if (DARWIN) + add_custom_command(TARGET ${NODE_TARGET} + POST_BUILD COMMAND + ${CMAKE_INSTALL_NAME_TOOL} -change /install/lib/libpython3.10.dylib @executable_path/../Frameworks/python/lib/libpython3.10.dylib + ${NODE_TARGET}) + endif() endif() if(ANDROID ) @@ -394,6 +410,24 @@ if(DARWIN) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/os/macos/com.demlabs.cellframe-diagtool.plist DESTINATION ${SHAREDIR} ) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/os/macos/Info.plist DESTINATION ${CONTENTSDIR} ) + set(PYTHON_PIP "${cpythonstatic_SOURCE_DIR}/bin/pip3") + set(PYTHON_BIN "${cpythonstatic_SOURCE_DIR}/bin/python3.10") + set(PYTHON_LIB "${cpythonstatic_SOURCE_DIR}/lib/libpython3.10.dylib") + set(PYTHON_LIB_DIR "${cpythonstatic_SOURCE_DIR}/lib/python3.10") + set(PYTHON_LIB_DIR_PRFX "python3.10") + + INSTALL(FILES ${PYTHON_PIP} DESTINATION ${RLIBDIR}/python/bin/ ) + INSTALL(FILES ${PYTHON_BIN} DESTINATION ${RLIBDIR}/python/bin/ ) + INSTALL(FILES ${PYTHON_LIB} DESTINATION ${RLIBDIR}/python/lib/ ) + + INSTALL(DIRECTORY ${PYTHON_LIB_DIR} DESTINATION ${RLIBDIR}/python/lib/ USE_SOURCE_PERMISSIONS) + + #install python-modules + INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycfhelpers DESTINATION ${RLIBDIR}/python/lib/${PYTHON_LIB_DIR_PRFX}/site-packages USE_SOURCE_PERMISSIONS) + INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycftools DESTINATION ${RLIBDIR}/python/lib/${PYTHON_LIB_DIR_PRFX}/site-packages USE_SOURCE_PERMISSIONS) + INSTALL(DIRECTORY python-cellframe/dists/interfaces DESTINATION ${RLIBDIR}/python/lib/ USE_SOURCE_PERMISSIONS) + + else() INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*") diff --git a/dist/share/default.setup b/dist/share/default.setup index dd929b4c1..2d38560c8 100644 --- a/dist/share/default.setup +++ b/dist/share/default.setup @@ -90,7 +90,7 @@ if Linux != ${HOST_OS} config cellframe-node plugins enabled ensure false endif -config cellframe-node plugins py_path ensure ${CONFIGS_PATH}/var/lib/plugins +config cellframe-node plugins py_path ensure ../var/lib/plugins config Backbone general node-role default full config KelVPN general node-role default full diff --git a/python-cellframe b/python-cellframe index 91cbfb22e..13b54a82f 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 91cbfb22e977c102af14e08d69e084bbf942148a +Subproject commit 13b54a82f6586bba8fb5e1febd21c7977ad32bdb -- GitLab From dec671ea55417592cbc9a8f298a199595fd1c328 Mon Sep 17 00:00:00 2001 From: Dmitry Pyzyrkov <dpuzyrkov@gmail.com> Date: Mon, 10 Mar 2025 11:11:52 +0700 Subject: [PATCH 48/80] ... --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75c867615..5e268198f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -410,6 +410,7 @@ if(DARWIN) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/os/macos/com.demlabs.cellframe-diagtool.plist DESTINATION ${SHAREDIR} ) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/os/macos/Info.plist DESTINATION ${CONTENTSDIR} ) + if (BUILD_WITH_PYTHON_ENV) set(PYTHON_PIP "${cpythonstatic_SOURCE_DIR}/bin/pip3") set(PYTHON_BIN "${cpythonstatic_SOURCE_DIR}/bin/python3.10") set(PYTHON_LIB "${cpythonstatic_SOURCE_DIR}/lib/libpython3.10.dylib") @@ -426,7 +427,7 @@ if(DARWIN) INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycfhelpers DESTINATION ${RLIBDIR}/python/lib/${PYTHON_LIB_DIR_PRFX}/site-packages USE_SOURCE_PERMISSIONS) INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycftools DESTINATION ${RLIBDIR}/python/lib/${PYTHON_LIB_DIR_PRFX}/site-packages USE_SOURCE_PERMISSIONS) INSTALL(DIRECTORY python-cellframe/dists/interfaces DESTINATION ${RLIBDIR}/python/lib/ USE_SOURCE_PERMISSIONS) - + endif() else() -- GitLab From dbb7f5bcd204a8b78b1e173f0b2e99ea2458d2e9 Mon Sep 17 00:00:00 2001 From: "nikolay.panko" <nikolay.panko@demlabs.net> Date: Mon, 10 Mar 2025 13:51:26 +0700 Subject: [PATCH 49/80] [-] Removed extra slashes in paths --- conftool/main.cpp | 6 +++--- dist/share/default.setup | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conftool/main.cpp b/conftool/main.cpp index 6e56531bc..1d5c098c4 100644 --- a/conftool/main.cpp +++ b/conftool/main.cpp @@ -114,11 +114,11 @@ std::string getNodeConfigPath(std::string basepath){ #endif #ifdef __linux__ - return "/opt/cellframe-node/"; + return "/opt/cellframe-node"; #endif #ifdef __APPLE__ - return "/Library/Application Support/CellframeNode/"; + return "/Library/Application Support/CellframeNode"; #endif @@ -130,7 +130,7 @@ std::string getNodeConfigPath(std::string basepath){ std::wstring path; GetStringRegKey(hKey, L"Common Documents", path, L""); std::string stdpath(path.begin(),path.end()); - return (std::filesystem::path{stdpath}/"cellframe-node/").string(); + return (std::filesystem::path{stdpath}/"cellframe-node").string(); #endif } diff --git a/dist/share/default.setup b/dist/share/default.setup index dd929b4c1..546d47675 100644 --- a/dist/share/default.setup +++ b/dist/share/default.setup @@ -7,7 +7,7 @@ # Predefined variables: # ${HOST_OS} -> Linux | Windows | Macos # ${HOSTNAME} -> hostname of a machine -# ${CONFIGS_PATH} -> /opt/cellframe-node/ for linux, +# ${CONFIGS_PATH} -> /opt/cellframe-node for linux, # Common Documents (usually C:\Users\Public\Documents\cellframe-node\) for Windows # # fromtemplate: create and populate config from "share/configs" templates -- GitLab From 9b05fbca4eb88f75366c40cdfc3afccdce957da3 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 10 Mar 2025 12:42:01 +0300 Subject: [PATCH 50/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 0f2446213..147aea17c 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 0f24462136e52cb6ed566e3f5bc5e4c9399e4f6e +Subproject commit 147aea17ce9b3637f17857d31e1adced82ce9965 -- GitLab From 902e9638aaa5be5f293de795b909bddc13caef40 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 10 Mar 2025 13:21:08 +0300 Subject: [PATCH 51/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 69944afa8..bfd2731ec 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 69944afa89fbffce1474069ebc6dde828c39e30e +Subproject commit bfd2731ec8335dfe256f16f30419cf115f30af2c -- GitLab From 6c6849bf06b9c119f54b1e0046450a282a471e89 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 10 Mar 2025 12:15:29 +0000 Subject: [PATCH 52/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index bfd2731ec..e3d11c838 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit bfd2731ec8335dfe256f16f30419cf115f30af2c +Subproject commit e3d11c83883e3cb114903e735d995eb99d660d5e -- GitLab From 5e75a94e5ad5d70467b24fd3c3d66be858080c5a Mon Sep 17 00:00:00 2001 From: Dmitry Pyzyrkov <dpuzyrkov@gmail.com> Date: Mon, 10 Mar 2025 19:30:13 +0700 Subject: [PATCH 53/80] [*] subs up --- cellframe-sdk | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 0f2446213..2238c4df5 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 0f24462136e52cb6ed566e3f5bc5e4c9399e4f6e +Subproject commit 2238c4df5c652e963011d82cf9e25c1fe582aea4 diff --git a/python-cellframe b/python-cellframe index 13b54a82f..df810e9cd 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 13b54a82f6586bba8fb5e1febd21c7977ad32bdb +Subproject commit df810e9cd9730a5b328468c15631e138baa29fbf -- GitLab From 55244fd3c6cbeb50c7d30f482a6a6aa008a66b2b Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 10 Mar 2025 12:42:37 +0000 Subject: [PATCH 54/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index e3d11c838..0c4eb0ff9 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit e3d11c83883e3cb114903e735d995eb99d660d5e +Subproject commit 0c4eb0ff93b87dfcab9c190de2a6977a745b8ae3 -- GitLab From ca485d9edab986d3c678f46a74699d07c5f27350 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 10 Mar 2025 15:36:04 +0000 Subject: [PATCH 55/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 2238c4df5..4c59bc050 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 2238c4df5c652e963011d82cf9e25c1fe582aea4 +Subproject commit 4c59bc050624bf001b0d4b775c31e22a1ec5dd69 -- GitLab From 54b1b9b57faf93ab2da996e441ccfbcab6f64d7d Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Mon, 10 Mar 2025 16:28:16 +0000 Subject: [PATCH 56/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 4c59bc050..547284fe2 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 4c59bc050624bf001b0d4b775c31e22a1ec5dd69 +Subproject commit 547284fe2a60d886a037b0d1984ce42e8fcd7e3f -- GitLab From 46a9ba69b64e2b9bf0867f20fb835d7d9641ba89 Mon Sep 17 00:00:00 2001 From: Nikolay Panko <nikolay.panko@demlabs.net> Date: Wed, 12 Mar 2025 11:44:54 +0000 Subject: [PATCH 57/80] [-] rm deploy of unsigned pakage in CI --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c364c615d..fc2c7f731 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -220,7 +220,6 @@ amd64:macos.release: - echo "Do hard work" - ./prod_build/build.sh --target osx release - ./prod_build/pack.sh --target osx release --sign /opt/buildtools/sign/macos/demlabs.sh - - /opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*.pkg - /opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*-signed.pkg --redirect-with-link macos/cellframe-node/$CI_COMMIT_REF_NAME/latest-amd64 --just-redirect artifacts: paths: -- GitLab From 48f9f01caa0c5347fbfe62c74d8a96a5594b162e Mon Sep 17 00:00:00 2001 From: Dmitry Puzyrkov <dmitry.puzyrkov@demlabs.net> Date: Wed, 12 Mar 2025 13:35:23 +0000 Subject: [PATCH 58/80] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc2c7f731..baabfc125 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -220,7 +220,7 @@ amd64:macos.release: - echo "Do hard work" - ./prod_build/build.sh --target osx release - ./prod_build/pack.sh --target osx release --sign /opt/buildtools/sign/macos/demlabs.sh - - /opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*-signed.pkg --redirect-with-link macos/cellframe-node/$CI_COMMIT_REF_NAME/latest-amd64 --just-redirect + - /opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*-signed.pkg --redirect-with-link macos/cellframe-node/$CI_COMMIT_REF_NAME/latest-amd64 artifacts: paths: - build_*/*.pkg -- GitLab From 9acbe3df2c511af40ae6fc3a7247274b4f880fbb Mon Sep 17 00:00:00 2001 From: "denis.sumin" <denis.smolov@demlabs.net> Date: Fri, 14 Mar 2025 15:29:40 +0700 Subject: [PATCH 59/80] [+] diagtool update --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index dfeb4a8f7..8aaeb2b5b 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit dfeb4a8f76a59842321ef40d56eb8509417d19b3 +Subproject commit 8aaeb2b5b6582e372060ec0b1a6ee8a647cddd8f -- GitLab From c4d320fb0781402f8cae9a7365f74d3d905f187b Mon Sep 17 00:00:00 2001 From: Dmitry Pyzyrkov <dpuzyrkov@gmail.com> Date: Fri, 14 Mar 2025 15:50:37 +0700 Subject: [PATCH 60/80] ... --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index 8aaeb2b5b..150f74bee 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit 8aaeb2b5b6582e372060ec0b1a6ee8a647cddd8f +Subproject commit 150f74beef1d02baae35f60d8ba37a9760cd4a2b -- GitLab From b15a4fc95959479ec35ee079387eafbd27cab8a8 Mon Sep 17 00:00:00 2001 From: Dmitry Pyzyrkov <dpuzyrkov@gmail.com> Date: Fri, 14 Mar 2025 15:59:33 +0700 Subject: [PATCH 61/80] ... --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index 150f74bee..5fb5d65cd 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit 150f74beef1d02baae35f60d8ba37a9760cd4a2b +Subproject commit 5fb5d65cd59cea4a76c739ab0be45cc02657d9bb -- GitLab From 1a5c1b78b8dcd3abfc0530ea237628f18647b860 Mon Sep 17 00:00:00 2001 From: Dmitry Pyzyrkov <dpuzyrkov@gmail.com> Date: Fri, 14 Mar 2025 16:04:39 +0700 Subject: [PATCH 62/80] ... --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index 5fb5d65cd..7c974cd83 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit 5fb5d65cd59cea4a76c739ab0be45cc02657d9bb +Subproject commit 7c974cd83b881186e41303214184827d5d8b7516 -- GitLab From 6e604cd9ffe0ff070594f7a0468595851d325813 Mon Sep 17 00:00:00 2001 From: "denis.sumin" <denis.smolov@demlabs.net> Date: Fri, 14 Mar 2025 16:08:50 +0700 Subject: [PATCH 63/80] [*] fix win build --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index 8aaeb2b5b..e863bd290 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit 8aaeb2b5b6582e372060ec0b1a6ee8a647cddd8f +Subproject commit e863bd290190294d59bb6aa59985635cab177dc7 -- GitLab From 86677200df093043a24d988bd95d54a7ee698fd9 Mon Sep 17 00:00:00 2001 From: Dmitry Pyzyrkov <dpuzyrkov@gmail.com> Date: Fri, 14 Mar 2025 16:14:03 +0700 Subject: [PATCH 64/80] .. --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index 7c974cd83..6497b3e0c 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit 7c974cd83b881186e41303214184827d5d8b7516 +Subproject commit 6497b3e0cc3d0ed500adb3ec73761115cf045749 -- GitLab From 7a2148c33e947970d8b673741d7892a256710c8e Mon Sep 17 00:00:00 2001 From: "denis.sumin" <denis.smolov@demlabs.net> Date: Fri, 14 Mar 2025 16:18:31 +0700 Subject: [PATCH 65/80] ... --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index e863bd290..5009a6d3f 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit e863bd290190294d59bb6aa59985635cab177dc7 +Subproject commit 5009a6d3f5658fcea9289b016323b72080b841c5 -- GitLab From 60caee367183463ed2ce9131f42e54eef643757f Mon Sep 17 00:00:00 2001 From: "denis.sumin" <denis.smolov@demlabs.net> Date: Fri, 14 Mar 2025 16:30:50 +0700 Subject: [PATCH 66/80] ... --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index 5009a6d3f..cfec047b3 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit 5009a6d3f5658fcea9289b016323b72080b841c5 +Subproject commit cfec047b31500619a00216f0486e807725ba8929 -- GitLab From 582ee86df9ceb9b2f799d2dec7f7f00f1bce49d5 Mon Sep 17 00:00:00 2001 From: "denis.sumin" <denis.smolov@demlabs.net> Date: Fri, 14 Mar 2025 16:48:05 +0700 Subject: [PATCH 67/80] ... --- diagtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagtool b/diagtool index cfec047b3..293cc6c40 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit cfec047b31500619a00216f0486e807725ba8929 +Subproject commit 293cc6c4038ea85c6819d9f847ad3802b02162b5 -- GitLab From e3d9ef2d552f0f8fdc77e7949039c8b5c5b340db Mon Sep 17 00:00:00 2001 From: "roman.khlopkov" <roman.khlopkov@demlabs.net> Date: Fri, 14 Mar 2025 13:52:41 +0300 Subject: [PATCH 68/80] [*] Voting rename to poll --- cellframe-sdk | 2 +- dap-sdk | 2 +- diagtool | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 730a53de6..492b6fe21 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 730a53de647f429e3a4996734308297dd6337b69 +Subproject commit 492b6fe21b4e22ff7ad78645d2eb6e6de9375e03 diff --git a/dap-sdk b/dap-sdk index a7b6da64e..f01ce0c6f 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit a7b6da64ee24a3aba64dcbbd5f3f356069d853ad +Subproject commit f01ce0c6fc7ad0ad0cc4975e46f281b2c9a893d0 diff --git a/diagtool b/diagtool index dfeb4a8f7..293cc6c40 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit dfeb4a8f76a59842321ef40d56eb8509417d19b3 +Subproject commit 293cc6c4038ea85c6819d9f847ad3802b02162b5 -- GitLab From 3158311b5185b08acf7813df9cab56be12e30031 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 14 Mar 2025 17:09:40 +0300 Subject: [PATCH 69/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 338a4dc0d..3edf3a8b7 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 338a4dc0d8b3abdd03a13819c764ee19a9ec577b +Subproject commit 3edf3a8b73e41c2bd3c6f9bf0977f97a76b817fc -- GitLab From 668bf3dc8f33014ebcfedfed5a57ec9ba657167e Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 14 Mar 2025 18:01:08 +0300 Subject: [PATCH 70/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 3edf3a8b7..21254d951 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 3edf3a8b73e41c2bd3c6f9bf0977f97a76b817fc +Subproject commit 21254d951374581e2c636e00ff9c8e87addfc7d8 -- GitLab From 8db8ad1de1e0d45944d1194cb440bf82d1589be7 Mon Sep 17 00:00:00 2001 From: "pavel.uhanov" <pavel.uhanov@demlabs.net> Date: Fri, 14 Mar 2025 20:00:33 +0300 Subject: [PATCH 71/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 21254d951..c3f54affb 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 21254d951374581e2c636e00ff9c8e87addfc7d8 +Subproject commit c3f54affb0d4c14164495ac006af38ab5cad91f0 -- GitLab From 181c611a826f1b5473dc492bfd839222caba964d Mon Sep 17 00:00:00 2001 From: Pavel Uhanov <pavel.uhanov@demlabs.net> Date: Mon, 17 Mar 2025 10:47:26 +0300 Subject: [PATCH 72/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index c3f54affb..e89b69477 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit c3f54affb0d4c14164495ac006af38ab5cad91f0 +Subproject commit e89b69477c3fb6690105ada141c4764cd57356d3 -- GitLab From 59e0ee74fe7a59384a0185731868862a4a04d0c6 Mon Sep 17 00:00:00 2001 From: Pavel Uhanov <pavel.uhanov@demlabs.net> Date: Mon, 17 Mar 2025 10:57:04 +0300 Subject: [PATCH 73/80] [*] subs update --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index e89b69477..ba4684914 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit e89b69477c3fb6690105ada141c4764cd57356d3 +Subproject commit ba468491418ee41f0771f6ce4691a4d7b5362417 -- GitLab From a5a430fc5b04ae28894ecd1e87e9af814043cd9c Mon Sep 17 00:00:00 2001 From: "Constantin P." <papizh.konstantin@demlabs.net> Date: Mon, 17 Mar 2025 17:04:34 +0700 Subject: [PATCH 74/80] Multiple updates with branches --- cellframe-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cellframe-sdk b/cellframe-sdk index 3206a12cd..8f5ac56c5 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 3206a12cd24760bded94c0664e64fa92cdf5b77c +Subproject commit 8f5ac56c5a38c4c47a8b61ab8176f25805da267d -- GitLab From 672b6a208739d7631df54d7e9ed8450a2780440b Mon Sep 17 00:00:00 2001 From: "Constantin P." <papizh.konstantin@demlabs.net> Date: Mon, 17 Mar 2025 17:06:03 +0700 Subject: [PATCH 75/80] Sub up --- dap-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dap-sdk b/dap-sdk index a7b6da64e..1df644274 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit a7b6da64ee24a3aba64dcbbd5f3f356069d853ad +Subproject commit 1df644274f2d0aecea9cc46d2c691035ec01a9c3 -- GitLab From be17cbb2971347ab319821489c6de25073662091 Mon Sep 17 00:00:00 2001 From: "Constantin P." <papizh.konstantin@demlabs.net> Date: Mon, 17 Mar 2025 18:28:38 +0700 Subject: [PATCH 76/80] Py up --- python-cellframe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-cellframe b/python-cellframe index 47acf3f2c..19d28d3f1 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 47acf3f2c114993d0bc32583b1de31107c39ab83 +Subproject commit 19d28d3f1904096d3b6d6bc5613bd4201782c085 -- GitLab From 0cc1d1b1fec3a649c7f26a7c2be18004a1399653 Mon Sep 17 00:00:00 2001 From: "Constantin P." <papizh.konstantin@demlabs.net> Date: Mon, 17 Mar 2025 18:54:29 +0700 Subject: [PATCH 77/80] Subs up --- cellframe-sdk | 2 +- dap-sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 8f5ac56c5..5c6324552 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 8f5ac56c5a38c4c47a8b61ab8176f25805da267d +Subproject commit 5c63245522d07aa0df0b4acaac381dc67f1d4f5b diff --git a/dap-sdk b/dap-sdk index 1df644274..ff8478aa0 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 1df644274f2d0aecea9cc46d2c691035ec01a9c3 +Subproject commit ff8478aa04fa94540016fee0038db4b63965d0d1 -- GitLab From 758b45681abcaac13c459d465c6052f88ca13063 Mon Sep 17 00:00:00 2001 From: "roman.khlopkov" <roman.khlopkov@demlabs.net> Date: Tue, 18 Mar 2025 13:26:03 +0300 Subject: [PATCH 78/80] [*] Unspent conditional OUTs listing fix --- cellframe-sdk | 2 +- dap-sdk | 2 +- python-cellframe | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 492b6fe21..ba14c8d42 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 492b6fe21b4e22ff7ad78645d2eb6e6de9375e03 +Subproject commit ba14c8d4244b7926a55da73c3d6d41c6191a3634 diff --git a/dap-sdk b/dap-sdk index f01ce0c6f..ff8478aa0 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit f01ce0c6fc7ad0ad0cc4975e46f281b2c9a893d0 +Subproject commit ff8478aa04fa94540016fee0038db4b63965d0d1 diff --git a/python-cellframe b/python-cellframe index 429359f23..19d28d3f1 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 429359f230ec02fc365ce473dcf375b8ba499eff +Subproject commit 19d28d3f1904096d3b6d6bc5613bd4201782c085 -- GitLab From 524d310a9c17baff081ce280d062ed2f70c3a5a4 Mon Sep 17 00:00:00 2001 From: "roman.khlopkov" <roman.khlopkov@demlabs.net> Date: Wed, 19 Mar 2025 18:09:16 +0300 Subject: [PATCH 79/80] [*] History correction --- cellframe-sdk | 2 +- python-cellframe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index ba14c8d42..5eaf73c90 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit ba14c8d4244b7926a55da73c3d6d41c6191a3634 +Subproject commit 5eaf73c90f24d64cd43db1e8c155b7283453c572 diff --git a/python-cellframe b/python-cellframe index 19d28d3f1..7c3af1217 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 19d28d3f1904096d3b6d6bc5613bd4201782c085 +Subproject commit 7c3af121722e24687a6e5e4d963d782d17245eca -- GitLab From f9d0cf28b4c937cb26557e19c5f7b979289c9794 Mon Sep 17 00:00:00 2001 From: "Constantin P." <papizh.konstantin@demlabs.net> Date: Thu, 20 Mar 2025 12:48:03 +0700 Subject: [PATCH 80/80] Subs up --- cellframe-sdk | 2 +- dap-sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index 5eaf73c90..1986edc22 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 5eaf73c90f24d64cd43db1e8c155b7283453c572 +Subproject commit 1986edc2233e084afdeecb312e95ed137ae0eb63 diff --git a/dap-sdk b/dap-sdk index ff8478aa0..dafe5ac22 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit ff8478aa04fa94540016fee0038db4b63965d0d1 +Subproject commit dafe5ac222f390aed78fc60528d04d2905555361 -- GitLab