Update to latest.

Author: tritao

sway-core/src/abi_generation/abi_str.rs

@@ -21,9 +21,13 @@ impl TypeId {
         resolved_type_id: TypeId,
     ) -> Result<String, ErrorEmitted> {
         let type_engine = engines.te();
-        let self_abi_str = type_engine
-            .get(*self)
-            .abi_str(handler, ctx, engines, true)?;
+        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)?
+        };
         if self.is_generic_parameter(engines, resolved_type_id) {
             Ok(format!("generic {self_abi_str}"))
         } else {

test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.release.json

@@ -1,5 +1,10 @@
 {
   "concreteTypes": [
+    {
+      "aliasOf": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+      "concreteTypeId": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+      "type": ""
+    },
     {
       "concreteTypeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d",
       "type": "()"
@@ -72,7 +77,7 @@
       "offset": 5104
     },
     {
-      "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
+      "concreteTypeId": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
       "indirect": false,
       "name": "ANOTHER_U8",
       "offset": 4840

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": [],

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": [],

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"
         }
       ],

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"
         }
       ],