From 1a3bc9a34b2d06994e135ee6cf1944901d42a203 Mon Sep 17 00:00:00 2001 From: Dowland Aiello Date: Thu, 18 Jul 2024 07:25:13 -0700 Subject: [PATCH] Use deployments file for channel ID lookup. --- src/strategies/naive.py | 1 - src/strategies/util.py | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/strategies/naive.py b/src/strategies/naive.py index 05d628f1f..3e0cb541a 100644 --- a/src/strategies/naive.py +++ b/src/strategies/naive.py @@ -10,7 +10,6 @@ import logging from src.contracts.route import Leg, Status, Route from src.contracts.pool.provider import PoolProvider -from src.contracts.pool.osmosis import OsmosisPoolProvider from src.contracts.auction import AuctionProvider from src.scheduler import Ctx from src.strategies.util import ( diff --git a/src/strategies/util.py b/src/strategies/util.py index da217a3d1..0845be750 100644 --- a/src/strategies/util.py +++ b/src/strategies/util.py @@ -22,7 +22,6 @@ try_multiple_rest_endpoints, try_multiple_clients_fatal, try_multiple_clients, - denom_info_on_chain, DENOM_QUANTITY_ABORT_ARB, ) from src.scheduler import Ctx @@ -371,12 +370,12 @@ async def transfer( succeeded. """ + src_channel_id = prev_leg.backend.chain_transfer_channel_ids[leg.backend.chain_id] + # Create a messate transfering the funds msg = tx_pb2.MsgTransfer( # pylint: disable=no-member source_port="transfer", - source_channel=prev_leg.backend.chain_transfer_channel_ids[ - leg.backend.chain_id - ], + source_channel=src_channel_id, sender=str( Address(ctx.wallet.public_key(), prefix=prev_leg.backend.chain_prefix) ), @@ -435,8 +434,8 @@ async def transfer_or_continue() -> bool: ack_resp = await try_multiple_rest_endpoints( leg.backend.endpoints, ( - f"/ibc/core/channel/v1/channels/{denom_info.channel}/" - f"ports/{denom_info.port}/packet_acks/" + f"/ibc/core/channel/v1/channels/{src_channel_id}/" + f"ports/transfer/packet_acks/" f"{submitted.response.events['send_packet']['packet_sequence']}" ), ctx.http_session,