From 33cfba02bf852d2004966b5882f5dda58f6cf173 Mon Sep 17 00:00:00 2001 From: Vadim Yavorsky Date: Mon, 5 Sep 2022 19:55:48 +0300 Subject: [PATCH 1/2] Add interfaces --- proxy/contracts/MessageProxy.sol | 2 +- proxy/contracts/mainnet/Twin.sol | 2 +- proxy/package.json | 2 +- proxy/yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/proxy/contracts/MessageProxy.sol b/proxy/contracts/MessageProxy.sol index 4bdc66972..bbcde9e2e 100644 --- a/proxy/contracts/MessageProxy.sol +++ b/proxy/contracts/MessageProxy.sol @@ -255,7 +255,7 @@ abstract contract MessageProxy is AccessControlEnumerableUpgradeable, IMessagePr /** * @dev Should return block number of the last message transferred to schain */ - function getLastOutgoingMessageBlockId(string memory targetSchainName) external view returns (uint) { + function getLastOutgoingMessageBlockId(string memory targetSchainName) external view override returns (uint) { bytes32 dstChainHash = keccak256(abi.encodePacked(targetSchainName)); require(connectedChains[dstChainHash].inited, "Destination chain is not initialized"); return connectedChains[dstChainHash].lastOutgoingMessageBlockId; diff --git a/proxy/contracts/mainnet/Twin.sol b/proxy/contracts/mainnet/Twin.sol index 3f217e6b0..4a90507ac 100644 --- a/proxy/contracts/mainnet/Twin.sol +++ b/proxy/contracts/mainnet/Twin.sol @@ -104,7 +104,7 @@ abstract contract Twin is SkaleManagerClient, ITwin { messageProxy = newMessageProxy; } - function getSchainContract(bytes32 schainHash) public view returns (address) { + function getSchainContract(bytes32 schainHash) public override view returns (address) { require( schainLinks[schainHash] != address(0), "Destination contract must be defined" diff --git a/proxy/package.json b/proxy/package.json index e6daef673..f72f4f121 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -26,7 +26,7 @@ "@openzeppelin/contracts-upgradeable": "^4.7.1", "@openzeppelin/hardhat-upgrades": "^1.9.0", "@skalenetwork/etherbase-interfaces": "^0.0.1-develop.20", - "@skalenetwork/ima-interfaces": "1.0.0-develop.20", + "@skalenetwork/ima-interfaces": "1.0.0-add-interface-1200.1", "@skalenetwork/skale-manager-interfaces": "1.0.0", "axios": "^0.21.4", "dotenv": "^10.0.0", diff --git a/proxy/yarn.lock b/proxy/yarn.lock index 1732af0fa..9a222b416 100644 --- a/proxy/yarn.lock +++ b/proxy/yarn.lock @@ -757,10 +757,10 @@ resolved "https://registry.yarnpkg.com/@skalenetwork/etherbase-interfaces/-/etherbase-interfaces-0.0.1-develop.20.tgz#33f61e18d695fd47063aa39dce4df335d26b9528" integrity sha512-j3xnuQtOtjvjAoUMJgSUFxRa9/Egkg1RyA8r6PjcEb33VksE4LWLBy0PNFUFehLZv48595JROTcViGeXXwg5HQ== -"@skalenetwork/ima-interfaces@1.0.0-develop.20": - version "1.0.0-develop.20" - resolved "https://registry.yarnpkg.com/@skalenetwork/ima-interfaces/-/ima-interfaces-1.0.0-develop.20.tgz#e4ae92f9832c08d289690f080b22363fa8f3a339" - integrity sha512-OV6lHSg/UiezfLHM/STawOlu2P0IxAXXVL0LilyunuOAtSg3lLfRRyTJKD3D+JePfhgIc25B8DUxJiRyQg4UIg== +"@skalenetwork/ima-interfaces@1.0.0-add-interface-1200.1": + version "1.0.0-add-interface-1200.1" + resolved "https://registry.yarnpkg.com/@skalenetwork/ima-interfaces/-/ima-interfaces-1.0.0-add-interface-1200.1.tgz#f1282b3405566922d062fb078e0ac9a11113fb78" + integrity sha512-iVGAwAWZMYiBztyc8NiPmMEQ0f8JmBcOChj0z06P4bD8ewA4XxMYsfwCNJu0sH1yHNv79UITHKnPF3K40GtKMA== dependencies: "@skalenetwork/skale-manager-interfaces" "^0.1.2" From 6ffac6778f050f9aac2036b32f95f124bbd7c4aa Mon Sep 17 00:00:00 2001 From: Vadim Yavorsky Date: Mon, 5 Sep 2022 21:13:33 +0300 Subject: [PATCH 2/2] Update dependencies --- proxy/package.json | 2 +- proxy/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/proxy/package.json b/proxy/package.json index f72f4f121..662746b12 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -26,7 +26,7 @@ "@openzeppelin/contracts-upgradeable": "^4.7.1", "@openzeppelin/hardhat-upgrades": "^1.9.0", "@skalenetwork/etherbase-interfaces": "^0.0.1-develop.20", - "@skalenetwork/ima-interfaces": "1.0.0-add-interface-1200.1", + "@skalenetwork/ima-interfaces": "1.0.0-develop.22", "@skalenetwork/skale-manager-interfaces": "1.0.0", "axios": "^0.21.4", "dotenv": "^10.0.0", diff --git a/proxy/yarn.lock b/proxy/yarn.lock index 9a222b416..2dc6bc77f 100644 --- a/proxy/yarn.lock +++ b/proxy/yarn.lock @@ -757,10 +757,10 @@ resolved "https://registry.yarnpkg.com/@skalenetwork/etherbase-interfaces/-/etherbase-interfaces-0.0.1-develop.20.tgz#33f61e18d695fd47063aa39dce4df335d26b9528" integrity sha512-j3xnuQtOtjvjAoUMJgSUFxRa9/Egkg1RyA8r6PjcEb33VksE4LWLBy0PNFUFehLZv48595JROTcViGeXXwg5HQ== -"@skalenetwork/ima-interfaces@1.0.0-add-interface-1200.1": - version "1.0.0-add-interface-1200.1" - resolved "https://registry.yarnpkg.com/@skalenetwork/ima-interfaces/-/ima-interfaces-1.0.0-add-interface-1200.1.tgz#f1282b3405566922d062fb078e0ac9a11113fb78" - integrity sha512-iVGAwAWZMYiBztyc8NiPmMEQ0f8JmBcOChj0z06P4bD8ewA4XxMYsfwCNJu0sH1yHNv79UITHKnPF3K40GtKMA== +"@skalenetwork/ima-interfaces@1.0.0-develop.22": + version "1.0.0-develop.22" + resolved "https://registry.yarnpkg.com/@skalenetwork/ima-interfaces/-/ima-interfaces-1.0.0-develop.22.tgz#ffbdd626840669634b555782c33ef976c27a79a2" + integrity sha512-sdtfJJN0QIWnmESY56RV0L6EO0YsNaRp2OAXwCNe7WUnYz9J9xB6aoEsFww0nA+tlIQz8jYi5u23QhKi97E/xQ== dependencies: "@skalenetwork/skale-manager-interfaces" "^0.1.2"