diff --git a/empiric-package/empiric/core/mixins/oracle.py b/empiric-package/empiric/core/mixins/oracle.py index 754ebcc5..5313e31e 100644 --- a/empiric-package/empiric/core/mixins/oracle.py +++ b/empiric-package/empiric/core/mixins/oracle.py @@ -67,7 +67,7 @@ async def publish_many( entries_subset = serialized_spot_entries[ix : ix + pagination] invocation = await self.oracle.publish_spot_entries.invoke( entries_subset, - callback=self.track_nonce, + # callback=self.track_nonce, max_fee=max_fee, ) ix += pagination @@ -93,7 +93,7 @@ async def publish_many( entries_subset = serialized_future_entries[ix : ix + pagination] invocation = await self.oracle.publish_future_entries.invoke( entries_subset, - callback=self.track_nonce, + # callback=self.track_nonce, max_fee=max_fee, ) ix += pagination @@ -209,7 +209,7 @@ async def set_checkpoint( invocation = await self.oracle.set_checkpoint.invoke( pair_id, aggregation_mode, - callback=self.track_nonce, + # callback=self.track_nonce, max_fee=max_fee, ) return invocation @@ -254,7 +254,7 @@ async def set_future_checkpoints( pair_ids_subset, expiry_timestamps, aggregation_mode, - callback=self.track_nonce, + # callback=self.track_nonce, max_fee=max_fee, ) ix += pagination diff --git a/empiric-package/pyproject.toml b/empiric-package/pyproject.toml index cda70337..841f39fe 100644 --- a/empiric-package/pyproject.toml +++ b/empiric-package/pyproject.toml @@ -7,7 +7,7 @@ profile = "black" [tool.poetry] name = "empiric-network" -version = "1.8.3" +version = "1.8.4" authors = ["Pragma "] description = "Core package for rollup-native Pragma Oracle" readme = "README.md" diff --git a/pyproject.toml b/pyproject.toml index 230c3649..9c026d44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pragma" -version = "1.8.3" +version = "1.8.4" description = "Pragma, the leading Oracle on zkRollups." authors = ["0xevolve "] license = "MIT" diff --git a/scripts/updates/add_pair.py b/scripts/updates/add_pair.py index 013968d1..75cf10a3 100644 --- a/scripts/updates/add_pair.py +++ b/scripts/updates/add_pair.py @@ -7,7 +7,6 @@ from starknet_py.net.models import StarknetChainId from starknet_py.contract import Contract, ContractFunction from empiric.core import Currency, Pair -from empiric.core.types import RPC_URLS ORACLE_ABI = [ { @@ -960,41 +959,41 @@ ] admin_contract_address = ( - # 0x029E7D00D0142EB684D6B010DDFE59348D892E5F8FF94F1B77CD372645DF4B77 mainnet - 0x021d6f33c00d3657d7ec6f9322399729afdf21533b77cf0512ac583b4755f011 # goerli + 0x029E7D00D0142EB684D6B010DDFE59348D892E5F8FF94F1B77CD372645DF4B77 # mainnet + # 0x021d6f33c00d3657d7ec6f9322399729afdf21533b77cf0512ac583b4755f011 # goerli ) oracle_proxy_address = ( - # 0x0346c57f094d641ad94e43468628d8e9c574dcb2803ec372576ccc60a40be2c4 mainnet - 0x446812bac98c08190dee8967180f4e3cdcd1db9373ca269904acb17f67f7093 # goerli + 0x0346c57f094d641ad94e43468628d8e9c574dcb2803ec372576ccc60a40be2c4 # mainnet + # 0x446812bac98c08190dee8967180f4e3cdcd1db9373ca269904acb17f67f7093 # goerli ) currencies_to_add = [ - # Currency( - # "LORDS", - # 8, - # 0, - # 0x0124aeb495b947201f5fac96fd1138e326ad86195b98df6dec9009158a533b49, - # 0x686f2404e77ab0d9070a46cdfb0b7fecdd2318b0, - # ), - # Currency( - # "R", - # 8, - # 0, - # 0x01fa2fb85f624600112040e1f3a848f53a37ed5a7385810063d5fe6887280333, - # 0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21, - # ), Currency( - "wstETH", - 8, + "LORDS", + 18, + 0, + 0x0124aeb495b947201f5fac96fd1138e326ad86195b98df6dec9009158a533b49, + 0x686f2404e77ab0d9070a46cdfb0b7fecdd2318b0, + ), + Currency( + "R", + 18, + 0, + 0x01fa2fb85f624600112040e1f3a848f53a37ed5a7385810063d5fe6887280333, + 0x183015a9bA6fF60230fdEaDc3F43b3D788b13e21, + ), + Currency( + "WSTETH", + 18, 0, 0x042b8f0484674ca266ac5d08e4ac6a3fe65bd3129795def2dca5c34ecc5f96d2, 0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0, ), ] pairs_to_add = [ - # Pair("LORDS/USD", "LORDS", "USD"), - # Pair("R/USD", "R", "USD"), - Pair("wstETH/USD", "wstETH", "USD"), + Pair("LORDS/USD", "LORDS", "USD"), + Pair("R/USD", "R", "USD"), + Pair("WSTETH/USD", "WSTETH", "USD"), ] # currencies_to_update = [ @@ -1007,7 +1006,7 @@ # ), # ] -NETWORK = "testnet" +NETWORK = "mainnet" CHAIN_ID = StarknetChainId.TESTNET if NETWORK == "testnet" else StarknetChainId.MAINNET @@ -1034,7 +1033,7 @@ async def main(): print(currency.to_dict()) invocation = await contract.functions['add_currency'].invoke( currency.to_dict(), - max_fee=int(1e16) + max_fee=int(1e15) ) print(hex(invocation.hash)) await invocation.wait_for_acceptance() @@ -1044,7 +1043,7 @@ async def main(): print(pair.to_dict()) invocation = await contract.functions['add_pair'].invoke( pair.to_dict(), - max_fee=int(1e16) + max_fee=int(1e15) ) print(hex(invocation.hash)) await invocation.wait_for_acceptance() diff --git a/stagecoach/jobs/publishers/starknet-publisher/Dockerfile b/stagecoach/jobs/publishers/starknet-publisher/Dockerfile index 23258fa4..f2b552d2 100644 --- a/stagecoach/jobs/publishers/starknet-publisher/Dockerfile +++ b/stagecoach/jobs/publishers/starknet-publisher/Dockerfile @@ -4,7 +4,7 @@ RUN yum install -y gcc python-devel gmp-devel git RUN python -m pip install --upgrade pip -RUN pip install empiric-network==1.8.3 typeguard==2.13.3 +RUN pip install empiric-network==1.8.4 typeguard==2.13.3 COPY app.py ${LAMBDA_TASK_ROOT}