diff --git a/proxy/DEPLOYED b/proxy/DEPLOYED index 05a40d136..611689143 100644 --- a/proxy/DEPLOYED +++ b/proxy/DEPLOYED @@ -1 +1 @@ -1.5.0-stable.1 +2.1.0-stable.0 diff --git a/proxy/migrations/upgradeMainnet.ts b/proxy/migrations/upgradeMainnet.ts index 7797df38d..8337fe2ab 100644 --- a/proxy/migrations/upgradeMainnet.ts +++ b/proxy/migrations/upgradeMainnet.ts @@ -65,7 +65,7 @@ async function getImaMainnetAbiAndAddress(): Promise { async function main() { const upgrader = new ImaMainnetUpgrader( - "1.5.0", + "2.1.0", await getImaMainnetAbiAndAddress(), contracts ); diff --git a/proxy/migrations/upgradeSchain.ts b/proxy/migrations/upgradeSchain.ts index c5cf1dd31..3c446c1fe 100644 --- a/proxy/migrations/upgradeSchain.ts +++ b/proxy/migrations/upgradeSchain.ts @@ -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 ); diff --git a/proxy/scripts/test_upgrade.sh b/proxy/scripts/test_upgrade.sh index 68aec7329..10ae15e09 100755 --- a/proxy/scripts/test_upgrade.sh +++ b/proxy/scripts/test_upgrade.sh @@ -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" \ @@ -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" \ @@ -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"