Merge pull request #6580 from remix-project-org/fix_update_value

update value

Author: STetsing

libs/remix-ai-core/src/inferencers/mcp/toolApiGenerator.ts

@@ -25,12 +25,6 @@ const modified = fileContent.replace('old', 'new');
 const compiled = await callMCPTool('solidity_compile', { file: 'contract.sol' });
 const deployed = await callMCPTool('deploy_contract', { contractName: 'MyToken' });
 
-// Multiple tasks 2
-const fileContent = await callMCPTool('file_read', { path:'contract.sol' });
-const content = JSON.parse(fileContent.content[0].text).content
-const updatedContent = fileContent.replace('contract Subscription', 'contract MySubscriptionContract');
-await callMCPTool('file_write', { path: 'ccontract.sol', content: updatedContent });
-
 
 // With loops for batch operations
 const files = ['contracts/Token.sol', 'contracts/NFT.sol', 'contracts/DAO.sol'];

libs/remix-ai-core/src/inferencers/remote/remoteInference.ts

@@ -24,13 +24,13 @@ export class RemoteInferencer implements ICompletions, IGeneration {
   protected sanitizePromptByteSize(prompt: string, provider?: string): string {
     // Provider-specific max byte limits
     const providerLimits: Record<string, number> = {
-      'mistralai': 80000,
-      'anthropic': 80000,
-      'openai': 80000
+      'mistralai': 70000,
+      'anthropic': 70000,
+      'openai': 70000
     };
 
-    // Get max bytes based on provider, default to 80KB
-    const maxBytes = provider ? (providerLimits[provider.toLowerCase()] || 80000) : 80000;
+    // Get max bytes based on provider, default to 70KB
+    const maxBytes = provider ? (providerLimits[provider.toLowerCase()] || 70000) : 70000;
 
     const encoder = new TextEncoder();
     const promptBytes = encoder.encode(prompt); // rough estimation, real size might be 10% more

libs/remix-ai-core/src/remix-mcp-server/handlers/DeploymentHandler.ts

@@ -20,8 +20,8 @@ import {
 import { Plugin } from '@remixproject/engine';
 import { getContractData } from '@remix-project/core-plugin'
 import type { TxResult } from '@remix-project/remix-lib';
-import { BrowserProvider } from "ethers"
-import { toNumber, ethers } from 'ethers'
+import { BrowserProvider, formatEther } from "ethers"
+import { toNumber } from 'ethers'
 import { execution } from '@remix-project/remix-lib';
 const { txFormat, txHelper: { makeFullTypeDefinition } } = execution;
 
@@ -104,6 +104,12 @@ export class DeployContractHandler extends BaseToolHandler {
       if (!data) {
         return this.createErrorResult(`Could not retrieve contract data for '${args.contractName}'`);
       }
+      await plugin.call('sidePanel', 'showContent', 'udapp' )
+      plugin.emit('setValueRequest', args.value || '0', 'wei')
+      if (args.value && args.value !== '0') {
+        plugin.call('notification', 'toast', `Value of ${formatEther(args.value)} ETH will be sent with the deployment`)
+        await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait a moment for the toast to be seen
+      }
 
       let txReturn
       try {
@@ -141,8 +147,7 @@ export class DeployContractHandler extends BaseToolHandler {
         logs: receipt.logs,
         contractAddress: receipt.contractAddress,
         success: receipt.status === 1 ? true : false
-      };
-      await plugin.call('sidePanel', 'showContent', 'udapp' )
+      }
       plugin.call('udapp', 'addInstance', result.contractAddress, data.abi, args.contractName, data)
 
       return this.createSuccessResult(result);
@@ -256,6 +261,13 @@ export class CallContractHandler extends BaseToolHandler {
       const isView = funcABI.stateMutability === 'view' || funcABI.stateMutability === 'pure';
       let txReturn
       try {
+        await plugin.call('sidePanel', 'showContent', 'udapp' )
+        plugin.emit('setValueRequest', args.value || '0', 'wei')
+        if (args.value && args.value !== '0') {
+          plugin.call('notification', 'toast', `Value of ${formatEther(args.value)} ETH will be sent with the deployment`)
+          await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait a moment for the toast to be seen
+        }
+
         txReturn = await new Promise((resolve, reject) => {
           const params = funcABI.type !== 'fallback' ? (args.args? args.args.join(',') : ''): ''
           plugin.call('blockchain', 'runOrCallContractMethod',

libs/remix-ui/run-tab/src/lib/actions/events.ts

@@ -3,7 +3,7 @@ import { RunTab } from "../types/run-tab"
 import { trackMatomoEvent } from '@remix-api'
 import { setExecutionContext, setFinalContext, updateAccountBalances, fillAccountsList } from "./account"
 import { setAccount, addExternalProvider, addInstance, addNewProxyDeployment, removeExternalProvider, setNetworkNameFromProvider, setPinnedChainId, setExecEnv } from "./actions"
-import { addDeployOption, clearAllInstances, clearRecorderCount, setSelectedAccount, fetchContractListSuccess, resetProxyDeployments, resetUdapp, setCurrentContract, setCurrentFile, setLoadType, setRecorderCount, setRemixDActivated, setSendValue, fetchAccountsListSuccess, fetchAccountsListRequest } from "./payload"
+import { addDeployOption, clearAllInstances, clearRecorderCount, setSelectedAccount, fetchContractListSuccess, resetProxyDeployments, resetUdapp, setCurrentContract, setCurrentFile, setLoadType, setRecorderCount, setRemixDActivated, setSendValue, fetchAccountsListSuccess, fetchAccountsListRequest, setSendUnit } from "./payload"
 import { updateInstanceBalance } from './deploy'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import BN from 'bn.js'
@@ -26,6 +26,10 @@ export const setupEvents = (plugin: RunTab) => {
     provider: null,
     chainId: null
   }
+  plugin.on('remixAI', 'setValueRequest', (value, unit) => {
+    dispatch(setSendUnit(unit))
+    dispatch(setSendValue(value))
+  })
   plugin.blockchain.events.on('newTransaction', (tx, receipt) => {
     plugin.emit('newTransaction', tx, receipt)
   })