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.

Sign up for GitHub

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

Jump to bottom

Update upgrade check #1692

Merged
merged 7 commits into from
Mar 25, 2024
Merged

Update upgrade check #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b71bb8
Merge pull request #1647 from skalenetwork/beta
DmytroNazarenko Nov 30, 2023
5140c82
Merge with stable
DimaStebaev Mar 7, 2024
2402652
Merge pull request #1682 from skalenetwork/release-2.1.0
DimaStebaev Mar 20, 2024
b5e7a28
Update deployed version
DimaStebaev Mar 20, 2024
af1cbf9
Merge branch 'beta' into release-2.1.0
DimaStebaev Mar 21, 2024
209817c
Replace localhost network with schain
DimaStebaev Mar 22, 2024
e685ebe
Replace localhost with 127.0.0.1
DimaStebaev Mar 22, 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: 1 addition & 1 deletion proxy/DEPLOYED
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.0-stable.1
2.1.0-stable.0
DimaStebaev marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion proxy/migrations/upgradeMainnet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ async function getImaMainnetAbiAndAddress(): Promise<SkaleABIFile> {

async function main() {
const upgrader = new ImaMainnetUpgrader(
"1.5.0",
"2.1.0",
await getImaMainnetAbiAndAddress(),
contracts
);
Expand Down
2 changes: 1 addition & 1 deletion proxy/migrations/upgradeSchain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ async function main() {
const pathToManifest: string = process.env.MANIFEST || "";
await manifestSetup(pathToManifest);
const upgrader = new ImaSchainUpgrader(
"1.5.0",
"2.1.0",
await getImaSchainAbiAndAddress(),
contracts
);
Expand Down
21 changes: 17 additions & 4 deletions proxy/scripts/test_upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ git clone --branch "$DEPLOYED_TAG" "https://github.com/$GITHUB_REPOSITORY.git" "
ACCOUNTS_FILENAME="$DEPLOYED_DIR/proxy/generatedAccounts.json"
GANACHE=$(npx ganache \
--😈 \
--miner.blockGasLimit 9000000 \
--miner.blockGasLimit 12000000 \
--logging.quiet \
--chain.allowUnlimitedContractSize \
--wallet.accountKeysPath "$ACCOUNTS_FILENAME" \
Expand All @@ -35,9 +35,20 @@ yarn install
cd proxy
PRIVATE_KEY_FOR_ETHEREUM=$(cat "$ACCOUNTS_FILENAME" | jq -r '.private_keys | to_entries | .[8].value')
PRIVATE_KEY_FOR_SCHAIN=$(cat "$ACCOUNTS_FILENAME" | jq -r '.private_keys | to_entries | .[9].value')
CHAIN_NAME_SCHAIN="Test" VERSION="$DEPLOYED_VERSION" PRIVATE_KEY_FOR_ETHEREUM="$PRIVATE_KEY_FOR_ETHEREUM" PRIVATE_KEY_FOR_SCHAIN="$PRIVATE_KEY_FOR_SCHAIN" npx hardhat run migrations/deploySkaleManagerComponents.ts --network localhost
URL_W3_S_CHAIN="http://127.0.0.1:8545"

CHAIN_NAME_SCHAIN="Test" \
VERSION="$DEPLOYED_VERSION" \
PRIVATE_KEY_FOR_ETHEREUM="$PRIVATE_KEY_FOR_ETHEREUM" \
PRIVATE_KEY_FOR_SCHAIN="$PRIVATE_KEY_FOR_SCHAIN" \
npx hardhat run migrations/deploySkaleManagerComponents.ts --network localhost
VERSION="$DEPLOYED_VERSION" npx hardhat run migrations/deployMainnet.ts --network localhost
CHAIN_NAME_SCHAIN="Test" VERSION="$DEPLOYED_VERSION" npx hardhat run migrations/deploySchain.ts --network localhost

CHAIN_NAME_SCHAIN="Test" \
VERSION="$DEPLOYED_VERSION" \
URL_W3_S_CHAIN="$URL_W3_S_CHAIN" \
PRIVATE_KEY_FOR_SCHAIN="$PRIVATE_KEY_FOR_SCHAIN" \
npx hardhat run migrations/deploySchain.ts --network schain

ABI_FILENAME_SCHAIN="proxySchain_Test.json"
ABI="data/$ABI_FILENAME_SCHAIN" \
Expand Down Expand Up @@ -70,6 +81,8 @@ MANIFEST="data/ima-schain-$DEPLOYED_VERSION-manifest.json" \
CHAIN_NAME_SCHAIN="Test" \
ALLOW_NOT_ATOMIC_UPGRADE="OK" \
VERSION=$VERSION_TAG \
npx hardhat run migrations/upgradeSchain.ts --network localhost
URL_W3_S_CHAIN="$URL_W3_S_CHAIN" \
PRIVATE_KEY_FOR_SCHAIN="$PRIVATE_KEY_FOR_SCHAIN" \
npx hardhat run migrations/upgradeSchain.ts --network schain

npx ganache instances stop "$GANACHE"
Loading