Skip to content

Commit

Permalink
Merge pull request #1721 from skalenetwork/tech-debt
Browse files Browse the repository at this point in the history
Tech debt
  • Loading branch information
DmytroNazarenko authored Nov 19, 2024
2 parents 189ee99 + 1ad91a2 commit 601d265
Show file tree
Hide file tree
Showing 67 changed files with 5,554 additions and 7,852 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contracts/schain/tokens/ERC721OnChain.sol
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ contract ERC721OnChain is
)
public
view
override(AccessControlEnumerableUpgradeable, ERC721Upgradeable)
override(AccessControlEnumerableUpgradeable, ERC721Upgradeable, ERC721URIStorageUpgradeable)
returns (bool)
{
return super.supportsInterface(interfaceId);
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/MessageProxyForSchainTester.sol
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ interface IMessageProxyForSchainTester {
}


contract MessageProxyForSchainTester is MessageProxyForSchain, IMessageProxyForSchainTester {
contract MessageProxyForSchainTester is MessageProxyForSchain, IMessageProxyForSchainTester {

IEtherbaseUpgradeable public etherbase = ETHERBASE;

Expand Down Expand Up @@ -82,4 +82,4 @@ contract MessageProxyForSchainTester is MessageProxyForSchain, IMessageProxyForS
function _getEtherbase() internal view override returns (IEtherbaseUpgradeable) {
return etherbase;
}
}
}
42 changes: 42 additions & 0 deletions contracts/test/SkaleManagerMock.sol
Original file line number Diff line number Diff line change
@@ -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.16;

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;
}
}
535 changes: 271 additions & 264 deletions gas/calculateGas.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Loading

0 comments on commit 601d265

Please sign in to comment.