Skip to content

Append custom meta entries in one section #2229

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
elizabethengelman merged 1 commit into from
Sep 29, 2025
Merged

Append custom meta entries in one section #2229

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
33 changes: 22 additions & 11 deletions cmd/soroban-cli/src/commands/contract/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ use std::{
env,
ffi::OsStr,
fmt::Debug,
fs, io,
fs,
io::{self, Cursor},
path::{self, Path, PathBuf},
process::{Command, ExitStatus, Stdio},
};
use stellar_xdr::curr::{Limits, ScMetaEntry, ScMetaV0, StringM, WriteXdr};
use stellar_xdr::curr::{Limited, Limits, ScMetaEntry, ScMetaV0, StringM, WriteXdr};

use crate::{commands::global, print::Print};

Expand Down Expand Up @@ -114,6 +115,8 @@ pub enum Error {
MetaArg(String),
#[error("use rust 1.81 or 1.84+ to build contracts (got {0})")]
RustVersion(String),
#[error(transparent)]
Xdr(#[from] stellar_xdr::curr::Error),
}

const WASM_TARGET: &str = "wasm32v1-none";
Expand Down Expand Up @@ -296,7 +299,17 @@ impl Cmd {
}

let mut wasm_bytes = fs::read(target_file_path).map_err(Error::ReadingWasmFile)?;
let xdr = self.encoded_new_meta()?;
wasm_gen::write_custom_section(&mut wasm_bytes, META_CUSTOM_SECTION_NAME, &xdr);

// Deleting .wasm file effectively unlinking it from /release/deps/.wasm preventing from overwrite
// See https://github.com/stellar/stellar-cli/issues/1694#issuecomment-2709342205
fs::remove_file(target_file_path).map_err(Error::DeletingArtifact)?;
fs::write(target_file_path, wasm_bytes).map_err(Error::WritingWasmFile)
}

fn encoded_new_meta(&self) -> Result<Vec<u8>, Error> {
let mut new_meta: Vec<ScMetaEntry> = Vec::new();
for (k, v) in self.meta.clone() {
let key: StringM = k
.clone()
Expand All @@ -308,17 +321,15 @@ impl Cmd {
.try_into()
.map_err(|e| Error::MetaArg(format!("{v} is an invalid metadata value: {e}")))?;
let meta_entry = ScMetaEntry::ScMetaV0(ScMetaV0 { key, val });
let xdr: Vec<u8> = meta_entry
.to_xdr(Limits::none())
.map_err(|e| Error::MetaArg(format!("failed to encode metadata entry: {e}")))?;

wasm_gen::write_custom_section(&mut wasm_bytes, META_CUSTOM_SECTION_NAME, &xdr);
new_meta.push(meta_entry);
}

// Deleting .wasm file effectively unlinking it from /release/deps/.wasm preventing from overwrite
// See https://github.com/stellar/stellar-cli/issues/1694#issuecomment-2709342205
fs::remove_file(target_file_path).map_err(Error::DeletingArtifact)?;
fs::write(target_file_path, wasm_bytes).map_err(Error::WritingWasmFile)
let mut buffer = Vec::new();
let mut writer = Limited::new(Cursor::new(&mut buffer), Limits::none());
for entry in new_meta {
entry.write_xdr(&mut writer)?;
}
Ok(buffer)
}

fn print_build_summary(print: &Print, target_file_path: &PathBuf) -> Result<(), Error> {
Expand Down