From c661d7fb7b98990dcf00c2a39ed2bebf27f67fab Mon Sep 17 00:00:00 2001 From: tim Date: Fri, 26 Jul 2024 01:59:14 -0400 Subject: [PATCH] bugfix; finaldata conf removed --- conf/arbsep/dexorder-arbsep.toml | 1 + conf/finaldata/dexorder-finaldata.toml | 10 ---------- conf/finaldata/logging-finaldata.toml | 20 -------------------- conf/finaldata/metadata-finaldata.json | 1 - src/dexorder/blockchain/connection.py | 2 +- src/dexorder/configuration/schema.py | 1 - 6 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 conf/finaldata/dexorder-finaldata.toml delete mode 100644 conf/finaldata/logging-finaldata.toml delete mode 100644 conf/finaldata/metadata-finaldata.json diff --git a/conf/arbsep/dexorder-arbsep.toml b/conf/arbsep/dexorder-arbsep.toml index c204969..7234366 100644 --- a/conf/arbsep/dexorder-arbsep.toml +++ b/conf/arbsep/dexorder-arbsep.toml @@ -1,3 +1,4 @@ +metadata='metadata.json' # the Dockerfile will move metadata-finaldata.json into positon account = '${accounts.gas}' rpc_url = '${rpc_urls.arbsep_alchemy}' ws_url = '${rpc_urls.arbsep_alchemy_ws}' diff --git a/conf/finaldata/dexorder-finaldata.toml b/conf/finaldata/dexorder-finaldata.toml deleted file mode 100644 index c97fe47..0000000 --- a/conf/finaldata/dexorder-finaldata.toml +++ /dev/null @@ -1,10 +0,0 @@ -metadata='metadata.json' # the Dockerfile will move metadata-finaldata.json into positon -ohlc_dir='/ohlc' -ws_url='' -redis_url='' - -walker_flush_interval=25 -concurrent_rpc_connections=6 - -[deployments] -42161='arbsep' diff --git a/conf/finaldata/logging-finaldata.toml b/conf/finaldata/logging-finaldata.toml deleted file mode 100644 index 376ed2b..0000000 --- a/conf/finaldata/logging-finaldata.toml +++ /dev/null @@ -1,20 +0,0 @@ -# https://docs.python.org/3/library/logging.config.html#logging-config-dictschema -version=1 - -[loggers.''] -level='INFO' -handlers=['console',] - -[loggers.dexorder] -level='DEBUG' - -[handlers.console] -class='logging.StreamHandler' -formatter='notime' -stream='ext://sys.stdout' - -[formatters.notime] -# https://docs.python.org/3/library/logging.html#logrecord-attributes -format='%(levelname)s %(name)s %(message)s' -# https://docs.python.org/3/library/time.html#time.strftime -datefmt='%Y-%m-%d %H:%M:%S' diff --git a/conf/finaldata/metadata-finaldata.json b/conf/finaldata/metadata-finaldata.json deleted file mode 100644 index 51342e7..0000000 --- a/conf/finaldata/metadata-finaldata.json +++ /dev/null @@ -1 +0,0 @@ -{"421614":{"t":[{"a":"0xC285286254318d1dFC9D58F55C3910d8E28e19B4","n":"Wrapped Ether","s":"WETH","d":18,"x":{"mock":true}},{"a":"0x1feCc53911C2fFeC5B12b805C5b49bE60bB544fF","n":"USD Coin","s":"USDC","d":6,"x":{"mock":true}}],"p":[{"a":"0xe6022A376189734F3Cd6Cd63872b7649A00294d8","b":"0x1feCc53911C2fFeC5B12b805C5b49bE60bB544fF","q":"0xC285286254318d1dFC9D58F55C3910d8E28e19B4","f":500,"e":1,"d":-12,"x":{"data":{"uri":"https://beta.dexorder.trade/ohlc/","chain":42161,"symbol":"0xC6962004f452bE9203591991D15f6b388e09E8D0","inverted":true}}}]}} \ No newline at end of file diff --git a/src/dexorder/blockchain/connection.py b/src/dexorder/blockchain/connection.py index 0e4a597..3635808 100644 --- a/src/dexorder/blockchain/connection.py +++ b/src/dexorder/blockchain/connection.py @@ -50,7 +50,7 @@ async def create_w3(rpc_url=None, account=NARG, autosign=True, name='default'): w3.middleware_onion.add(await async_construct_sign_and_send_raw_middleware(a)) w3.eth.default_account = a.address has_account = True - log.info(f'{name} w3 configured with autosign') + log.info(f'{name} w3 configured to autosign as {a.address}') if not has_account: log.info(f'No account set for {name} w3') return w3 diff --git a/src/dexorder/configuration/schema.py b/src/dexorder/configuration/schema.py index 66a3158..e4a749f 100644 --- a/src/dexorder/configuration/schema.py +++ b/src/dexorder/configuration/schema.py @@ -28,7 +28,6 @@ class Config: account: Optional[str] = None # may be a private key or an account alias accounts: Optional[dict[str,str]] = field(default_factory=dict) # account aliases - deployments: Optional[dict[str,str]] = field(default_factory=dict) min_gas: str = '0' walker_name: str = 'default'