resolve

Author: mmsqe

flake.lock

@@ -36,15 +36,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "release-24.05",
+        "branch": "release-24.11",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "50286248f2d7283682bdd47ba14af33a9233b88b",
-        "sha256": "19sqfs6pamknhlg3mqpqs3wj0wj1ynj5icfmhqmjjvq08byfc2hl",
+        "rev": "112c247873ba67732a9dd2563cb3d7b7749a82df",
+        "sha256": "00ghsa6842lkd0c0k0ln6531inq03y4m0nphczwnhf5n9g72sddh",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/50286248f2d7283682bdd47ba14af33a9233b88b.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/112c247873ba67732a9dd2563cb3d7b7749a82df.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "poetry2nix": {
@@ -53,10 +53,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "29b2641c1c6e67d836f9a9fda8a6de85be9644ac",
-        "sha256": "164qi61dxw3y345bkdpiwxrk7cql7pf6kay2xi9y751ypssrji4m",
+        "rev": "d90f9db68a4bda31c346be16dfd8d3263be4547e",
+        "sha256": "0yfg51z8giwapc4kxxcrh47xr0zppwxiwaj7iyy6qsfd3a9649yz",
         "type": "tarball",
-        "url": "https://github.com/nix-community/poetry2nix/archive/29b2641c1c6e67d836f9a9fda8a6de85be9644ac.tar.gz",
+        "url": "https://github.com/nix-community/poetry2nix/archive/d90f9db68a4bda31c346be16dfd8d3263be4547e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "flake-compat": {

nix/sources.json

@@ -6,16 +6,23 @@ poetry2nix.mkPoetryEnv {
     let
       buildSystems = {
         pystarport = [ "poetry-core" ];
-        cprotobuf = [ "setuptools" ];
+        cprotobuf = [
+          "setuptools"
+          "poetry-core"
+        ];
         durations = [ "setuptools" ];
         multitail2 = [ "setuptools" ];
         pytest-github-actions-annotate-failures = [ "setuptools" ];
         flake8-black = [ "setuptools" ];
         flake8-isort = [ "hatchling" ];
         pyunormalize = [ "setuptools" ];
         eth-bloom = [ "setuptools" ];
-        ckzg = ["setuptools"];
-        aiohappyeyeballs = ["poetry-core"];
+        isort = [ "poetry-core" ];
+        typing-inspection = [ "hatchling" ];
+        docker = [
+          "hatchling"
+          "hatch-vcs"
+        ];
       };
     in
     lib.mapAttrs

nix/testenv.nix

@@ -31,7 +31,12 @@ eth-account = "^0.13.4"
 pyyaml = "^6.0.2rc1"
 
 [tool.poetry.dev-dependencies]
+attrs = "24.2.0"
+referencing = "v0.35.1"
+rpds-py = "v0.22.3"
 aiohappyeyeballs = "2.4.4"
+typing-extensions = "4.12.2"
+termcolor = "2.5.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

tests/integration_tests/poetry.lock

@@ -8,4 +8,4 @@ def test_call(ethermint):
     w3_wait_for_new_blocks(w3, 1)
     res = contract.caller.getBlockHash(height).hex()
     blk = w3.eth.get_block(height)
-    assert f"0x{res}" == blk.hash.hex(), res
+    assert res == blk.hash.hex(), res

tests/integration_tests/pyproject.toml

@@ -34,7 +34,7 @@ def test_traceblock(ethermint):
             "nonce": nonce + n,
         }
         signed = sign_transaction(w3, tx, acc.key)
-        txhash = w3.eth.send_raw_transaction(signed.rawTransaction)
+        txhash = w3.eth.send_raw_transaction(signed.raw_transaction)
         txhashes.append(txhash)
     for txhash in txhashes[0 : total - 1]:
         res = w3.eth.wait_for_transaction_receipt(txhash)

tests/integration_tests/test_block.py

@@ -113,7 +113,7 @@ def test_priority(ethermint):
     signed = [sign_transaction(w3, tx, key=KEYS[sender]) for sender, tx in test_cases]
     # send the txs from low priority to high,
     # but the later sent txs should be included earlier.
-    txhashes = [w3.eth.send_raw_transaction(tx.rawTransaction) for tx in signed]
+    txhashes = [w3.eth.send_raw_transaction(tx.raw_transaction) for tx in signed]
 
     receipts = [w3.eth.wait_for_transaction_receipt(txhash) for txhash in txhashes]
     print(receipts)

tests/integration_tests/test_debug_traceblock.py

@@ -43,7 +43,7 @@ def test_pruned_node(pruned):
         {"from": ADDRS["validator"]}
     )
     signed = sign_transaction(w3, tx, KEYS["validator"])
-    txhash = w3.eth.send_raw_transaction(signed.rawTransaction)
+    txhash = w3.eth.send_raw_transaction(signed.raw_transaction)
     print("wait for prunning happens")
     w3_wait_for_new_blocks(w3, 15)
 

tests/integration_tests/test_priority.py

@@ -179,9 +179,9 @@ def test_trace_tx_reverse_transfer(ethermint):
             "nonce": nonce,
         }
     )
-    raw_transactions.append(sign_transaction(w3, tx, acc.key).rawTransaction)
+    raw_transactions.append(sign_transaction(w3, tx, acc.key).raw_transaction)
     tx = tx | {"nonce": nonce + 1}
-    raw_transactions.append(sign_transaction(w3, tx, acc.key).rawTransaction)
+    raw_transactions.append(sign_transaction(w3, tx, acc.key).raw_transaction)
     w3_wait_for_new_blocks(w3, 1)
     sended_hash_set = send_raw_transactions(w3, raw_transactions)
     for h in sended_hash_set:
@@ -225,7 +225,7 @@ def test_destruct(ethermint):
                 }
             )
         )
-        raw_transactions.append(sign_transaction(w3, tx, acc.key).rawTransaction)
+        raw_transactions.append(sign_transaction(w3, tx, acc.key).raw_transaction)
         nonce += 1
     sended_hash_set = send_raw_transactions(w3, raw_transactions)