From b4dc733a732ac1259b5c8cdd9b5fa07b4995c214 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:07:59 -0400
Subject: [PATCH 1/4] add block_header_extension types to ship abi

---
 libraries/state_history/abi.cpp | 59 ++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/libraries/state_history/abi.cpp b/libraries/state_history/abi.cpp
index 095b150886..fb5cf7f3fe 100644
--- a/libraries/state_history/abi.cpp
+++ b/libraries/state_history/abi.cpp
@@ -588,6 +588,13 @@ extern const char* const state_history_plugin_abi = R"({
                 { "type": "uint32", "name": "account_net_usage_average_window" }
             ]
         },
+        {
+            "name": "finalizer_authority", "fields": [
+                { "name": "description", "type": "string" },
+                { "name": "weight", "type": "uint64" },
+                { "name": "public_key", "type": "bytes" }
+            ]
+        },
         {
             "name": "finalizer_authority_with_string_key", "fields": [
                 { "name": "description", "type": "string" },
@@ -616,6 +623,55 @@ extern const char* const state_history_plugin_abi = R"({
                 { "name": "pending_finalizer_policy", "type": "finalizer_policy_with_string_key?" },
                 { "name": "last_pending_finalizer_policy_generation", "type": "uint32" }
             ]
+        },
+        {
+            "name": "protocol_feature_activation_extension", "fields": [
+                { "name": "protocol_features", "type": "checksum256[]" }
+            ]
+        },
+        {
+            "name": "producer_schedule_change_extension", "base": "producer_authority_schedule", "fields": []
+        },
+        {
+            "name": "qc_claim", "fields": [
+                { "name": "block_num", "type": "uint32" },
+                { "name": "is_strong_qc", "type": "bool" }
+            ]
+        },
+        {
+            "name": "insert_finalizer_policy_index_pair", "fields": [
+                { "name": "index", "type": "uint16" },
+                { "name": "value", "type": "finalizer_authority" }
+            ]
+        },
+        {
+            "name": "finalizer_policy_diff", "fields": [
+                { "name": "generation", "type": "uint32" },
+                { "name": "threshold", "type": "uint64" },
+                { "name": "remove_indexes", "type": "uint16[]" },
+                { "name": "insert_indexes", "type": "insert_finalizer_policy_index_pair[]" }
+            ]
+        },
+        {
+            "name": "insert_proposer_policy_index_pair", "fields": [
+                { "name": "index", "type": "uint16" },
+                { "name": "value", "type": "producer_authority" }
+            ]
+        },
+        {
+            "name": "proposer_policy_diff", "fields": [
+                { "name": "version", "type": "uint32" },
+                { "name": "proposal_time", "type": "block_timestamp_type" },
+                { "name": "remove_indexes", "type": "uint16[]" },
+                { "name": "insert_indexes", "type": "insert_proposer_policy_index_pair[]" }
+            ]
+        },
+        {
+            "name": "finality_extension", "fields": [
+                { "name": "qc_claim", "type": "qc_claim" },
+                { "name": "new_finalizer_policy_diff", "type": "finalizer_policy_diff?" },
+                { "name": "new_proposer_policy_diff", "type": "proposer_policy_diff?" }
+            ]
         }
     ],
     "types": [
@@ -657,7 +713,8 @@ extern const char* const state_history_plugin_abi = R"({
         { "name": "resource_limits_ratio", "types": ["resource_limits_ratio_v0"] },
         { "name": "elastic_limit_parameters", "types": ["elastic_limit_parameters_v0"] },
         { "name": "resource_limits_config", "types": ["resource_limits_config_v0"] },
-        { "name": "block_signing_authority", "types": ["block_signing_authority_v0"] }
+        { "name": "block_signing_authority", "types": ["block_signing_authority_v0"] },
+        { "name": "block_header_extension", "types": ["protocol_feature_activation_extension", "producer_schedule_change_extension", "finality_extension"] }
     ],
     "tables": [
         { "name": "account", "type": "account", "key_names": ["name"] },

From 308fe2567153632c7e5dc3738df7baf2d8063dd2 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 17 Sep 2024 12:23:11 -0400
Subject: [PATCH 2/4] bump abieos submod to branch w/ ship updates

---
 tests/abieos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/abieos b/tests/abieos
index 5bd9a54824..ae78105e01 160000
--- a/tests/abieos
+++ b/tests/abieos
@@ -1 +1 @@
-Subproject commit 5bd9a5482411e1a3054792f4210ce2bebe29d9a5
+Subproject commit ae78105e015dae0dc10466018f8d7c3eae455285

From 3dc089683ea5e8ff010759e71a59ca503e5da756 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:41:18 -0400
Subject: [PATCH 3/4] bump abieos submod to branch w/ ship updates & gcc fix

---
 tests/abieos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/abieos b/tests/abieos
index ae78105e01..d2586071be 160000
--- a/tests/abieos
+++ b/tests/abieos
@@ -1 +1 @@
-Subproject commit ae78105e015dae0dc10466018f8d7c3eae455285
+Subproject commit d2586071be1b3383ac6c38a8beec91a0901ea458

From b33ec51f5cb4c659105939492f8658927c409fb0 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:17:04 -0400
Subject: [PATCH 4/4] bump abieos submodule to main's head w/ ship changes

---
 tests/abieos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/abieos b/tests/abieos
index d2586071be..4663982fc2 160000
--- a/tests/abieos
+++ b/tests/abieos
@@ -1 +1 @@
-Subproject commit d2586071be1b3383ac6c38a8beec91a0901ea458
+Subproject commit 4663982fc2c61d85a5d56e2277862ee46699ac3b