Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent submitting calls to messages marked as immutable #1397

Merged
merged 4 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Remove check for compatible `scale` and `scale-info` versions - [#1370](https://github.com/paritytech/cargo-contract/pull/1370)
- Add workspace support -[#1358](https://github.com/paritytech/cargo-contract/pull/1358)

### Fixed
- Do not allow to execute calls on immutable contract messages - [#1397](https://github.com/paritytech/cargo-contract/pull/1397)

## [4.0.0-alpha]

Replaces the yanked `3.1.0` due to issues with supporting *both* Rust versions < `1.70`
Expand Down
17 changes: 17 additions & 0 deletions crates/extrinsics/src/call.rs
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,23 @@ impl CallExec {
&self,
gas_limit: Option<Weight>,
) -> Result<DisplayEvents, ErrorVariant> {
if !self
.transcoder()
.metadata()
.spec()
.messages()
.iter()
.find(|msg| msg.label() == &self.message)
.expect("message exist after calling CallExec::done()")
.mutates()
{
let inner = anyhow!(
"Tried to execute a call on the immutable contract message '{}'. Please do a dry-run instead.",
&self.message
);
return Err(inner.into());
}

// use user specified values where provided, otherwise estimate
let gas_limit = match gas_limit {
Some(gas_limit) => gas_limit,
Expand Down
13 changes: 10 additions & 3 deletions crates/extrinsics/src/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ impl ContractsNodeProcess {
);
let result = OnlineClient::new().await;
if let Ok(client) = result {
break Ok(client)
break Ok(client);
}
if attempts < MAX_ATTEMPTS {
attempts += 1;
continue
continue;
}
if let Err(err) = result {
break Err(err)
break Err(err);
}
};
match client {
Expand Down Expand Up @@ -509,6 +509,13 @@ async fn api_build_upload_instantiate_call() {
.to_string();
assert!(value.contains("true"), "{:#?}", value);

// call the contract on the immutable "get" message trying to execute
// this should fail because "get" is immutable
match call.call(None).await {
Err(crate::ErrorVariant::Generic(_)) => {}
_ => panic!("immutable call was not prevented"),
}

// call the contract
// flip the value
let call = CallCommandBuilder::default()
Expand Down
Loading