From 2f94f814101004a24dbb132950c3815966cd6e03 Mon Sep 17 00:00:00 2001 From: josojo Date: Mon, 11 Dec 2023 13:12:06 +0100 Subject: [PATCH 1/4] fix deployment script to consider forkPreparationTime --- src/deployment/3_deployContracts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/deployment/3_deployContracts.js b/src/deployment/3_deployContracts.js index 11225528..6c4b413a 100644 --- a/src/deployment/3_deployContracts.js +++ b/src/deployment/3_deployContracts.js @@ -32,6 +32,7 @@ async function main() { // Constant variables const networkIDMainnet = 0; const attemptsDeployProxy = 5; + const forkPreparationTime = 60 * 60 * 24 * 7; /* * Check deploy parameters From db6c9e67285134bf53d51bd3806a1bb894440bc3 Mon Sep 17 00:00:00 2001 From: josojo Date: Mon, 11 Dec 2023 13:23:57 +0100 Subject: [PATCH 2/4] making it better configurable via deployment parameters --- src/deployment/3_deployContracts.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/deployment/3_deployContracts.js b/src/deployment/3_deployContracts.js index 6c4b413a..11225528 100644 --- a/src/deployment/3_deployContracts.js +++ b/src/deployment/3_deployContracts.js @@ -32,7 +32,6 @@ async function main() { // Constant variables const networkIDMainnet = 0; const attemptsDeployProxy = 5; - const forkPreparationTime = 60 * 60 * 24 * 7; /* * Check deploy parameters From eff0af4b89bab8d232e71b2e328a7a84de7f690b Mon Sep 17 00:00:00 2001 From: josojo Date: Mon, 11 Dec 2023 14:20:06 +0100 Subject: [PATCH 3/4] update zkevm-contracts --- lib/zkevm-contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zkevm-contracts b/lib/zkevm-contracts index 4c90c6a6..1f184d0a 160000 --- a/lib/zkevm-contracts +++ b/lib/zkevm-contracts @@ -1 +1 @@ -Subproject commit 4c90c6a6ed347a049a2a50f0e94caba9471747e6 +Subproject commit 1f184d0a3cf0501b4fdc704b028c5ddee8b1472e From 5002480e05fa572a6f5182cd2f95d61242c41924 Mon Sep 17 00:00:00 2001 From: josojo Date: Mon, 18 Dec 2023 19:16:56 +0100 Subject: [PATCH 4/4] updated zkevm-contract to main branch --- lib/zkevm-contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zkevm-contracts b/lib/zkevm-contracts index 1f184d0a..98773c5c 160000 --- a/lib/zkevm-contracts +++ b/lib/zkevm-contracts @@ -1 +1 @@ -Subproject commit 1f184d0a3cf0501b4fdc704b028c5ddee8b1472e +Subproject commit 98773c5cbaffb6d4b14b523d29b4b0b3ab4f4e37