Update to latest.

tritao · tritao · commit b7251efc8a2a · 2025-10-20T09:25:04.000+01:00
diff --git a/sway-core/src/abi_generation/abi_str.rs b/sway-core/src/abi_generation/abi_str.rs
@@ -21,9 +21,16 @@ impl TypeId {
         resolved_type_id: TypeId,
     ) -> Result<String, ErrorEmitted> {
         let type_engine = engines.te();
+        // let self_abi_str = if let TypeInfo::Alias { .. } = &*type_engine.get(*self) {
+        //     String::default()
+        // } else {
+        //     type_engine
+        //         .get(*self)
+        //         .abi_str(handler, ctx, engines, true)?
+        // };
         let self_abi_str = type_engine
-            .get(*self)
-            .abi_str(handler, ctx, engines, true)?;
+                .get(*self)
+                .abi_str(handler, ctx, engines, true)?;
         if self.is_generic_parameter(engines, resolved_type_id) {
             Ok(format!("generic {self_abi_str}"))
         } else {
@@ -200,10 +207,9 @@ impl TypeInfo {
                 "__slice {}",
                 ty.abi_str(handler, ctx, engines, false)?
             )),
-            Alias { .. } => {
-                // Aliases are handled specially when processing the ABI, so we should never get here.
-                unreachable!()
-            }
+            Alias { name, .. } => {
+                Ok(name.to_string())
+            },
             TraitType {
                 name,
                 implemented_in: _,
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.release.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.release.json
@@ -9,6 +9,11 @@
       "metadataTypeId": 0,
       "type": "(bool, u64)"
     },
+    {
+      "aliasOf": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+      "concreteTypeId": "22e190db53f32bb3ef6abe65c77f9f16b783eadc491786e5c9aa367853a9507b",
+      "type": "AnotherU8"
+    },
     {
       "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6",
       "metadataTypeId": 1,
@@ -72,7 +77,7 @@
       "offset": 5104
     },
     {
-      "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+      "concreteTypeId": "22e190db53f32bb3ef6abe65c77f9f16b783eadc491786e5c9aa367853a9507b",
       "indirect": false,
       "name": "ANOTHER_U8",
       "offset": 4840
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.debug.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.debug.json
@@ -4,6 +4,11 @@
       "concreteTypeId": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080",
       "metadataTypeId": 0,
       "type": "(struct TwoGenerics<u64,u32>, struct OneGeneric<u8>)"
+    },
+    {
+      "aliasOf": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080",
+      "concreteTypeId": "559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd",
+      "type": "A"
     }
   ],
   "configurables": [],
@@ -14,12 +19,12 @@
       "attributes": null,
       "inputs": [
         {
-          "concreteTypeId": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080",
+          "concreteTypeId": "559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd",
           "name": "input"
         }
       ],
       "name": "main",
-      "output": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080"
+      "output": "559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd"
     }
   ],
   "loggedTypes": [],
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.release.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.release.json
@@ -4,6 +4,11 @@
       "concreteTypeId": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080",
       "metadataTypeId": 0,
       "type": "(struct TwoGenerics<u64,u32>, struct OneGeneric<u8>)"
+    },
+    {
+      "aliasOf": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080",
+      "concreteTypeId": "559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd",
+      "type": "A"
     }
   ],
   "configurables": [],
@@ -14,12 +19,12 @@
       "attributes": null,
       "inputs": [
         {
-          "concreteTypeId": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080",
+          "concreteTypeId": "559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd",
           "name": "input"
         }
       ],
       "name": "main",
-      "output": "f0ea9e428f47d8b233443fc8f7d3bb5ad2ae35d5175e8c15f0f76b3459c9c080"
+      "output": "559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd"
     }
   ],
   "loggedTypes": [],
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_alias/json_abi_oracle_new_encoding.debug.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_alias/json_abi_oracle_new_encoding.debug.json
@@ -8,6 +8,11 @@
       "concreteTypeId": "41bd1a98f0a59642d8f824c805b798a5f268d1f7d05808eb05c4189c493f1be0",
       "metadataTypeId": 0,
       "type": "(u64, u64)"
