From ff0d7f469e659df4c79a821f3eb6fc7b46ec8287 Mon Sep 17 00:00:00 2001
From: Siddharth Suresh <siddharth@stellar.org>
Date: Fri, 26 Apr 2024 12:07:28 -0700
Subject: [PATCH 1/2] Fix config settings upgrade json for v21

---
 local/core/etc/config-settings/testnet.json   | 71 ++++++++-----------
 local/core/etc/config-settings/unlimited.json | 71 ++++++++-----------
 2 files changed, 62 insertions(+), 80 deletions(-)

diff --git a/local/core/etc/config-settings/testnet.json b/local/core/etc/config-settings/testnet.json
index 45532313..ed9059fc 100644
--- a/local/core/etc/config-settings/testnet.json
+++ b/local/core/etc/config-settings/testnet.json
@@ -164,85 +164,76 @@
           "ext": "v0",
           "const_term": 1059,
           "linear_term": 502
-        }
-      ]
-    },
-    {
-      "contract_cost_params_memory_bytes": [
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 0
         },
         {
           "ext": "v0",
-          "const_term": 16,
-          "linear_term": 128
+          "const_term": 73077,
+          "linear_term": 25410
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 0
+          "linear_term": 540752
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 0
+          "linear_term": 176363
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 0
+          "linear_term": 29989
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 0
+          "linear_term": 1061449
         },
         {
           "ext": "v0",
-          "const_term": 242,
-          "linear_term": 384
+          "const_term": 0,
+          "linear_term": 237336
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 384
+          "linear_term": 328476
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 0
+          "linear_term": 701845
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 0
+          "linear_term": 429383
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 0
+          "linear_term": 28
         },
         {
           "ext": "v0",
-          "const_term": 132773,
-          "linear_term": 4903
+          "const_term": 43030,
+          "linear_term": 0
         },
         {
           "ext": "v0",
-          "const_term": 132773,
-          "linear_term": 4903
+          "const_term": 0,
+          "linear_term": 7556
         },
         {
           "ext": "v0",
-          "const_term": 14,
-          "linear_term": 0
+          "const_term": 0,
+          "linear_term": 10711
         },
         {
           "ext": "v0",
           "const_term": 0,
-          "linear_term": 0
+          "linear_term": 3300
         },
         {
           "ext": "v0",
@@ -251,37 +242,37 @@
         },
         {
           "ext": "v0",
-          "const_term": 181,
-          "linear_term": 0
+          "const_term": 0,
+          "linear_term": 23038
         },
         {
           "ext": "v0",
-          "const_term": 99,
-          "linear_term": 0
+          "const_term": 0,
+          "linear_term": 42488
         },
         {
           "ext": "v0",
-          "const_term": 99,
-          "linear_term": 0
+          "const_term": 0,
+          "linear_term": 828974
         },
         {
           "ext": "v0",
-          "const_term": 99,
-          "linear_term": 0
+          "const_term": 0,
+          "linear_term": 297100
         },
         {
           "ext": "v0",
-          "const_term": 99,
-          "linear_term": 0
+          "const_term": 0,
+          "linear_term": 14
         },
         {
           "ext": "v0",
-          "const_term": 99,
+          "const_term": 1882,
           "linear_term": 0
         },
         {
           "ext": "v0",
-          "const_term": 0,
+          "const_term": 3000906,
           "linear_term": 0
         }
       ]
diff --git a/local/core/etc/config-settings/unlimited.json b/local/core/etc/config-settings/unlimited.json
index a23e006a..5dbc0223 100644
--- a/local/core/etc/config-settings/unlimited.json
+++ b/local/core/etc/config-settings/unlimited.json
@@ -164,85 +164,76 @@
               "ext": "v0",
               "const_term": 1059,
               "linear_term": 502
