Remove Salt in code generation during build_create

.gitlab-ci.yml

@@ -18,7 +18,7 @@ variables:
   GIT_DEPTH:                       100
   CARGO_INCREMENTAL:               0
   CARGO_TARGET_DIR:                "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
-  CI_IMAGE:                        "paritytech/ink-ci-linux:production"
+  CI_IMAGE:                        "paritytech/ink-ci-linux:staging"
   PURELY_STD_CRATES:               "lang/codegen metadata"
   ALSO_WASM_CRATES:                "env storage storage/derive allocator prelude primitives lang lang/macro lang/ir"
   # this var is changed to "-:staging" when the CI image gets rebuilt
@@ -40,6 +40,7 @@ workflow:
       - artifacts/
 
 .rust-info-script:                 &rust-info-script
+  - cc --version
   - rustup show
   - cargo --version
   - rustup +nightly show

crates/lang/codegen/src/generator/cross_calling.rs

@@ -685,7 +685,7 @@ impl CrossCalling<'_> {
             fn #ident(
                 #( #input_bindings : #input_types ),*
             ) -> Self::#output_ident {
-                ::ink_env::call::build_create::<Environment, Salt, Self>()
+                ::ink_env::call::build_create::<Environment, Self>()
                     .exec_input(
                         ::ink_env::call::ExecutionInput::new(
                             ::ink_env::call::Selector::new([ #( #composed_selector ),* ])

crates/lang/macro/tests/compile_tests.rs

@@ -23,9 +23,10 @@ fn compile_tests() {
     t.pass("tests/ui/pass/05-erc721-contract.rs");
     t.pass("tests/ui/pass/06-non-ink-items.rs");
     t.pass("tests/ui/pass/07-flipper-as-dependency.rs");
-    t.pass("tests/ui/pass/08-static-env.rs");
-    t.pass("tests/ui/pass/09-derive-for-storage.rs");
-    t.pass("tests/ui/pass/10-alias-storage-struct-impl.rs");
+    t.pass("tests/ui/pass/08-flipper-as-dependency-trait.rs");
+    t.pass("tests/ui/pass/09-static-env.rs");
+    t.pass("tests/ui/pass/10-derive-for-storage.rs");
+    t.pass("tests/ui/pass/11-alias-storage-struct-impl.rs");
 
     t.compile_fail("tests/ui/fail/C-00-constructor-self-ref.rs");
     t.compile_fail("tests/ui/fail/C-01-constructor-self-mut.rs");

crates/lang/macro/tests/ui/pass/08-flipper-as-dependency-trait.rs

@@ -0,0 +1,40 @@
+use ink_lang as ink;
+
+#[ink::contract(compile_as_dependency = true)]
+mod flipper {
+    #[ink_lang::trait_definition]
+    pub trait FlipperTrait {
+        #[ink(constructor)]
+        fn new() -> Self;
+
+        #[ink(message)]
+        fn flip(&mut self);
+
+        #[ink(message)]
+        fn get(&self) -> bool;
+    }
+
+    #[ink(storage)]
+    pub struct Flipper {
+        value: bool,
+    }
+
+    impl FlipperTrait for Flipper {
+        #[ink(constructor)]
+        fn new() -> Self {
+            Self::default()
+        }
+
+        #[ink(message)]
+        fn flip(&mut self) {
+            self.value = !self.value;
+        }
+
+        #[ink(message)]
+        fn get(&self) -> bool {
+            self.value
+        }
+    }
+}
+
+fn main() {}