+    },
+    {
+      "aliasOf": "41bd1a98f0a59642d8f824c805b798a5f268d1f7d05808eb05c4189c493f1be0",
+      "concreteTypeId": "0c549b98c3db49207607c6f5f063b081b1a724bc479a2a1b353ff2c60f3f1d49",
+      "type": "AliasedTuple"
     }
   ],
   "configurables": [],
@@ -18,7 +23,7 @@
       "attributes": null,
       "inputs": [
         {
-          "concreteTypeId": "41bd1a98f0a59642d8f824c805b798a5f268d1f7d05808eb05c4189c493f1be0",
+          "concreteTypeId": "0c549b98c3db49207607c6f5f063b081b1a724bc479a2a1b353ff2c60f3f1d49",
           "name": "arg1"
         }
       ],
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_alias/json_abi_oracle_new_encoding.release.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_alias/json_abi_oracle_new_encoding.release.json
@@ -8,6 +8,11 @@
       "concreteTypeId": "41bd1a98f0a59642d8f824c805b798a5f268d1f7d05808eb05c4189c493f1be0",
       "metadataTypeId": 0,
       "type": "(u64, u64)"
+    },
+    {
+      "aliasOf": "41bd1a98f0a59642d8f824c805b798a5f268d1f7d05808eb05c4189c493f1be0",
+      "concreteTypeId": "0c549b98c3db49207607c6f5f063b081b1a724bc479a2a1b353ff2c60f3f1d49",
+      "type": "AliasedTuple"
     }
   ],
   "configurables": [],
