Merge pull request #404 from InjectiveLabs/c-655/add_chainlink_data_streams_oracle

[C-655] add chainlink data streams oracle

Author: aarmoa

.gitignore

@@ -140,9 +140,8 @@ dmypy.json
 cython_debug/
 
 .idea
-
 .chain_cookie
 .exchange_cookie
-
 .flakeheaven_cache
 .vscode/settings.json
+.python-version

Makefile

@@ -26,7 +26,7 @@ clean-all:
 	$(call clean_repos)
 
 clone-injective-indexer:
-	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.17.16 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.17.81 --depth 1 --single-branch
 
 clone-all: clone-injective-indexer
 

buf.gen.yaml

@@ -16,19 +16,19 @@ inputs:
   - git_repo: https://github.com/InjectiveLabs/wasmd
     tag: v0.53.3-inj.2
   - git_repo: https://github.com/InjectiveLabs/cometbft
-    tag: v1.0.1-inj.4
+    tag: v1.0.1-inj.3
   - git_repo: https://github.com/InjectiveLabs/cosmos-sdk
-    tag: v0.50.14-inj
+    tag: v0.50.14-inj.3
 #  - git_repo: https://github.com/InjectiveLabs/wasmd
 #    branch: v0.51.x-inj
 #    subdir: proto
   - git_repo: https://github.com/InjectiveLabs/hyperlane-cosmos
     tag: v1.0.1-inj
     subdir: proto
   - git_repo: https://github.com/InjectiveLabs/injective-core
-    tag: v1.17.0
+    tag: v1.18.0-alpha.3
     subdir: proto
-#  - git_repo: https://github.com/InjectiveLabs/injective-core
-#    branch: master
-#    subdir: proto
+  # - git_repo: https://github.com/InjectiveLabs/injective-core
+  #   branch: c-655/add_chainlink_data_streams_oracle
+  #   subdir: proto
   - directory: proto

examples/chain_client/permissions/1_MsgCreateNamespace.py

@@ -91,12 +91,13 @@ async def main() -> None:
     message = composer.msg_create_namespace(
         sender=address.to_acc_bech32(),
         denom=denom,
-        contract_hook="",
+        wasm_hook="",
         role_permissions=[role1, role2, role3],
         actor_roles=[actor_role1, actor_role2],
         role_managers=[role_manager],
         policy_statuses=[policy_status1, policy_status2],
         policy_manager_capabilities=[policy_manager_capability],
+        evm_hook="",
     )
 
     # broadcast the transaction

examples/chain_client/permissions/2_MsgUpdateNamespace.py

@@ -75,11 +75,12 @@ async def main() -> None:
     message = composer.msg_update_namespace(
         sender=address.to_acc_bech32(),
         denom=denom,
-        contract_hook="inj19ld6swyldyujcn72j7ugnu9twafhs9wxlyye5m",
+        wasm_hook="inj19ld6swyldyujcn72j7ugnu9twafhs9wxlyye5m",
         role_permissions=[role1, role2],
         role_managers=[role_manager],
         policy_statuses=[policy_status1, policy_status2],
         policy_manager_capabilities=[policy_manager_capability],
+        evm_hook="",
     )
 
     # broadcast the transaction

examples/exchange_client/oracle_rpc/3_OracleList.py

@@ -9,7 +9,7 @@ async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
     client = IndexerClient(network)
-    oracle_list = await client.fetch_oracle_list()
+    oracle_list = await client.fetch_oracle_list(symbol="TIA", oracle_type="provider")
     print(json.dumps(oracle_list, indent=2))
 
 

poetry.lock

@@ -1294,8 +1294,16 @@ async def fetch_oracle_price(
             oracle_scale_factor=oracle_scale_factor,
         )
 
