Merge branch 'main' into nixpkgs-23-11

crypto-org-chain · Feb 19, 2024 · cedd89b · cedd89b
2 parents a542b84 + 7ff2940
commit cedd89b
Show file tree

Hide file tree

Showing 21 changed files with 341 additions and 185 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, macos-14]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,7 +48,10 @@ jobs:
   release-macos:
     # runs sequentially to avoid creating duplicated release
     needs: ["release"]
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        runner: [macos-latest, macos-14]
+    runs-on: ${{ matrix.runner }}
     environment: release
     steps:
       - uses: actions/checkout@v3
@@ -86,10 +89,11 @@ jobs:
           done
 
           # update checksum and upload
-          sha256sum *.tar.gz > "checksums-darwin.txt"
+          CHKFILE="checksums-darwin-$(uname -p).txt"
+          sha256sum *.tar.gz > "$CHKFILE"
           echo 'FILES<<EOF' >> $GITHUB_ENV
           ls -1 *.tar.gz >> $GITHUB_ENV
-          echo "checksums-darwin.txt" >> $GITHUB_ENV
+          echo "$CHKFILE" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
           cat $GITHUB_ENV
       - name: upload binaries

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+*February 19, 2024*
+
+## v1.1.0-rc4
+
+### State Machine Breaking
+
+- [#1318](https://github.com/crypto-org-chain/cronos/pull/1318) Add packet_sequence index in relayer event.
+
 *February 5, 2024*
 
 ## v1.1.0-rc3

diff --git a/go.mod b/go.mod
@@ -237,7 +237,7 @@ replace (
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e
-	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240201093104-a762382867f5
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240215080911-ebecd4c35025
 	// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0

diff --git a/go.sum b/go.sum
@@ -484,8 +484,8 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1
 github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240103063449-c887e863fae2 h1:z3LXxlOuRHfRuS6LpA3t9eSaekHmzsdrrDkaXP8UEeU=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240103063449-c887e863fae2/go.mod h1:hljXsedSCJYge78hyaMYy+yzDQVGZtKAZBjZn5QMddk=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20240201093104-a762382867f5 h1:0oopvRSoHpEiKFqx7Vn0mJlGcSyLmxK89FR57BqcxC0=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20240201093104-a762382867f5/go.mod h1:T3Tkhw8XMu8rYObcXpeTqGUaKogS+DKsGPD3ulHN/mg=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240215080911-ebecd4c35025 h1:lc8T/ho1MtbKydKhUfF2DB74Me8+rQnD2n1FjUKLqMo=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240215080911-ebecd4c35025/go.mod h1:T3Tkhw8XMu8rYObcXpeTqGUaKogS+DKsGPD3ulHN/mg=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e h1:vnyepPQ/m25+19xcTuBUdRxmltZ/EjVWNqEjhg7Ummk=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e/go.mod h1:+a8pUj1tOyJ2RinsNQD4326YS+leSoKGiG/uVVb0x6Y=
 github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e h1:rSTc35OBjjCBx47rHPWBCIHNGPbMnEj8f7fNcK2TjVI=

diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -216,8 +216,8 @@ schema = 3
     hash = "sha256-lDIqRLUrXYCb9mmFBY/+WW+ee69+IkxOgqjHVyo4ij0="
     replaced = "github.com/crypto-org-chain/go-ethereum"
   [mod."github.com/evmos/ethermint"]
-    version = "v0.6.1-0.20240201093104-a762382867f5"
-    hash = "sha256-tNF3+JH39zphjbOXrkf4JpxJlEsguN7ZHyJ3cUP1CjA="
+    version = "v0.6.1-0.20240215080911-ebecd4c35025"
+    hash = "sha256-MlDcZntdbcH3+PzYtZW1hBwM59Eyb2KNkUd5fNXrHUM="
     replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/felixge/httpsnoop"]
     version = "v1.0.2"

diff --git a/integration_tests/contracts/package-lock.json b/integration_tests/contracts/package-lock.json
diff --git a/integration_tests/cosmoscli.py b/integration_tests/cosmoscli.py
@@ -222,13 +222,16 @@ def tx_search(self, events: str):
             self.raw("query", "txs", events=events, output="json", node=self.node_rpc)
         )
 
-    def tx_search_rpc(self, criteria: str):
+    def tx_search_rpc(self, criteria: str, order=None):
         node_rpc_http = "http" + self.node_rpc.removeprefix("tcp")
+        params = {
+            "query": f'"{criteria}"',
+        }
+        if order:
+            params["order_by"] = f'"{order}"'
         rsp = requests.get(
             f"{node_rpc_http}/tx_search",
-            params={
-                "query": f'"{criteria}"',
-            },
+            params=params,
         ).json()
         assert "error" not in rsp, rsp["error"]
         return rsp["result"]["txs"]

diff --git a/integration_tests/ibc_utils.py b/integration_tests/ibc_utils.py
@@ -427,7 +427,7 @@ def check_balance_change():
     actual = chains[0].balance(sender, base_denom)
     assert actual == old_amt_sender_base, actual
     assert chains[1].balance(receiver, "basecro") == old_amt_receiver_base - fee_amount
-    return amount
+    return amount, packet_seq
 
 
 def ibc_denom(channel, denom):