-            }
-          ]
-        },
-        {
-          "contract_cost_params_memory_bytes": [
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 0
             },
             {
               "ext": "v0",
-              "const_term": 16,
-              "linear_term": 128
+              "const_term": 73077,
+              "linear_term": 25410
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 0
+              "linear_term": 540752
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 0
+              "linear_term": 176363
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 0
+              "linear_term": 29989
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 0
+              "linear_term": 1061449
             },
             {
               "ext": "v0",
-              "const_term": 242,
-              "linear_term": 384
+              "const_term": 0,
+              "linear_term": 237336
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 384
+              "linear_term": 328476
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 0
+              "linear_term": 701845
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 0
+              "linear_term": 429383
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 0
+              "linear_term": 28
             },
             {
               "ext": "v0",
-              "const_term": 132773,
-              "linear_term": 4903
+              "const_term": 43030,
+              "linear_term": 0
             },
             {
               "ext": "v0",
-              "const_term": 132773,
-              "linear_term": 4903
+              "const_term": 0,
+              "linear_term": 7556
             },
             {
               "ext": "v0",
-              "const_term": 14,
-              "linear_term": 0
+              "const_term": 0,
+              "linear_term": 10711
             },
             {
               "ext": "v0",
               "const_term": 0,
-              "linear_term": 0
+              "linear_term": 3300
             },
             {
               "ext": "v0",
@@ -251,37 +242,37 @@
             },
             {
               "ext": "v0",
-              "const_term": 181,
-              "linear_term": 0
+              "const_term": 0,
+              "linear_term": 23038
             },
             {
               "ext": "v0",
-              "const_term": 99,
-              "linear_term": 0
+              "const_term": 0,
+              "linear_term": 42488
             },
             {
               "ext": "v0",
-              "const_term": 99,
-              "linear_term": 0
+              "const_term": 0,
+              "linear_term": 828974
             },
             {
               "ext": "v0",
-              "const_term": 99,
-              "linear_term": 0
+              "const_term": 0,
+              "linear_term": 297100
             },
             {
               "ext": "v0",
-              "const_term": 99,
-              "linear_term": 0
+              "const_term": 0,
+              "linear_term": 14
             },
             {
               "ext": "v0",
-              "const_term": 99,
+              "const_term": 1882,
               "linear_term": 0
             },
             {
               "ext": "v0",
-              "const_term": 0,
+              "const_term": 3000906,
               "linear_term": 0
             }
           ]

From dce76f12811535183bac58e481bdcc33e517231f Mon Sep 17 00:00:00 2001
From: Siddharth Suresh <siddharth@stellar.org>
Date: Fri, 26 Apr 2024 12:16:01 -0700
Subject: [PATCH 2/2] Remove cpu cost types as well

---
 local/core/etc/config-settings/testnet.json   | 229 ------------------
 local/core/etc/config-settings/unlimited.json | 229 ------------------
 2 files changed, 458 deletions(-)

diff --git a/local/core/etc/config-settings/testnet.json b/local/core/etc/config-settings/testnet.json
index ed9059fc..cae277f2 100644
--- a/local/core/etc/config-settings/testnet.json
+++ b/local/core/etc/config-settings/testnet.json
@@ -48,235 +48,6 @@
         "fee_tx_size1_kb": 1624
       }
     },
