From 5a886c9ca10605cf6e69f8a25068f4574dff3c6f Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:42:27 -0700 Subject: [PATCH 01/13] chore: updated Updated dependencies for: reth => v1.5.1 (https://github.com/paradigmxyz/reth/compare/v1.5.0...v1.5.1) --- versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.json b/versions.json index 5911c7a38..8adf08092 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ "tracking": "tag" }, "op_reth": { - "tag": "v1.5.0", - "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", + "tag": "v1.5.1", + "commit": "dbe7ee9c21392f360ff01f6307480f5d7dd73a3a", "owner": "paradigmxyz", "repo": "reth", "tracking": "tag" From b85a1a0dd3490262c8ad70d648c9d08641c90fa4 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:43:39 -0700 Subject: [PATCH 02/13] chore: updated Updated dependencies for: reth => v1.5.1 (https://github.com/paradigmxyz/reth/compare/v1.5.0...v1.5.1) --- dependency_updater/dependency_updater.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index d465adfb2..fb1d9e90c 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -56,11 +56,13 @@ func main() { Name: "commit", Usage: "Stages updater changes and creates commit message", Required: false, + Value: false, }, &cli.BoolFlag{ Name: "github-action", Usage: "Specifies whether tool is being used through github action workflow", Required: false, + Value: false, }, }, Action: func(ctx context.Context, cmd *cli.Command) error { From fcca3a2287bbf1b43d282842791b39673129db0c Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:46:13 -0700 Subject: [PATCH 03/13] view --- dependency_updater/dependency_updater.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index fb1d9e90c..d465adfb2 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -56,13 +56,11 @@ func main() { Name: "commit", Usage: "Stages updater changes and creates commit message", Required: false, - Value: false, }, &cli.BoolFlag{ Name: "github-action", Usage: "Specifies whether tool is being used through github action workflow", Required: false, - Value: false, }, }, Action: func(ctx context.Context, cmd *cli.Command) error { From a13a216ed5fb80153d7629ad7cac2c262aff5a83 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:47:12 -0700 Subject: [PATCH 04/13] change json --- versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.json b/versions.json index 8adf08092..5911c7a38 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ "tracking": "tag" }, "op_reth": { - "tag": "v1.5.1", - "commit": "dbe7ee9c21392f360ff01f6307480f5d7dd73a3a", + "tag": "v1.5.0", + "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", "owner": "paradigmxyz", "repo": "reth", "tracking": "tag" From 55ab1daf8f0e94e293a538fe0271d7d93eb45663 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:47:30 -0700 Subject: [PATCH 05/13] chore: updated Updated dependencies for: reth => v1.5.1 (https://github.com/paradigmxyz/reth/compare/v1.5.0...v1.5.1) --- versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.json b/versions.json index 5911c7a38..8adf08092 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ "tracking": "tag" }, "op_reth": { - "tag": "v1.5.0", - "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", + "tag": "v1.5.1", + "commit": "dbe7ee9c21392f360ff01f6307480f5d7dd73a3a", "owner": "paradigmxyz", "repo": "reth", "tracking": "tag" From e5f256a5b1295c69a59053f08c0912edd53ce63d Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:48:54 -0700 Subject: [PATCH 06/13] m --- versions.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.env b/versions.env index 2abb93c20..7f1bd3bf5 100644 --- a/versions.env +++ b/versions.env @@ -10,6 +10,6 @@ export OP_GETH_TAG=v1.101511.0 export OP_NODE_COMMIT=7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161 export OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git export OP_NODE_TAG=op-node/v1.13.4 -export OP_RETH_COMMIT=61e38f9af154fe91e776d8f5e449d20a1571e8cf +export OP_RETH_COMMIT=dbe7ee9c21392f360ff01f6307480f5d7dd73a3a export OP_RETH_REPO=https://github.com/paradigmxyz/reth.git -export OP_RETH_TAG=v1.5.0 \ No newline at end of file +export OP_RETH_TAG=v1.5.1 \ No newline at end of file From 8ec7ca8f2692feac79fa0d40ea890cef35142429 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:50:51 -0700 Subject: [PATCH 07/13] fix order of creating env --- dependency_updater/dependency_updater.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index d465adfb2..ad5fd097a 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -116,6 +116,11 @@ func updater(token string, repoPath string, commit bool, githubAction bool) erro } } + e := createVersionsEnv(repoPath, dependencies) + if e != nil { + return fmt.Errorf("error creating versions.env: %s", e) + } + if (commit && updatedDependencies != nil) || (githubAction && updatedDependencies != nil) { err := createCommitMessage(updatedDependencies, repoPath, githubAction) if err != nil { @@ -123,11 +128,6 @@ func updater(token string, repoPath string, commit bool, githubAction bool) erro } } - e := createVersionsEnv(repoPath, dependencies) - if e != nil { - return fmt.Errorf("error creating versions.env: %s", e) - } - return nil } From 75fe7a3f9dcc323ae6e192bb1b90caaecf200a67 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:52:09 -0700 Subject: [PATCH 08/13] test old version --- versions.env | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions.env b/versions.env index 7f1bd3bf5..2abb93c20 100644 --- a/versions.env +++ b/versions.env @@ -10,6 +10,6 @@ export OP_GETH_TAG=v1.101511.0 export OP_NODE_COMMIT=7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161 export OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git export OP_NODE_TAG=op-node/v1.13.4 -export OP_RETH_COMMIT=dbe7ee9c21392f360ff01f6307480f5d7dd73a3a +export OP_RETH_COMMIT=61e38f9af154fe91e776d8f5e449d20a1571e8cf export OP_RETH_REPO=https://github.com/paradigmxyz/reth.git -export OP_RETH_TAG=v1.5.1 \ No newline at end of file +export OP_RETH_TAG=v1.5.0 \ No newline at end of file diff --git a/versions.json b/versions.json index 8adf08092..5911c7a38 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ "tracking": "tag" }, "op_reth": { - "tag": "v1.5.1", - "commit": "dbe7ee9c21392f360ff01f6307480f5d7dd73a3a", + "tag": "v1.5.0", + "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", "owner": "paradigmxyz", "repo": "reth", "tracking": "tag" From c718b4865e7e0b12046adc5487b136652b67816b Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:52:36 -0700 Subject: [PATCH 09/13] chore: updated Updated dependencies for: reth => v1.5.1 (https://github.com/paradigmxyz/reth/compare/v1.5.0...v1.5.1) --- versions.env | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions.env b/versions.env index 2abb93c20..7f1bd3bf5 100644 --- a/versions.env +++ b/versions.env @@ -10,6 +10,6 @@ export OP_GETH_TAG=v1.101511.0 export OP_NODE_COMMIT=7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161 export OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git export OP_NODE_TAG=op-node/v1.13.4 -export OP_RETH_COMMIT=61e38f9af154fe91e776d8f5e449d20a1571e8cf +export OP_RETH_COMMIT=dbe7ee9c21392f360ff01f6307480f5d7dd73a3a export OP_RETH_REPO=https://github.com/paradigmxyz/reth.git -export OP_RETH_TAG=v1.5.0 \ No newline at end of file +export OP_RETH_TAG=v1.5.1 \ No newline at end of file diff --git a/versions.json b/versions.json index 5911c7a38..8adf08092 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ "tracking": "tag" }, "op_reth": { - "tag": "v1.5.0", - "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", + "tag": "v1.5.1", + "commit": "dbe7ee9c21392f360ff01f6307480f5d7dd73a3a", "owner": "paradigmxyz", "repo": "reth", "tracking": "tag" From 115dcc7a6514bbe35431c23a3f0e2bdfd3db4e76 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 12:57:37 -0700 Subject: [PATCH 10/13] downgrade version --- versions.env | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions.env b/versions.env index 7f1bd3bf5..2abb93c20 100644 --- a/versions.env +++ b/versions.env @@ -10,6 +10,6 @@ export OP_GETH_TAG=v1.101511.0 export OP_NODE_COMMIT=7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161 export OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git export OP_NODE_TAG=op-node/v1.13.4 -export OP_RETH_COMMIT=dbe7ee9c21392f360ff01f6307480f5d7dd73a3a +export OP_RETH_COMMIT=61e38f9af154fe91e776d8f5e449d20a1571e8cf export OP_RETH_REPO=https://github.com/paradigmxyz/reth.git -export OP_RETH_TAG=v1.5.1 \ No newline at end of file +export OP_RETH_TAG=v1.5.0 \ No newline at end of file diff --git a/versions.json b/versions.json index 8adf08092..5911c7a38 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ "tracking": "tag" }, "op_reth": { - "tag": "v1.5.1", - "commit": "dbe7ee9c21392f360ff01f6307480f5d7dd73a3a", + "tag": "v1.5.0", + "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", "owner": "paradigmxyz", "repo": "reth", "tracking": "tag" From 7d21fb4267eaf09a204c700974a7c10db39bfff0 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 13:00:47 -0700 Subject: [PATCH 11/13] chore: updated Updated dependencies for: reth => v1.5.1 (https://github.com/paradigmxyz/reth/compare/v1.5.0...v1.5.1) --- versions.env | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions.env b/versions.env index 2abb93c20..7f1bd3bf5 100644 --- a/versions.env +++ b/versions.env @@ -10,6 +10,6 @@ export OP_GETH_TAG=v1.101511.0 export OP_NODE_COMMIT=7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161 export OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git export OP_NODE_TAG=op-node/v1.13.4 -export OP_RETH_COMMIT=61e38f9af154fe91e776d8f5e449d20a1571e8cf +export OP_RETH_COMMIT=dbe7ee9c21392f360ff01f6307480f5d7dd73a3a export OP_RETH_REPO=https://github.com/paradigmxyz/reth.git -export OP_RETH_TAG=v1.5.0 \ No newline at end of file +export OP_RETH_TAG=v1.5.1 \ No newline at end of file diff --git a/versions.json b/versions.json index 5911c7a38..8adf08092 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ "tracking": "tag" }, "op_reth": { - "tag": "v1.5.0", - "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", + "tag": "v1.5.1", + "commit": "dbe7ee9c21392f360ff01f6307480f5d7dd73a3a", "owner": "paradigmxyz", "repo": "reth", "tracking": "tag" From 4d88ee711fe2beddf63ae99e33bd7fdcdd6af3c0 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 13:01:36 -0700 Subject: [PATCH 12/13] undo sync --- versions.env | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions.env b/versions.env index 7f1bd3bf5..2abb93c20 100644 --- a/versions.env +++ b/versions.env @@ -10,6 +10,6 @@ export OP_GETH_TAG=v1.101511.0 export OP_NODE_COMMIT=7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161 export OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git export OP_NODE_TAG=op-node/v1.13.4 -export OP_RETH_COMMIT=dbe7ee9c21392f360ff01f6307480f5d7dd73a3a +export OP_RETH_COMMIT=61e38f9af154fe91e776d8f5e449d20a1571e8cf export OP_RETH_REPO=https://github.com/paradigmxyz/reth.git -export OP_RETH_TAG=v1.5.1 \ No newline at end of file +export OP_RETH_TAG=v1.5.0 \ No newline at end of file diff --git a/versions.json b/versions.json index 8adf08092..5911c7a38 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,8 @@ "tracking": "tag" }, "op_reth": { - "tag": "v1.5.1", - "commit": "dbe7ee9c21392f360ff01f6307480f5d7dd73a3a", + "tag": "v1.5.0", + "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", "owner": "paradigmxyz", "repo": "reth", "tracking": "tag" From f68fb7796500a1ffa3671a4d34cd8af22272be46 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Wed, 9 Jul 2025 13:09:09 -0700 Subject: [PATCH 13/13] change function name --- dependency_updater/dependency_updater.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index ad5fd097a..91267c115 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -273,7 +273,7 @@ func updateVersionTagAndCommit( dependencies Dependencies) error { dependencies[dependencyType].Tag = tag dependencies[dependencyType].Commit = commit - err := writeToVersionsEnv(repoPath, dependencies) + err := writeToVersionsJson(repoPath, dependencies) if err != nil { return fmt.Errorf("error writing to versions "+dependencyType+": %s", err) } @@ -281,7 +281,7 @@ func updateVersionTagAndCommit( return nil } -func writeToVersionsEnv(repoPath string, dependencies Dependencies) error { +func writeToVersionsJson(repoPath string, dependencies Dependencies) error { // formatting json updatedJson, err := json.MarshalIndent(dependencies, "", " ") print(dependencies["base_reth_node"].Branch)