Feature/modius

.env.example

@@ -8,4 +8,5 @@ DEV_RPC=
 GNOSIS_RPC=
 ETHEREUM_RPC=
 OPTIMISM_RPC=
-BASE_RPC=
+BASE_RPC=
+MODE_RPC=

.github/workflows/release.yml

@@ -233,7 +233,7 @@ jobs:
           BASE_RPC: https://virtual.base.rpc.tenderly.co/2a91611a-3251-48a6-8095-b86815de84bf
           GNOSIS_RPC: https://virtual.gnosis.rpc.tenderly.co/7de511da-9ad7-4e9f-98c1-e99052e92b15
           ETHEREUM_RPC: https://rpc-gate.autonolas.tech/ethereum-rpc/
-          MODE_RPC: https://mainnet.mode.network
+          MODE_RPC: https://virtual.mode.rpc.tenderly.co/9f5ab06c-f005-4f8d-8bb2-786cb7b8f865
 
       # Run the build and notarization process for production
       - name: Build, notarize, and publish (Production)
@@ -282,11 +282,11 @@ jobs:
           BASE_RPC: https://virtual.base.rpc.tenderly.co/2a91611a-3251-48a6-8095-b86815de84bf
           GNOSIS_RPC: https://virtual.gnosis.rpc.tenderly.co/7de511da-9ad7-4e9f-98c1-e99052e92b15
           ETHEREUM_RPC: https://rpc-gate.autonolas.tech/ethereum-rpc/
-          MODE_RPC: https://mainnet.mode.network
+          MODE_RPC: https://virtual.mode.rpc.tenderly.co/9f5ab06c-f005-4f8d-8bb2-786cb7b8f865
         run: |
           echo "OPTIMISM_RPC=https://rpc-gate.autonolas.tech/optimism-rpc/" >> .env
           echo "BASE_RPC=https://virtual.base.rpc.tenderly.co/2a91611a-3251-48a6-8095-b86815de84bf" >> .env
           echo "GNOSIS_RPC=https://virtual.gnosis.rpc.tenderly.co/7de511da-9ad7-4e9f-98c1-e99052e92b15" >> .env
           echo "ETHEREUM_RPC=https://rpc-gate.autonolas.tech/ethereum-rpc/" >> .env
-          echo "MODE_RPC=https://mainnet.mode.network" >> .env
+          echo "MODE_RPC=https://virtual.mode.rpc.tenderly.co/9f5ab06c-f005-4f8d-8bb2-786cb7b8f865" >> .env
           node build.js

.github/workflows/release_win.yml

@@ -23,7 +23,7 @@ jobs:
             BASE_RPC: "https://virtual.base.rpc.tenderly.co/2a91611a-3251-48a6-8095-b86815de84bf"
             GNOSIS_RPC: "https://virtual.gnosis.rpc.tenderly.co/7de511da-9ad7-4e9f-98c1-e99052e92b15"
             ETHEREUM_RPC: "https://rpc-gate.autonolas.tech/ethereum-rpc/"  
-            MODE_RPC: "https://mainnet.mode.network"          
+            MODE_RPC: "https://virtual.mode.rpc.tenderly.co/9f5ab06c-f005-4f8d-8bb2-786cb7b8f865"          
             arch: "x64"
     defaults:
       run:

electron/store.js

