Merge branch 'main' into assembly-eulogia

Author: leighmcculloch

Cargo.lock

@@ -258,6 +258,7 @@ Generate code client bindings for a contract
 * `json` — Generate Json Bindings
 * `rust` — Generate Rust bindings
 * `typescript` — Generate a TypeScript / JavaScript package
+* `python` — Generate Python bindings
 
 
 
@@ -306,6 +307,14 @@ Generate a TypeScript / JavaScript package
 
 
 
+## `stellar contract bindings python`
+
+Generate Python bindings
+
+**Usage:** `stellar contract bindings python`
+
+
+
 ## `stellar contract build`
 
 Build a contract from source
@@ -1654,7 +1663,7 @@ Creates and funds a new account with the specified starting balance
 * `--destination <DESTINATION>` — Account Id to create, e.g. `GBX...`
 * `--starting-balance <STARTING_BALANCE>` — Initial balance in stroops of the account, default 1 XLM
 
-  Default value: `10000000`
+  Default value: `10_000_000`
 
 
 
@@ -1681,7 +1690,7 @@ Sets, modifies, or deletes a data entry (name/value pair) that is attached to an
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
-* `--data-name <DATA_NAME>` — Line to change, either 4 or 12 alphanumeric characters, or "native" if not specified
+* `--data-name <DATA_NAME>` — String up to 64 bytes long. If this is a new Name it will add the given name/value pair to the account. If this Name is already present then the associated value will be modified
 * `--data-value <DATA_VALUE>` — Up to 64 bytes long hex string If not present then the existing Name will be deleted. If present then this value will be set in the `DataEntry`
 
 
@@ -1713,7 +1722,7 @@ Sends an amount in a specific asset to a destination account
 * `--asset <ASSET>` — Asset to send, default native, e.i. XLM
 
   Default value: `native`
-* `--amount <AMOUNT>` — Amount of the aforementioned asset to send
+* `--amount <AMOUNT>` — Amount of the aforementioned asset to send. e.g. `10_000_000` (1 XLM)
 
 
 

FULL_HELP_DOCS.md

@@ -93,7 +93,7 @@ async fn payment() {
             "--destination",
             test1.as_str(),
             "--amount",
-            ONE_XLM.to_string().as_str(),
+            "10_000_000",
         ])
         .assert()
         .success();

cmd/crates/soroban-test/tests/it/integration/tx/operations.rs

@@ -1,4 +1,5 @@
 pub mod json;
+pub mod python;
 pub mod rust;
 pub mod typescript;
 
@@ -12,6 +13,9 @@ pub enum Cmd {
 
     /// Generate a TypeScript / JavaScript package
     Typescript(typescript::Cmd),
+
+    /// Generate Python bindings
+    Python(python::Cmd),
 }
 
 #[derive(thiserror::Error, Debug)]
@@ -24,6 +28,9 @@ pub enum Error {
 
     #[error(transparent)]
     Typescript(#[from] typescript::Error),
+
+    #[error(transparent)]
+    Python(#[from] python::Error),
 }
 
 impl Cmd {
@@ -32,6 +39,7 @@ impl Cmd {
             Cmd::Json(json) => json.run()?,
             Cmd::Rust(rust) => rust.run()?,
             Cmd::Typescript(ts) => ts.run().await?,
+            Cmd::Python(python) => python.run()?,
         }
         Ok(())
     }

cmd/soroban-cli/src/commands/contract/bindings.rs

@@ -0,0 +1,19 @@
+use std::fmt::Debug;
+
+use clap::Parser;
+
+#[derive(Parser, Debug, Clone)]
+#[group(skip)]
+pub struct Cmd {}
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("python binding generation is not implemented in the stellar-cli, but is available via the tool located here: https://github.com/lightsail-network/stellar-contract-bindings")]
+    NotImplemented,
+}
+
+impl Cmd {
+    pub fn run(&self) -> Result<(), Error> {
+        Err(Error::NotImplemented)
+    }
+}

