Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tech debt #1721

Merged
merged 45 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
417fa9a
Update package.json dependencies and fix version path for deployment …
yavrsky Nov 12, 2024
0bd9c2e
Replace hardhat plugins with updated versions for verification and ma…
yavrsky Nov 12, 2024
6245de6
Refactor helper scripts for deployment in tests
yavrsky Nov 12, 2024
2d64d75
Refactor DepositBoxes
yavrsky Nov 12, 2024
0ce05b9
Refactor TokenManagers
yavrsky Nov 12, 2024
1923ff6
FIix solidity compile
yavrsky Nov 12, 2024
a914c09
Refactor CommunityLocker
yavrsky Nov 12, 2024
42646c3
Refactor and add couple tests in CommunityPool
yavrsky Nov 12, 2024
257e758
Refactor ERCOnChain tests and Linker
yavrsky Nov 12, 2024
d37c474
Fix MessageProxy tests
yavrsky Nov 12, 2024
93faa73
Refactor deployMainnet script
yavrsky Nov 12, 2024
09ab382
Refactor upgradeMainnet script
yavrsky Nov 12, 2024
64f5ee5
Fix deploySkaleManagerComponents script
yavrsky Nov 12, 2024
dfe7022
Fix test_upgrade script
yavrsky Nov 12, 2024
9cb2ba2
Add excludes for tsconfig.json
yavrsky Nov 12, 2024
c785000
Fix eslinter
yavrsky Nov 12, 2024
08f460a
Fix calculateGas test
yavrsky Nov 12, 2024
6c044e7
Update test_deploy script to deploy only to mainnet
yavrsky Nov 12, 2024
33c432e
Comment storing new abi after upgrade
yavrsky Nov 12, 2024
e62cfe6
Refactor deployMainnet script
yavrsky Nov 13, 2024
01749f2
Remove stringKeccak256, use ethers.id instead
yavrsky Nov 13, 2024
7feb173
Update TypeScript configuration and refactor BigInt usage in tests
yavrsky Nov 13, 2024
9a0e9a0
Refactor contract interaction to use instance directly instead of get…
yavrsky Nov 13, 2024
db7a09b
Upgrade dependencies for eslint
yavrsky Nov 13, 2024
a4183ff
Add SkaleManagerMock
yavrsky Nov 14, 2024
6915f26
Fix deployMainnet.ts
yavrsky Nov 14, 2024
ba8d003
Add deploy of SkaleManager to deploySkaleManagerComponents script
yavrsky Nov 14, 2024
1931cdf
Fix linters
yavrsky Nov 14, 2024
d10d7e1
Add handler for transaction receipts in calculateGas.ts
yavrsky Nov 14, 2024
975d2f3
Fix linter
yavrsky Nov 14, 2024
912a61a
Add generation of new abi's
yavrsky Nov 15, 2024
88782a8
Fix deploy script for schain part
yavrsky Nov 15, 2024
7be6507
Fix deploySchain.ts
yavrsky Nov 18, 2024
3afbb70
Fix hotfixUpgrade script
yavrsky Nov 18, 2024
53222fe
Fix submitTransaction.ts
yavrsky Nov 18, 2024
630249a
Fix transferOwnership.ts
yavrsky Nov 18, 2024
5041226
Change name for generated abi's
yavrsky Nov 18, 2024
fa75d8d
Fix test_upgrade.sh
yavrsky Nov 18, 2024
8856adc
Fix getVersion
yavrsky Nov 18, 2024
2ced3c5
Use assert to fix eslint no-unused-expressions
yavrsky Nov 18, 2024
e74edcd
Remove unused function stringToHex
yavrsky Nov 18, 2024
61cc023
Rename SkaleManager to SkaleManagerMock
yavrsky Nov 18, 2024
05b7583
Remove .only
yavrsky Nov 18, 2024
3a15d9f
Remove isTrue
yavrsky Nov 18, 2024
1ad91a2
Bump upgrade-tools version
yavrsky Nov 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading