Merge branch 'nonce_fix' into 'main'

Removing pending nonces count. See merge request flarenetwork/fast-updates!32
flare-foundation · Sep 16, 2024 · 6c655d1 · 6c655d1
2 parents 2c4c47c + efb2027
commit 6c655d1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/go-client/client/transaction_queue.go b/go-client/client/transaction_queue.go
@@ -94,7 +94,7 @@ func (txQueue *TransactionQueue) QueueExecution(i int) {
 			}
 		}
 		ctx, cancelFunc := context.WithTimeout(context.Background(), time.Duration(config.CallTimeoutMillisDefault)*time.Millisecond)
-		nonce, err := txQueue.chainClient.PendingNonceAt(ctx, txQueue.accounts[i].Address)
+		nonce, err := txQueue.chainClient.NonceAt(ctx, txQueue.accounts[i].Address, nil)
 		cancelFunc()
 		if err != nil {
 			txQueue.ErrChan <- &ErrorRequest{err, compReq}

diff --git a/go-client/config.toml b/go-client/config.toml
@@ -20,9 +20,9 @@ accounts = [
     "0x23c601ae397441f3ef6f1075dcb0031ff17fb079837beadaf3c84d96c6f3e569",
     "0xee9d129c1997549ee09c0757af5939b2483d80ad649a0eda68e8b0357ad11131",
 ]
-gas_limit = 8000000
+gas_limit = 2500000
 value = 0
-gas_price_multiplier = 1.2
+gas_price_multiplier = 2.5
 
 
 [logger]

diff --git a/go-client/tests/configs/config1.toml b/go-client/tests/configs/config1.toml
@@ -1,6 +1,6 @@
 [client]
-signing_private_key = "0x28d1bfbbafe9d1d4f5a11c3c16ab6bf9084de48d99fbac4058bdfa3c80b29089"
-sortition_private_key = "0x28d1bfbbafe9d1d4f5a11c3c16ab6bf9084de48d99fbac4058bdfa3c80b29089"
+signing_private_key = "0x28d1bfbbafe9d1d4f5a11c3c16ab6bf9084de48d99fbac4058bdfa3c80b2908a"
+sortition_private_key = "0x28d1bfbbafe9d1d4f5a11c3c16ab6bf9084de48d99fbac4058bdfa3c80b2908a"
 fast_updater_address = "0x0C6c3C47A1f650809B0D1048FDf9603e09473D7E"
 fast_updates_configuration_address = "0x06bA8d8af0dF898D0712DffFb0f862cC51AF45c2"
 submission_address = "0x18b9306737eaf6E8FC8e737F488a1AE077b18053"
@@ -16,9 +16,9 @@ accounts = [
     "0xf7d92163b49d93b0fb810b9bb7fb2b3a7a3833495b9f04c1148fa311a538870d",
     "0xf2369231bdf51d8b3f994b63a675ba413169bcdd27228cee057db8f18348ea7c",
 ]
-gas_limit = 8000000
+gas_limit = 2500000
 value = 0
-gas_price_multiplier = 1.2
+gas_price_multiplier = 2.5
 
 [logger]
 level = "INFO"

diff --git a/go-client/tests/configs/config2.toml b/go-client/tests/configs/config2.toml
@@ -1,6 +1,6 @@
 [client]
-signing_private_key = "0x28d1bfbbafe9d1d4f5a11c3c16ab6bf9084de48d99fbac4058bdfa3c80b2908d"
-sortition_private_key = "0x28d1bfbbafe9d1d4f5a11c3c16ab6bf9084de48d99fbac4058bdfa3c80b2908d"
+signing_private_key = "0x28d1bfbbafe9d1d4f5a11c3c16ab6bf9084de48d99fbac4058bdfa3c80b2908f"
+sortition_private_key = "0x28d1bfbbafe9d1d4f5a11c3c16ab6bf9084de48d99fbac4058bdfa3c80b2908f"
 fast_updater_address = "0x0C6c3C47A1f650809B0D1048FDf9603e09473D7E"
 fast_updates_configuration_address = "0x06bA8d8af0dF898D0712DffFb0f862cC51AF45c2"
 submission_address = "0x18b9306737eaf6E8FC8e737F488a1AE077b18053"
@@ -16,9 +16,9 @@ accounts = [
     "0xef47811d16008e26090a629d205cb80a57e0515ab73349cd01eb4f18d29782bf",
     "0x4be7bbacf640bb188f4d7faaba95537c5d81c860af42ca9c84e56f0214d4742d",
 ]
-gas_limit = 8000000
+gas_limit = 2500000
 value = 0
-gas_price_multiplier = 1.2
+gas_price_multiplier = 2.5
 
 [logger]
 level = "INFO"

diff --git a/go-client/tests/configs/config3.toml b/go-client/tests/configs/config3.toml
@@ -1,6 +1,6 @@
 [client]
-signing_private_key = "0x3470bca8ba3507255a31d99a04ae7ed047974c1aba721021a0dfdcffa29a685c"
-sortition_private_key = "0x3470bca8ba3507255a31d99a04ae7ed047974c1aba721021a0dfdcffa29a685c"
+signing_private_key = "0xca6d4f53adac71df9e5a132e42c798554512e87bfe19c1672727fb43ca7bc5bb"
+sortition_private_key = "0x08dc158828e5f138bd18fc543cc236e0a443475a1733ff2217a024f40a7bc5b7"
 fast_updater_address = "0x0C6c3C47A1f650809B0D1048FDf9603e09473D7E"
 fast_updates_configuration_address = "0x06bA8d8af0dF898D0712DffFb0f862cC51AF45c2"
 submission_address = "0x18b9306737eaf6E8FC8e737F488a1AE077b18053"
@@ -16,9 +16,9 @@ accounts = [
     "0x4f57fb560c0ac60b8556a0ddd08a04befb4a3c93d0a62e6923b3b74c9c45a0ec",
     "0x9af36beedf7efdedccb631bf95c2b4e14e0fb6b6af4f89f89ff30001f7510bee",
 ]
-gas_limit = 8000000
+gas_limit = 2500000
 value = 0
-gas_price_multiplier = 1.2
+gas_price_multiplier = 2.5
 
 [logger]
 level = "INFO"