@@ -18,7 +23,7 @@
       "attributes": null,
       "inputs": [
         {
-          "concreteTypeId": "41bd1a98f0a59642d8f824c805b798a5f268d1f7d05808eb05c4189c493f1be0",
+          "concreteTypeId": "0c549b98c3db49207607c6f5f063b081b1a724bc479a2a1b353ff2c60f3f1d49",
           "name": "arg1"
         }
       ],
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.debug.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.debug.json
@@ -1,19 +1,34 @@
 {
   "concreteTypes": [
     {
-      "concreteTypeId": "a28cf4bd3deddbee8bde0daa7b4534d37db682c73dc398fd720c75f3775a3df0",
+      "concreteTypeId": "e9133707b9a5964870ad23e86be4f17604dcc01a7f1aa3c29c89bc00bf826150",
+      "metadataTypeId": 0,
+      "type": "(SubId, SubId)"
+    },
+    {
+      "concreteTypeId": "6dc857ccc5450dd9656c41075b5f827d26b117e08f6a7aeb27c83eddb7eb46c2",
       "metadataTypeId": 1,
-      "type": "(b256, [enum std::identity::Identity; 2], struct contract_with_type_aliases_abi::IdentityAliasWrapper, struct contract_with_type_aliases_abi::Generic<struct contract_with_type_aliases_abi::IdentityAliasWrapper>, (b256, b256), str[9])"
+      "type": "(SubId, [IdentityAlias; 2], IdentityAliasWrapperAlias, struct contract_with_type_aliases_abi::Generic<IdentityAliasWrapperAlias>, (SubId, SubId), StringTy)"
     },
     {
-      "concreteTypeId": "bc42ec26f2a17c5b23fc007d96b96bf35f8949ee156afdd789064210d881f7e0",
-      "metadataTypeId": 0,
-      "type": "(b256, b256)"
+      "aliasOf": "1567acc73497bb83e04c376e2c8d3997d0207f0b9b8fa17b0192ee62e1c7a60b",
+      "concreteTypeId": "ec8b64f449a0a882a300f033518b1d36d4d86ae5fb56a2f73bee536991354f8c",
+      "type": "IdentityAliasWrapperAlias"
     },
     {
-      "concreteTypeId": "2771ee6889dff227342d90c5f1ea6019ad8c8de50880048f823e1b926b26c13e",
-      "metadataTypeId": 2,
-      "type": "[enum std::identity::Identity; 2]"
+      "aliasOf": "bc5b9d5b85b9fb6e78bbb779cc67a95e60d6f291cd256a4c7dba66308dc7dfb8",
+      "concreteTypeId": "ad6cdbd8e07b2c3d4b95f6b4ba8e5eeb6106b604fb4dfc6ccb8274ee194aadf0",
+      "type": "StringTy"
+    },
+    {
+      "aliasOf": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
+      "concreteTypeId": "ed5a69f3ec26a28dea9c502e4de03d3c9da64d76a6cafee4348d8f090db3f1ba",
+      "type": "SubId"
+    },
+    {
+      "concreteTypeId": "51e03ee1e6f7b7c928eab4ea7bd4f5140eb25216646a3742afbe75a753b0bce3",
+      "metadataTypeId": 4,
+      "type": "[IdentityAlias; 2]"
     },
     {
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
@@ -24,11 +39,11 @@
       "type": "str[9]"
     },
     {
-      "concreteTypeId": "3981e3d30e52d053c35da213685243d8c82ef363f58bfc2d14986c393254c450",
+      "concreteTypeId": "7587b556083bd8ec430f2588f6b8aaeba231743f84761b1d8955e125f2527ef2",
       "metadataTypeId": 5,
-      "type": "struct contract_with_type_aliases_abi::Generic<struct contract_with_type_aliases_abi::IdentityAliasWrapper>",
+      "type": "struct contract_with_type_aliases_abi::Generic<IdentityAliasWrapperAlias>",
       "typeArguments": [
-        "1567acc73497bb83e04c376e2c8d3997d0207f0b9b8fa17b0192ee62e1c7a60b"
+        "ec8b64f449a0a882a300f033518b1d36d4d86ae5fb56a2f73bee536991354f8c"
       ]
     },
     {
@@ -45,32 +60,32 @@
       "attributes": null,
       "inputs": [
         {
-          "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
+          "concreteTypeId": "ed5a69f3ec26a28dea9c502e4de03d3c9da64d76a6cafee4348d8f090db3f1ba",
           "name": "x"
         },
         {
-          "concreteTypeId": "2771ee6889dff227342d90c5f1ea6019ad8c8de50880048f823e1b926b26c13e",
+          "concreteTypeId": "51e03ee1e6f7b7c928eab4ea7bd4f5140eb25216646a3742afbe75a753b0bce3",
           "name": "y"
         },
         {
-          "concreteTypeId": "1567acc73497bb83e04c376e2c8d3997d0207f0b9b8fa17b0192ee62e1c7a60b",
+          "concreteTypeId": "ec8b64f449a0a882a300f033518b1d36d4d86ae5fb56a2f73bee536991354f8c",
           "name": "z"
         },
         {
-          "concreteTypeId": "3981e3d30e52d053c35da213685243d8c82ef363f58bfc2d14986c393254c450",
+          "concreteTypeId": "7587b556083bd8ec430f2588f6b8aaeba231743f84761b1d8955e125f2527ef2",
           "name": "w"
         },
         {
-          "concreteTypeId": "bc42ec26f2a17c5b23fc007d96b96bf35f8949ee156afdd789064210d881f7e0",
+          "concreteTypeId": "e9133707b9a5964870ad23e86be4f17604dcc01a7f1aa3c29c89bc00bf826150",
           "name": "u"
         },
         {
-          "concreteTypeId": "bc5b9d5b85b9fb6e78bbb779cc67a95e60d6f291cd256a4c7dba66308dc7dfb8",
+          "concreteTypeId": "ad6cdbd8e07b2c3d4b95f6b4ba8e5eeb6106b604fb4dfc6ccb8274ee194aadf0",
           "name": "s"
         }
       ],
       "name": "foo",
-      "output": "a28cf4bd3deddbee8bde0daa7b4534d37db682c73dc398fd720c75f3775a3df0"
+      "output": "6dc857ccc5450dd9656c41075b5f827d26b117e08f6a7aeb27c83eddb7eb46c2"
     }
   ],
   "loggedTypes": [],
@@ -80,11 +95,11 @@
       "components": [
         {
           "name": "__tuple_element",
-          "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b"
+          "typeId": "ed5a69f3ec26a28dea9c502e4de03d3c9da64d76a6cafee4348d8f090db3f1ba"
         },
         {
           "name": "__tuple_element",
-          "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b"
+          "typeId": "ed5a69f3ec26a28dea9c502e4de03d3c9da64d76a6cafee4348d8f090db3f1ba"
         }
       ],
       "metadataTypeId": 0,
@@ -94,22 +109,22 @@
       "components": [
         {
           "name": "__tuple_element",
-          "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b"
+          "typeId": "ed5a69f3ec26a28dea9c502e4de03d3c9da64d76a6cafee4348d8f090db3f1ba"
         },
         {
           "name": "__tuple_element",
-          "typeId": 2
+          "typeId": 4
         },
         {
           "name": "__tuple_element",
-          "typeId": 6
+          "typeId": "ec8b64f449a0a882a300f033518b1d36d4d86ae5fb56a2f73bee536991354f8c"
         },
         {
           "name": "__tuple_element",
           "typeArguments": [
             {
               "name": "",
-              "typeId": 6
+              "typeId": "ec8b64f449a0a882a300f033518b1d36d4d86ae5fb56a2f73bee536991354f8c"
             }
           ],
           "typeId": 5
@@ -120,82 +135,52 @@
         },
         {
           "name": "__tuple_element",
-          "typeId": "bc5b9d5b85b9fb6e78bbb779cc67a95e60d6f291cd256a4c7dba66308dc7dfb8"
+          "typeId": "ad6cdbd8e07b2c3d4b95f6b4ba8e5eeb6106b604fb4dfc6ccb8274ee194aadf0"
         }
       ],
       "metadataTypeId": 1,
       "type": "(_, _, _, _, _, _)"
     },
     {
-      "components": [
-        {
-          "name": "__array_element",
-          "typeId": 3
-        }
-      ],
       "metadataTypeId": 2,
-      "type": "[_; 2]"
+      "type": "IdentityAlias"
+    },
+    {
+      "metadataTypeId": 3,
+      "type": "T"
     },
     {
       "components": [
         {
-          "name": "Address",
-          "typeId": 7
-        },
-        {
-          "name": "ContractId",
-          "typeId": 8
+          "name": "__array_element",
+          "typeId": 2
         }
       ],
-      "metadataTypeId": 3,
-      "type": "enum std::identity::Identity"
-    },
-    {
       "metadataTypeId": 4,
-      "type": "generic T"
+      "type": "[_; 2]"
     },
     {
       "components": [
         {
           "name": "f",
-          "typeId": 4
+          "typeId": 3
         }
       ],
       "metadataTypeId": 5,
       "type": "struct contract_with_type_aliases_abi::Generic",
       "typeParameters": [
-        4
+        3
       ]
     },
     {
       "components": [
         {
           "name": "i",
-          "typeId": 3
+          "typeId": 2
         }
       ],
       "metadataTypeId": 6,
       "type": "struct contract_with_type_aliases_abi::IdentityAliasWrapper"
-    },
-    {
-      "components": [
-        {
-          "name": "bits",
-          "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b"
-        }
-      ],
-      "metadataTypeId": 7,
-      "type": "struct std::address::Address"
-    },
-    {
-      "components": [
-        {
-          "name": "bits",
-          "typeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b"
-        }
-      ],
-      "metadataTypeId": 8,
-      "type": "struct std::contract_id::ContractId"
     }
   ],
   "panickingCalls": {},
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.release.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.release.json
