mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

transition to pinned

Browse Source
flakycookbook
aniket-engg 11 months ago committed by Aniket
parent 7e17fc027c
commit 9749cd977c
13 changed files with 85 additions and 85 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      apps/remix-ide/src/app/tabs/locales/en/udapp.json
  2. 12
      apps/remix-ide/src/app/udapp/run-tab.js
  3. 14
      libs/remix-ui/run-tab/src/lib/actions/actions.ts
  4. 4
      libs/remix-ui/run-tab/src/lib/actions/deploy.ts
  5. 14
      libs/remix-ui/run-tab/src/lib/actions/events.ts
  6. 4
      libs/remix-ui/run-tab/src/lib/actions/index.ts
  7. 18
      libs/remix-ui/run-tab/src/lib/actions/payload.ts
  8. 16
      libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
  9. 20
      libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
  10. 4
      libs/remix-ui/run-tab/src/lib/constants/index.ts
  11. 44
      libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
  12. 2
      libs/remix-ui/run-tab/src/lib/run-tab.tsx
  13. 14
      libs/remix-ui/run-tab/src/lib/types/index.ts

4
apps/remix-ide/src/app/tabs/locales/en/udapp.json
Unescape View File

@ -72,8 +72,8 @@
"udapp.savedContracts": "Pinned Contracts", "udapp.savedContracts": "Pinned Contracts",
"udapp.tooltipTextPinnedContracts": "List of pinned contracts for selected workspace & network", "udapp.tooltipTextPinnedContracts": "List of pinned contracts for selected workspace & network",
"udapp.NoSavedInstanceText": "No pinned contracts found for selected workspace & network", "udapp.NoPinnedInstanceText": "No pinned contracts found for selected workspace & network",
"udapp.tooltipTextDelete": "Delete pinned contract", "udapp.tooltipTextDelete": "Delete immediately",
"udapp.tooltipTextUnpin": "Unpin contract", "udapp.tooltipTextUnpin": "Unpin contract",
"udapp.pinnedAt": "Pinned at", "udapp.pinnedAt": "Pinned at",
"udapp.filePath": "File path", "udapp.filePath": "File path",

12
apps/remix-ide/src/app/udapp/run-tab.js
Unescape View File

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

14
libs/remix-ui/run-tab/src/lib/actions/actions.ts
Unescape View File

