Skip to content

Fix instantiate_with_code with already uploaded code #594

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.

Sign up for GitHub

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

Merged
ascjones merged 1 commit into from
May 30, 2022
Merged

Fix instantiate_with_code with already uploaded code #594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions src/cmd/extrinsics/instantiate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,9 @@ impl<'a> Exec<'a> {
Code::Upload(code) => {
let (code_hash, contract_account) =
self.instantiate_with_code(code).await?;
name_value_println!("Code hash", format!("{:?}", code_hash));
if let Some(code_hash) = code_hash {
name_value_println!("Code hash", format!("{:?}", code_hash));
}
name_value_println!("Contract", contract_account.to_ss58check());
}
Code::Existing(code_hash) => {
Expand All @@ -265,7 +267,7 @@ impl<'a> Exec<'a> {
async fn instantiate_with_code(
&self,
code: Bytes,
) -> Result<(CodeHash, ContractAccount)> {
) -> Result<(Option<CodeHash>, ContractAccount)> {
let api = self.subxt_api().await?;
let tx_progress = api
.tx()
Expand All @@ -287,14 +289,16 @@ impl<'a> Exec<'a> {

display_events(&result, &self.transcoder, metadata, &self.verbosity)?;

let code_stored = result
// The CodeStored event is only raised if the contract has not already been uploaded.
let code_hash = result
.find_first::<api::contracts::events::CodeStored>()?
.ok_or_else(|| anyhow!("Failed to find CodeStored event"))?;
.map(|code_stored| code_stored.code_hash);

let instantiated = result
.find_first::<api::contracts::events::Instantiated>()?
.ok_or_else(|| anyhow!("Failed to find Instantiated event"))?;

Ok((code_stored.code_hash, instantiated.contract))
Ok((code_hash, instantiated.contract))
}

async fn instantiate(&self, code_hash: CodeHash) -> Result<ContractAccount> {
Expand Down