Merge pull request #380 from InjectiveLabs/fix/rebase_dev_with_v1_10

aarmoa · web-flow · commit c78af1785ebe · 2025-05-20T19:47:59.000+02:00
Fix/rebase dev with v1.10
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.10.0] - 9999-99-99
+## [Unreleased] - 9999-99-99
+
+## [1.10.0] - 2025-04-16
+### Added
+- Added support for the queries in the new TXFees module
+
 ### Changed
 - Update in the implementation of the gas limit estimator to use the same values as the chain for the fixed gas messages
+- Updated all compiled protos for compatibility with Injective core v1.15 and Indexer v1.15.6
 
 ## [1.9.1] - 2025-03-03
 ### Fixed
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ clean-all:
 	$(call clean_repos)
 
 clone-injective-indexer:
-	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.14.48 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.15.6 --depth 1 --single-branch
 
 clone-all: clone-injective-indexer
 
diff --git a/README.md b/README.md
@@ -35,11 +35,11 @@ $ poetry install
 
 # connecting to Injective Exchange API
 # and listening for new orders from a specific spot market
-$ poetry run python examples/exchange_client/spot_exchange_rpc/8_StreamOrders.py
+$ poetry run python examples/exchange_client/spot_exchange_rpc/8_StreamOrderbookUpdate.py
 
 # sending a msg with bank transfer
 # signs and posts a transaction to the Injective Chain
-$ poetry run python examples/chain_client/1_MsgSend.py
+$ poetry run python examples/chain_client/bank/1_MsgSend.py
 ```
 Upgrade `pip` to the latest version, if you see these warnings:
   ```
@@ -65,21 +65,14 @@ Upgrade `pip` to the latest version, if you see these warnings:
   pip install injective-py
   ```
 
-3. Fetch latest denom config
-```
-poetry run python pyinjective/utils/fetch_metadata.py
-```
-
-Note that the [sync client](https://github.com/InjectiveLabs/sdk-python/blob/master/pyinjective/client.py) has been deprecated as of April 18, 2022. If you are using the sync client please make sure to transition to the [async client](https://github.com/InjectiveLabs/sdk-python/blob/master/pyinjective/async_client.py), for more information read [here](https://github.com/InjectiveLabs/sdk-python/issues/101)
-
-4. Run all unit tests in a development environment
+3. Run all unit tests in a development environment
 ```
 poetry run pytest -v
 ```
 
 ## License
 
-Copyright © 2021 - 2022 Injective Labs Inc. (https://injectivelabs.org/)
+Copyright © 2021 - 2025 Injective Labs Inc. (https://injectivelabs.org/)
 
 <a href="https://drive.google.com/uc?export=view&id=1-fPQRh_D_dnun2yTtSsPW5MypVBOVYJP"><img src="https://drive.google.com/uc?export=view&id=1-fPQRh_D_dnun2yTtSsPW5MypVBOVYJP" style="width: 300px; max-width: 100%; height: auto" />
 
diff --git a/buf.gen.yaml b/buf.gen.yaml
@@ -12,16 +12,16 @@ inputs:
   - module: buf.build/googleapis/googleapis
   - module: buf.build/cosmos/ics23
   - git_repo: https://github.com/InjectiveLabs/cosmos-sdk
-    tag: v0.50.9-inj-4
+    tag: v0.50.9-inj.5
   - git_repo: https://github.com/InjectiveLabs/ibc-go
-    tag: v8.6.1-inj
+    tag: v8.7.0-inj
   - git_repo: https://github.com/InjectiveLabs/wasmd
     tag: v0.53.2-inj.2
 #  - git_repo: https://github.com/InjectiveLabs/wasmd
 #    branch: v0.51.x-inj
 #    subdir: proto
   - git_repo: https://github.com/InjectiveLabs/injective-core
-    tag: v1.15.0-beta.2
+    tag: v1.15.0
     subdir: proto
 #  - git_repo: https://github.com/InjectiveLabs/injective-core
 #    branch: release/v1.15.x
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyinjective/proto/exchange/injective_explorer_rpc_pb2.py b/pyinjective/proto/exchange/injective_explorer_rpc_pb2.py
diff --git a/pyinjective/proto/google/rpc/error_details_pb2.py b/pyinjective/proto/google/rpc/error_details_pb2.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "injective-py"
-version = "1.10.0-rc1"
+version = "1.11.0-rc1"
 description = "Injective Python SDK, with Exchange API Client"
 authors = ["Injective Labs <contact@injectivelabs.org>"]
 license = "Apache-2.0"
diff --git a/tests/client/indexer/grpc/test_indexer_grpc_explorer_api.py b/tests/client/indexer/grpc/test_indexer_grpc_explorer_api.py
@@ -542,6 +542,7 @@ async def test_fetch_block(
             total_txs=5,
             txs=[tx_data],
             timestamp="2023-11-29 20:23:33.842 +0000 UTC",
+            block_unix_timestamp=123456789,
         )
 
         explorer_servicer.block_responses.append(
@@ -593,6 +594,7 @@ async def test_fetch_block(
                     }
                 ],
                 "timestamp": block_info.timestamp,
+                "blockUnixTimestamp": str(block_info.block_unix_timestamp),
             },
         }
 

Original file line number	Diff line number	Diff line change
`@@ -542,6 +542,7 @@ async def test_fetch_block(`
`542`	`542`	`total_txs=5,`
`543`	`543`	`txs=[tx_data],`
`544`	`544`	`timestamp="2023-11-29 20:23:33.842 +0000 UTC",`
	`545`	`+ block_unix_timestamp=123456789,`
`545`	`546`	`)`
`546`	`547`
`547`	`548`	`explorer_servicer.block_responses.append(`
`@@ -593,6 +594,7 @@ async def test_fetch_block(`
`593`	`594`	`}`
`594`	`595`	`],`
`595`	`596`	`"timestamp": block_info.timestamp,`
	`597`	`+ "blockUnixTimestamp": str(block_info.block_unix_timestamp),`
`596`	`598`	`},`
`597`	`599`	`}`
`598`	`600`