@ -1,5 +1,5 @@
import { ContractData } from "@remix-project/core-plugin" 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) => { export const setAccount = (dispatch: React.Dispatch<any>, account: string) => {
dispatch(setSelectedAccount(account)) dispatch(setSelectedAccount(account))
@ -70,13 +70,13 @@ export const addInstance = (dispatch: React.Dispatch<any>, instance: { contractD
dispatch(addNewInstance(instance)) dispatch(addNewInstance(instance))
} }
export const addSavedInstance = (dispatch: React.Dispatch<any>, instance: { contractData?: ContractData, address: string, name: string, abi?: any, decodedResponse?: Record<number, any>, pinnedAt?: 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 = {} instance.decodedResponse = {}
dispatch(addNewSavedInstance(instance)) dispatch(addNewPinnedInstance(instance))
} }
export const removeInstance = (dispatch: React.Dispatch<any>, index: number, isSavedContract: boolean, shouldDelete: boolean) => { export const removeInstance = (dispatch: React.Dispatch<any>, index: number, isPinnedContract: boolean, shouldDelete: boolean) => {
dispatch(removeExistingInstance(index, isSavedContract, shouldDelete)) dispatch(removeExistingInstance(index, isPinnedContract, shouldDelete))
} }
export const clearInstances = (dispatch: React.Dispatch<any>) => { export const clearInstances = (dispatch: React.Dispatch<any>) => {
@ -84,8 +84,8 @@ export const clearInstances = (dispatch: React.Dispatch<any>) => {
dispatch(clearRecorderCount()) dispatch(clearRecorderCount())
} }
export const clearSavedInstances = (dispatch: React.Dispatch<any>) => { export const clearPinnedInstances = (dispatch: React.Dispatch<any>) => {
dispatch(clearAllSavedInstances()) dispatch(clearAllPinnedInstances())
dispatch(clearRecorderCount()) dispatch(clearRecorderCount())
} }

4
libs/remix-ui/run-tab/src/lib/actions/deploy.ts
Unescape View File

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

14
libs/remix-ui/run-tab/src/lib/actions/events.ts
Unescape View File

@ -1,8 +1,8 @@
import { envChangeNotification } from "@remix-ui/helper" import { envChangeNotification } from "@remix-ui/helper"
import { RunTab } from "../types/run-tab" import { RunTab } from "../types/run-tab"
import { setExecutionContext, setFinalContext, updateAccountBalances, fillAccountsList } from "./account" import { setExecutionContext, setFinalContext, updateAccountBalances, fillAccountsList } from "./account"
import { addExternalProvider, addInstance, addSavedInstance, addNewProxyDeployment, removeExternalProvider, setNetworkNameFromProvider } from "./actions" import { addExternalProvider, addInstance, addPinnedInstance, addNewProxyDeployment, removeExternalProvider, setNetworkNameFromProvider } from "./actions"
import { addDeployOption, clearAllInstances, clearAllSavedInstances, clearRecorderCount, fetchContractListSuccess, resetProxyDeployments, resetUdapp, setCurrentContract, setCurrentFile, setLoadType, setRecorderCount, setRemixDActivated, setSendValue, fetchAccountsListSuccess } from "./payload" import { addDeployOption, clearAllInstances, clearAllPinnedInstances, clearRecorderCount, fetchContractListSuccess, resetProxyDeployments, resetUdapp, setCurrentContract, setCurrentFile, setLoadType, setRecorderCount, setRemixDActivated, setSendValue, fetchAccountsListSuccess } from "./payload"
import { updateInstanceBalance } from './deploy' import { updateInstanceBalance } from './deploy'
import { CompilerAbstract } from '@remix-project/remix-solidity' import { CompilerAbstract } from '@remix-project/remix-solidity'
import BN from 'bn.js' import BN from 'bn.js'
@ -79,16 +79,16 @@ export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
dispatch(clearAllInstances()) dispatch(clearAllInstances())
}) })
plugin.on('udapp', 'clearAllSavedInstancesReducer', () => { plugin.on('udapp', 'clearAllPinnedInstancesReducer', () => {
dispatch(clearAllSavedInstances()) dispatch(clearAllPinnedInstances())
}) })
plugin.on('udapp', 'addInstanceReducer', (address, abi, name, contractData?) => { plugin.on('udapp', 'addInstanceReducer', (address, abi, name, contractData?) => {
addInstance(dispatch, { contractData, abi, address, name }) addInstance(dispatch, { contractData, abi, address, name })
}) })
plugin.on('udapp', 'addSavedInstanceReducer', (address, abi, name, pinnedAt, filePath) => { plugin.on('udapp', 'addPinnedInstanceReducer', (address, abi, name, pinnedAt, filePath) => {
addSavedInstance(dispatch, { abi, address, name, pinnedAt, filePath}) addPinnedInstance(dispatch, { abi, address, name, pinnedAt, filePath})
}) })
plugin.on('filePanel', 'setWorkspace', async () => { plugin.on('filePanel', 'setWorkspace', async () => {
@ -104,7 +104,7 @@ export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
for (const file of filePaths) { for (const file of filePaths) {
const pinnedContract = await plugin.call('fileManager', 'readFile', file) const pinnedContract = await plugin.call('fileManager', 'readFile', file)
const pinnedContractObj = JSON.parse(pinnedContract) const pinnedContractObj = JSON.parse(pinnedContract)
if (pinnedContractObj) addSavedInstance(dispatch, pinnedContractObj) if (pinnedContractObj) addPinnedInstance(dispatch, pinnedContractObj)
} }
} catch(err) { } catch(err) {
console.log(err) console.log(err)

4
libs/remix-ui/run-tab/src/lib/actions/index.ts
Unescape View File

@ -48,9 +48,9 @@ export const setGasPriceStatus = (status: boolean) => updateGasPriceStatus(dispa
export const setMaxFee = (fee: string) => updateMaxFee(dispatch, fee) export const setMaxFee = (fee: string) => updateMaxFee(dispatch, fee)
export const setMaxPriorityFee = (fee: string) => updateMaxPriorityFee(dispatch, fee) export const setMaxPriorityFee = (fee: string) => updateMaxPriorityFee(dispatch, fee)
export const removeInstances = () => clearInstances(dispatch) 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 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 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 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) export const runScenario = (liveMode: boolean, gasEstimationPrompt: (msg: string) => JSX.Element, passphrasePrompt: (msg: string) => JSX.Element, confirmDialogContent: MainnetPrompt) => runCurrentScenario(liveMode, plugin, dispatch, gasEstimationPrompt, passphrasePrompt, confirmDialogContent)

18
libs/remix-ui/run-tab/src/lib/actions/payload.ts
Unescape View File

@ -1,5 +1,5 @@
import { ContractData } from '@remix-project/core-plugin' 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' import { ContractList, DeployOptions } from '../types'
export const fetchAccountsListRequest = () => { 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, pinnedAt?: number }) => { export const addNewPinnedInstance = (instance: { contractData?: ContractData, address: string, name: string, abi?: any, pinnedAt?: number }) => {
return { return {
type: ADD_SAVED_INSTANCE, type: ADD_PINNED_INSTANCE,
payload: instance payload: instance
} }
} }
export const removeExistingInstance = (index: number, isSavedContract: boolean, shouldDelete: boolean) => { export const removeExistingInstance = (index: number, isPinnedContract: boolean, shouldDelete: boolean) => {
return { return {
type: REMOVE_INSTANCE, type: REMOVE_INSTANCE,
payload: { payload: {
index, index,
isSavedContract, isPinnedContract,
shouldDelete shouldDelete
} }
} }
@ -254,20 +254,20 @@ export const clearAllInstances = () => {
} }
} }
export const clearAllSavedInstances = () => { export const clearAllPinnedInstances = () => {
return { 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 { return {
type: SET_DECODED_RESPONSE, type: SET_DECODED_RESPONSE,
payload: { payload: {
instanceIndex, instanceIndex,
funcIndex, funcIndex,
response, response,
isSavedContract isPinnedContract
} }
} }
} }

16
libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
Unescape View File

@ -34,7 +34,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
localStorage.removeItem('savedContracts') localStorage.removeItem('savedContracts')
} }
// Clear existing saved instance state // Clear existing saved instance state
await props.plugin.call('udapp', 'clearAllSavedInstances') await props.plugin.call('udapp', 'clearAllPinnedInstances')
// Load contracts from FE // Load contracts from FE
const dirName = props.plugin.REACT_API.networkName === 'VM' ? props.plugin.REACT_API.selectExEnv : chainId.current const dirName = props.plugin.REACT_API.networkName === 'VM' ? props.plugin.REACT_API.selectExEnv : chainId.current
const isPinnedAvailable = await props.plugin.call('fileManager', 'exists', `.deploys/pinned-contracts/${dirName}`) const isPinnedAvailable = await props.plugin.call('fileManager', 'exists', `.deploys/pinned-contracts/${dirName}`)
@ -45,7 +45,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
for (const file of filePaths) { for (const file of filePaths) {
const pinnedContract = await props.plugin.call('fileManager', 'readFile', file) const pinnedContract = await props.plugin.call('fileManager', 'readFile', file)
const pinnedContractObj = JSON.parse(pinnedContract) const pinnedContractObj = JSON.parse(pinnedContract)
if (pinnedContractObj) await props.plugin.call('udapp', 'addSavedInstance', pinnedContractObj.address, pinnedContractObj.abi, pinnedContractObj.name, pinnedContractObj.pinnedAt, pinnedContractObj.filePath) if (pinnedContractObj) await props.plugin.call('udapp', 'addPinnedInstance', pinnedContractObj.address, pinnedContractObj.abi, pinnedContractObj.name, pinnedContractObj.pinnedAt, pinnedContractObj.filePath)
} }
} catch(err) { } catch(err) {
console.log(err) console.log(err)
@ -70,15 +70,15 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
</CustomTooltip> </CustomTooltip>
</div> </div>
{props.savedInstances.instanceList.length > 0 ? ( {props.pinnedInstances.instanceList.length > 0 ? (
<div> <div>
{' '} {' '}
{props.savedInstances.instanceList.map((instance, index) => { {props.pinnedInstances.instanceList.map((instance, index) => {
return ( return (
<UniversalDappUI <UniversalDappUI
key={index} key={index}
instance={instance} instance={instance}
isSavedContract={true} isPinnedContract={true}
context={props.getContext()} context={props.getContext()}
removeInstance={props.removeInstance} removeInstance={props.removeInstance}
index={index} index={index}
@ -96,8 +96,8 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
})} })}
</div> </div>
) : ( ) : (
<span className="mx-2 mt-2 text-dark" data-id="NoSavedInstanceText"> <span className="mx-2 mt-2 text-dark" data-id="NoPinnedInstanceText">
<FormattedMessage id="udapp.NoSavedInstanceText" /> <FormattedMessage id="udapp.NoPinnedInstanceText" />
</span> </span>
)} )}
@ -126,7 +126,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
<UniversalDappUI <UniversalDappUI
key={index} key={index}
instance={instance} instance={instance}
isSavedContract={false} isPinnedContract={false}
context={props.getContext()} context={props.getContext()}
removeInstance={props.removeInstance} removeInstance={props.removeInstance}
index={index} index={index}

20
libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
Unescape View File

@ -123,17 +123,17 @@ export function UniversalDappUI(props: UdappProps) {
} }
const remove = async() => { const remove = async() => {
if (props.isSavedContract) { if (props.isPinnedContract) {
await unsavePinnedContract() await unsavePinnedContract()
_paq.push(['trackEvent', 'udapp', 'pinContracts', 'unpinned']) _paq.push(['trackEvent', 'udapp', 'pinContracts', 'unpinned'])
} }
props.removeInstance(props.index, props.isSavedContract, false) props.removeInstance(props.index, props.isPinnedContract, false)
} }
const deletePinnedContract = async() => { const deletePinnedContract = async() => {
await unsavePinnedContract() await unsavePinnedContract()
_paq.push(['trackEvent', 'udapp', 'pinContracts', 'deletePinned']) _paq.push(['trackEvent', 'udapp', 'pinContracts', 'deletePinned'])
props.removeInstance(props.index, props.isSavedContract, true) props.removeInstance(props.index, props.isPinnedContract, true)
} }
const pinContract = async() => { const pinContract = async() => {
@ -153,7 +153,7 @@ export function UniversalDappUI(props: UdappProps) {
} }
await props.plugin.call('fileManager', 'writeFile', `.deploys/pinned-contracts/${dirName}/${props.instance.address}.json`, JSON.stringify(objToSave, null, 2)) await props.plugin.call('fileManager', 'writeFile', `.deploys/pinned-contracts/${dirName}/${props.instance.address}.json`, JSON.stringify(objToSave, null, 2))
// Add contract to saved contracts list on UI // Add contract to saved contracts list on UI
await props.plugin.call('udapp', 'addSavedInstance', objToSave.address, objToSave.abi, objToSave.name, objToSave.pinnedAt, objToSave.filePath) await props.plugin.call('udapp', 'addPinnedInstance', objToSave.address, objToSave.abi, objToSave.name, objToSave.pinnedAt, objToSave.filePath)
_paq.push(['trackEvent', 'udapp', 'pinContracts', `pinned at ${dirName}`]) _paq.push(['trackEvent', 'udapp', 'pinContracts', `pinned at ${dirName}`])
// Remove contract from deployed contracts list on UI // Remove contract from deployed contracts list on UI
props.removeInstance(props.index, false, false) props.removeInstance(props.index, false, false)
@ -165,7 +165,7 @@ export function UniversalDappUI(props: UdappProps) {
props.runTransactions( props.runTransactions(
props.index, props.index,
props.isSavedContract, props.isPinnedContract,
lookupOnly, lookupOnly,
funcABI, funcABI,
inputsValues, inputsValues,
@ -268,7 +268,7 @@ export function UniversalDappUI(props: UdappProps) {
</span> </span>
<div className="input-group udapp_nameNbuts"> <div className="input-group udapp_nameNbuts">
<div className="udapp_titleText input-group-prepend"> <div className="udapp_titleText input-group-prepend">
{ props.isSavedContract ? ( <CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappUnpinTooltip" tooltipText={props.isSavedContract ? `Contract: ${props.instance.name}, Address: ${address}, Pinned at: ${new Date(props.instance.pinnedAt).toLocaleString()}` : '' }> { props.isPinnedContract ? ( <CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappUnpinTooltip" tooltipText={props.isPinnedContract ? `Contract: ${props.instance.name}, Address: ${address}, Pinned at: ${new Date(props.instance.pinnedAt).toLocaleString()}` : '' }>
<span className="input-group-text udapp_spanTitleText"> <span className="input-group-text udapp_spanTitleText">
{props.instance.name} at {shortenAddress(address)} {props.instance.name} at {shortenAddress(address)}
</span> </span>
@ -279,7 +279,7 @@ export function UniversalDappUI(props: UdappProps) {
<div className="btn" style={{padding: '0.15rem'}}> <div className="btn" style={{padding: '0.15rem'}}>
<CopyToClipboard tip={intl.formatMessage({id: 'udapp.copy'})} content={address} direction={'top'} /> <CopyToClipboard tip={intl.formatMessage({id: 'udapp.copy'})} content={address} direction={'top'} />
</div> </div>
{ props.isSavedContract ? ( <div className="btn" style={{padding: '0.15rem', marginLeft: '-0.5rem'}}> { props.isPinnedContract ? ( <div className="btn" style={{padding: '0.15rem', marginLeft: '-0.5rem'}}>
<CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappUnpinTooltip" tooltipText={<FormattedMessage id="udapp.tooltipTextUnpin" />}> <CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappUnpinTooltip" tooltipText={<FormattedMessage id="udapp.tooltipTextUnpin" />}>
<i className="fas fa-thumbtack p-2 text-success" aria-hidden="true" data-id="universalDappUiUdappUnpin" onClick={remove}></i> <i className="fas fa-thumbtack p-2 text-success" aria-hidden="true" data-id="universalDappUiUdappUnpin" onClick={remove}></i>
</CustomTooltip> </CustomTooltip>
@ -290,7 +290,7 @@ export function UniversalDappUI(props: UdappProps) {
</div> ) </div> )
} }
</div> </div>
{ props.isSavedContract ? ( <div className="btn" style={{padding: '0.15rem', marginLeft: '-0.5rem'}}> { props.isPinnedContract ? ( <div className="btn" style={{padding: '0.15rem', marginLeft: '-0.5rem'}}>
<CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappDeleteTooltip" tooltipText={<FormattedMessage id="udapp.tooltipTextDelete" />}> <CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappDeleteTooltip" tooltipText={<FormattedMessage id="udapp.tooltipTextDelete" />}>
<i className="far fa-trash p-2" aria-hidden="true" data-id="universalDappUiUdappDelete" onClick={deletePinnedContract}></i> <i className="far fa-trash p-2" aria-hidden="true" data-id="universalDappUiUdappDelete" onClick={deletePinnedContract}></i>
</CustomTooltip> </CustomTooltip>
@ -309,14 +309,14 @@ export function UniversalDappUI(props: UdappProps) {
</label> </label>
{props.exEnvironment === 'injected' && <i className="fas fa-edit btn btn-sm p-0" onClick={() => {props.editInstance(props.instance)}}></i>} {props.exEnvironment === 'injected' && <i className="fas fa-edit btn btn-sm p-0" onClick={() => {props.editInstance(props.instance)}}></i>}
</div> </div>
{ props.isSavedContract && props.instance.pinnedAt ? ( { props.isPinnedContract && props.instance.pinnedAt ? (
<div className="d-flex" data-id="instanceContractSavedOn"> <div className="d-flex" data-id="instanceContractSavedOn">
<label> <label>
<b><FormattedMessage id="udapp.pinnedAt" />:</b> {(new Date(props.instance.pinnedAt)).toLocaleString()} <b><FormattedMessage id="udapp.pinnedAt" />:</b> {(new Date(props.instance.pinnedAt)).toLocaleString()}
</label> </label>
</div> </div>
) : null } ) : null }
{ props.isSavedContract && props.instance.filePath ? ( { props.isPinnedContract && props.instance.filePath ? (
<div className="d-flex" data-id="instanceContractFilePath"> <div className="d-flex" data-id="instanceContractFilePath">
<label> <label>
<b><FormattedMessage id="udapp.filePath" />:</b> {props.instance.filePath} <b><FormattedMessage id="udapp.filePath" />:</b> {props.instance.filePath}

4
libs/remix-ui/run-tab/src/lib/constants/index.ts
Unescape View File

@ -33,11 +33,11 @@ export const SET_MAX_PRIORITY_FEE = 'SET_MAX_PRIORITY_FEE'
export const SET_BASE_FEE_PER_GAS = 'SET_BASE_FEE_PER_GAS' export const SET_BASE_FEE_PER_GAS = 'SET_BASE_FEE_PER_GAS'
export const SET_GAS_PRICE = 'SET_GAS_PRICE' export const SET_GAS_PRICE = 'SET_GAS_PRICE'
export const ADD_INSTANCE = 'ADD_INSTANCE' export const ADD_INSTANCE = 'ADD_INSTANCE'
export const ADD_SAVED_INSTANCE = 'ADD_SAVED_INSTANCE' export const ADD_PINNED_INSTANCE = 'ADD_PINNED_INSTANCE'
export const UPDATE_INSTANCES_BALANCE = 'UPDATE_INSTANCES_BALANCE' export const UPDATE_INSTANCES_BALANCE = 'UPDATE_INSTANCES_BALANCE'
export const REMOVE_INSTANCE = 'REMOVE_INSTANCE' export const REMOVE_INSTANCE = 'REMOVE_INSTANCE'
export const CLEAR_INSTANCES = 'CLEAR_INSTANCES' export const CLEAR_INSTANCES = 'CLEAR_INSTANCES'
export const CLEAR_SAVED_INSTANCES = 'CLEAR_SAVED_INSTANCES' export const CLEAR_PINNED_INSTANCES = 'CLEAR_PINNED_INSTANCES'
export const SET_DECODED_RESPONSE = 'SET_DECODED_RESPONSE' export const SET_DECODED_RESPONSE = 'SET_DECODED_RESPONSE'
export const SET_PATH_TO_SCENARIO = 'SET_PATH_TO_SCENARIO' export const SET_PATH_TO_SCENARIO = 'SET_PATH_TO_SCENARIO'
export const SET_RECORDER_COUNT = 'SET_RECORDER_COUNT' export const SET_RECORDER_COUNT = 'SET_RECORDER_COUNT'

44
libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
Unescape View File

@ -1,6 +1,6 @@
import { ContractData } from '@remix-project/core-plugin' import { ContractData } from '@remix-project/core-plugin'
import { ContractList, DeployOptions, RunTabState } from '../types' import { ContractList, DeployOptions, RunTabState } from '../types'
import { 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, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, 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, ADD_DEPLOY_OPTION, REMOVE_DEPLOY_OPTION, SET_REMIXD_ACTIVATED, FETCH_PROXY_DEPLOYMENTS, NEW_PROXY_DEPLOYMENT, RESET_PROXY_DEPLOYMENTS, EXTRACT_COMPILER_VERSION } from '../constants' import { 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, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, 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, ADD_DEPLOY_OPTION, REMOVE_DEPLOY_OPTION, SET_REMIXD_ACTIVATED, FETCH_PROXY_DEPLOYMENTS, NEW_PROXY_DEPLOYMENT, RESET_PROXY_DEPLOYMENTS, EXTRACT_COMPILER_VERSION } from '../constants'
declare const window: any declare const window: any
interface Action { interface Action {
@ -63,7 +63,7 @@ export const runTabInitialState: RunTabState = {
instanceList: [], instanceList: [],
error: null error: null
}, },
savedInstances: { pinnedInstances: {
instanceList: [], instanceList: [],
error: null error: null
}, },
@ -491,13 +491,13 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
} }
} }
case ADD_SAVED_INSTANCE: { case ADD_PINNED_INSTANCE: {
const payload: { contractData: ContractData, address: string, name: string, abi?: any, pinnedAt: number, decodedResponse?: Record<number, any> } = action.payload const payload: { contractData: ContractData, address: string, name: string, abi?: any, pinnedAt: number, decodedResponse?: Record<number, any> } = action.payload
return { return {
...state, ...state,
savedInstances: { pinnedInstances: {
...state.savedInstances, ...state.pinnedInstances,
instanceList: [...state.savedInstances.instanceList, payload] instanceList: [...state.pinnedInstances.instanceList, payload]
} }
} }
} }
@ -515,25 +515,25 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
} }
case REMOVE_INSTANCE: { case REMOVE_INSTANCE: {
const payload: { index: number, isSavedContract: boolean, shouldDelete: boolean } = action.payload const payload: { index: number, isPinnedContract: boolean, shouldDelete: boolean } = action.payload
if (payload.isSavedContract) { if (payload.isPinnedContract) {
if (payload.shouldDelete) return { if (payload.shouldDelete) return {
...state, ...state,
savedInstances: { pinnedInstances: {
...state.savedInstances, ...state.pinnedInstances,
instanceList: state.savedInstances.instanceList.filter((_, index) => index !== payload.index) instanceList: state.pinnedInstances.instanceList.filter((_, index) => index !== payload.index)
} }
} }
else return { else return {
...state, ...state,
savedInstances: { pinnedInstances: {
...state.savedInstances, ...state.pinnedInstances,
instanceList: state.savedInstances.instanceList.filter((_, index) => index !== payload.index) instanceList: state.pinnedInstances.instanceList.filter((_, index) => index !== payload.index)
}, },
instances: { instances: {
...state.instances, ...state.instances,
instanceList: [...state.instances.instanceList, state.savedInstances.instanceList[payload.index]] instanceList: [...state.instances.instanceList, state.pinnedInstances.instanceList[payload.index]]
} }
} }
} else return { } else return {
@ -555,10 +555,10 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
} }
} }
case CLEAR_SAVED_INSTANCES: { case CLEAR_PINNED_INSTANCES: {
return { return {
...state, ...state,
savedInstances: { pinnedInstances: {
instanceList: [], instanceList: [],
error: null error: null
} }
@ -566,13 +566,13 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
} }
case SET_DECODED_RESPONSE: { case SET_DECODED_RESPONSE: {
const payload: { instanceIndex: number, funcIndex: number, response: any, isSavedContract: boolean } = action.payload const payload: { instanceIndex: number, funcIndex: number, response: any, isPinnedContract: boolean } = action.payload
if (action.payload.isSavedContract) if (action.payload.isPinnedContract)
return { return {
...state, ...state,
savedInstances: { pinnedInstances: {
...state.savedInstances, ...state.pinnedInstances,
instanceList: state.savedInstances.instanceList.map((instance, index) => { instanceList: state.pinnedInstances.instanceList.map((instance, index) => {
if (payload.instanceIndex === index) instance.decodedResponse[payload.funcIndex] = payload.response if (payload.instanceIndex === index) instance.decodedResponse[payload.funcIndex] = payload.response
return instance return instance
}) })

2
libs/remix-ui/run-tab/src/lib/run-tab.tsx
Unescape View File

@ -314,7 +314,7 @@ export function RunTabUI(props: RunTabProps) {
<InstanceContainerUI <InstanceContainerUI
plugin={plugin} plugin={plugin}
instances={runTab.instances} instances={runTab.instances}
savedInstances={runTab.savedInstances} pinnedInstances={runTab.pinnedInstances}
clearInstances={removeInstances} clearInstances={removeInstances}
removeInstance={removeSingleInstance} removeInstance={removeSingleInstance}
getContext={getExecutionContext} getContext={getExecutionContext}

14
libs/remix-ui/run-tab/src/lib/types/index.ts
Unescape View File

@ -96,7 +96,7 @@ export interface RunTabState {
}[], }[],
error: string error: string
}, },
savedInstances: { pinnedInstances: {
instanceList: { instanceList: {
contractData?: ContractData, contractData?: ContractData,
address: string, address: string,
@ -307,7 +307,7 @@ export interface InstanceContainerProps {
}[], }[],
error: string error: string
}, },
savedInstances: { pinnedInstances: {
instanceList: { instanceList: {
contractData?: ContractData, contractData?: ContractData,
address: string, address: string,
@ -321,11 +321,11 @@ export interface InstanceContainerProps {
error: string error: string
}, },
clearInstances: () => void, clearInstances: () => void,
removeInstance: (index: number, isSavedContract:boolean, shouldDelete: boolean) => void, removeInstance: (index: number, isPinnedContract:boolean, shouldDelete: boolean) => void,
getContext: () => 'memory' | 'blockchain', getContext: () => 'memory' | 'blockchain',
runTransactions: ( runTransactions: (
instanceIndex: number, instanceIndex: number,
isSavedContract: boolean, isPinnedContract: boolean,
lookupOnly: boolean, lookupOnly: boolean,
funcABI: FuncABI, funcABI: FuncABI,
inputsValues: string, inputsValues: string,
@ -429,15 +429,15 @@ export interface UdappProps {
filePath?: string filePath?: string
}, },
context: 'memory' | 'blockchain', context: 'memory' | 'blockchain',
isSavedContract?: boolean isPinnedContract?: boolean
removeInstance: (index: number, isSavedContract: boolean, shouldDelete: boolean) => void, removeInstance: (index: number, isPinnedContract: boolean, shouldDelete: boolean) => void,
index: number, index: number,
gasEstimationPrompt: (msg: string) => JSX.Element, gasEstimationPrompt: (msg: string) => JSX.Element,
passphrasePrompt: (message: string) => JSX.Element, passphrasePrompt: (message: string) => JSX.Element,
mainnetPrompt: (tx: Tx, network: Network, amount: string, gasEstimation: string, gasFees: (maxFee: string, cb: (txFeeText: string, priceStatus: boolean) => void) => void, determineGasPrice: (cb: (txFeeText: string, gasPriceValue: string, gasPriceStatus: boolean) => void) => void) => JSX.Element, mainnetPrompt: (tx: Tx, network: Network, amount: string, gasEstimation: string, gasFees: (maxFee: string, cb: (txFeeText: string, priceStatus: boolean) => void) => void, determineGasPrice: (cb: (txFeeText: string, gasPriceValue: string, gasPriceStatus: boolean) => void) => void) => JSX.Element,
runTransactions: ( runTransactions: (
instanceIndex: number, instanceIndex: number,
isSavedContract: boolean, isPinnedContract: boolean,
lookupOnly: boolean, lookupOnly: boolean,
funcABI: FuncABI, funcABI: FuncABI,
inputsValues: string, inputsValues: string,

Write Preview
Loading…
Cancel
Save