-    {
-      "contract_cost_params_cpu_instructions": [
-        {
-          "ext": "v0",
-          "const_term": 4,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 434,
-          "linear_term": 16
-        },
-        {
-          "ext": "v0",
-          "const_term": 42,
-          "linear_term": 16
-        },
-        {
-          "ext": "v0",
-          "const_term": 44,
-          "linear_term": 16
-        },
-        {
-          "ext": "v0",
-          "const_term": 295,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 60,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 221,
-          "linear_term": 26
-        },
-        {
-          "ext": "v0",
-          "const_term": 331,
-          "linear_term": 4369
-        },
-        {
-          "ext": "v0",
-          "const_term": 3636,
-          "linear_term": 7013
-        },
-        {
-          "ext": "v0",
-          "const_term": 40256,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 377551,
-          "linear_term": 4059
-        },
-        {
-          "ext": "v0",
-          "const_term": 417482,
-          "linear_term": 45712
-        },
-        {
-          "ext": "v0",
-          "const_term": 417482,
-          "linear_term": 45712
-        },
-        {
-          "ext": "v0",
-          "const_term": 1945,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 6481,
-          "linear_term": 5943
-        },
-        {
-          "ext": "v0",
-          "const_term": 711,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 2314804,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 4176,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 4716,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 4680,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 4256,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 884,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 1059,
-          "linear_term": 502
-        },
-        {
-          "ext": "v0",
-          "const_term": 73077,
-          "linear_term": 25410
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 540752
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 176363
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 29989
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 1061449
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 237336
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 328476
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 701845
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 429383
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 28
-        },
-        {
-          "ext": "v0",
-          "const_term": 43030,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 7556
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 10711
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 3300
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 23038
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 42488
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 828974
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 297100
-        },
-        {
-          "ext": "v0",
-          "const_term": 0,
-          "linear_term": 14
-        },
-        {
-          "ext": "v0",
-          "const_term": 1882,
-          "linear_term": 0
-        },
-        {
-          "ext": "v0",
-          "const_term": 3000906,
-          "linear_term": 0
-        }
-      ]
-    },
     {
       "contract_data_key_size_bytes": 200
     },
diff --git a/local/core/etc/config-settings/unlimited.json b/local/core/etc/config-settings/unlimited.json
index 5dbc0223..e9b82771 100644
--- a/local/core/etc/config-settings/unlimited.json
+++ b/local/core/etc/config-settings/unlimited.json
@@ -48,235 +48,6 @@
                 "fee_tx_size1_kb": 500
             }
         },
-        {
-          "contract_cost_params_cpu_instructions": [
-            {
-              "ext": "v0",
-              "const_term": 4,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 434,
-              "linear_term": 16
-            },
-            {
-              "ext": "v0",
-              "const_term": 42,
-              "linear_term": 16
-            },
-            {
-              "ext": "v0",
-              "const_term": 44,
-              "linear_term": 16
-            },
-            {
-              "ext": "v0",
-              "const_term": 295,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 60,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 221,
-              "linear_term": 26
-            },
-            {
-              "ext": "v0",
-              "const_term": 331,
-              "linear_term": 4369
-            },
-            {
-              "ext": "v0",
-              "const_term": 3636,
-              "linear_term": 7013
-            },
-            {
-              "ext": "v0",
-              "const_term": 40256,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 377551,
-              "linear_term": 4059
-            },
-            {
-              "ext": "v0",
-              "const_term": 417482,
-              "linear_term": 45712
-            },
-            {
-              "ext": "v0",
-              "const_term": 417482,
-              "linear_term": 45712
-            },
-            {
-              "ext": "v0",
-              "const_term": 1945,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 6481,
-              "linear_term": 5943
-            },
-            {
-              "ext": "v0",
-              "const_term": 711,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 2314804,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 4176,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 4716,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 4680,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 4256,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 884,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 1059,
-              "linear_term": 502
-            },
-            {
-              "ext": "v0",
-              "const_term": 73077,
-              "linear_term": 25410
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 540752
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 176363
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 29989
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 1061449
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 237336
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 328476
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 701845
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 429383
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 28
-            },
-            {
-              "ext": "v0",
-              "const_term": 43030,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 7556
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 10711
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 3300
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 23038
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 42488
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 828974
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 297100
-            },
-            {
-              "ext": "v0",
-              "const_term": 0,
-              "linear_term": 14
-            },
-            {
-              "ext": "v0",
-              "const_term": 1882,
-              "linear_term": 0
-            },
-            {
-              "ext": "v0",
-              "const_term": 3000906,
-              "linear_term": 0
-            }
-          ]
-        },
         {
             "contract_data_key_size_bytes": 4294967295
         },