Problem: nixpkgs is too old (crypto-org-chain#1032)

Solution: - update to release-23.11 vendor hash use nixpkgs 23.05 NIXPKGS_ALLOW_INSECURE=1 optional event_query_tx fix gov upgrade update deps
esavaris75 · Feb 19, 2024 · c0436a5 · c0436a5
1 parent 04e8e09
commit c0436a5
Show file tree

Hide file tree

Showing 22 changed files with 227 additions and 224 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -9,6 +9,9 @@ on:
     tags:
       - "*"
 
+env:
+  NIXPKGS_ALLOW_INSECURE: 1
+
 jobs:
   lint:
     runs-on: ubuntu-latest

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
     flake-utils.url = "github:numtide/flake-utils";
     nix-bundle-exe = {
       url = "github:3noch/nix-bundle-exe";
@@ -9,7 +9,7 @@
     gomod2nix = {
       url = "github:nix-community/gomod2nix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.utils.follows = "flake-utils";
+      inputs.flake-utils.follows = "flake-utils";
     };
   };
 
@@ -49,7 +49,7 @@
           devShells = {
             chain-maind = pkgs.mkShell {
               buildInputs = with pkgs; [
-                go_1_20
+                go_1_21
                 rocksdb
               ];
             };

diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock
diff --git a/integration_tests/pyproject.toml b/integration_tests/pyproject.toml
@@ -19,7 +19,7 @@ pytest-github-actions-annotate-failures = "^0.1.7"
 protobuf = "^3.20.2"
 pyyaml = "^6.0.1"
 python-dateutil = "^2.8.1"
-pystarport = { git = "https://github.com/crypto-com/pystarport.git", branch = "main" }
+pystarport = { git = "https://github.com/crypto-com/pystarport.git", branch = "main", rev = "d86272f" }
 chainlibpy = "^2.2.0"
 
 # manually upgrade to make hatchling build success in poetry2nix
@@ -28,5 +28,5 @@ pathspec = "^0.10.1"
 [tool.poetry.dev-dependencies]
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
diff --git a/integration_tests/test_gov.py b/integration_tests/test_gov.py
@@ -58,16 +58,27 @@ def approve_proposal(cluster, rsp, vote_option="yes"):
     assert proposal["status"] == "PROPOSAL_STATUS_DEPOSIT_PERIOD", proposal
 
     amount = cluster.balance(cluster.address("ecosystem"))
-    rsp = cluster.gov_deposit("ecosystem", proposal_id, "1cro")
+    rsp = cluster.gov_deposit("ecosystem", proposal_id, "1cro", event_query_tx=False)
     assert rsp["code"] == 0, rsp["raw_log"]
     assert cluster.balance(cluster.address("ecosystem")) == amount - 100000000
     proposal = cluster.query_proposal(proposal_id)
     assert proposal["status"] == "PROPOSAL_STATUS_VOTING_PERIOD", proposal
 
     if vote_option is not None:
-        rsp = cluster.gov_vote("validator", proposal_id, vote_option)
+        rsp = cluster.gov_vote(
+            "validator",
+            proposal_id,
+            vote_option,
+            event_query_tx=False,
+        )
         assert rsp["code"] == 0, rsp["raw_log"]
-        rsp = cluster.gov_vote("validator", proposal_id, vote_option, i=1)
+        rsp = cluster.gov_vote(
+            "validator",
+            proposal_id,
+            vote_option,
+            i=1,
+            event_query_tx=False,
+        )
         assert rsp["code"] == 0, rsp["raw_log"]
         assert (
             int(cluster.query_tally(proposal_id, i=1)[vote_option + "_count"])
@@ -128,7 +139,12 @@ def test_deposit_period_expires(cluster):
 
     amount2 = cluster.balance(cluster.address("ecosystem"))
 
-    rsp = cluster.gov_deposit("ecosystem", proposal_id, "5000basecro")
+    rsp = cluster.gov_deposit(
+        "ecosystem",
+        proposal_id,
+        "5000basecro",
+        event_query_tx=False,
+    )
     assert rsp["code"] == 0, rsp["raw_log"]
     proposal = cluster.query_proposal(proposal_id)
     assert proposal["total_deposit"] == [{"denom": "basecro", "amount": "10000"}]
@@ -182,9 +198,9 @@ def test_community_pool_spend_proposal(cluster):
     proposal_id = ev["proposal_id"]
 
     # vote
-    rsp = cluster.gov_vote("validator", proposal_id, "yes")
+    rsp = cluster.gov_vote("validator", proposal_id, "yes", event_query_tx=False)
     assert rsp["code"] == 0, rsp["raw_log"]
-    rsp = cluster.gov_vote("validator", proposal_id, "yes", i=1)
+    rsp = cluster.gov_vote("validator", proposal_id, "yes", i=1, event_query_tx=False)
     assert rsp["code"] == 0, rsp["raw_log"]
 
     # wait for voting period end
@@ -232,7 +248,7 @@ def test_change_vote(cluster):
 
     proposal_id = parse_events(rsp["logs"])["submit_proposal"]["proposal_id"]
 
-    rsp = cluster.gov_vote("validator", proposal_id, "yes")
+    rsp = cluster.gov_vote("validator", proposal_id, "yes", event_query_tx=False)
     assert rsp["code"] == 0, rsp["raw_log"]
 
     cluster.query_tally(proposal_id) == {
@@ -243,7 +259,7 @@ def test_change_vote(cluster):
     }
 
     # change vote to no
-    rsp = cluster.gov_vote("validator", proposal_id, "no")
+    rsp = cluster.gov_vote("validator", proposal_id, "no", event_query_tx=False)
     assert rsp["code"] == 0, rsp["raw_log"]
 
     cluster.query_tally(proposal_id) == {
@@ -285,10 +301,13 @@ def test_inherit_vote(cluster):
     # non-validator voter
     voter1 = cluster.address("community")
     cluster.delegate_amount(
-        cluster.address("validator", bech="val"), "10basecro", voter1
+        cluster.address("validator", bech="val"),
+        "10basecro",
+        voter1,
+        event_query_tx=False,
     )
 
-    rsp = cluster.gov_vote("validator", proposal_id, "yes")
+    rsp = cluster.gov_vote("validator", proposal_id, "yes", event_query_tx=False)
     assert rsp["code"] == 0, rsp["raw_log"]
     assert cluster.query_tally(proposal_id) == {
         "yes_count": "1000000010",
@@ -297,7 +316,7 @@ def test_inherit_vote(cluster):
         "no_with_veto_count": "0",
     }
 
-    rsp = cluster.gov_vote(voter1, proposal_id, "no")
+    rsp = cluster.gov_vote(voter1, proposal_id, "no", event_query_tx=False)
     assert rsp["code"] == 0, rsp["raw_log"]
 
     assert cluster.query_tally(proposal_id) == {

diff --git a/integration_tests/test_hardware_wallet.py b/integration_tests/test_hardware_wallet.py
@@ -34,7 +34,7 @@ def test_ledger_transfer(cluster):
     reserve_balance = cluster.balance(reserve_addr)
     hw_balance = cluster.balance(hw_addr)
 
-    tx = cluster.transfer_from_ledger("hw", reserve_addr, "1cro")
+    tx = cluster.transfer_from_ledger("hw", reserve_addr, "1cro", event_query_tx=False)
     print("transfer tx", tx["txhash"])
     assert tx["logs"] == [
         {

diff --git a/integration_tests/test_ibc.py b/integration_tests/test_ibc.py
@@ -38,7 +38,12 @@ def test_ibc(cluster):
 
     # do a transfer from ibc-0 to ibc-1
     rsp = cluster["ibc-0"].ibc_transfer(
-        "relayer", addr_1, "10000basecro", src_channel, 1
+        "relayer",
+        addr_1,
+        "10000basecro",
+        src_channel,
+        1,
+        event_query_tx=False,
     )
     assert rsp["code"] == 0, rsp["raw_log"]
     # sender balance decreased
@@ -86,7 +91,12 @@ def test_ibc(cluster):
 
     # transfer back
     rsp = cluster["ibc-1"].ibc_transfer(
-        "relayer", addr_0, f"10000ibc/{denom_hash}", dst_channel, 0
+        "relayer",
+        addr_0,
+        f"10000ibc/{denom_hash}",
+        dst_channel,
+        0,
+        event_query_tx=False,
     )
     print("ibc transfer back")
     assert rsp["code"] == 0, rsp["raw_log"]
@@ -185,7 +195,12 @@ def test_update_chain_id(cluster):
     balance_0 = cluster["ibc-0"].balance(cluster["ibc-0"].address("relayer"))
     recipient = cluster["ibc-1"].address("relayer")
     rsp = cluster["ibc-0"].ibc_transfer(
-        "relayer", recipient, "10000basecro", channels[0]["channel_id"], 1
+        "relayer",
+        recipient,
+        "10000basecro",
+        channels[0]["channel_id"],
+        1,
+        event_query_tx=False,
     )
     assert rsp["code"] == 0, rsp["raw_log"]
     time.sleep(10)

diff --git a/integration_tests/test_ibc_channel_genesis.py b/integration_tests/test_ibc_channel_genesis.py
@@ -65,7 +65,12 @@ def test_ibc_genesis_channel(cluster):
 
     # # do a transfer from ibc-0 to ibc-1
     rsp = cluster["ibc-0"].ibc_transfer(
-        "relayer", addr_1, "%dbasecro" % transfer_amount, "channel-0", 1
+        "relayer",
+        addr_1,
+        "%dbasecro" % transfer_amount,
+        "channel-0",
+        1,
+        event_query_tx=False,
     )
     assert rsp["code"] == 0, rsp["raw_log"]
     # sender balance decreased
@@ -117,6 +122,7 @@ def test_ibc_genesis_channel(cluster):
         "%dibc/%s" % (transfer_amount, denom_hash),
         "channel-0",
         0,
+        event_query_tx=False,
     )
     assert rsp["code"] == 0, rsp["raw_log"]
 

diff --git a/integration_tests/test_ibc_extended.py b/integration_tests/test_ibc_extended.py
@@ -41,7 +41,12 @@ def test_ibc_extended(cluster):
     denom_string = f"transfer/{dst_channel}/basecro"
     # send A -> C
     rsp = cluster["ibc-0"].ibc_transfer(
-        "relayer", addr_1, "10000basecro", src_channel, 1
+        "relayer",
+        addr_1,
+        "10000basecro",
+        src_channel,
+        1,
+        event_query_tx=False,
     )
     time.sleep(10)
     res = json.loads(
@@ -65,7 +70,12 @@ def test_ibc_extended(cluster):
     ]
     # send B <- C
     rsp = cluster["ibc-1"].ibc_transfer(
-        "relayer", addr_0_signer, f"55ibc/{denom_hash}", dst_channel, 0
+        "relayer",
+        addr_0_signer,
+        f"55ibc/{denom_hash}",
+        dst_channel,
+        0,
+        event_query_tx=False,
     )
     assert rsp["code"] == 0, rsp["raw_log"]
     time.sleep(10)