cmd/soroban-cli/src/commands/contract/bindings/python.rs

@@ -1,6 +1,6 @@
 use clap::{command, Parser};
 
-use crate::{commands::tx, xdr};
+use crate::{commands::tx, tx::builder, xdr};
 
 #[derive(Parser, Debug, Clone)]
 #[group(skip)]
@@ -11,15 +11,15 @@ pub struct Cmd {
     #[arg(long)]
     pub destination: xdr::AccountId,
     /// Initial balance in stroops of the account, default 1 XLM
-    #[arg(long, default_value = "10000000")]
-    pub starting_balance: i64,
+    #[arg(long, default_value = "10_000_000")]
+    pub starting_balance: builder::Amount,
 }
 
 impl From<&Cmd> for xdr::OperationBody {
     fn from(cmd: &Cmd) -> Self {
         xdr::OperationBody::CreateAccount(xdr::CreateAccountOp {
             destination: cmd.destination.clone(),
-            starting_balance: cmd.starting_balance,
+            starting_balance: cmd.starting_balance.into(),
         })
     }
 }

cmd/soroban-cli/src/commands/tx/new/create_account.rs

@@ -7,7 +7,9 @@ use crate::{commands::tx, xdr};
 pub struct Cmd {
     #[command(flatten)]
     pub tx: tx::Args,
-    /// Line to change, either 4 or 12 alphanumeric characters, or "native" if not specified
+    /// String up to 64 bytes long.
+    /// If this is a new Name it will add the given name/value pair to the account.
+    /// If this Name is already present then the associated value will be modified.
     #[arg(long)]
     pub data_name: xdr::StringM<64>,
     /// Up to 64 bytes long hex string

cmd/soroban-cli/src/commands/tx/new/manage_data.rs

@@ -13,17 +13,17 @@ pub struct Cmd {
     /// Asset to send, default native, e.i. XLM
     #[arg(long, default_value = "native")]
     pub asset: builder::Asset,
-    /// Amount of the aforementioned asset to send.
+    /// Amount of the aforementioned asset to send. e.g. `10_000_000` (1 XLM)
     #[arg(long)]
-    pub amount: i64,
+    pub amount: builder::Amount,
 }
 
 impl From<&Cmd> for xdr::OperationBody {
     fn from(cmd: &Cmd) -> Self {
         xdr::OperationBody::Payment(xdr::PaymentOp {
             destination: cmd.destination.clone(),
             asset: cmd.asset.clone().into(),
-            amount: cmd.amount,
+            amount: cmd.amount.into(),
         })
     }
 }

cmd/soroban-cli/src/commands/tx/new/payment.rs

@@ -1,6 +1,8 @@
+pub mod amount;
 pub mod asset;
 pub mod transaction;
 
+pub use amount::Amount;
 pub use asset::Asset;
 pub use transaction::TxExt;
 

cmd/soroban-cli/src/tx/builder.rs

@@ -0,0 +1,35 @@
+use std::str::FromStr;
+
+#[derive(Clone, Debug, Copy)]
+pub struct Amount(i64);
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("cannot start or end with `_`: {0}")]
+    CannotStartOrEndWithUnderscore(String),
+    #[error(transparent)]
+    IntParse(#[from] std::num::ParseIntError),
+}
+
+impl FromStr for Amount {
+    type Err = Error;
+
+    fn from_str(value: &str) -> Result<Self, Self::Err> {
+        if value.starts_with('_') || value.ends_with('_') {
+            return Err(Error::CannotStartOrEndWithUnderscore(value.to_string()));
+        }
+        Ok(Self(value.replace('_', "").parse::<i64>()?))
+    }
+}
+
+impl From<Amount> for i64 {
+    fn from(builder: Amount) -> Self {
+        builder.0
+    }
+}
+
+impl From<&Amount> for i64 {
+    fn from(builder: &Amount) -> Self {
+        (*builder).into()
+    }
+}