feat: add pay amount field to tx_execute (#275)

informalsystems · Nov 2, 2024 · d12343a · d12343a
1 parent 40fa326
commit d12343a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/crates/cli/src/handler/handshake.rs b/crates/cli/src/handler/handshake.rs
@@ -56,7 +56,7 @@ async fn handshake(args: HandshakeRequest, config: Config) -> Result<String> {
                 2000000,
                 &config.tx_sender,
                 json!(res),
-                "11000untrn",
+                "0untrn"
             )
             .await
             .map_err(|err| eyre!(Box::new(err)))?// TODO: change
@@ -106,7 +106,7 @@ async fn handshake(args: HandshakeRequest, config: Config) -> Result<String> {
                 2000000,
                 &config.tx_sender,
                 json!(res),
-                "11000untrn",
+                "0untrn"
             )
             .await
             .map_err(|err| eyre!(Box::new(err)))? // todo change

diff --git a/crates/utils/cw-client/src/cli.rs b/crates/utils/cw-client/src/cli.rs
@@ -152,16 +152,23 @@ impl CwClient for CliClient {
         gas: u64,
         sender: &str,
         msg: M,
-        fees: &str,
+        pay_amount: &str,
     ) -> Result<String, Self::Error> {
+        let gas_amount = match gas {
+            0 => "auto",
+            _ => &gas.to_string(),
+        };
+
         let mut command = self.new_command()?;
         let command = command
             .args(["--node", self.url.as_str()])
             .args(["--chain-id", chain_id.as_ref()])
             .args(["tx", "wasm"])
             .args(["execute", contract.as_ref(), &msg.to_string()])
-            .args(["--gas", &gas.to_string()])
-            .args(["--fees", fees])
+            .args(["--amount", pay_amount])
+            .args(["--gas", gas_amount])
+            .args(["--gas-adjustment", "1.3"])
+            .args(["--gas-prices", "0.025untrn"])
             .args(["--from", sender])
             .args(["--output", "json"])
             .arg("-y");

diff --git a/crates/utils/cw-client/src/grpc.rs b/crates/utils/cw-client/src/grpc.rs
@@ -88,7 +88,7 @@ impl CwClient for GrpcClient {
         gas: u64,
         _sender: &str,
         msg: M,
-        _fees: &str,
+        _pay_amount: &str,
     ) -> Result<String, Self::Error> {
         let tm_pubkey = self.sk.public_key();
         let sender = tm_pubkey
@@ -257,7 +257,7 @@ mod tests {
                 2000000,
                 "/* unused since we're getting the account from the sk */",
                 json!([]),
-                "11000untrn",
+                "0untrn",
             )
             .await?;
         println!("{}", tx_hash);

diff --git a/crates/utils/cw-client/src/lib.rs b/crates/utils/cw-client/src/lib.rs
@@ -37,7 +37,7 @@ pub trait CwClient {
         gas: u64,
         sender: &str,
         msg: M,
-        fees: &str,
+        pay_amount: &str,
     ) -> Result<String, Self::Error>;
 
     fn deploy<M: ToString>(