Merge branch 'master' into vyper-patch-005

apps/remix-ide-e2e/src/tests/pinned_contracts.test.ts

@@ -0,0 +1,94 @@
+'use strict'
+import { NightwatchBrowser } from 'nightwatch'
+import init from '../helpers/init'
+
+module.exports = {
+  '@disabled': true,
+  before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    init(browser, done)
+  },
+  'Should show text in pinned contracts section #group1': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('udapp')
+      .assert.elementPresent('*[data-id="pinnedContracts"]')
+      .assert.textContains('*[data-id="pinnedContractsSublabel"]', '(VM: vm-cancun)')
+      .assert.elementPresent('*[data-id="NoPinnedInstanceText"]')
+      .assert.textContains('*[data-id="NoPinnedInstanceText"]', 'No pinned contracts found for selected workspace & network')
+  },
+  'Deploy & pin contract #group1': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('filePanel')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .click('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .click('*[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]')
+      .clickLaunchIcon('udapp')
+      .click('*[data-id="Deploy - transact (not payable)"]')
+      .assert.elementPresent('*[data-id="unpinnedInstance0xd9145CCE52D386f254917e481eB44e9943F39138"]')
+      .click('*[data-id="universalDappUiUdappPin"]')
+      .assert.elementPresent('*[data-id="deployAndRunNoInstanceText"]')
+      .assert.textContains('*[data-id="deployAndRunNoInstanceText"]', 'Currently you have no unpinned contracts to interact with.')
+      .assert.not.elementPresent('*[data-id="NoPinnedInstanceText"]')
+      .assert.elementPresent('*[data-id="pinnedInstance0xd9145CCE52D386f254917e481eB44e9943F39138"]')
+    },
+  'Interact with pinned contract #group1': function (browser: NightwatchBrowser) {
+    browser
+      .click('*[data-id="universalDappUiTitleExpander0"]')
+      .assert.elementPresent('*[data-id="instanceContractBal"]')
+      .assert.elementPresent('*[data-id="instanceContractPinnedAt"]')
+      .assert.elementPresent('*[data-id="instanceContractFilePath"]')
+      .assert.textContains('*[data-id="instanceContractFilePath"]', 'default_workspace/contracts/1_Storage.sol')
+      .clickFunction('retrieve - call')
+      .testFunction('last',
+      {
+        to: 'Storage.retrieve() 0xd9145CCE52D386f254917e481eB44e9943F39138',
+        'decoded output': { "0": "uint256: 0" }
+      })
+      .clickFunction('store - transact (not payable)', { types: 'uint256 num', values: '35' })
+      .testFunction('last',
+      {
+        status: '0x1 Transaction mined and execution succeed',
+        'decoded input': { "uint256 num": "35" }
+      })
+      .clickFunction('retrieve - call')
+      .testFunction('last',
+      {
+        to: 'Storage.retrieve() 0xd9145CCE52D386f254917e481eB44e9943F39138',
+        'decoded output': { "0": "uint256: 35" }
+      })
+    },
+  'Unpin & interact #group1': function (browser: NightwatchBrowser) {
+    browser
+      .click('*[data-id="universalDappUiUdappUnpin"]')
+      .assert.textContains('*[data-id="NoPinnedInstanceText"]', 'No pinned contracts found for selected workspace & network')
+      .assert.not.elementPresent('*[data-id="deployAndRunNoInstanceText"]')
+      .click('*[data-id="universalDappUiTitleExpander0"]')
+      .assert.not.elementPresent('*[data-id="instanceContractPinnedAt"]')
+      .assert.not.elementPresent('*[data-id="instanceContractFilePath"]')
+      .clickFunction('retrieve - call')
+      .testFunction('last',
+      {
+        to: 'Storage.retrieve() 0xd9145CCE52D386f254917e481eB44e9943F39138',
+        'decoded output': { "0": "uint256: 35" }
+      })
+      .clickFunction('store - transact (not payable)', { types: 'uint256 num', values: '55' })
+      .testFunction('last',
+      {
+        status: '0x1 Transaction mined and execution succeed',
+        'decoded input': { "uint256 num": "55" }
+      })
+      .clickFunction('retrieve - call')
+      .testFunction('last',
+      {
+        to: 'Storage.retrieve() 0xd9145CCE52D386f254917e481eB44e9943F39138',
+        'decoded output': { "0": "uint256: 55" }
+      })
+    },
+  'Re-pin & delete immediately #group1': function (browser: NightwatchBrowser) {
+    browser
+      .click('*[data-id="universalDappUiUdappPin"]')
+      .assert.elementPresent('*[data-id="deployAndRunNoInstanceText"]')
+      .click('*[data-id="universalDappUiUdappDelete"]')
+      .assert.textContains('*[data-id="NoPinnedInstanceText"]', 'No pinned contracts found for selected workspace & network')
+      .assert.textContains('*[data-id="deployAndRunNoInstanceText"]', 'Currently you have no unpinned contracts to interact with.')
+    },
+}

