feat: Build verifiable contracts

.github/workflows/integration-tests.yml

@@ -85,7 +85,27 @@ jobs:
       - name: Run integration tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: cargo nextest run --locked --no-default-features --features "contract,integration-tests" --test contract --no-fail-fast --nocapture --status-level all
+        run: |
+          if [[ "${{ matrix.os }}" == "macos-latest" ]]; then
+            cargo nextest run \
+            --locked \
+            --no-default-features \
+            --features "contract,integration-tests" \
+            --test contract \
+            --no-fail-fast \
+            --nocapture \
+            --status-level all \
+            -- --skip verifiable_contract_lifecycle
+          else
+            cargo nextest run \
+            --locked \
+            --no-default-features \
+            --features "contract,integration-tests" \
+            --test contract \
+            --no-fail-fast \
+            --nocapture \
+            --status-level all  
+          fi
 
   chain-integration-tests:
     strategy:

Cargo.toml

@@ -57,9 +57,9 @@ sp-weights = { version = "33.0.0", default-features = false }
 scale = { package = "parity-scale-codec", version = "3.7.5", features = ["derive"] }
 scale-info = { version = "2.11.6", default-features = false, features = ["derive"] }
 scale-value = { version = "0.18.0", default-features = false, features = ["from-string", "parser-ss58"] }
-contract-build = { version = "6.0.0-beta.1", default-features = false }
-contract-extrinsics = { version = "6.0.0-beta.1", default-features = false }
-contract-transcode = { version = "6.0.0-beta.1", default-features = false }
+contract-build = { git = "https://github.com/use-ink/cargo-contract", rev = "ceb7b89", default-features = false }
+contract-extrinsics = { git = "https://github.com/use-ink/cargo-contract", rev = "ceb7b89", default-features = false }
+contract-transcode = { git = "https://github.com/use-ink/cargo-contract", rev = "ceb7b89", default-features = false }
 heck = { version = "0.5.0", default-features = false }
 
 # parachains

crates/pop-cli/src/commands/build/contract.rs

@@ -1,17 +1,21 @@
 // SPDX-License-Identifier: GPL-3.0
 
+use super::{BuildArgs, Profile};
 use crate::cli;
-use pop_contracts::{MetadataSpec, Verbosity, build_smart_contract};
+use pop_contracts::{BuildMode, ImageVariant, MetadataSpec, Verbosity, build_smart_contract};
 use std::path::PathBuf;
 
 /// Configuration for building a smart contract.
 pub struct BuildContract {
 	/// Path of the contract project.
 	pub(crate) path: PathBuf,
-	/// Build profile: `true` for release mode, `false` for debug mode.
-	pub(crate) release: bool,
+	/// Build profile: `Release` for release mode, `Debug` for debug mode, `Verifiable` for
+	/// deterministic, release mode.
+	pub(crate) build_mode: BuildMode,
 	/// Which specification to use for contract metadata.
 	pub(crate) metadata: Option<MetadataSpec>,
+	/// A custom image for a verifiable build
+	pub(crate) image: Option<ImageVariant>,
 }
 
 impl BuildContract {
@@ -27,10 +31,107 @@ impl BuildContract {
 	fn build(self, cli: &mut impl cli::traits::Cli) -> anyhow::Result<&'static str> {
 		cli.intro("Building your contract")?;
 		// Build contract.
-		let build_result =
-			build_smart_contract(&self.path, self.release, Verbosity::Default, self.metadata)?;
+		let build_result = build_smart_contract(
+			&self.path,
+			self.build_mode,
+			Verbosity::Default,
+			self.metadata,
+			self.image,
+		)?;
 		cli.success(build_result.display())?;
 		cli.outro("Build completed successfully!")?;
 		Ok("contract")
 	}
 }
