Add walnut flag to sozo execute and migrate apply commands

Cargo.toml

@@ -39,6 +39,7 @@ members = [
 	"crates/saya/core",
 	"crates/saya/provider",
 	"crates/sozo/signers",
+	"crates/sozo/walnut",
 	"crates/torii/client",
 	"crates/torii/server",
 	"crates/torii/types-test",
@@ -111,6 +112,7 @@ saya-provider = { path = "crates/saya/provider" }
 # sozo
 sozo-ops = { path = "crates/sozo/ops" }
 sozo-signers = { path = "crates/sozo/signers" }
+sozo-walnut = { path = "crates/sozo/walnut" }
 
 anyhow = "1.0.80"
 assert_fs = "1.1"
@@ -207,6 +209,7 @@ tower-http = "0.4.4"
 tracing = "0.1.34"
 tracing-subscriber = { version = "0.3.16", features = [ "env-filter", "json" ] }
 url = { version = "2.4.0", features = [ "serde" ] }
+walkdir = "2.5.0"
 
 # server
 hyper = "0.14.27"

bin/sozo/src/commands/auth.rs

@@ -149,24 +149,38 @@ pub async fn grant(
 ) -> Result<()> {
     trace!(?kind, ?world, ?starknet, ?account, ?transaction, "Executing Grant command.");
     let world =
-        utils::world_from_env_metadata(world, account, starknet, &env_metadata, config).await?;
+        utils::world_from_env_metadata(world, account, &starknet, &env_metadata, config).await?;
 
     match kind {
         AuthKind::Writer { models_contracts } => {
             trace!(
                 contracts=?models_contracts,
                 "Granting Writer permissions."
             );
-            auth::grant_writer(ui, &world, &models_contracts, transaction.into(), default_namespace)
-                .await
+            auth::grant_writer(
+                ui,
+                &world,
+                &models_contracts,
+                transaction.into(),
+                default_namespace,
+                &starknet.url(env_metadata.as_ref()).ok(),
+            )
+            .await
         }
         AuthKind::Owner { owners_resources } => {
             trace!(
                 resources=?owners_resources,
                 "Granting Owner permissions."
             );
-            auth::grant_owner(ui, &world, &owners_resources, transaction.into(), default_namespace)
-                .await
+            auth::grant_owner(
+                ui,
+                &world,
+                &owners_resources,
+                transaction.into(),
+                default_namespace,
+                &starknet.url(env_metadata.as_ref()).ok(),
+            )
+            .await
         }
     }
 }
@@ -185,7 +199,7 @@ pub async fn revoke(
 ) -> Result<()> {
     trace!(?kind, ?world, ?starknet, ?account, ?transaction, "Executing Revoke command.");
     let world =
-        utils::world_from_env_metadata(world, account, starknet, &env_metadata, config).await?;
+        utils::world_from_env_metadata(world, account, &starknet, &env_metadata, config).await?;
 
     match kind {
         AuthKind::Writer { models_contracts } => {
@@ -199,6 +213,7 @@ pub async fn revoke(
                 &models_contracts,
                 transaction.into(),
                 default_namespace,
+                &starknet.url(env_metadata.as_ref()).ok(),
             )
             .await
         }
@@ -207,8 +222,15 @@ pub async fn revoke(
                 resources=?owners_resources,
                 "Revoking Owner permissions."
             );
-            auth::revoke_owner(ui, &world, &owners_resources, transaction.into(), default_namespace)
-                .await
+            auth::revoke_owner(
+                ui,
+                &world,
+                &owners_resources,
+                transaction.into(),
+                default_namespace,
+                &starknet.url(env_metadata.as_ref()).ok(),
+            )
+            .await
         }
     }
 }

bin/sozo/src/commands/execute.rs

@@ -65,7 +65,7 @@ impl ExecuteArgs {
             let world = utils::world_from_env_metadata(
                 self.world,
                 self.account,
-                self.starknet,
+                &self.starknet,
                 &env_metadata,
                 config,
             )
@@ -93,6 +93,7 @@ impl ExecuteArgs {
                 calldata,
                 &world,
                 &tx_config,
+                &self.starknet.url(env_metadata.as_ref()).ok(),
             )
             .await
         })

bin/sozo/src/commands/options/transaction.rs

@@ -37,6 +37,11 @@ pub struct TransactionOptions {
     )]
     #[arg(global = true)]
     pub receipt: bool,
+
+    #[arg(long)]
+    #[arg(help = "Display the link to debug the transaction with Walnut.")]
+    #[arg(global = true)]
+    pub walnut: bool,
 }
 
 impl TransactionOptions {
@@ -52,10 +57,11 @@ impl TransactionOptions {
             (true, false) => Ok(TxnAction::Estimate),
             (false, true) => Ok(TxnAction::Simulate),
             (false, false) => Ok(TxnAction::Send {
-                wait: self.wait,
+                wait: self.wait || self.walnut,
                 receipt: self.receipt,
                 max_fee_raw: self.max_fee_raw,
                 fee_estimate_multiplier: self.fee_estimate_multiplier,
+                walnut: self.walnut,
             }),
         }
     }
@@ -71,9 +77,10 @@ impl From<TransactionOptions> for TxnConfig {
         );
         Self {
             fee_estimate_multiplier: value.fee_estimate_multiplier,
-            wait: value.wait,
+            wait: value.wait || value.walnut,
             receipt: value.receipt,
             max_fee_raw: value.max_fee_raw,
+            walnut: value.walnut,
         }
     }
 }

bin/sozo/src/commands/register.rs

@@ -60,7 +60,7 @@ impl RegisterArgs {
 
         config.tokio_handle().block_on(async {
             let world =
-                utils::world_from_env_metadata(world, account, starknet, &env_metadata, config)
+                utils::world_from_env_metadata(world, account, &starknet, &env_metadata, config)
                     .await?;
             let provider = world.account.provider();
             let mut world_reader = WorldContractReader::new(world_address, &provider);
@@ -73,6 +73,7 @@ impl RegisterArgs {
                 world_reader,
                 world_address,
                 config,
+                &starknet.url(env_metadata.as_ref()).ok(),
             )
             .await
         })

bin/sozo/src/utils.rs

@@ -52,7 +52,7 @@ pub fn load_metadata_from_config(config: &Config) -> Result<Option<Environment>,
 pub async fn world_from_env_metadata(
     world: WorldOptions,
     account: AccountOptions,
-    starknet: StarknetOptions,
+    starknet: &StarknetOptions,
     env_metadata: &Option<Environment>,
     config: &Config,
 ) -> Result<WorldContract<SozoAccount<JsonRpcClient<HttpTransport>>>, Error> {
@@ -64,7 +64,7 @@ pub async fn world_from_env_metadata(
         .account(
             provider,
             WorldAddressOrName::Address(world_address),
-            &starknet,
+            starknet,
             env_metadata,
             config,
         )