-    async def fetch_oracle_list(self) -> Dict[str, Any]:
-        return await self.indexer_client.fetch_oracle_list()
+    async def fetch_oracle_list(
+        self,
+        symbol: Optional[str] = None,
+        oracle_type: Optional[str] = None,
+        per_page: Optional[int] = None,
+        token: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        return await self.indexer_client.fetch_oracle_list(
+            symbol=symbol, oracle_type=oracle_type, per_page=per_page, token=token
+        )
 
     # InsuranceRPC
 

pyinjective/async_client.py

@@ -15,8 +15,19 @@ def __init__(self, channel: Channel, cookie_assistant: CookieAssistant):
         self._stub = self._stub = exchange_oracle_grpc.InjectiveOracleRPCStub(channel)
         self._assistant = GrpcApiRequestAssistant(cookie_assistant=cookie_assistant)
 
-    async def fetch_oracle_list(self) -> Dict[str, Any]:
-        request = exchange_oracle_pb.OracleListRequest()
+    async def fetch_oracle_list(
+        self,
+        symbol: Optional[str] = None,
+        oracle_type: Optional[str] = None,
+        per_page: Optional[int] = None,
+        token: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        request = exchange_oracle_pb.OracleListRequest(
+            symbol=symbol,
+            oracle_type=oracle_type,
+            per_page=per_page,
+            token=token,
+        )
         response = await self._execute_call(call=self._stub.OracleList, request=request)
 
         return response

pyinjective/client/indexer/grpc/indexer_grpc_oracle_api.py

@@ -1626,21 +1626,23 @@ def msg_create_namespace(
         self,
         sender: str,
         denom: str,
-        contract_hook: str,
+        wasm_hook: str,
         role_permissions: List[injective_permissions_pb.Role],
         actor_roles: List[injective_permissions_pb.ActorRoles],
         role_managers: List[injective_permissions_pb.RoleManager],
         policy_statuses: List[injective_permissions_pb.PolicyStatus],
         policy_manager_capabilities: List[injective_permissions_pb.PolicyManagerCapability],
+        evm_hook: str,
     ) -> injective_permissions_tx_pb.MsgCreateNamespace:
         namespace = injective_permissions_pb.Namespace(
             denom=denom,
-            contract_hook=contract_hook,
+            wasm_hook=wasm_hook,
             role_permissions=role_permissions,
             actor_roles=actor_roles,
             role_managers=role_managers,
             policy_statuses=policy_statuses,
             policy_manager_capabilities=policy_manager_capabilities,
+            evm_hook=evm_hook,
         )
         return injective_permissions_tx_pb.MsgCreateNamespace(
             sender=sender,
@@ -1651,22 +1653,25 @@ def msg_update_namespace(
         self,
         sender: str,
         denom: str,
-        contract_hook: str,
+        wasm_hook: str,
         role_permissions: List[injective_permissions_pb.Role],
         role_managers: List[injective_permissions_pb.RoleManager],
         policy_statuses: List[injective_permissions_pb.PolicyStatus],
         policy_manager_capabilities: List[injective_permissions_pb.PolicyManagerCapability],
+        evm_hook: str,
     ) -> injective_permissions_tx_pb.MsgUpdateNamespace:
-        contract_hook_update = injective_permissions_tx_pb.MsgUpdateNamespace.SetContractHook(new_value=contract_hook)
+        wasm_hook_update = injective_permissions_tx_pb.MsgUpdateNamespace.SetContractHook(new_value=wasm_hook)
+        evm_hook_update = injective_permissions_tx_pb.MsgUpdateNamespace.SetContractHook(new_value=evm_hook)
 
         return injective_permissions_tx_pb.MsgUpdateNamespace(
             sender=sender,
             denom=denom,
-            contract_hook=contract_hook_update,
+            wasm_hook=wasm_hook_update,
             role_permissions=role_permissions,
             role_managers=role_managers,
             policy_statuses=policy_statuses,
             policy_manager_capabilities=policy_manager_capabilities,
+            evm_hook=evm_hook_update,
         )
 
     def msg_update_actor_roles(