apps/remix-ide/src/app/tabs/locales/en/udapp.json

@@ -70,12 +70,12 @@
   "udapp.deployAndRunNoInstanceText": "Currently you have no unpinned contracts to interact with.",
   "udapp.tooltipText6": "Autogenerated generic user interfaces for interaction with deployed/unpinned contracts",
 
-  "udapp.savedContracts": "Pinned Contracts",
+  "udapp.pinnedContracts": "Pinned Contracts",
   "udapp.tooltipTextPinnedContracts": "List of pinned contracts for selected workspace & network",
-  "udapp.NoSavedInstanceText": "No pinned contracts found for selected workspace & network",
-  "udapp.tooltipTextDelete": "Delete pinned contract",
+  "udapp.NoPinnedInstanceText": "No pinned contracts found for selected workspace & network",
+  "udapp.tooltipTextDelete": "Delete immediately",
   "udapp.tooltipTextUnpin": "Unpin contract",
-  "udapp.savedOn": "Pinned at",
+  "udapp.pinnedAt": "Pinned at",
   "udapp.filePath": "File path",
 
   "udapp._comment_recorderCardUI.tsx": "libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx",

apps/remix-ide/src/app/udapp/run-tab.js

@@ -28,9 +28,9 @@ const profile = {
     'getSettings',
     'setEnvironmentMode',
     'clearAllInstances',
-    'clearAllSavedInstances',
+    'clearAllPinnedInstances',
     'addInstance',
-    'addSavedInstance',
+    'addPinnedInstance',
     'resolveContractAndAddInstance'
   ]
 }
@@ -81,16 +81,16 @@ export class RunTab extends ViewPlugin {
     this.emit('clearAllInstancesReducer')
   }
 
