From c95e9a3857e168d39f81615df5418dc99de3fbab Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:46:57 +1000 Subject: [PATCH] fix --- cmd/soroban-cli/src/assembled.rs | 6 +++--- cmd/soroban-cli/src/commands/contract/deploy/wasm.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/soroban-cli/src/assembled.rs b/cmd/soroban-cli/src/assembled.rs index e911cd0ef..d7dc19417 100644 --- a/cmd/soroban-cli/src/assembled.rs +++ b/cmd/soroban-cli/src/assembled.rs @@ -3,8 +3,8 @@ use stellar_xdr::curr::{ self as xdr, ExtensionPoint, Hash, InvokeHostFunctionOp, LedgerFootprint, Limits, Memo, Operation, OperationBody, Preconditions, ReadXdr, RestoreFootprintOp, SorobanAuthorizationEntry, SorobanAuthorizedFunction, SorobanResources, SorobanTransactionData, - Transaction, TransactionExt, TransactionSignaturePayload, - TransactionSignaturePayloadTaggedTransaction, VecM, WriteXdr, + Transaction, TransactionEnvelope, TransactionExt, TransactionSignaturePayload, + TransactionSignaturePayloadTaggedTransaction, TransactionV1Envelope, VecM, WriteXdr, }; use soroban_rpc::{Error, RestorePreamble, SimulateTransactionResponse}; @@ -231,7 +231,7 @@ fn assemble( } // Update transaction fees to meet the minimum resource fees. - let classic_tx_fee: u64 = crate::DEFAULT_TRANSACTION_FEES.into(); + let classic_tx_fee: u64 = DEFAULT_TRANSACTION_FEES.into(); // Choose larger of existing fee or inclusion + resource fee. tx.fee = tx.fee.max( diff --git a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs index 3a846273e..36ce2e9f7 100644 --- a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs +++ b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs @@ -241,7 +241,7 @@ impl NetworkRunnable for Cmd { print.infoln("Simulating deploy transaction…"); - let txn = simulate_and_assemble_transaction(&client, &tx).await?; + let txn = simulate_and_assemble_transaction(&client, &txn).await?; let txn = self.fee.apply_to_assembled_txn(txn).transaction().clone(); if self.fee.sim_only {