Bug fix: double nested imported structs reporting wrong program of origin

compiler/ast/src/struct/mod.rs

@@ -87,9 +87,9 @@ impl Composite {
                         mode: if input.owner().is_public() { Mode::Public } else { Mode::Private },
                         identifier: Identifier::from(id),
                         type_: match entry {
-                            Public(t) => Type::from_snarkvm(t, Some(external_program)),
+                            Public(t) => Type::from_snarkvm(t, None),
-                            Private(t) => Type::from_snarkvm(t, Some(external_program)),
+                            Private(t) => Type::from_snarkvm(t, None),
-                            Constant(t) => Type::from_snarkvm(t, Some(external_program)),
+                            Constant(t) => Type::from_snarkvm(t, None),
                         },
                         span: Default::default(),
                         id: Default::default(),

compiler/ast/src/stub/finalize_stub.rs

@@ -57,10 +57,7 @@ impl FinalizeStub {
         Self { identifier, input, output, output_type, span, id }
     }
 
-    pub fn from_snarkvm<N: Network, Command: CommandTrait<N>>(
+    pub fn from_snarkvm<N: Network, Command: CommandTrait<N>>(finalize: &FinalizeCore<N, Command>) -> Self {
-        finalize: &FinalizeCore<N, Command>,
-        _program: Symbol,
-    ) -> Self {
         let mut inputs = Vec::new();
 
         finalize.inputs().iter().enumerate().for_each(|(index, input)| {

compiler/ast/src/stub/function_stub.rs

@@ -171,7 +171,7 @@ impl FunctionStub {
                         span: Default::default(),
                         id: Default::default(),
                         type_: Composite(CompositeType {
-                            id: Identifier::from(loc.name()),
+                            id: Identifier::from(loc.resource()),
                             program: Some(ProgramId::from(loc.program_id()).name.name),
                         }),
                     }]
@@ -242,7 +242,7 @@ impl FunctionStub {
                 .collect_vec(),
             output: outputs,
             output_type,
-            finalize_stub: function.finalize_logic().map(|f| FinalizeStub::from_snarkvm(f, program)),
+            finalize_stub: function.finalize_logic().map(|f| FinalizeStub::from_snarkvm(f)),
             span: Default::default(),
             id: Default::default(),
         }

tests/expectations/compiler/structs/external_struct.out

@@ -16,16 +16,29 @@ outputs:
           bytecode: c562a0b23873460644ce0af83bd46d2a4010f5d667aafd72940cfa0dd3a1c893
           errors: ""
           warnings: ""
-        - initial_symbol_table: d8f0481ecd769d2d8af4f244abe6006c7e12b729117fc29a7267d41c6f0d57ad
+        - initial_symbol_table: bf4df4d282d441aa066c448ef97e451268e0d97c08c33516ac2a4c0eb97d1a5a
-          type_checked_symbol_table: 1eab9bddabe0b00f992523c4c80b88a8f3033aa5d6ca9102aa5b51a162adcb02
+          type_checked_symbol_table: ce38b76652d71f02ff483b21887a257d27d51ff9a6d2f1d273c50d7733955ad7
-          unrolled_symbol_table: 1eab9bddabe0b00f992523c4c80b88a8f3033aa5d6ca9102aa5b51a162adcb02
+          unrolled_symbol_table: ce38b76652d71f02ff483b21887a257d27d51ff9a6d2f1d273c50d7733955ad7
-          initial_ast: 38cd119329ad4170eda4cb315b72902d429cd74244d9c153b1d194a4124698c2
+          initial_ast: fb484404a5aca0a1d1dcb51c54b2195e83d72e1cf19b2d2eeddcbe531c2558bf
-          unrolled_ast: 4daf97295f744585bc4b5a2e6557d2bb716fd9fc2f79fa00bf8b8d5ac6fbf6b7
+          unrolled_ast: 0b8ae6c05d6b718d105e7fe79a14b72a3f74efa18f0624f4618ada431a4adace
-          ssa_ast: 2f2a5545904826a820e060abdf52b85769827a050c0cdbf6cff1632e64644cbc
+          ssa_ast: 52253a43ed60f1aa6520ca3d5d29c571059caa223a05e8b80b60f32651196d7e
-          flattened_ast: 0b83ac35c14f3a002ce9ba33abb0c75a8d82ce51dfa4a8e5416b994bd27032ad
+          flattened_ast: 60592e06a8db12be7a35dd37054030664d51927d3a123a38acf6503fb6343fe0
-          destructured_ast: e1de58ac6095e735da767cf3a26077787bd47926edd5c98392a0ce727a928b39
+          destructured_ast: 961efe33a4a47fbfb4218a95347b7062018e5fa77bb513f22b9acbe4c016c03d
-          inlined_ast: e1de58ac6095e735da767cf3a26077787bd47926edd5c98392a0ce727a928b39
+          inlined_ast: 961efe33a4a47fbfb4218a95347b7062018e5fa77bb513f22b9acbe4c016c03d
-          dce_ast: 88f0635026139e6f165145eca46ecbc8393d7489c12173e0ff8ee806eebe5b00
+          dce_ast: 37a02eb2fbab6060f141d694cc8133082d82a10e7f97ba449450cb9d69a5d2d8
-          bytecode: f114f62411901c27e665e0550b5c4e34d5a24b0bffd01ca6bbeca2831462d1bf
+          bytecode: 5a1ca0038e83880d6d2cd5413ca4e8ec01e2622d635d6d8b2cb64463cd5c4817
+          errors: ""
+          warnings: ""
+        - initial_symbol_table: e80a77083f229ce01b84834841c3e7d330ad78706aee47f6fc42141cf7f77cec
+          type_checked_symbol_table: 5958f63685c7956cdc25d43d19b292ef961f29bf0ec690e8b73afc1c47fdda7c
+          unrolled_symbol_table: 5958f63685c7956cdc25d43d19b292ef961f29bf0ec690e8b73afc1c47fdda7c
+          initial_ast: 5ca5cf48edf7f39b3354b62a6734f405deddccdd8410aa08daed5658c9a79b53
+          unrolled_ast: 36b9c5c7c81ec9def1ef719adadced944756ddea840d29686cb47c0cfa1e81c5
+          ssa_ast: dd9bf2ce3d140495623090b88a85d5a3c574218e79952ffeb859ec8d34d538de
+          flattened_ast: 88c2918ebbf795fdb8a45c751abcec24026aeaecbac32b36e83b5e7bc19bb366
+          destructured_ast: ee0c8933257d1577e4a6bd78eda5c989a9f02df7603949407a0f71a53a66301a
+          inlined_ast: ee0c8933257d1577e4a6bd78eda5c989a9f02df7603949407a0f71a53a66301a
+          dce_ast: ee0c8933257d1577e4a6bd78eda5c989a9f02df7603949407a0f71a53a66301a
+          bytecode: 641b261d2641bab7d3bc2b54ddbaf507988552b5488bd1d33a88de17edc33d42
           errors: ""
           warnings: ""

tests/tests/compiler/structs/external_struct.leo

@@ -40,9 +40,43 @@ program child.aleo {
 import child.aleo;
 program parent.aleo {
 
+    record BooHoo {
+        owner: address,
+        val: u32,
+        woo: Woo,
+    }
+
+    struct Woo {
+        a: u32,
+        b: u32,
+    }
+
     transition create_wrapper() -> (Foo, child.aleo/Boo) {
         let f: Foo = Foo {bar: [Bar {baz: [Baz {one: One {two: [Two {val1: 1u32, val2: 2u32}, Two {val1: 3u32, val2: 4u32}]}}, Baz {one: One {two: [Two {val1: 5u32, val2: 6u32}, Two {val1: 7u32, val2: 8u32}]}}]}]};
         let (f1, b1): (Foo, child.aleo/Boo) = child.aleo/create();
         return child.aleo/create();
     }
+
+    transition create_another_wrapper() -> (Foo, child.aleo/Boo, BooHoo, Woo) {
+        let f: Foo = Foo {bar: [Bar {baz: [Baz {one: One {two: [Two {val1: 1u32, val2: 2u32}, Two {val1: 3u32, val2: 4u32}]}}, Baz {one: One {two: [Two {val1: 5u32, val2: 6u32}, Two {val1: 7u32, val2: 8u32}]}}]}]};
+        let (f1, b1): (Foo, child.aleo/Boo) = child.aleo/create();
+        return (f1, b1, BooHoo {owner: self.caller, val: 10u32, woo: Woo {a: 1u32, b: 2u32}}, Woo {a: 3u32, b: 4u32});
+    }
+
+}
+
+// --- Next Program --- //
+import parent.aleo;
+import child.aleo;
+program grandparent.aleo {
+
+    transition main(b: u32) -> u32 {
+        let a: u32 = 1u32 + b;
+        return a;
+    }
+
+    ///transition omega_wrapper() -> (Foo, child.aleo/Boo, parent.aleo/BooHoo, Woo) {
+    ///    let (f, b, bh, w): (Foo, child.aleo/Boo, parent.aleo/BooHoo, Woo) = parent.aleo/create_another_wrapper();
+    ///    return parent.aleo/create_another_wrapper();
+    ///}
 }