From 7e8f4807204f29ab016ea98d1595a50ea2153063 Mon Sep 17 00:00:00 2001 From: Hoa Lee Date: Tue, 2 Apr 2024 13:28:37 +0700 Subject: [PATCH 1/6] batch size as a option --- crates/script/src/broadcast.rs | 3 ++- crates/script/src/lib.rs | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/crates/script/src/broadcast.rs b/crates/script/src/broadcast.rs index 224bcc44cf45..c5e684016050 100644 --- a/crates/script/src/broadcast.rs +++ b/crates/script/src/broadcast.rs @@ -321,7 +321,8 @@ impl BundledState { // We send transactions and wait for receipts in batches of 100, since some networks // cannot handle more than that. - let batch_size = if sequential_broadcast { 1 } else { 100 }; + let valid_batch_size = if self.args.batch_size > 100 { 100 } else { self.args.batch_size }; + let batch_size = if sequential_broadcast { 1 } else { valid_batch_size as usize }; let mut index = already_broadcasted; for (batch_number, batch) in diff --git a/crates/script/src/lib.rs b/crates/script/src/lib.rs index fd4ba66f6c0e..6f1213172b4e 100644 --- a/crates/script/src/lib.rs +++ b/crates/script/src/lib.rs @@ -105,8 +105,14 @@ pub struct ScriptArgs { /// Broadcasts the transactions. #[arg(long)] + pub broadcast: bool, + /// Batch size of transactions. + /// --batch-size + #[arg(long, default_value = "100")] + pub batch_size: i32, + /// Skips on-chain simulation. #[arg(long)] pub skip_simulation: bool, From 412fd89454645fdc6fca8d265d9c0037b22c7c22 Mon Sep 17 00:00:00 2001 From: Hoa Lee - Icetea <95201916+hoaleee@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:54:00 +0700 Subject: [PATCH 2/6] Update crates/script/src/broadcast.rs Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> --- crates/script/src/broadcast.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/script/src/broadcast.rs b/crates/script/src/broadcast.rs index c5e684016050..b9f7a04c2d84 100644 --- a/crates/script/src/broadcast.rs +++ b/crates/script/src/broadcast.rs @@ -322,7 +322,7 @@ impl BundledState { // We send transactions and wait for receipts in batches of 100, since some networks // cannot handle more than that. let valid_batch_size = if self.args.batch_size > 100 { 100 } else { self.args.batch_size }; - let batch_size = if sequential_broadcast { 1 } else { valid_batch_size as usize }; + let batch_size = if sequential_broadcast { 1 } else { valid_batch_size }; let mut index = already_broadcasted; for (batch_number, batch) in From 0a79dd2368aa599afdfc7fd4e63546d4ee47c098 Mon Sep 17 00:00:00 2001 From: Hoa Lee - Icetea <95201916+hoaleee@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:54:07 +0700 Subject: [PATCH 3/6] Update crates/script/src/broadcast.rs Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> --- crates/script/src/broadcast.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/script/src/broadcast.rs b/crates/script/src/broadcast.rs index b9f7a04c2d84..04329891d28f 100644 --- a/crates/script/src/broadcast.rs +++ b/crates/script/src/broadcast.rs @@ -321,7 +321,7 @@ impl BundledState { // We send transactions and wait for receipts in batches of 100, since some networks // cannot handle more than that. - let valid_batch_size = if self.args.batch_size > 100 { 100 } else { self.args.batch_size }; + let valid_batch_size = self.args.batch_size.min(100); let batch_size = if sequential_broadcast { 1 } else { valid_batch_size }; let mut index = already_broadcasted; From 83cf06c92fbd631752e7be034611874038434854 Mon Sep 17 00:00:00 2001 From: Hoa Lee - Icetea <95201916+hoaleee@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:54:29 +0700 Subject: [PATCH 4/6] Update crates/script/src/lib.rs Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> --- crates/script/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/script/src/lib.rs b/crates/script/src/lib.rs index 6f1213172b4e..5c7b51151be4 100644 --- a/crates/script/src/lib.rs +++ b/crates/script/src/lib.rs @@ -105,7 +105,6 @@ pub struct ScriptArgs { /// Broadcasts the transactions. #[arg(long)] - pub broadcast: bool, /// Batch size of transactions. From e36cf2286c0e381c8884e8bf452f0efa92270815 Mon Sep 17 00:00:00 2001 From: Hoa Lee - Icetea <95201916+hoaleee@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:54:37 +0700 Subject: [PATCH 5/6] Update crates/script/src/lib.rs Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> --- crates/script/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/script/src/lib.rs b/crates/script/src/lib.rs index 5c7b51151be4..ad3377d955b2 100644 --- a/crates/script/src/lib.rs +++ b/crates/script/src/lib.rs @@ -110,7 +110,7 @@ pub struct ScriptArgs { /// Batch size of transactions. /// --batch-size #[arg(long, default_value = "100")] - pub batch_size: i32, + pub batch_size: usize, /// Skips on-chain simulation. #[arg(long)] From 8ebad7937536015db53f5646123e271be6b0d481 Mon Sep 17 00:00:00 2001 From: Hoa Lee - Icetea <95201916+hoaleee@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:54:45 +0700 Subject: [PATCH 6/6] Update crates/script/src/lib.rs Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> --- crates/script/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/script/src/lib.rs b/crates/script/src/lib.rs index ad3377d955b2..299fdec7b448 100644 --- a/crates/script/src/lib.rs +++ b/crates/script/src/lib.rs @@ -108,7 +108,6 @@ pub struct ScriptArgs { pub broadcast: bool, /// Batch size of transactions. - /// --batch-size #[arg(long, default_value = "100")] pub batch_size: usize,