+
+/// Resolve the `BuildMode` to use in a contract build depending on the specified args
+///
+/// # Arguments
+/// * `args` - The `BuildArgs` needed to resolve the `BuildMode`
+pub(super) fn resolve_build_mode(args: &BuildArgs) -> BuildMode {
+	match (&args.profile, args.verifiable) {
+		(Some(Profile::Release), false) | (Some(Profile::Production), false) => BuildMode::Release,
+		(None, true) => BuildMode::Verifiable,
+		(None, false) if args.release => BuildMode::Release,
+		// Fallback to debug mode
+		_ => BuildMode::Debug,
+	}
+}
+
+pub(super) fn resolve_image(args: &BuildArgs) -> anyhow::Result<Option<ImageVariant>> {
+	match (&args.image, args.verifiable) {
+		(Some(image), true) => Ok(Some(ImageVariant::Custom(image.clone()))),
+		(None, true) => Ok(Some(ImageVariant::Default)),
+		(None, false) => Ok(None),
+		(Some(_), false) =>
+			Err(anyhow::anyhow!("Custom images can only be used in verifiable builds")),
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn resolve_build_mode_works() {
+		// Profile::Release + verifiable=false -> Release
+		assert_eq!(
+			resolve_build_mode(&BuildArgs {
+				profile: Some(Profile::Release),
+				..Default::default()
+			}),
+			BuildMode::Release
+		);
+		// Profile::Production + verifiable=false -> Release
+		assert_eq!(
+			resolve_build_mode(&BuildArgs {
+				profile: Some(Profile::Production),
+				..Default::default()
+			}),
+			BuildMode::Release
+		);
+		// No profile + verifiable=true -> Verifiable
+		assert_eq!(
+			resolve_build_mode(&BuildArgs { verifiable: true, ..Default::default() }),
+			BuildMode::Verifiable
+		);
+		// No profile + verifiable=false + release=true -> Release
+		assert_eq!(
+			resolve_build_mode(&BuildArgs { release: true, ..Default::default() }),
+			BuildMode::Release
+		);
+		// Profile::Debug + verifiable=false -> Debug
+		assert_eq!(
+			resolve_build_mode(&BuildArgs { profile: Some(Profile::Debug), ..Default::default() }),
+			BuildMode::Debug
+		);
+		// No profile + verifiable=false + release=false -> Debug
+		assert_eq!(resolve_build_mode(&BuildArgs::default()), BuildMode::Debug);
+	}
+
+	#[test]
+	fn resolve_image_works() {
+		// Custom image + verifiable=true -> Custom image
+		assert!(matches!(resolve_image(&BuildArgs {
+				image: Some("my-image:latest".to_string()),
+				verifiable: true,
+				..Default::default()
+			}), Ok(Some(ImageVariant::Custom(custom))) if custom == "my-image:latest"
+		));
+		// No image + verifiable=true -> Default image
+		assert!(matches!(
+			resolve_image(&BuildArgs { verifiable: true, ..Default::default() }),
+			Ok(Some(ImageVariant::Default))
+		));
+		// No image + verifiable=false -> None
+		assert!(matches!(resolve_image(&BuildArgs::default()), Ok(None)));
+		// Custom image + verifiable=false -> Error
+		let err = resolve_image(&BuildArgs {
+			image: Some("my-image:latest".to_string()),
+			verifiable: false,
+			..Default::default()
+		})
+		.unwrap_err();
+		assert_eq!(err.to_string(), "Custom images can only be used in verifiable builds");
+	}
+}

crates/pop-cli/src/commands/build/mod.rs

@@ -47,7 +47,7 @@ pub(crate) struct BuildArgs {
 	#[cfg(feature = "chain")]
 	pub command: Option<Command>,
 	/// Directory path with flag for your project [default: current directory]
-	#[arg(long)]
+	#[arg(long, visible_alias = "manifest-path")]
 	pub(crate) path: Option<PathBuf>,
 	/// Directory path without flag for your project [default: current directory]
 	#[arg(value_name = "PATH", index = 1, conflicts_with = "path")]
@@ -84,10 +84,15 @@ pub(crate) struct BuildArgs {
 	#[clap(long, help_heading = CONTRACT_HELP_HEADER)]
 	#[cfg(feature = "contract")]
 	pub(crate) metadata: Option<MetadataSpec>,
-    /// Whether to build in a way that the contract is verifiable
-    ///#[clap(long, help_heading = CONTRACT_HELP_HEADER)]
-    ///#[cfg(feature = "contract")]
-    ///pub(crate) verifiable: bool
+	/// Whether to build in a way that the contract is verifiable. For verifiable contracts, use
+	/// --manifest-path instead of --path to directly point to your contracts Cargo.toml
+	#[clap(long, conflicts_with_all = ["release", "profile"], help_heading = CONTRACT_HELP_HEADER)]
+	#[cfg(feature = "contract")]
+	pub(crate) verifiable: bool,
+	/// Custom image for verifiable builds
+	#[clap(long, requires = "verifiable", help_heading = CONTRACT_HELP_HEADER)]
+	#[cfg(feature = "contract")]
+	pub(crate) image: Option<String>,
 }
 
 /// Subcommand for building chain artifacts.
@@ -120,12 +125,10 @@ impl Command {
 
 		#[cfg(feature = "contract")]
 		if pop_contracts::is_supported(&project_path)? {
-			// All commands originating from root command are valid
-			let release = match &args.profile {
-				Some(profile) => (*profile).into(),
-				None => args.release,
-			};
-			BuildContract { path: project_path, release, metadata: args.metadata }.execute()?;
+			let build_mode = contract::resolve_build_mode(args);
+			let image = contract::resolve_image(args)?;
+			BuildContract { path: project_path, build_mode, metadata: args.metadata, image }
+				.execute()?;
 			return Ok(());
 		}
 
@@ -361,6 +364,10 @@ mod tests {
 					only_runtime: false,
 					#[cfg(feature = "contract")]
 					metadata: None,
+					#[cfg(feature = "contract")]
+					verifiable: false,
+					#[cfg(feature = "contract")]
+					image: None,
 				},
 				project_path,
 				&mut cli,
@@ -429,6 +436,10 @@ mod tests {
 			only_runtime: false,
 			#[cfg(feature = "contract")]
 			metadata: None,
+			#[cfg(feature = "contract")]
+			verifiable: false,
+			#[cfg(feature = "contract")]
+			image: None,
 		})?;
 
 		Ok(())
@@ -474,6 +485,10 @@ mod tests {
 			only_runtime: false,
 			#[cfg(feature = "contract")]
 			metadata: None,
+			#[cfg(feature = "contract")]
+			verifiable: false,
+			#[cfg(feature = "contract")]
+			image: None,
 		})?;
 
 		// Test 2: Execute with production profile
@@ -496,6 +511,10 @@ mod tests {
 			only_runtime: false,
 			#[cfg(feature = "contract")]
 			metadata: None,
+			#[cfg(feature = "contract")]
+			verifiable: false,
+			#[cfg(feature = "contract")]
+			image: None,
 		})?;
 
 		// Test 3: Execute with custom features
