From ee45b0f7cef933d0c94cf68bbae019910109f127 Mon Sep 17 00:00:00 2001
From: truemiller <mlxndrj@gmail.com>
Date: Thu, 29 Aug 2024 10:54:30 +0100
Subject: [PATCH 1/5] refactor: remove iteration as it's too volatile, error
 prone

---
 frontend/components/ManageStakingPage/index.tsx | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/frontend/components/ManageStakingPage/index.tsx b/frontend/components/ManageStakingPage/index.tsx
index 310d19eca..804abfaa5 100644
--- a/frontend/components/ManageStakingPage/index.tsx
+++ b/frontend/components/ManageStakingPage/index.tsx
@@ -1,8 +1,6 @@
 import { CloseOutlined } from '@ant-design/icons';
 import { Button, Card } from 'antd';
 
-import { Chain } from '@/client';
-import { SERVICE_STAKING_TOKEN_MECH_USAGE_CONTRACT_ADDRESSES } from '@/constants/contractAddresses';
 import { Pages } from '@/enums/PageState';
 import { StakingProgram } from '@/enums/StakingProgram';
 import { usePageState } from '@/hooks/usePageState';
@@ -26,15 +24,10 @@ export const ManageStakingPage = () => {
       }
     >
       <WhatAreStakingContractsSection />
-      {Object.entries(
-        SERVICE_STAKING_TOKEN_MECH_USAGE_CONTRACT_ADDRESSES[Chain.GNOSIS],
-      ).map(([stakingProgram, contractAddress]) => (
-        <StakingContractSection
-          key={contractAddress}
-          stakingProgram={stakingProgram as StakingProgram}
-          contractAddress={contractAddress}
-        />
-      ))}
+      {/* Pearl Beta */}
+      <StakingContractSection stakingProgram={StakingProgram.Beta} />
+      {/* Pearl alpha */}
+      <StakingContractSection stakingProgram={StakingProgram.Alpha} />
     </Card>
   );
 };

From 65f98d94e889c9424e8b9078dfe3f18c2ac21abe Mon Sep 17 00:00:00 2001
From: truemiller <mlxndrj@gmail.com>
Date: Thu, 29 Aug 2024 10:55:06 +0100
Subject: [PATCH 2/5] refactor: only show migrate button on beta, or future
 contracts

---
 .../StakingContractSection/index.tsx            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/components/ManageStakingPage/StakingContractSection/index.tsx b/frontend/components/ManageStakingPage/StakingContractSection/index.tsx
index 856a5648f..1971f8cc8 100644
--- a/frontend/components/ManageStakingPage/StakingContractSection/index.tsx
+++ b/frontend/components/ManageStakingPage/StakingContractSection/index.tsx
@@ -1,9 +1,10 @@
 import { Button, Flex, Popover, theme, Typography } from 'antd';
 import { useMemo, useState } from 'react';
 
-import { DeploymentStatus } from '@/client';
+import { Chain, DeploymentStatus } from '@/client';
 import { OpenAddFundsSection } from '@/components/MainPage/sections/AddFundsSection';
 import { CardSection } from '@/components/styled/CardSection';
+import { SERVICE_STAKING_TOKEN_MECH_USAGE_CONTRACT_ADDRESSES } from '@/constants/contractAddresses';
 import { STAKING_PROGRAM_META } from '@/constants/stakingProgramMeta';
 import { UNICODE_SYMBOLS } from '@/constants/symbols';
 import { Pages } from '@/enums/PageState';
@@ -17,7 +18,6 @@ import { useServiceTemplates } from '@/hooks/useServiceTemplates';
 import { useStakingContractInfo } from '@/hooks/useStakingContractInfo';
 import { useStakingProgram } from '@/hooks/useStakingProgram';
 import { ServicesService } from '@/service/Services';
