Skip to content

Commit

Permalink
typos
Browse files Browse the repository at this point in the history
  • Loading branch information
ignasirv committed Oct 24, 2024
1 parent a7c6ca0 commit a34fddf
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions docker/scripts/v2/deploy-dockerv2.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/bin/bash
# Set the -e option to stop the script if any command fails
set -e
rm -rf docker/gethData/geth_data
DEV_PERIOD=1 docker compose -f docker/docker-compose.yml up -d geth
sudo rm -rf docker/gethData/geth_data
sudo DEV_PERIOD=1 docker compose -f docker/docker-compose.yml up -d geth
sleep 5
node docker/scripts/fund-accounts.js
cp docker/scripts/v2/deploy_parameters_docker.json deployment/v2/deploy_parameters.json
cp docker/scripts/v2/create_rollup_parameters_docker.json deployment/v2/create_rollup_parameters.json
npm run deploy:testnet:v2:localhost
rm -rf docker/deploymentOutput
mkdir docker/deploymentOutput
mv deployment/v2/deploy_output.json docker/deploymentOutput
mv deployment/v2/genesis.json docker/deploymentOutput
mv deployment/v2/create_rollup_output.json docker/deploymentOutput
DEV_PERIOD=1 docker compose -f docker/docker-compose.yml down
docker build -t hermeznetwork/geth-zkevm-contracts -f docker/Dockerfile .
sudo mv deployment/v2/deploy_output.json docker/deploymentOutput
sudo mv deployment/v2/genesis.json docker/deploymentOutput
sudo mv deployment/v2/create_rollup_output.json docker/deploymentOutput
sudo DEV_PERIOD=1 docker compose -f docker/docker-compose.yml down
sudo docker build -t hermeznetwork/geth-zkevm-contracts -f docker/Dockerfile .
# Let it readable for the multiplatform build coming later!
chmod -R go+rxw docker/gethData
sudo chmod -R go+rxw docker/gethData
16 changes: 8 additions & 8 deletions upgrade/upgradePessimistic/upgradePessimistic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ async function main() {

/*
* Check upgrade parameters
* Check that every necessary parameter is fullfilled
* Check that every necessary parameter is fulfilled
*/
const mandatoryUpgradeParameters = ["rollupManagerAddress", "timelockDelay"];

Expand All @@ -39,7 +39,7 @@ async function main() {
const bridgeAddress = await polygonRMContract.bridgeAddress();

// Load provider
let currentProvider = ethers.provider;
const currentProvider = ethers.provider;
if (upgradeParameters.multiplierGas || upgradeParameters.maxFeePerGas) {
if (process.env.HARDHAT_NETWORK !== "hardhat") {
currentProvider = ethers.getDefaultProvider(
Expand Down Expand Up @@ -96,7 +96,7 @@ async function main() {
// load timelock
const timelockContractFactory = await ethers.getContractFactory("PolygonZkEVMTimelock", deployer);

// prapare upgrades
// prepare upgrades

// Upgrade to rollup manager
const PolygonRollupManagerFactory = await ethers.getContractFactory("PolygonRollupManager");
Expand Down Expand Up @@ -125,8 +125,8 @@ async function main() {
const operationRollupManager = genOperation(
proxyAdmin.target,
0, // value
proxyAdmin.interface.encodeFunctionData("upgrade", [rollupManagerAddress, implRollupManager]),
ethers.ZeroHash, // predecesoor
proxyAdmin.interface.encodeFunctionData("upgrade", [rollupManagerAddress, implRollupManager]), // data
ethers.ZeroHash, // predecessor
salt // salt
);

Expand All @@ -135,7 +135,7 @@ async function main() {
operationRollupManager.target,
operationRollupManager.value,
operationRollupManager.data,
ethers.ZeroHash, // predecesoor
ethers.ZeroHash, // predecessor
salt, // salt
timelockDelay,
]);
Expand All @@ -145,7 +145,7 @@ async function main() {
operationRollupManager.target,
operationRollupManager.value,
operationRollupManager.data,
ethers.ZeroHash, // predecesoor
ethers.ZeroHash, // predecessor
salt, // salt
]);

Expand All @@ -155,7 +155,7 @@ async function main() {
const outputJson = {
scheduleData,
executeData,
timelockContractAdress: timelockAddress,
timelockContractAddress: timelockAddress,
};
fs.writeFileSync(pathOutputJson, JSON.stringify(outputJson, null, 1));
}
Expand Down

0 comments on commit a34fddf

Please sign in to comment.