@@ -515,6 +534,10 @@ mod tests {
 				only_runtime: false,
 				#[cfg(feature = "contract")]
 				metadata: None,
+				#[cfg(feature = "contract")]
+				verifiable: false,
+				#[cfg(feature = "contract")]
+				image: None,
 			})?;
 		}
 
@@ -538,6 +561,10 @@ mod tests {
 			only_runtime: false,
 			#[cfg(feature = "contract")]
 			metadata: None,
+			#[cfg(feature = "contract")]
+			verifiable: false,
+			#[cfg(feature = "contract")]
+			image: None,
 		})?;
 
 		// Test 5: Execute with path_pos instead of path
@@ -560,6 +587,10 @@ mod tests {
 			only_runtime: false,
 			#[cfg(feature = "contract")]
 			metadata: None,
+			#[cfg(feature = "contract")]
+			verifiable: false,
+			#[cfg(feature = "contract")]
+			image: None,
 		})?;
 
 		// Test 6: Execute with benchmark and try_runtime flags
@@ -579,6 +610,10 @@ mod tests {
 				only_runtime: false,
 				#[cfg(feature = "contract")]
 				metadata: None,
+				#[cfg(feature = "contract")]
+				verifiable: false,
+				#[cfg(feature = "contract")]
+				image: None,
 			})?;
 		}
 

crates/pop-cli/src/commands/call/contract.rs

@@ -19,8 +19,8 @@ use clap::Args;
 use cliclack::spinner;
 use pop_common::{DefaultConfig, Keypair, parse_h160_account};
 use pop_contracts::{
-	CallExec, CallOpts, ContractCallable, ContractFunction, ContractStorage, DefaultEnvironment,
-	Verbosity, Weight, build_smart_contract, call_smart_contract,
+	BuildMode, CallExec, CallOpts, ContractCallable, ContractFunction, ContractStorage,
+	DefaultEnvironment, Verbosity, Weight, build_smart_contract, call_smart_contract,
 	call_smart_contract_from_signed_payload, dry_run_gas_estimate_call, fetch_contract_storage,
 	get_call_payload, get_contract_storage_info, get_messages, set_up_call,
 };
@@ -202,7 +202,13 @@ impl CallContractCommand {
 		cli.warning("NOTE: contract has not yet been built.")?;
 		let spinner = spinner();
 		spinner.start("Building contract in RELEASE mode...");
-		let result = match build_smart_contract(&project_path, true, Verbosity::Quiet, None) {
+		let result = match build_smart_contract(
+			&project_path,
+			BuildMode::Release,
+			Verbosity::Quiet,
+			None,
+			None,
+		) {
 			Ok(result) => result,
 			Err(e) => {
 				return Err(anyhow!(format!(