Merge pull request #1130 from rainlanguage/2025-01-07-dotrain-order-u…

…pdate

crates/cli/src/commands/order/calldata.rs

@@ -6,7 +6,6 @@ use clap::Parser;
 use rain_orderbook_common::add_order::AddOrderArgs;
 use rain_orderbook_common::dotrain_order::DotrainOrder;
 use std::fs::read_to_string;
-use std::ops::Deref;
 use std::path::PathBuf;
 
 #[derive(Parser, Clone)]
@@ -37,18 +36,13 @@ impl Execute for AddOrderCalldata {
             }
             None => None,
         };
-        let order = DotrainOrder::new(dotrain, settings).await?;
+        let order = DotrainOrder::new(dotrain, settings.map(|v| vec![v])).await?;
         let dotrain_string = order.dotrain().to_string();
 
-        let config_deployment = order
-            .config()
-            .deployments
-            .get(&self.deployment)
-            .ok_or(anyhow!("specified deployment is undefined!"))?;
+        let config_deployment = order.dotrain_yaml().get_deployment(&self.deployment)?;
 
         let add_order_args =
-            AddOrderArgs::new_from_deployment(dotrain_string, config_deployment.deref().clone())
-                .await;
+            AddOrderArgs::new_from_deployment(dotrain_string, config_deployment.clone()).await;
 
         let add_order_calldata = add_order_args?
             .try_into_call(config_deployment.scenario.deployer.network.rpc.to_string())
@@ -160,6 +154,8 @@ scenarios:
     some-scenario:
         network: some-network
         deployer: some-deployer
+        bindings:
+            key: 10
 
 orders:
     some-order:
@@ -177,6 +173,7 @@ deployments:
         scenario: some-scenario
         order: some-order
 ---
+#key !Test binding key
 #calculate-io
 _ _: 0 0;
 #handle-io

crates/cli/src/commands/order/compose.rs

@@ -42,7 +42,7 @@ impl Execute for Compose {
             None => None,
         };
 
-        let order = DotrainOrder::new(dotrain, settings).await?;
+        let order = DotrainOrder::new(dotrain, settings.map(|v| vec![v])).await?;
 
         let rainlang = if self.post {
             order
@@ -133,7 +133,22 @@ scenarios:
     some-scenario:
         network: some-network
         deployer: some-deployer
+        bindings:
+            key1: 10
+
+tokens:
+    token-one:
+        network: some-network
+        address: 0x1234567890123456789012345678901234567890
+
+orders:
+    some-order:
+        inputs:
+            - token: token-one
+        outputs:
+            - token: token-one
 ---
+#key1 !Test binding
 #calculate-io
 _ _: 0 0;
 #handle-io

crates/cli/src/commands/order/listorderfrontmatterkeys.rs

@@ -41,19 +41,21 @@ impl Execute for ListOrderFrontmatterKeys {
             None => None,
         };
 
-        let order = DotrainOrder::new(dotrain, settings).await?;
+        let order = DotrainOrder::new(dotrain, settings.map(|v| vec![v])).await?;
 
         let keys_string = match self.key_type {
             KeyType::Deployment => {
-                let deployment_keys = order.config().deployments.keys();
+                let deployment_keys = order.dotrain_yaml().get_deployment_keys()?;
                 deployment_keys
+                    .iter()
                     .map(|key| key.to_string())
                     .collect::<Vec<String>>()
                     .join(" ")
             }
             KeyType::Scenario => {
-                let scenario_keys = order.config().scenarios.keys();
+                let scenario_keys = order.dotrain_yaml().get_scenario_keys()?;
                 scenario_keys
+                    .iter()
                     .map(|key| key.to_string())
                     .collect::<Vec<String>>()
                     .join(" ")

crates/cli/src/commands/order/mod.rs

@@ -2,7 +2,6 @@ mod add;
 mod calldata;
 mod compose;
 mod detail;
-mod filter;
 mod list;
 mod listorderfrontmatterkeys;
 mod orderbook_address;
@@ -15,7 +14,6 @@ use anyhow::Result;
 use calldata::AddOrderCalldata;
 use clap::Parser;
 use compose::Compose;
-use filter::Filter;
 use listorderfrontmatterkeys::ListOrderFrontmatterKeys;
 
 use detail::CliOrderDetailArgs;
@@ -53,8 +51,6 @@ pub enum Order {
 
     #[command(about = "Get frontmatter keys from a dotrain file", alias = "keys")]
     ListOrderFrontmatterKeys(ListOrderFrontmatterKeys),
-    #[command()]
-    Filter(Filter),
 }
 
 impl Execute for Order {
@@ -68,7 +64,6 @@ impl Execute for Order {
             Order::Calldata(calldata) => calldata.execute().await,
             Order::OrderbookAddress(orderbook_address) => orderbook_address.execute().await,
             Order::ListOrderFrontmatterKeys(keys) => keys.execute().await,
-            Order::Filter(filter) => filter.execute().await,
         }
     }
 }

crates/cli/src/commands/order/orderbook_address.rs

@@ -34,24 +34,24 @@ impl Execute for OrderbookAddress {
             }
             None => None,
         };
-        let order = DotrainOrder::new(dotrain, settings).await?;
-        let order_config = order.config().clone();
-        let deployment_ref = order_config
-            .deployments
-            .get(&self.deployment)
-            .ok_or(anyhow!("specified deployment is undefined!"))?;
+        let order = DotrainOrder::new(dotrain, settings.map(|v| vec![v])).await?;
+        let deployment_ref = order.dotrain_yaml().get_deployment(&self.deployment)?;
 
         let orderbook_address = if let Some(v) = &deployment_ref.order.orderbook {
             v.address
         } else {
             let network_key = &deployment_ref.scenario.deployer.network.key;
-            order_config
-                .orderbooks
-                .iter()
-                .find(|(k, v)| *k == network_key || v.network.key == *network_key)
-                .ok_or(anyhow!("specified orderbook is undefined!"))?
-                .1
-                .address
+            let mut orderbook_address = None;
+            for key in order.orderbook_yaml().get_orderbook_keys()? {
+                let orderbook = order.orderbook_yaml().get_orderbook(&key)?;
+                if key == *network_key || orderbook.network.key == *network_key {
+                    orderbook_address = Some(orderbook.address);
+                }
+            }
+            if orderbook_address.is_none() {
+                return Err(anyhow!("specified orderbook is undefined!"));
+            }
+            orderbook_address.unwrap()
         };
         output(&None, self.encoding.clone(), orderbook_address.as_slice())?;
 
@@ -149,6 +149,8 @@ scenarios:
     some-scenario:
         network: some-network
         deployer: some-deployer
+        bindings:
+            key1: 10
 
 orders:
     some-order:
@@ -165,6 +167,7 @@ deployments:
         scenario: some-scenario
         order: some-order
 ---
+#key !Test binding
 #calculate-io
 _ _: 0 0;
 #handle-io