-  clearAllSavedInstances() {
-    this.emit('clearAllSavedInstancesReducer')
+  clearAllPinnedInstances() {
+    this.emit('clearAllPinnedInstancesReducer')
   }
 
   addInstance(address, abi, name, contractData) {
     this.emit('addInstanceReducer', address, abi, name, contractData)
   }
 
-  addSavedInstance(address, abi, name, savedOn, filePath) {
-    this.emit('addSavedInstanceReducer', address, abi, name, savedOn, filePath)
+  addPinnedInstance(address, abi, name, pinnedAt, filePath) {
+    this.emit('addPinnedInstanceReducer', address, abi, name, pinnedAt, filePath)
   }
 
   createVMAccount(newAccount) {

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

@@ -1,5 +1,5 @@
 import { ContractData } from "@remix-project/core-plugin"
-import { addNewInstance, addNewSavedInstance, addProvider, clearAllInstances, clearAllSavedInstances, clearRecorderCount, hidePopUp, newProxyDeployment, removeExistingInstance, removeProvider, setBaseFeePerGas, setConfirmSettings, setCurrentContract, setExecutionEnvironment, setExternalEndpoint, setGasLimit, setGasPrice, setGasPriceStatus, setMatchPassphrase, setMaxFee, setMaxPriorityFee, setNetworkName, setPassphrase, setPathToScenario, setSelectedAccount, setSendUnit, setSendValue } from "./payload"
+import { addNewInstance, addNewPinnedInstance, addProvider, clearAllInstances, clearAllPinnedInstances, clearRecorderCount, hidePopUp, newProxyDeployment, removeExistingInstance, removeProvider, setBaseFeePerGas, setConfirmSettings, setCurrentContract, setExecutionEnvironment, setExternalEndpoint, setGasLimit, setGasPrice, setGasPriceStatus, setMatchPassphrase, setMaxFee, setMaxPriorityFee, setNetworkName, setPassphrase, setPathToScenario, setSelectedAccount, setSendUnit, setSendValue } from "./payload"
 
 export const setAccount = (dispatch: React.Dispatch<any>, account: string) => {
   dispatch(setSelectedAccount(account))
@@ -70,22 +70,22 @@ export const addInstance = (dispatch: React.Dispatch<any>, instance: { contractD
   dispatch(addNewInstance(instance))
 }
 
-export const addSavedInstance = (dispatch: React.Dispatch<any>, instance: { contractData?: ContractData, address: string, name: string, abi?: any, decodedResponse?: Record<number, any>, savedOn?: number, filePath?: string }) => {
+export const addPinnedInstance = (dispatch: React.Dispatch<any>, instance: { contractData?: ContractData, address: string, name: string, abi?: any, decodedResponse?: Record<number, any>, pinnedAt?: number, filePath?: string }) => {
   instance.decodedResponse = {}
-  dispatch(addNewSavedInstance(instance))
+  dispatch(addNewPinnedInstance(instance))
 }
 
-export const removeInstance = (dispatch: React.Dispatch<any>, index: number, isSavedContract: boolean, shouldDelete: boolean) => {
-  dispatch(removeExistingInstance(index, isSavedContract, shouldDelete))
+export const removeInstance = (dispatch: React.Dispatch<any>, index: number, isPinnedContract: boolean, shouldDelete: boolean) => {
+  dispatch(removeExistingInstance(index, isPinnedContract, shouldDelete))
 }
 
 export const clearInstances = (dispatch: React.Dispatch<any>) => {
   dispatch(clearAllInstances())
   dispatch(clearRecorderCount())
 }
 
-export const clearSavedInstances = (dispatch: React.Dispatch<any>) => {
-  dispatch(clearAllSavedInstances())
+export const clearPinnedInstances = (dispatch: React.Dispatch<any>) => {
+  dispatch(clearAllPinnedInstances())
   dispatch(clearRecorderCount())
 }
 

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

@@ -283,7 +283,7 @@ export const runTransactions = (
   plugin: RunTab,
   dispatch: React.Dispatch<any>,
   instanceIndex: number,
-  isSavedContract: boolean,
+  isPinnedContract: boolean,
   lookupOnly: boolean,
   funcABI: FuncABI,
   inputsValues: string,
@@ -320,7 +320,7 @@ export const runTransactions = (
     (returnValue) => {
       const response = txFormat.decodeResponse(returnValue, funcABI)
 
-      dispatch(setDecodedResponse(instanceIndex, response, funcIndex, isSavedContract))
+      dispatch(setDecodedResponse(instanceIndex, response, funcIndex, isPinnedContract))
     },
     (network, tx, gasEstimation, continueTxExecution, cancelCb) => {
       confirmationHandler(plugin, dispatch, mainnetPrompt, network, tx, gasEstimation, continueTxExecution, cancelCb)

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

@@ -1,8 +1,8 @@
 import { envChangeNotification } from "@remix-ui/helper"
 import { RunTab } from "../types/run-tab"
 import { setExecutionContext, setFinalContext, updateAccountBalances, fillAccountsList } from "./account"
-import { addExternalProvider, addInstance, addSavedInstance, addNewProxyDeployment, removeExternalProvider, setNetworkNameFromProvider } from "./actions"
-import { addDeployOption, clearAllInstances, clearAllSavedInstances, clearRecorderCount, fetchContractListSuccess, resetProxyDeployments, resetUdapp, setCurrentContract, setCurrentFile, setLoadType, setRecorderCount, setRemixDActivated, setSendValue, fetchAccountsListSuccess } from "./payload"
+import { addExternalProvider, addInstance, addPinnedInstance, addNewProxyDeployment, removeExternalProvider, setNetworkNameFromProvider } from "./actions"
+import { addDeployOption, clearAllInstances, clearAllPinnedInstances, clearRecorderCount, fetchContractListSuccess, resetProxyDeployments, resetUdapp, setCurrentContract, setCurrentFile, setLoadType, setRecorderCount, setRemixDActivated, setSendValue, fetchAccountsListSuccess } from "./payload"
 import { updateInstanceBalance } from './deploy'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import BN from 'bn.js'
@@ -79,21 +79,37 @@ export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
     dispatch(clearAllInstances())
   })
 
-  plugin.on('udapp', 'clearAllSavedInstancesReducer', () => {
-    dispatch(clearAllSavedInstances())
+  plugin.on('udapp', 'clearAllPinnedInstancesReducer', () => {
+    dispatch(clearAllPinnedInstances())
   })
 
   plugin.on('udapp', 'addInstanceReducer', (address, abi, name, contractData?) => {
     addInstance(dispatch, { contractData, abi, address, name })
   })
 
-  plugin.on('udapp', 'addSavedInstanceReducer', (address, abi, name, savedOn, filePath) => {
-    addSavedInstance(dispatch, { abi, address, name, savedOn, filePath})
+  plugin.on('udapp', 'addPinnedInstanceReducer', (address, abi, name, pinnedAt, filePath) => {
+    addPinnedInstance(dispatch, { abi, address, name, pinnedAt, filePath})
   })
 
-  plugin.on('filePanel', 'setWorkspace', () => {
+  plugin.on('filePanel', 'setWorkspace', async () => {
     dispatch(resetUdapp())
     resetAndInit(plugin)
+    const { network } = await plugin.call('blockchain', 'getCurrentNetworkStatus')
+    const dirName = plugin.REACT_API.networkName === 'VM' ? plugin.REACT_API.selectExEnv : network.id
+    const isPinnedAvailable = await plugin.call('fileManager', 'exists', `.deploys/pinned-contracts/${dirName}`)
+    if (isPinnedAvailable) {
+      try {
+        const list = await plugin.call('fileManager', 'readdir', `.deploys/pinned-contracts/${dirName}`)
+        const filePaths = Object.keys(list)
+        for (const file of filePaths) {
+          const pinnedContract = await plugin.call('fileManager', 'readFile', file)
+          const pinnedContractObj = JSON.parse(pinnedContract)
+          if (pinnedContractObj) addPinnedInstance(dispatch, pinnedContractObj)
+        }
+      } catch(err) {
+        console.log(err)
+      }
+    }
     plugin.call('manager', 'isActive', 'remixd').then((activated) => {
       dispatch(setRemixDActivated(activated))
     })

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

@@ -48,9 +48,9 @@ export const setGasPriceStatus = (status: boolean) => updateGasPriceStatus(dispa
 export const setMaxFee = (fee: string) => updateMaxFee(dispatch, fee)
 export const setMaxPriorityFee = (fee: string) => updateMaxPriorityFee(dispatch, fee)
 export const removeInstances = () => clearInstances(dispatch)
-export const removeSingleInstance = (index: number, isSavedContract: boolean, shouldDelete: boolean) => removeInstance(dispatch, index, isSavedContract, shouldDelete)
+export const removeSingleInstance = (index: number, isPinnedContract: boolean, shouldDelete: boolean) => removeInstance(dispatch, index, isPinnedContract, shouldDelete)
 export const getExecutionContext = () => getContext(plugin)
-export const executeTransactions = (instanceIndex: number, isSavedContract: boolean, lookupOnly: boolean, funcABI: FuncABI, inputsValues: string, contractName: string, contractABI, contract, address, logMsg:string, mainnetPrompt: MainnetPrompt, gasEstimationPrompt: (msg: string) => JSX.Element, passphrasePrompt: (msg: string) => JSX.Element, funcIndex?: number) => runTransactions(plugin, dispatch, instanceIndex, isSavedContract, lookupOnly, funcABI, inputsValues, contractName, contractABI, contract, address, logMsg, mainnetPrompt, gasEstimationPrompt, passphrasePrompt, funcIndex)
+export const executeTransactions = (instanceIndex: number, isPinnedContract: boolean, lookupOnly: boolean, funcABI: FuncABI, inputsValues: string, contractName: string, contractABI, contract, address, logMsg:string, mainnetPrompt: MainnetPrompt, gasEstimationPrompt: (msg: string) => JSX.Element, passphrasePrompt: (msg: string) => JSX.Element, funcIndex?: number) => runTransactions(plugin, dispatch, instanceIndex, isPinnedContract, lookupOnly, funcABI, inputsValues, contractName, contractABI, contract, address, logMsg, mainnetPrompt, gasEstimationPrompt, passphrasePrompt, funcIndex)
 export const loadFromAddress = (contract: ContractData, address: string) => loadAddress(plugin, dispatch, contract, address)
 export const storeNewScenario = async (prompt: (msg: string, defaultValue: string) => JSX.Element) => storeScenario(plugin, dispatch, prompt)
 export const runScenario = (liveMode: boolean, gasEstimationPrompt: (msg: string) => JSX.Element, passphrasePrompt: (msg: string) => JSX.Element, confirmDialogContent: MainnetPrompt) => runCurrentScenario(liveMode, plugin, dispatch, gasEstimationPrompt, passphrasePrompt, confirmDialogContent)

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

@@ -1,5 +1,5 @@
 import { ContractData } from '@remix-project/core-plugin'
-import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_SAVED_INSTANCE, UPDATE_INSTANCES_BALANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_SAVED_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_REMIXD_ACTIVATED, FETCH_PROXY_DEPLOYMENTS, NEW_PROXY_DEPLOYMENT, RESET_PROXY_DEPLOYMENTS, EXTRACT_COMPILER_VERSION } from '../constants'
+import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PINNED_INSTANCE, UPDATE_INSTANCES_BALANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_PINNED_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_REMIXD_ACTIVATED, FETCH_PROXY_DEPLOYMENTS, NEW_PROXY_DEPLOYMENT, RESET_PROXY_DEPLOYMENTS, EXTRACT_COMPILER_VERSION } from '../constants'
 import { ContractList, DeployOptions } from '../types'
 
 export const fetchAccountsListRequest = () => {
@@ -230,19 +230,19 @@ export const addNewInstance = (instance: { contractData?: ContractData, address:
   }
 }
 
-export const addNewSavedInstance = (instance: { contractData?: ContractData, address: string, name: string, abi?: any, savedOn?: number }) => {
+export const addNewPinnedInstance = (instance: { contractData?: ContractData, address: string, name: string, abi?: any, pinnedAt?: number }) => {
   return {
-    type: ADD_SAVED_INSTANCE,
+    type: ADD_PINNED_INSTANCE,
     payload: instance
   }
 }
 
-export const removeExistingInstance = (index: number, isSavedContract: boolean, shouldDelete: boolean) => {
+export const removeExistingInstance = (index: number, isPinnedContract: boolean, shouldDelete: boolean) => {
   return {
     type: REMOVE_INSTANCE,
     payload: { 
       index,
-      isSavedContract,
+      isPinnedContract,
       shouldDelete 
     }
   }
@@ -254,20 +254,20 @@ export const clearAllInstances = () => {
   }
 }
 
-export const clearAllSavedInstances = () => {
+export const clearAllPinnedInstances = () => {
   return {
-    type: CLEAR_SAVED_INSTANCES
+    type: CLEAR_PINNED_INSTANCES
   }
 }
 
-export const setDecodedResponse = (instanceIndex: number, response, funcIndex?: number, isSavedContract?: boolean) => {
+export const setDecodedResponse = (instanceIndex: number, response, funcIndex?: number, isPinnedContract?: boolean) => {
   return {
     type: SET_DECODED_RESPONSE,
     payload: {
       instanceIndex,
       funcIndex,
       response,
-      isSavedContract
+      isPinnedContract
     }
   }
 }