@@ -18,6 +18,7 @@ const schema = {
   // Each agent has its own settings
   trader: { type: 'object', default: defaultInitialAgentSettings },
   memeooorr: { type: 'object', default: defaultInitialAgentSettings },
+  modius: { type: 'object', default: defaultInitialAgentSettings },
 };
 
 /**

frontend/client/types.ts

@@ -33,8 +33,10 @@ export type ChainData = {
     agent_id: number;
     cost_of_bond: number;
     fund_requirements: {
-      agent: number;
-      safe: number;
+      [tokenAddress: string]: {
+        agent: number;
+        safe: number;
+      };
     };
     nft: string;
     staking_program_id: StakingProgramId;
@@ -95,7 +97,7 @@ export type ConfigurationTemplate = {
   use_mech_marketplace?: boolean;
   cost_of_bond: number;
   monthly_gas_estimate: number;
-  fund_requirements: FundRequirementsTemplate;
+  fund_requirements: { [tokenAddress: string]: FundRequirementsTemplate };
 };
 
 export type FundRequirementsTemplate = {

frontend/components/AgentSelection.tsx

@@ -91,8 +91,9 @@ const EachAgent = memo(
       }
 
       // Neither service nor safe is created
-      if (agentType === AgentType.Memeooorr) {
-        // if the selected type is Memeooorr - should set up the agent first
+      if (agentType === AgentType.Memeooorr || agentType === AgentType.Modius) {
+        // if the selected type requires setting up an agent - should redirect to SetupYourAgent first
+        // TODO: can have this as a boolean flag in agentConfig?
         gotoPage(Pages.Setup);
         gotoSetup(SetupScreen.SetupYourAgent);
         return;

frontend/components/MainPage/header/AgentButton/AgentNotRunningButton.tsx

@@ -23,6 +23,7 @@ import {
 } from '@/hooks/useBalanceContext';
 import { useElectronApi } from '@/hooks/useElectronApi';
 import { MultisigOwners, useMultisigs } from '@/hooks/useMultisig';
+import { useNeedsFunds } from '@/hooks/useNeedsFunds';
 import { usePageState } from '@/hooks/usePageState';
 import { useService } from '@/hooks/useService';
 import { useServices } from '@/hooks/useServices';
@@ -31,15 +32,13 @@ import {
   useStakingContractContext,
 } from '@/hooks/useStakingContractDetails';
 import { useStakingProgram } from '@/hooks/useStakingProgram';
-import { useStore } from '@/hooks/useStore';
 import { useMasterWalletContext } from '@/hooks/useWallet';
 import { ServicesService } from '@/service/Services';
 import { WalletService } from '@/service/Wallet';
 import { AgentConfig } from '@/types/Agent';
 import { delayInSeconds } from '@/utils/delay';
 
 const useServiceDeployment = () => {
-  const { storeState } = useStore();
   const { showNotification } = useElectronApi();
 
   const { goto: gotoPage } = usePageState();
@@ -80,8 +79,7 @@ const useServiceDeployment = () => {
     (balance) => balance.evmChainId === selectedAgentConfig.evmHomeChainId,
   )?.balance;
 
-  const { masterSafeBalances, masterSafeNativeGasBalance } =
-    useMasterBalances();
+  const { masterSafeNativeGasBalance } = useMasterBalances();
 
   const {
     isAllStakingContractDetailsRecordLoaded,
@@ -98,6 +96,10 @@ const useServiceDeployment = () => {
 
   const { masterSafesOwners } = useMultisigs(masterSafes);
 
+  const { isInitialFunded, needsInitialFunding } = useNeedsFunds(
+    selectedStakingProgramId,
+  );
+
   const requiredStakedOlas =
     selectedStakingProgramId &&
     STAKING_PROGRAMS[selectedAgentConfig.evmHomeChainId][
@@ -128,13 +130,6 @@ const useServiceDeployment = () => {
       return false;
     }
 
-    const masterSafeOlasBalance = masterSafeBalances?.find(
-      (walletBalanceResult) =>
-        walletBalanceResult.symbol === TokenSymbol.OLAS &&
-        walletBalanceResult.evmChainId === selectedAgentConfig.evmHomeChainId,
-    )?.balance;
-
-    const isInitialFunded = storeState?.[selectedAgentType]?.isInitialFunded;
     if (service && isInitialFunded && isServiceStaked) {
       return (serviceTotalStakedOlas ?? 0) >= requiredStakedOlas;
     }
@@ -160,36 +155,25 @@ const useServiceDeployment = () => {
     }
 
     // SERVICE IS NOT STAKED AND/OR IS STARTING FOR THE FIRST TIME
-    const totalOlasStakedAndInSafes = sum([
-      serviceOlasBalanceOnHomeChain,
-      serviceTotalStakedOlas,
-      masterSafeOlasBalance,
-    ]);
-
-    const hasEnoughForInitialDeployment =
-      (totalOlasStakedAndInSafes ?? 0) >= requiredStakedOlas &&
-      (masterSafeNativeGasBalance ?? 0) >= safeThreshold;
-
-    return hasEnoughForInitialDeployment;
+    // Check if it has enough initial funding
+    return !needsInitialFunding;
   }, [
     isServicesLoading,
     isServiceRunning,
     isAllStakingContractDetailsRecordLoaded,
     requiredStakedOlas,
     hasEnoughServiceSlots,
     isServiceStaked,
-    masterSafeBalances,
     service,
-    storeState,
-    selectedAgentType,
+    isInitialFunded,
     isAgentEvicted,
     isEligibleForStaking,
     selectedAgentConfig.operatingThresholds,
     selectedAgentConfig.evmHomeChainId,
-    serviceOlasBalanceOnHomeChain,
+    needsInitialFunding,
     serviceTotalStakedOlas,
-    masterSafeNativeGasBalance,
     serviceSafeOlasWithStaked,
+    masterSafeNativeGasBalance,
   ]);
 
   const pauseAllPolling = useCallback(() => {
@@ -362,7 +346,7 @@ const useServiceDeployment = () => {
     selectedAgentType,
   ]);
 
-  const buttonText = `Start agent ${service ? '' : '& stake'}`;
+  const buttonText = `Start agent ${isServiceStaked ? '' : '& stake'}`;
 
   return { isDeployable, handleStart, buttonText };
 };

frontend/components/MainPage/sections/AlertSections/LowFunds/EmptyFunds.tsx

@@ -43,7 +43,7 @@ export const EmptyFunds = () => {
             <InlineBanner text="Your safe address" address={masterEoaAddress} />
           )}
           <PurpleDivider />
-          <FundsToActivate stakingFundsRequired otherFundsRequired />
+          <FundsToActivate stakingFundsRequired nativeFundsRequired />
         </Flex>
       }
       type="primary"

frontend/components/MainPage/sections/AlertSections/LowFunds/FundsToActivate.tsx

@@ -16,17 +16,20 @@ const { Text } = Typography;
 
 type FundsToActivateProps = {
   stakingFundsRequired: boolean;
-  otherFundsRequired: boolean;
+  nativeFundsRequired: boolean;
+  additionalFundsRequired?: boolean;
 };
 
 const FUNDS_REQUIRED_FOR_BY_AGENT_TYPE = {
   [AgentType.PredictTrader]: 'for trading',
   [AgentType.Memeooorr]: 'for agent operations',
+  [AgentType.Modius]: 'minimum for investment',
 };
 
 export const FundsToActivate = ({
   stakingFundsRequired = true,
-  otherFundsRequired = true,
+  nativeFundsRequired = true,
+  additionalFundsRequired = true,
 }: FundsToActivateProps) => {
   const { selectedStakingProgramId } = useStakingProgram();
 
@@ -39,16 +42,38 @@ export const FundsToActivate = ({
 
   // Calculate the required OLAS
   const olasRequired = useMemo(() => {
+    if (!serviceFundRequirements[homeChainId]) return;
+
     const olas = serviceFundRequirements[homeChainId][TokenSymbol.OLAS];
     return `${UNICODE_SYMBOLS.OLAS}${olas} OLAS `;
   }, [homeChainId, serviceFundRequirements]);
 
   // Calculate the required native token (Eg. ETH)
   const nativeTokenRequired = useMemo(() => {
+    if (!serviceFundRequirements[homeChainId]) return;
+
     const native = serviceFundRequirements[homeChainId][nativeTokenSymbol];
     return `${native} ${nativeTokenSymbol}`;
   }, [homeChainId, serviceFundRequirements, nativeTokenSymbol]);
 
+  // Calculate additional tokens requirements (Eg. USDC)
+  const additionalTokensRequired = useMemo(() => {
+    if (!serviceFundRequirements[homeChainId]) return [];
+
+    const additionalTokens = Object.keys(
+      serviceFundRequirements[homeChainId],
+    ).filter(
+      (token) => token !== TokenSymbol.OLAS && token !== nativeTokenSymbol,
+    );
+
+    if (additionalTokens.length === 0) return [];
+
+    return additionalTokens.map((tokenSymbol) => {
+      const token = serviceFundRequirements[homeChainId]?.[tokenSymbol];
+      return `${token} ${tokenSymbol}`;
+    });
+  }, [homeChainId, serviceFundRequirements, nativeTokenSymbol]);
+
   return (
     <>
       <Text>
@@ -63,12 +88,20 @@ export const FundsToActivate = ({
             staking.
           </div>
         )}
-        {otherFundsRequired && (
+        {nativeFundsRequired && (
           <div>
             {UNICODE_SYMBOLS.BULLET} <Text strong>{nativeTokenRequired}</Text> -
             {` ${FUNDS_REQUIRED_FOR_BY_AGENT_TYPE[selectedAgentType]}.`}
           </div>
         )}
+
+        {additionalFundsRequired &&
+          additionalTokensRequired.map((additionalToken) => (
+            <div key={additionalToken}>
+              {UNICODE_SYMBOLS.BULLET} <Text strong>{additionalToken}</Text> -
+              {` ${FUNDS_REQUIRED_FOR_BY_AGENT_TYPE[selectedAgentType]}.`}
+            </div>
+          ))}
       </Flex>
 
       {masterSafeAddress && (

frontend/components/MainPage/sections/AlertSections/LowFunds/LowFunds.tsx

@@ -1,6 +1,8 @@
 import { round } from 'lodash';
 import { useMemo } from 'react';
 
+import { getNativeTokenSymbol } from '@/config/tokens';
+import { TokenSymbol } from '@/enums/Token';
 import { WalletType } from '@/enums/Wallet';
 import { useMasterBalances } from '@/hooks/useBalanceContext';
 import { useNeedsFunds } from '@/hooks/useNeedsFunds';
@@ -22,8 +24,9 @@ export const LowFunds = () => {
     masterSafeNativeGasBalance,
   } = useMasterBalances();
 
-  const { nativeBalancesByChain, olasBalancesByChain, isInitialFunded } =
-    useNeedsFunds(selectedStakingProgramId);
+  const { balancesByChain, isInitialFunded } = useNeedsFunds(
+    selectedStakingProgramId,
+  );
   const { tokenSymbol, masterThresholds } = useLowFundsDetails();
 
   const chainId = selectedAgentConfig.evmHomeChainId;
@@ -50,15 +53,14 @@ export const LowFunds = () => {
   // Show the empty funds alert if the agent is not funded
   const isEmptyFundsVisible = useMemo(() => {
     if (!isBalanceLoaded) return false;
-    if (!olasBalancesByChain) return false;
-    if (!nativeBalancesByChain) return false;
+    if (!balancesByChain) return false;
 
     // If the agent is not funded, <MainNeedsFunds /> will be displayed
     if (!isInitialFunded) return false;
 
     if (
-      round(nativeBalancesByChain[chainId], 2) === 0 &&
-      round(olasBalancesByChain[chainId], 2) === 0 &&
+      round(balancesByChain[chainId][getNativeTokenSymbol(chainId)], 2) === 0 &&
+      round(balancesByChain[chainId][TokenSymbol.OLAS], 2) === 0 &&
       isSafeSignerBalanceLow
     ) {
       return true;
@@ -69,8 +71,7 @@ export const LowFunds = () => {
     isBalanceLoaded,
     isInitialFunded,
     chainId,
-    nativeBalancesByChain,
-    olasBalancesByChain,
+    balancesByChain,
     isSafeSignerBalanceLow,
   ]);
 

frontend/components/MainPage/sections/AlertSections/LowFunds/MainNeedsFunds.tsx

@@ -18,6 +18,7 @@ export const MainNeedsFunds = () => {
   const {
     hasEnoughEthForInitialFunding,
     hasEnoughOlasForInitialFunding,
+    hasEnoughAdditionalTokensForInitialFunding,
     isInitialFunded,
     needsInitialFunding,
   } = useNeedsFunds(selectedStakingProgramId);
@@ -28,6 +29,7 @@ export const MainNeedsFunds = () => {
     if (
       hasEnoughEthForInitialFunding &&
       hasEnoughOlasForInitialFunding &&
+      hasEnoughAdditionalTokensForInitialFunding &&
       !isInitialFunded
     ) {
       electronApi.store?.set?.(`${selectedAgentType}.isInitialFunded`, true);
@@ -37,6 +39,7 @@ export const MainNeedsFunds = () => {
     selectedAgentType,
     hasEnoughEthForInitialFunding,
     hasEnoughOlasForInitialFunding,
+    hasEnoughAdditionalTokensForInitialFunding,
     isInitialFunded,
   ]);
 
@@ -54,7 +57,10 @@ export const MainNeedsFunds = () => {
 
           <FundsToActivate
             stakingFundsRequired={!hasEnoughOlasForInitialFunding}
-            otherFundsRequired={!hasEnoughEthForInitialFunding}
+            nativeFundsRequired={!hasEnoughEthForInitialFunding}
+            additionalFundsRequired={
+              !hasEnoughAdditionalTokensForInitialFunding
+            }
           />
         </Flex>
       }