Refactor: ChainType and LedgerType

api.md

@@ -203,9 +203,9 @@ Creates a master wallet for given chain type. If a wallet already exists for a g
 <details>
   <summary>Request</summary>
 
-```js
+```json
 {
-  "chain_type": ChainType,
+  "chain": Chain,
 }
 ```
 
@@ -240,7 +240,7 @@ Creates a Gnosis safe for given chain type.
 
 ```js
 {
-  "chain_type": ChainType,
+  "chain": Chain,
 }
 ```
 
@@ -295,7 +295,7 @@ Returns the list of existing service configurations.
     "env_variables": {...},
     "hash": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u",
     "hash_history": {"1731487112": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u"},
-    "home_chain_id": "100",
+    "home_chain": "gnosis",
     "keys": [...],
     "name": "valory/trader_omen_gnosis",
     "service_config_id": "sc-85a7a12a-8c6b-46b8-919a-b8a3b8e3ad39",
@@ -324,7 +324,7 @@ Create a service configuration using a template.
     "env_variables": {...},
     "hash": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u",
     "image": "https://operate.olas.network/_next/image?url=%2Fimages%2Fprediction-agent.png&w=3840&q=75",
-    "home_chain_id": "100",
+    "home_chain": "gnosis",
     "name": "valory/trader_omen_gnosis",
     "service_version": "v0.18.4"
   }
@@ -342,7 +342,7 @@ Create a service configuration using a template.
   "env_variables": {...},
   "hash": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u",
   "hash_history": {"1731487112": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u"},
-  "home_chain_id": "100",
+  "home_chain": "gnosis",
   "keys": [...],
   "name": "valory/trader_omen_gnosis",
   "service_config_id": "sc-85a7a12a-8c6b-46b8-919a-b8a3b8e3ad39",
@@ -369,7 +369,7 @@ Update all the service configurations whose Service Public ID match the Service
     "env_variables": {...},
     "hash": "bafybeibpseosblmaw6sk6zsnic2kfxfsijrnfluuhkwboyqhx7ma7zw2me",
     "image": "https://operate.olas.network/_next/image?url=%2Fimages%2Fprediction-agent.png&w=3840&q=75",
-    "home_chain_id": "100",
+    "home_chain": "gnosis",
     "name": "valory/trader_omen_gnosis",
     "service_version": "v0.19.0"
   }
@@ -390,7 +390,7 @@ The response contains an array of the services which have been updated (an empty
     "env_variables": {...},
     "hash": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u",
     "hash_history": {"1731487112": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u", "1731490000": "bafybeibpseosblmaw6sk6zsnic2kfxfsijrnfluuhkwboyqhx7ma7zw2me"},
-    "home_chain_id": "100",
+    "home_chain": "gnosis",
     "keys": [...],
     "name": "valory/trader_omen_gnosis",
     "service_config_id": "sc-85a7a12a-8c6b-46b8-919a-b8a3b8e3ad39",
@@ -451,7 +451,7 @@ Returns the service configuration `service_config_id`.
     "env_variables": {...},
     "hash": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u",
     "hash_history": {"1731487112": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u"},
-    "home_chain_id": "100",
+    "home_chain": "gnosis",
     "keys": [...],
     "name": "valory/trader_omen_gnosis",
     "service_config_id": "sc-85a7a12a-8c6b-46b8-919a-b8a3b8e3ad39",
@@ -498,7 +498,7 @@ The response contains the updated service configuration following the on-chain o
   "env_variables": {...},
   "hash": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u",
   "hash_history": {"1731487112": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u"},
-  "home_chain_id": "100",
+  "home_chain": "gnosis",
   "keys": [...],
   "name": "valory/trader_omen_gnosis",
   "service_config_id": "sc-85a7a12a-8c6b-46b8-919a-b8a3b8e3ad39",
@@ -525,7 +525,7 @@ Update service configuration `service_config_id` with the provided template.
     "env_variables": {...},
     "hash": "bafybeibpseosblmaw6sk6zsnic2kfxfsijrnfluuhkwboyqhx7ma7zw2me",
     "image": "https://operate.olas.network/_next/image?url=%2Fimages%2Fprediction-agent.png&w=3840&q=75",
-    "home_chain_id": "100",
+    "home_chain": "gnosis",
     "name": "valory/trader_omen_gnosis",
     "service_version": "v0.19.0"
   }
@@ -545,7 +545,7 @@ Update service configuration `service_config_id` with the provided template.
     "env_variables": {...},
     "hash": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u",
     "hash_history": {"1731487112": "bafybeidicxsruh3r4a2xarawzan6ocwyvpn3ofv42po5kxf7x6ck7kn22u", "1731490000": "bafybeibpseosblmaw6sk6zsnic2kfxfsijrnfluuhkwboyqhx7ma7zw2me"},
-    "home_chain_id": "100",
+    "home_chain": "gnosis",
     "keys": [...],
     "name": "valory/trader_omen_gnosis",
     "service_config_id": "sc-85a7a12a-8c6b-46b8-919a-b8a3b8e3ad39",

frontend/client/enums.ts

@@ -6,13 +6,13 @@ export enum MiddlewareAction {
 }
 
 export enum MiddlewareChain {
-  ETHEREUM = 0,
-  GOERLI = 1,
-  GNOSIS = 2,
-  SOLANA = 3,
-  OPTIMISM = 4,
-  BASE = 5,
-  MODE = 6,
+  ETHEREUM = "ethereum",
+  GOERLI = "goerli",
+  GNOSIS = "gnosis",
+  SOLANA = "solana",
+  OPTIMISM = "optimism",
+  BASE = "base",
+  MODE = "mode",
 }
 
 export enum MiddlewareLedger {

frontend/client/types.ts

@@ -18,7 +18,6 @@ export type ServiceKeys = {
 
 export type LedgerConfig = {
   rpc: string;
-  type: MiddlewareLedger;
   chain: MiddlewareChain;
 };
 
@@ -50,12 +49,12 @@ export type MiddlewareServiceResponse = {
   hash_history: {
     [block: string]: string;
   };
-  home_chain_id: number;
+  home_chain: MiddlewareChain;
   keys: ServiceKeys[];
   service_path?: string;
   version: string;
   chain_configs: {
-    [chainId: number]: {
+    [chain in MiddlewareChain]: {
       ledger_config: LedgerConfig;
       chain_data: ChainData;
     };
@@ -75,7 +74,7 @@ export type ServiceTemplate = {
   description: string;
   image: string;
   service_version: string;
-  home_chain_id: string;
+  home_chain: string;
   configurations: { [key: string]: ConfigurationTemplate };
   env_variables: { [key: string]: EnvVariableAttributes };
   deploy?: boolean;

frontend/components/SetupPage/Create/SetupCreateSafe.tsx

@@ -16,10 +16,14 @@ import { delayInSeconds } from '@/utils/delay';
 
 const { Text } = Typography;
 
-const capitalizedMiddlewareChainNames = {
-  [+MiddlewareChain.ETHEREUM]: 'Ethereum',
-  [+MiddlewareChain.BASE]: 'Base',
-  [+MiddlewareChain.OPTIMISM]: 'Optimism',
+const capitalizedMiddlewareChainNames: { [key in MiddlewareChain]: string } = {
+  [MiddlewareChain.ETHEREUM]: 'Ethereum',
+  [MiddlewareChain.BASE]: 'Base',
+  [MiddlewareChain.OPTIMISM]: 'Optimism',
+  [MiddlewareChain.GOERLI]: 'Goerli',
+  [MiddlewareChain.GNOSIS]: 'Gnosis',
+  [MiddlewareChain.SOLANA]: 'Solana',
+  [MiddlewareChain.MODE]: 'Mode',
 };
 
 export const SetupCreateSafe = () => {
@@ -129,7 +133,7 @@ export const SetupCreateSafe = () => {
 
     const safeCreationsRequired = Object.entries(chainsToCreateSafesFor).reduce(
       (acc, [chain, safeAddressAlreadyExists]) => {
-        const middlewareChain = +chain as MiddlewareChain;
+        const middlewareChain = chain as MiddlewareChain;
         if (safeAddressAlreadyExists) {
           switch (middlewareChain) {
             case MiddlewareChain.OPTIMISM:

frontend/components/SetupPage/Create/SetupEoaFunding.tsx

@@ -173,11 +173,11 @@ export const SetupEoaFunding = () => {
   const { goto } = useSetup();
   const { masterEoaAddress } = useWallet();
   const [currentChain, setCurrentChain] = useState<MiddlewareChain>(
-    +Object.keys(eoaFundingMap)[0] as MiddlewareChain,
+    Object.keys(eoaFundingMap)[0] as MiddlewareChain,
   );
 
   const currentFundingMapObject =
-    eoaFundingMap[+currentChain as keyof typeof eoaFundingMap];
+    eoaFundingMap[currentChain as keyof typeof eoaFundingMap];
 
   const getIsCurrentChainFunded = useCallback(
     async (
@@ -218,7 +218,7 @@ export const SetupEoaFunding = () => {
     if (nextChainExists) {
       // goto next chain
       setCurrentChain(
-        +Object.keys(eoaFundingMap)[indexOfCurrentChain + 1] as MiddlewareChain,
+        Object.keys(eoaFundingMap)[indexOfCurrentChain + 1] as MiddlewareChain,
       );
       return;
     }

frontend/components/YourWalletPage/YourAgent.tsx

@@ -109,7 +109,7 @@ const AgentTitle = () => {
 const ServiceAndNftDetails = () => {
   const { serviceId } = useServices();
   const serviceAddress =
-    SERVICE_REGISTRY_L2_CONTRACT_ADDRESS[`${MiddlewareChain.OPTIMISM}`];
+    SERVICE_REGISTRY_L2_CONTRACT_ADDRESS[MiddlewareChain.OPTIMISM];
 
   return (
     <NftCard>

frontend/config/chains.ts

@@ -12,7 +12,7 @@ type ChainConfig = {
   name: string;
   currency: string;
   chainId: number;
-  middlewareChain: number;
+  middlewareChain: MiddlewareChainId;
   rpc: HttpUrl;
 };
 

frontend/constants/serviceTemplates.ts

@@ -1,4 +1,5 @@
 import { ServiceTemplate, EnvProvisionType } from '@/client';
+import { CHAIN_CONFIG } from '@/config/chains';
 import { ChainId } from '@/enums/Chain';
 import { StakingProgramId } from '@/enums/StakingProgram';
 
@@ -10,9 +11,9 @@ export const SERVICE_TEMPLATES: ServiceTemplate[] = [
     image:
       'https://operate.olas.network/_next/image?url=%2Fimages%2Fprediction-agent.png&w=3840&q=75',
     service_version: 'v0.18.4',
-    home_chain_id: ChainId.Gnosis.toString(),
+    home_chain: CHAIN_CONFIG[ChainId.Gnosis].middlewareChain,
     configurations: {
-      [ChainId.Optimism]: {
+      [CHAIN_CONFIG[ChainId.Optimism].middlewareChain]: {
         staking_program_id: StakingProgramId.OptimusAlpha, // default, may be overwritten
         nft: 'bafybeig64atqaladigoc3ds4arltdu63wkdrk3gesjfvnfdmz35amv7faq',
         rpc: 'http://localhost:8545',
@@ -105,9 +106,9 @@ export const SERVICE_TEMPLATES: ServiceTemplate[] = [
   //     image:
   //       'https://operate.olas.network/_next/image?url=%2Fimages%2Fprediction-agent.png&w=3840&q=75',
   //     service_version: 'v0.2.9',
-  //     home_chain_id: `${CHAINS.OPTIMISM.chainId}`,
+  //     home_chain: `${CHAINS.OPTIMISM}`,
   //     configurations: {
-  //       [CHAINS.OPTIMISM.chainId]: {
+  //       [CHAINS.OPTIMISM.middlewareChain]: {
   //         staking_program_id: StakingProgramId.OptimusAlpha, // default, may be overwritten
   //         nft: 'bafybeig64atqaladigoc3ds4arltdu63wkdrk3gesjfvnfdmz35amv7faq',
   //         // rpc: 'http://localhost:8545',
@@ -122,7 +123,7 @@ export const SERVICE_TEMPLATES: ServiceTemplate[] = [
   //           safe: 1000,
   //         },
   //       },
-  //       [CHAINS.ETHEREUM.chainId]: {
+  //       [CHAINS.ETHEREUM.middlewareChain]: {
   //         staking_program_id: StakingProgramId.OptimusAlpha, // default, may be overwritten
   //         nft: 'bafybeig64atqaladigoc3ds4arltdu63wkdrk3gesjfvnfdmz35amv7faq',
   //         // rpc: 'http://localhost:8545',
@@ -137,7 +138,7 @@ export const SERVICE_TEMPLATES: ServiceTemplate[] = [
   //           safe: 1000,
   //         },
   //       },
-  //       [CHAINS.BASE.chainId]: {
+  //       [CHAINS.BASE.middlewareChain]: {
   //         staking_program_id: StakingProgramId.OptimusAlpha, // default, may be overwritten
   //         nft: 'bafybeig64atqaladigoc3ds4arltdu63wkdrk3gesjfvnfdmz35amv7faq',
   //         // rpc: 'http://localhost:8545',

frontend/context/BalanceProvider.tsx

@@ -63,7 +63,7 @@ export const BalanceContext = createContext<{
   optimismBalance?: number;
 }>({
   isLoaded: false,
-  setIsLoaded: () => {},
+  setIsLoaded: () => { },
   isBalanceLoaded: false,
   olasBondBalance: undefined,
   olasDepositBalance: undefined,
@@ -76,8 +76,8 @@ export const BalanceContext = createContext<{
   walletBalances: {},
   agentSafeBalance: undefined,
   agentEoaBalance: undefined,
-  updateBalances: async () => {},
-  setIsPaused: () => {},
+  updateBalances: async () => { },
+  setIsPaused: () => { },
   totalOlasStakedBalance: undefined,
   baseBalance: undefined,
   ethereumBalance: undefined,
@@ -171,7 +171,7 @@ export const BalanceProvider = ({ children }: PropsWithChildren) => {
 
       // TODO: refactor to use ChainId enum, service from useService(),
       const serviceId =
-        services?.[0]?.chain_configs[CHAIN_CONFIG.OPTIMISM.chainId].chain_data
+        services?.[0]?.chain_configs[CHAIN_CONFIG[ChainId.Optimism].middlewareChain].chain_data
           .token;
 
       if (!isNumber(serviceId)) {
@@ -232,7 +232,7 @@ export const BalanceProvider = ({ children }: PropsWithChildren) => {
 
   const agentEoaAddress = useMemo(
     () =>
-      services?.[0]?.chain_configs?.[CHAIN_CONFIG.OPTIMISM.chainId]?.chain_data
+      services?.[0]?.chain_configs?.[CHAIN_CONFIG[ChainId.Optimism].middlewareChain]?.chain_data
         ?.instances?.[0],
     [services],
   );
@@ -249,11 +249,11 @@ export const BalanceProvider = ({ children }: PropsWithChildren) => {
 
   const agentSafeBalance = useMemo(
     () =>
-      services?.[0]?.chain_configs[CHAIN_CONFIG.OPTIMISM.chainId].chain_data
+      services?.[0]?.chain_configs[CHAIN_CONFIG[ChainId.Optimism].middlewareChain].chain_data
         ?.multisig &&
       walletBalances[
-        services[0].chain_configs[CHAIN_CONFIG.OPTIMISM.chainId].chain_data
-          .multisig!
+      services[0].chain_configs[CHAIN_CONFIG[ChainId.Optimism].middlewareChain].chain_data
+        .multisig!
       ],
     [services, walletBalances],
   );

frontend/context/StakingContractInfoProvider.tsx

@@ -22,6 +22,7 @@ import {
   DEFAULT_STAKING_PROGRAM_ID,
   StakingProgramContext,
 } from './StakingProgramProvider';
+import { ChainId } from '@/enums/Chain';
 
 type StakingContractInfoContextProps = {
   activeStakingContractInfo?: Partial<StakingContractInfo>;
@@ -43,8 +44,8 @@ export const StakingContractInfoContext =
     isStakingContractInfoRecordLoaded: false,
     isActiveStakingContractInfoLoaded: false,
     stakingContractInfoRecord: undefined,
-    updateActiveStakingContractInfo: async () => {},
-    setIsPaused: () => {},
+    updateActiveStakingContractInfo: async () => { },
+    setIsPaused: () => { },
   });
 
 export const StakingContractInfoProvider = ({
@@ -71,7 +72,7 @@ export const StakingContractInfoProvider = ({
 
   const serviceId = useMemo(
     () =>
-      services?.[0]?.chain_configs[CHAIN_CONFIG.OPTIMISM.chainId].chain_data?.token,
+      services?.[0]?.chain_configs[CHAIN_CONFIG[ChainId.Optimism].middlewareChain].chain_data?.token,
     [services],
   );
 

frontend/context/StakingProgramProvider.tsx

@@ -11,6 +11,7 @@ import { CHAIN_CONFIG } from '@/config/chains';
 import { StakingProgramId } from '@/enums/StakingProgram';
 import { useServices } from '@/hooks/useServices';
 import { AutonolasService } from '@/service/Autonolas';
+import { ChainId } from '@/enums/Chain';
 
 export const INITIAL_DEFAULT_STAKING_PROGRAM_ID = StakingProgramId.Beta;
 
@@ -22,8 +23,8 @@ export const StakingProgramContext = createContext<{
 }>({
   activeStakingProgramId: undefined,
   defaultStakingProgramId: INITIAL_DEFAULT_STAKING_PROGRAM_ID,
-  updateActiveStakingProgramId: async () => {},
-  setDefaultStakingProgramId: () => {},
+  updateActiveStakingProgramId: async () => { },
+  setDefaultStakingProgramId: () => { },
 });
 
 /** Determines the current active staking program, if any */
@@ -40,10 +41,10 @@ export const StakingProgramProvider = ({ children }: PropsWithChildren) => {
   const updateActiveStakingProgramId = useCallback(async () => {
     // if no service nft, not staked
     const serviceId =
-      service?.chain_configs[CHAIN_CONFIG.OPTIMISM.chainId].chain_data?.token;
+      service?.chain_configs[CHAIN_CONFIG[ChainId.Optimism].middlewareChain].chain_data?.token;
 
     if (
-      !service?.chain_configs[CHAIN_CONFIG.OPTIMISM.chainId].chain_data?.token
+      !service?.chain_configs[CHAIN_CONFIG[ChainId.Optimism].middlewareChain].chain_data?.token
     ) {
       setActiveStakingProgramId(null);
       return;