From 445d802f0605e9b21fde7c9bf8871eeef1a152af Mon Sep 17 00:00:00 2001 From: kevin Heifner Date: Mon, 20 Jul 2026 09:07:03 -0500 Subject: [PATCH] remove base_per_transaction_net_usage from the embedded SHiP ABI wire-sysio #519 removed the field from chain_config (regenesis, new chain_id). The embedded copy must match the streamed ABI or global_property deltas misdecode whenever the embedded copy is used instead of the handshake-streamed one. --- include/sysio/ship_protocol.hpp | 6 ++---- src/ship.abi.cpp | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/sysio/ship_protocol.hpp b/include/sysio/ship_protocol.hpp index 40f1de8..7392de3 100644 --- a/include/sysio/ship_protocol.hpp +++ b/include/sysio/ship_protocol.hpp @@ -644,7 +644,6 @@ namespace sysio { namespace ship_protocol { uint64_t max_block_net_usage = {}; uint32_t target_block_net_usage_pct = {}; uint32_t max_transaction_net_usage = {}; - uint32_t base_per_transaction_net_usage = {}; uint32_t net_usage_leeway = {}; uint32_t context_free_discount_net_usage_num = {}; uint32_t context_free_discount_net_usage_den = {}; @@ -661,7 +660,7 @@ namespace sysio { namespace ship_protocol { }; SYSIO_REFLECT(chain_config_v0, max_block_net_usage, target_block_net_usage_pct, max_transaction_net_usage, - base_per_transaction_net_usage, net_usage_leeway, context_free_discount_net_usage_num, + net_usage_leeway, context_free_discount_net_usage_num, context_free_discount_net_usage_den, max_block_cpu_usage, target_block_cpu_usage_pct, max_transaction_cpu_usage, min_transaction_cpu_usage, max_transaction_lifetime, deferred_trx_expiration_window, max_transaction_delay, max_inline_action_size, max_inline_action_depth, @@ -671,7 +670,6 @@ namespace sysio { namespace ship_protocol { uint64_t max_block_net_usage = {}; uint32_t target_block_net_usage_pct = {}; uint32_t max_transaction_net_usage = {}; - uint32_t base_per_transaction_net_usage = {}; uint32_t net_usage_leeway = {}; uint32_t context_free_discount_net_usage_num = {}; uint32_t context_free_discount_net_usage_den = {}; @@ -689,7 +687,7 @@ namespace sysio { namespace ship_protocol { }; SYSIO_REFLECT(chain_config_v1, max_block_net_usage, target_block_net_usage_pct, max_transaction_net_usage, - base_per_transaction_net_usage, net_usage_leeway, context_free_discount_net_usage_num, + net_usage_leeway, context_free_discount_net_usage_num, context_free_discount_net_usage_den, max_block_cpu_usage, target_block_cpu_usage_pct, max_transaction_cpu_usage, min_transaction_cpu_usage, max_transaction_lifetime, deferred_trx_expiration_window, max_transaction_delay, max_inline_action_size, max_inline_action_depth, diff --git a/src/ship.abi.cpp b/src/ship.abi.cpp index 3d2198c..f1dc138 100644 --- a/src/ship.abi.cpp +++ b/src/ship.abi.cpp @@ -411,7 +411,6 @@ extern const char* const state_history_plugin_abi = R"({ { "type": "uint64", "name": "max_block_net_usage" }, { "type": "uint32", "name": "target_block_net_usage_pct" }, { "type": "uint32", "name": "max_transaction_net_usage" }, - { "type": "uint32", "name": "base_per_transaction_net_usage" }, { "type": "uint32", "name": "net_usage_leeway" }, { "type": "uint32", "name": "context_free_discount_net_usage_num" }, { "type": "uint32", "name": "context_free_discount_net_usage_den" }, @@ -432,7 +431,6 @@ extern const char* const state_history_plugin_abi = R"({ { "type": "uint64", "name": "max_block_net_usage" }, { "type": "uint32", "name": "target_block_net_usage_pct" }, { "type": "uint32", "name": "max_transaction_net_usage" }, - { "type": "uint32", "name": "base_per_transaction_net_usage" }, { "type": "uint32", "name": "net_usage_leeway" }, { "type": "uint32", "name": "context_free_discount_net_usage_num" }, { "type": "uint32", "name": "context_free_discount_net_usage_den" },