Updates json ABIs.

FuelLabs · May 15, 2024 · 06edbca · 06edbca
1 parent bb5c9fb
commit 06edbca
Show file tree

Hide file tree

Showing 23 changed files with 109 additions and 992 deletions.
diff --git a/.../test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json b/.../test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
@@ -88,7 +88,7 @@
         "typeArguments": null
       },
       "name": "BOOL",
-      "offset": 13544
+      "offset": 13552
     },
     {
       "configurableType": {
@@ -97,7 +97,7 @@
         "typeArguments": null
       },
       "name": "U8",
-      "offset": 13552
+      "offset": 13560
     },
     {
       "configurableType": {
@@ -106,7 +106,7 @@
         "typeArguments": null
       },
       "name": "ANOTHERU8",
-      "offset": 13568
+      "offset": 13576
     },
     {
       "configurableType": {
@@ -115,7 +115,7 @@
         "typeArguments": null
       },
       "name": "U16",
-      "offset": 13576
+      "offset": 13584
     },
     {
       "configurableType": {
@@ -124,7 +124,7 @@
         "typeArguments": null
       },
       "name": "U32",
-      "offset": 13584
+      "offset": 13592
     },
     {
       "configurableType": {
@@ -133,7 +133,7 @@
         "typeArguments": null
       },
       "name": "U64",
-      "offset": 13600
+      "offset": 13608
     },
     {
       "configurableType": {
@@ -142,7 +142,7 @@
         "typeArguments": null
       },
       "name": "U256",
-      "offset": 13616
+      "offset": 13624
     },
     {
       "configurableType": {
@@ -178,7 +178,7 @@
   ],
   "loggedTypes": [
     {
-      "logId": 0,
+      "logId": 3330666440490685604,
       "loggedType": {
         "name": "",
         "type": 0,

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle.json
@@ -1,79 +1,56 @@
 {
   "configurables": [],
+  "encoding": "1",
   "functions": [
     {
       "attributes": null,
       "inputs": [],
       "name": "main",
       "output": {
         "name": "",
-        "type": 14,
+        "type": 13,
         "typeArguments": null
       }
     }
   ],
   "loggedTypes": [
     {
-      "logId": 0,
+      "logId": 4579537983717831593,
       "loggedType": {
         "name": "",
-        "type": 7,
+        "type": 6,
         "typeArguments": []
       }
     },
     {
-      "logId": 1,
+      "logId": 16566583104751091389,
       "loggedType": {
         "name": "",
-        "type": 8,
+        "type": 7,
         "typeArguments": [
           {
             "name": "",
-            "type": 14,
+            "type": 13,
             "typeArguments": null
           }
         ]
       }
     },
     {
-      "logId": 2,
-      "loggedType": {
-        "name": "",
-        "type": 1,
-        "typeArguments": []
-      }
-    },
-    {
-      "logId": 3,
+      "logId": 5087777005172090899,
       "loggedType": {
         "name": "",
         "type": 1,
         "typeArguments": []
       }
     },
     {
-      "logId": 4,
+      "logId": 5555909392781521367,
       "loggedType": {
         "name": "",
         "type": 5,
         "typeArguments": []
       }
-    },
-    {
-      "logId": 5,
-      "loggedType": {
-        "name": "",
-        "type": 6,
-        "typeArguments": []
-      }
-    },
-    {
-      "logId": 6,
-      "loggedType": {
-        "name": "",
-        "type": 6,
-        "typeArguments": []
-      }
     }
   ],
   "messagesTypes": [],
@@ -88,11 +65,11 @@
       "components": [
         {
           "name": "A",
-          "type": 8,
+          "type": 7,
           "typeArguments": [
             {
               "name": "",
-              "type": 14,
+              "type": 13,
               "typeArguments": null
             }
           ]
@@ -131,47 +108,35 @@
       "typeId": 5,
       "typeParameters": null
     },
-    {
-      "components": [
-        {
-          "name": "p",
-          "type": 3,
-          "typeArguments": null
-        }
-      ],
-      "type": "struct NotAutoEncodable",
-      "typeId": 6,
-      "typeParameters": null
-    },
     {
       "components": [
         {
           "name": "a",
-          "type": 14,
+          "type": 13,
           "typeArguments": null
         },
         {
           "name": "b",
-          "type": 13,
+          "type": 12,
           "typeArguments": null
         },
         {
           "name": "c",
-          "type": 11,
+          "type": 10,
           "typeArguments": null
         },
         {
           "name": "d",
-          "type": 15,
+          "type": 14,
           "typeArguments": null
         },
         {
           "name": "e",
-          "type": 10,
+          "type": 9,
           "typeArguments": [
             {
               "name": "",
-              "type": 14,
+              "type": 13,
               "typeArguments": null
             }
           ]
@@ -183,12 +148,12 @@
         },
         {
           "name": "g",
-          "type": 12,
+          "type": 11,
           "typeArguments": null
         }
       ],
       "type": "struct S",
-      "typeId": 7,
+      "typeId": 6,
       "typeParameters": null
     },
     {
@@ -200,7 +165,7 @@
         }
       ],
       "type": "struct SS",
-      "typeId": 8,
+      "typeId": 7,
       "typeParameters": [
         2
       ]
@@ -214,12 +179,12 @@
         },
         {
           "name": "cap",
-          "type": 14,
+          "type": 13,
           "typeArguments": null
         }
       ],
       "type": "struct std::vec::RawVec",
-      "typeId": 9,
+      "typeId": 8,
       "typeParameters": [
         2
       ]
@@ -228,7 +193,7 @@
       "components": [
         {
           "name": "buf",
-          "type": 9,
+          "type": 8,
           "typeArguments": [
             {
               "name": "",
@@ -239,44 +204,44 @@
         },
         {
           "name": "len",
-          "type": 14,
+          "type": 13,
           "typeArguments": null
         }
       ],
       "type": "struct std::vec::Vec",
-      "typeId": 10,
+      "typeId": 9,
       "typeParameters": [
         2
       ]
     },
     {
       "components": null,
       "type": "u16",
-      "typeId": 11,
+      "typeId": 10,
       "typeParameters": null
     },
     {
       "components": null,
       "type": "u256",
-      "typeId": 12,
+      "typeId": 11,
       "typeParameters": null
     },
     {
       "components": null,
       "type": "u32",
-      "typeId": 13,
+      "typeId": 12,
       "typeParameters": null
     },
     {
       "components": null,
       "type": "u64",
-      "typeId": 14,
+      "typeId": 13,
       "typeParameters": null
     },
     {
       "components": null,
       "type": "u8",
-      "typeId": 15,
+      "typeId": 14,
       "typeParameters": null
     }
   ]

diff --git a/...e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json b/...e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json
@@ -15,15 +15,15 @@
   ],
   "loggedTypes": [
     {
-      "logId": 0,
+      "logId": 4579537983717831593,
       "loggedType": {
         "name": "",
         "type": 6,
         "typeArguments": []
       }
     },
     {
-      "logId": 1,
+      "logId": 16566583104751091389,
       "loggedType": {
         "name": "",
         "type": 7,
@@ -37,23 +37,15 @@
       }
     },
     {
-      "logId": 2,
+      "logId": 5087777005172090899,
       "loggedType": {
         "name": "",
         "type": 1,
         "typeArguments": []
       }
     },
     {
-      "logId": 3,
-      "loggedType": {
-        "name": "",
-        "type": 1,
-        "typeArguments": []
-      }
-    },
-    {
-      "logId": 4,
+      "logId": 5555909392781521367,
       "loggedType": {
         "name": "",
         "type": 5,

diff --git a/...test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle.json b/...test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle.json
@@ -1,5 +1,6 @@
 {
   "configurables": [],
+  "encoding": "1",
   "functions": [
     {
       "attributes": null,
@@ -20,7 +21,7 @@
   ],
   "loggedTypes": [
     {
-      "logId": 0,
+      "logId": 3647243719605075626,
       "loggedType": {
         "name": "",
         "type": 1,

diff --git a/.../should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json b/.../should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json
@@ -21,7 +21,7 @@
   ],
   "loggedTypes": [
     {
-      "logId": 0,
+      "logId": 3647243719605075626,
       "loggedType": {
         "name": "",
         "type": 1,