-import { Address } from '@/types/Address';
 import { getMinimumStakedAmountRequired } from '@/utils/service';
 
 import {
@@ -54,10 +54,8 @@ const { useToken } = theme;
 
 export const StakingContractSection = ({
   stakingProgram,
-  contractAddress,
 }: {
   stakingProgram: StakingProgram;
-  contractAddress: Address;
 }) => {
   const { goto } = usePageState();
   const {
@@ -76,6 +74,11 @@ export const StakingContractSection = ({
     useStakingContractInfo();
   const [isFundingSectionOpen, setIsFundingSectionOpen] = useState(false);
 
+  const stakingContractAddress =
+    SERVICE_STAKING_TOKEN_MECH_USAGE_CONTRACT_ADDRESSES[Chain.GNOSIS][
+      stakingProgram
+    ];
+
   const stakingContractInfoForStakingProgram =
     stakingContractInfoRecord?.[stakingProgram];
 
@@ -258,7 +261,7 @@ export const StakingContractSection = ({
             // here instead of isSelected we should check that the contract is not the old staking contract
             // but the one from staking factory (if we want to open govern)
             <a
-              href={`https://gnosisscan.io/address/${contractAddress}`}
+              href={`https://gnosisscan.io/address/${stakingContractAddress}`}
               target="_blank"
               className="ml-auto"
             >
@@ -286,7 +289,7 @@ export const StakingContractSection = ({
 
         {cantMigrateAlert}
         {/* Switch to program button */}
-        {
+        {stakingProgram !== StakingProgram.Alpha && (
           <Popover content={!isMigratable && cantMigrateReason}>
             <Button
               type="primary"
@@ -319,7 +322,7 @@ export const StakingContractSection = ({
               Switch to {activeStakingProgramMeta?.name} contract
             </Button>
           </Popover>
-        }
+        )}
         {stakingProgram === StakingProgram.Beta && (
           <Button
             type="default"

From 267bb70533745ab9b97ca0083870bad492c66c00 Mon Sep 17 00:00:00 2001
From: jmoreira-valory <jose.moreira.sanchez@valory.xyz>
Date: Thu, 29 Aug 2024 11:59:57 +0200
Subject: [PATCH 3/5] chore: add timestamp to renamed folder

---
 operate/services/manage.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/operate/services/manage.py b/operate/services/manage.py
index 675f06ae8..076701949 100644
--- a/operate/services/manage.py
+++ b/operate/services/manage.py
@@ -23,6 +23,7 @@
 import logging
 import os
 import shutil
+import time
 import traceback
 import typing as t
 from collections import Counter
@@ -116,7 +117,8 @@ def json(self) -> t.List[t.Dict]:
                     f"Failed to load service: {path.name}. Exception: {e}"
                 )
                 # rename the invalid path
-                invalid_path = path.parent / f"invalid_{path.name}"
+                timestamp = int(time.time())
+                invalid_path = path.parent / f"invalid_{timestamp}_{path.name}"
                 os.rename(path, invalid_path)
                 self.logger.info(
                     f"Renamed invalid service: {path.name} to {invalid_path.name}"

From 27a552b3bd8bd1aa35b5faba407109c9d4e0caec Mon Sep 17 00:00:00 2001
From: Josh Miller <31908788+truemiller@users.noreply.github.com>
Date: Thu, 29 Aug 2024 11:01:05 +0100
Subject: [PATCH 4/5] chore: remove redundant comments

---
 frontend/components/ManageStakingPage/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/components/ManageStakingPage/index.tsx b/frontend/components/ManageStakingPage/index.tsx
index 804abfaa5..82938256f 100644
--- a/frontend/components/ManageStakingPage/index.tsx
+++ b/frontend/components/ManageStakingPage/index.tsx
@@ -24,9 +24,7 @@ export const ManageStakingPage = () => {
       }
     >
       <WhatAreStakingContractsSection />
-      {/* Pearl Beta */}
       <StakingContractSection stakingProgram={StakingProgram.Beta} />
-      {/* Pearl alpha */}
       <StakingContractSection stakingProgram={StakingProgram.Alpha} />
     </Card>
   );

From 6f16c71d7cc7efb9603f32f8b445872adeb3c1ff Mon Sep 17 00:00:00 2001
From: truemiller <mlxndrj@gmail.com>
Date: Thu, 29 Aug 2024 12:28:58 +0100
Subject: [PATCH 5/5] bump: rc120

---
 electron/install.js | 2 +-
 package.json        | 2 +-
 pyproject.toml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/electron/install.js b/electron/install.js
index 81894f857..861bf44ed 100644
--- a/electron/install.js
+++ b/electron/install.js
@@ -14,7 +14,7 @@ const { paths } = require('./constants');
  * - use "" (nothing as a suffix) for latest release candidate, for example "0.1.0rc26"
  * - use "alpha" for alpha release, for example "0.1.0rc26-alpha"
  */
-const OlasMiddlewareVersion = '0.1.0rc118';
+const OlasMiddlewareVersion = '0.1.0rc120';
 
 const path = require('path');
 const { app } = require('electron');
diff --git a/package.json b/package.json
index 47b1ee4f9..f940d09a7 100644
--- a/package.json
+++ b/package.json
@@ -58,5 +58,5 @@
     "download-binaries": "sh download_binaries.sh",
     "build:pearl": "sh build_pearl.sh"
   },
-  "version": "0.1.0-rc118"
+  "version": "0.1.0-rc120"
 }
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 7600e0d30..a02e08312 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "olas-operate-middleware"
-version = "0.1.0-rc118"
+version = "0.1.0-rc120"
 description = ""
 authors = ["David Vilela <dvilelaf@gmail.com>", "Viraj Patel <vptl185@gmail.com>"]
 readme = "README.md"