From 1c13e4b377c9bab95e85ab3a0168215108d09d8b Mon Sep 17 00:00:00 2001 From: Hussein Ait Lahcen Date: Fri, 13 Dec 2024 10:53:28 +0100 Subject: [PATCH] fix(evm): contracts are not splitted anymore, the abi can be extracted from the handler directly --- evm/contracts/core/24-host/IBCStore.sol | 8 +++----- evm/evm.nix | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/evm/contracts/core/24-host/IBCStore.sol b/evm/contracts/core/24-host/IBCStore.sol index c062046557..a80f3f441a 100644 --- a/evm/contracts/core/24-host/IBCStore.sol +++ b/evm/contracts/core/24-host/IBCStore.sol @@ -28,12 +28,10 @@ abstract contract IBCStore { mapping(uint32 => address) public channelOwner; // Sequences for identifier - bytes32 public constant nextClientSequencePath = - keccak256("nextClientSequence"); - bytes32 public constant nextConnectionSequencePath = + bytes32 constant nextClientSequencePath = keccak256("nextClientSequence"); + bytes32 constant nextConnectionSequencePath = keccak256("nextConnectionSequence"); - bytes32 public constant nextChannelSequencePath = - keccak256("nextChannelSequence"); + bytes32 constant nextChannelSequencePath = keccak256("nextChannelSequence"); function getClient( uint32 clientId diff --git a/evm/evm.nix b/evm/evm.nix index 65fae4e5ce..19d0cce41c 100644 --- a/evm/evm.nix +++ b/evm/evm.nix @@ -503,11 +503,7 @@ _: { cd $out jq --compact-output --slurp 'map(.abi) | add' \ - ${contracts}/out/IBCClient.sol/IBCClient.json \ - ${contracts}/out/IBCPacket.sol/IBCPacket.json \ - ${contracts}/out/IBCConnection.sol/IBCConnection.json \ - ${contracts}/out/OwnableIBCHandler.sol/OwnableIBCHandler.json \ - ${contracts}/out/IBCChannel.sol/IBCChannelHandshake.json > ibc-handler.json + ${contracts}/out/OwnableIBCHandler.sol/OwnableIBCHandler.json > ibc-handler.json jq --compact-output --slurp 'map(.abi) | add' \ ${contracts}/out/Relay.sol/IRelay.json \