fix: extend default timeout to 5 minutes (#683)

Refs: ETCM-9741

Author: rsporny

changelog.md

@@ -2,34 +2,32 @@
 
 This changelog is based on [Keep A Changelog](https://keepachangelog.com/en/1.1.0).
 
-# Unreleased
+# v1.6.1
 
 ## Changed
 
-## Removed
+* Default `smart-contracts` timeout from 2 minutes to 5 minutes
 
 ## Fixed
 
-## Added
-
-# v1.6.1
+* `governance init` when genesis utxo had a script attached, then transaction fee was sometimes calculated incorrectly
 
-## Fixed
+## Removed
 
-* `governance init` when genesis utxo had a script attached, then transaction fee was sometimes calculated incorrectly
+* Removed unnecessary transitive dependencies from multiple crates
 
 # v1.6.0
 
 ## Changed
 
-* Split MainchainPublicKey to StakePoolPublicKey and StakePublicKey. Some parameters names has been changed as well, so potentially compiliation of downstream projects could be broken.
+* Split MainchainPublicKey to StakePoolPublicKey and StakePublicKey. Some parameters names has been changed as well, so potentially compilation of downstream projects could be broken.
 * Update polkadot-sdk to polkadot-stable2412-1.
 WARNING: Benchmarking command has been removed, because `frame-benchmarking-cli` crate became GPLv3 without any exception.
 * Made Cardano slot duration configurable with default of 1000ms. If your partner chain's main chain is Cardano
 mainnet or one of the official testnets, you don't need to change anything. Otherwise, the duration can
 be set through `MC__SLOT_DURATION_MILLIS` environment variable.
 * e2e-tests: updated python to 3.12 and libs versions.
-* Committee member data stored by the Session Validator Management Pallet is now fullly generic. To migrate to this version,
+* Committee member data stored by the Session Validator Management Pallet is now fully generic. To migrate to this version,
 define your own `CommitteeMember` type and implement the trait `CommitteeMember` for it. See the `CommitteeMember`
 type implemented in `node/runtime/src/lib.rs` for reference using Ariadne.
 * Merged functionality of `NativeTokenManagementInherentDataProvider::new_if_pallet_present` into `new`. Use this single constructor from now on.
@@ -43,7 +41,7 @@ type implemented in `node/runtime/src/lib.rs` for reference using Ariadne.
 ## Added
 
 * block-production-log pallet, see it's readme for more details.
-* Block participaton pallet and inherent data provider, making available data on block producers
+* Block participation pallet and inherent data provider, making available data on block producers
   and their delegators. This feature is meant to be used by Partner Chains developers to implement
   block production reward payouts in their own runtimes. See `toolkit/primitives/block-participation/README.md`
   for more information.
@@ -135,7 +133,7 @@ provider will not query the main chain state or produce inherent data at all.
 * * Specific changes will depend on the node implementation.
 * Update toolchain to 1.81.0
 * Implemented batch queries and caching for the native token observability. Improves performance of the full-sync.
-* Added ogmios-client interal library for communication with Ogmios
+* Added ogmios-client internal library for communication with Ogmios
 * Using Ogmios for reading Cardano Network parameters in `partner-chains-cli`, instead of asking user to choose them
 * Bugfix: rephrased vague log message when selecting the epoch committee
 * Removed the `main-chain-follower-api` completely. Each crate that depended on it now defines its own `*DataSource`

toolkit/cli/smart-contracts-commands/src/d_parameter.rs

@@ -32,7 +32,7 @@ impl UpsertDParameterCmd {
 			&d_param,
 			&payment_key,
 			&client,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 

toolkit/cli/smart-contracts-commands/src/governance.rs

@@ -47,7 +47,7 @@ impl InitGovernanceCmd {
 			&payment_key,
 			self.genesis_utxo,
 			&client,
-			FixedDelayRetries::two_minutes(),
+			FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 		Ok(())
@@ -78,7 +78,7 @@ impl UpdateGovernanceCmd {
 			&payment_key,
 			self.genesis_utxo,
 			&client,
-			FixedDelayRetries::two_minutes(),
+			FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 

toolkit/cli/smart-contracts-commands/src/permissioned_candidates.rs

@@ -48,7 +48,7 @@ impl UpsertPermissionedCandidatesCmd {
 			&permissioned_candidates,
 			&payment_key,
 			&client,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 

toolkit/cli/smart-contracts-commands/src/register.rs

@@ -61,7 +61,7 @@ impl RegisterCmd {
 			&candidate_registration,
 			&payment_key,
 			&client,
-			FixedDelayRetries::two_minutes(),
+			FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 
@@ -93,7 +93,7 @@ impl DeregisterCmd {
 			&payment_signing_key,
 			self.spo_public_key,
 			&client,
-			FixedDelayRetries::two_minutes(),
+			FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 

toolkit/cli/smart-contracts-commands/src/reserve.rs

@@ -62,7 +62,7 @@ impl InitReserveCmd {
 			self.genesis_utxo,
 			&payment_key,
 			&client,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 		Ok(())
@@ -102,7 +102,7 @@ impl CreateReserveCmd {
 			self.genesis_utxo,
 			&payment_key,
 			&client,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 		Ok(())
@@ -132,7 +132,7 @@ impl DepositReserveCmd {
 			self.genesis_utxo,
 			&payment_key,
 			&client,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 		Ok(())
@@ -162,7 +162,7 @@ impl UpdateReserveSettingsCmd {
 			&payment_key,
 			self.total_accrued_function_script_hash,
 			&client,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 		Ok(())
@@ -188,7 +188,7 @@ impl HandoverReserveCmd {
 			self.genesis_utxo,
 			&payment_key,
 			&client,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 		Ok(())
@@ -222,7 +222,7 @@ impl ReleaseReserveCmd {
 			self.reference_utxo,
 			&payment_key,
 			&client,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await?;
 		Ok(())

toolkit/offchain/src/await_tx.rs

@@ -23,8 +23,8 @@ impl FixedDelayRetries {
 		Self { delay, retries }
 	}
 
-	pub fn two_minutes() -> Self {
-		Self { delay: Duration::from_secs(5), retries: 23 }
+	pub fn five_minutes() -> Self {
+		Self { delay: Duration::from_secs(5), retries: 59 }
 	}
 }
 

toolkit/offchain/src/d_param/mod.rs

@@ -47,7 +47,7 @@ impl<C: QueryLedgerState + QueryNetwork + Transactions + QueryUtxoByUtxoId> Upse
 			d_parameter,
 			payment_signing_key,
 			self,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await
 	}

toolkit/offchain/src/init_governance/mod.rs

@@ -47,7 +47,7 @@ where
 			payment_key,
 			Some(genesis_utxo_id),
 			self,
-			FixedDelayRetries::two_minutes(),
+			FixedDelayRetries::five_minutes(),
 		)
 		.await
 		.map(|(_, tx)| tx)

toolkit/offchain/src/permissioned_candidates.rs

@@ -51,7 +51,7 @@ impl<C: QueryLedgerState + QueryNetwork + Transactions + QueryUtxoByUtxoId>
 			candidates,
 			payment_signing_key,
 			self,
-			&FixedDelayRetries::two_minutes(),
+			&FixedDelayRetries::five_minutes(),
 		)
 		.await
 	}