wip

Author: wbbradley

contracts/subsidies/sources/subsidies.move

@@ -330,6 +330,7 @@ public fun register_blob(
     root_hash: u256,
     size: u64,
     encoding_type: u8,
+    chunk_size: u64,
     deletable: bool,
     write_payment: &mut Coin<WAL>,
     ctx: &mut TxContext,
@@ -341,6 +342,7 @@ public fun register_blob(
         root_hash,
         size,
         encoding_type,
+        chunk_size,
         deletable,
         write_payment,
         ctx,

contracts/subsidies/tests/subsidies_tests.move

@@ -636,6 +636,7 @@ fun register_default_blob(
         ROOT_HASH,
         UNENCODED_SIZE,
         RS2,
+        0, // chunk_size: 0 for RS2 encoding (non-chunked)
         deletable,
         &mut fake_coin,
         ctx,

contracts/walrus/sources/system/redstuff.move

@@ -208,7 +208,8 @@ fun test_chunked_encoding_single_chunk() {
 
 #[test]
 fun test_compute_num_chunks() {
-    let chunk_size = DEFAULT_CHUNK_SIZE;
+    // 10 MB default chunk size (same as Rust DEFAULT_CHUNK_SIZE)
+    let chunk_size = 10 * 1024 * 1024;
     // Small blob: 1 chunk
     assert_eq!(compute_num_chunks(1000, chunk_size), 1);
 

crates/walrus-sui/benches/gas_cost_bench.rs

@@ -290,6 +290,7 @@ fn prepare_blob_metadata() -> BlobObjectMetadata {
         unencoded_size: size,
         encoded_size: resource_size,
         encoding_type,
+        chunk_size: 0, // RS2 blobs don't use chunks
     }
 }
 

crates/walrus-sui/src/client.rs

@@ -286,6 +286,8 @@ pub struct BlobObjectMetadata {
     pub encoded_size: u64,
     /// The encoding type of the blob.
     pub encoding_type: EncodingType,
+    /// The chunk size for chunked blobs (0 for non-chunked blobs).
+    pub chunk_size: u64,
 }
 
 impl<const V: bool> TryFrom<&BlobMetadataWithId<V>> for BlobObjectMetadata {
@@ -296,12 +298,20 @@ impl<const V: bool> TryFrom<&BlobMetadataWithId<V>> for BlobObjectMetadata {
             .metadata()
             .encoded_size()
             .context("cannot compute encoded size")?;
+
+        // Extract chunk_size from metadata (0 for non-chunked blobs)
+        let chunk_size = match metadata.metadata() {
+            walrus_core::metadata::BlobMetadata::V2(v2) => v2.chunk_size,
+            _ => 0, // RS2 blobs don't have chunk_size
+        };
+
         Ok(Self {
             blob_id: *metadata.blob_id(),
             root_hash: metadata.metadata().compute_root_hash(),
             unencoded_size: metadata.metadata().unencoded_length(),
             encoded_size,
             encoding_type: metadata.metadata().encoding_type(),
+            chunk_size,
         })
     }
 }

crates/walrus-sui/src/client/transaction_builder.rs

@@ -351,6 +351,7 @@ impl WalrusPtbBuilder {
             self.pt_builder.pure(blob_metadata.unencoded_size)?,
             self.pt_builder
                 .pure(u8::from(blob_metadata.encoding_type))?,
+            self.pt_builder.pure(blob_metadata.chunk_size)?,
             self.pt_builder.pure(persistence.is_deletable())?,
             self.wal_coin_arg()?,
         ];
@@ -389,6 +390,7 @@ impl WalrusPtbBuilder {
             self.pt_builder.pure(blob_metadata.unencoded_size)?,
             self.pt_builder
                 .pure(u8::from(blob_metadata.encoding_type))?,
+            self.pt_builder.pure(blob_metadata.chunk_size)?,
             self.pt_builder.pure(persistence.is_deletable())?,
             self.wal_coin_arg()?,
         ];

crates/walrus-sui/src/system_setup.rs

@@ -101,6 +101,12 @@ fn compile_package_inner_blocking(
     build_config: MoveBuildConfig,
     chain_id: Option<String>,
 ) -> Result<(CompiledPackage, MoveBuildConfig)> {
+    tracing::info!(
+        ?package_path,
+        ?build_config,
+        chain_id,
+        "Compiling Walrus package"
+    );
     let build_config = resolve_lock_file_path(build_config, &package_path)?;
 
     // Set the package ID to zero.
@@ -116,7 +122,7 @@ fn compile_package_inner_blocking(
     };
 
     let run_bytecode_verifier = true;
-    let print_diags_to_stderr = false;
+    let print_diags_to_stderr = true;
     let config = BuildConfig {
         config: build_config.clone(),
         run_bytecode_verifier,

crates/walrus-sui/tests/test_walrus_sui.rs

@@ -165,6 +165,7 @@ async fn test_register_certify_blob() -> anyhow::Result<()> {
         unencoded_size: size,
         encoded_size: resource_size,
         encoding_type,
+        chunk_size: 0, // RS2 blobs don't use chunks
     };
 
     let blob_obj = walrus_client
@@ -256,6 +257,7 @@ async fn test_register_certify_blob() -> anyhow::Result<()> {
         unencoded_size: size,
         encoded_size: resource_size,
         encoding_type,
+        chunk_size: 0, // RS2 blobs don't use chunks
     };
 
     let blob_obj = walrus_client

scripts/local-testbed.sh

@@ -45,7 +45,7 @@ usage() {
 }
 
 run_node() {
-  cmd="./target/release/walrus-node run --config-path $working_dir/$1.yaml ${2:-} \
+  cmd="RUST_LOG=debug ./target/release/walrus-node run --config-path $working_dir/$1.yaml ${2:-} \
     |& tee $working_dir/$1.log"
   echo "Running within tmux: '$cmd'..."
   tmux new -d -s "$1" "$cmd"