Merge pull request #1731 from skalenetwork/merge-develop

Pull changes from v2.2 release

.github/workflows/publish.yml

@@ -9,6 +9,7 @@ on:
       - 'v*.*.*'
       - develop
       - beta
+      - release-candidate
       - stable
   push:
     tags:

.gitignore

@@ -10,6 +10,8 @@ test-tokens/typechain
 .openzeppelin/dev-*.json
 .openzeppelin/unknown-*.json
 .openzeppelin/.session
+.openzeppelin/holesky.json
+.openzeppelin/sepolia.json
 
 # predeployed generator artificats
 predeployed/test/additional.json

contracts/schain/tokens/ERC721OnChain.sol

@@ -104,7 +104,7 @@ contract ERC721OnChain is
     )
         public
         view
-        override(AccessControlEnumerableUpgradeable, ERC721Upgradeable)
+        override(AccessControlEnumerableUpgradeable, ERC721Upgradeable, ERC721URIStorageUpgradeable)
         returns (bool)
     {
         return super.supportsInterface(interfaceId);

contracts/test/SkaleManagerMock.sol

@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+/**
+ *   SkaleManagerMock.sol - SKALE Interchain Messaging Agent
+ *   Copyright (C) 2024-Present SKALE Labs
+ *   @author Artem Payvin
+ *
+ *   SKALE IMA is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published
+ *   by the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   SKALE IMA is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with SKALE IMA.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+pragma solidity 0.8.27;
+
+import "./TestContractManager.sol";
+interface ISkaleManagerMock {
+    function setVersion(string calldata newVersion) external;
+}
+
+contract SkaleManagerMock is ISkaleManagerMock, ContractManager {
+
+    ContractManager public contractManager;
+
+    string public version;
+
+    constructor(address newContractManager) {
+        contractManager = ContractManager(newContractManager);
+    }
+
+    function setVersion(string calldata newVersion) external override {
+        version = newVersion;
+    }
+}

hardhat.config.ts

@@ -1,6 +1,6 @@
 import { HardhatUserConfig } from "hardhat/config";
-import "@nomiclabs/hardhat-etherscan";
-import "@nomiclabs/hardhat-waffle";
+import "@nomicfoundation/hardhat-verify";
+import "@nomicfoundation/hardhat-chai-matchers";
 import "@openzeppelin/hardhat-upgrades";
 import "@typechain/hardhat";
 import "solidity-coverage";