Merge branch 'main' into parallel-gen-tx

Signed-off-by: yihuang <[email protected]>

.gitignore

@@ -23,5 +23,5 @@ result
 integration_tests/configs/*.yaml
 
 # direnv
-/.envrc
-/.direnv
+.envrc
+.direnv

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Improvements
 
 * [#1645](https://github.com/crypto-org-chain/cronos/pull/1645) Gen test tx in parallel even in single node.
+* (testground)[#1644](https://github.com/crypto-org-chain/cronos/pull/1644) load generator retry with backoff on error.
 
 *Oct 14, 2024*
 

testground/README.md

@@ -42,7 +42,7 @@ nix run .#stateless-testcase -- gen /tmp/data/out \
   --num-txs 20 \
   --num-idle 20 \
   --app-patch '{"mempool": {"max-txs": -1}}' \
-  --config-patch '{"mempool": {"size": 100000}}' \
+  --config-patch '{"mempool": {"size": 10000}}' \
   --tx-type erc20-transfer \
   --genesis-patch '{"consensus": {"params": {"block": {"max_gas": "263000000"}}}}'
 ```

testground/benchmark/benchmark/transaction.py

@@ -6,6 +6,7 @@
 from pathlib import Path
 
 import aiohttp
+import backoff
 import eth_abi
 import ujson
 
@@ -105,6 +106,8 @@ def load(datadir: Path, global_seq: int) -> [str]:
         return ujson.load(f)
 
 
+@backoff.on_predicate(backoff.expo, max_time=60, max_value=5)
+@backoff.on_exception(backoff.expo, aiohttp.ClientError, max_time=60, max_value=5)
 async def async_sendtx(session, raw):
     async with session.post(
         LOCAL_JSON_RPC,
@@ -117,7 +120,9 @@ async def async_sendtx(session, raw):
     ) as rsp:
         data = await rsp.json()
         if "error" in data:
-            print("send tx error", data["error"])
+            print("send tx error, will retry,", data["error"])
+            return False
+        return True
 
 
 async def send(txs):

testground/benchmark/pyproject.toml

@@ -19,6 +19,7 @@ click = "^8.1.7"
 ujson = "^5.10.0"
 jsonmerge = "^1.9.2"
 
+backoff = "^2.2.1"
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.2"
 pytest-github-actions-annotate-failures = "^0.2.0"