Merge branch 'master' into remixd_terminal

pull/5370/head
David Zagi 3 years ago committed by GitHub
commit 46cf08e4dc
  1. 2
      apps/remix-ide-e2e/src/tests/editor.spec.ts
  2. 10
      apps/remix-ide-e2e/src/tests/gist.spec.ts
  3. 2
      apps/remix-ide/src/app/tabs/hardhat-provider.js
  4. 37
      apps/remix-ide/src/app/tabs/settings-tab.js
  5. 7
      libs/remix-analyzer/package.json
  6. 7
      libs/remix-astwalker/package.json
  7. 7
      libs/remix-debug/package.json
  8. 5
      libs/remix-lib/package.json
  9. 32
      libs/remix-lib/src/execution/txExecution.ts
  10. 7
      libs/remix-simulator/package.json
  11. 7
      libs/remix-solidity/package.json
  12. 11
      libs/remix-tests/package.json
  13. 2
      libs/remix-ui/file-explorer/src/lib/file-explorer-context-menu.tsx
  14. 36
      libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
  15. 19
      libs/remix-ui/file-explorer/src/lib/reducers/fileSystem.ts
  16. 2
      libs/remix-ui/file-explorer/src/lib/types/index.ts
  17. 2
      libs/remix-ui/settings/src/lib/constants.ts
  18. 99
      libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
  19. 42
      libs/remix-ui/settings/src/lib/settingsAction.ts
  20. 4
      libs/remix-url-resolver/package.json
  21. 2
      libs/remixd/package.json

@ -36,7 +36,7 @@ module.exports = {
.click('*[class="ace_content"]')
.sendKeys('*[class="ace_text-input"]', 'error')
.pause(2000)
.waitForElementVisible('.ace_error', 60000)
.waitForElementVisible('.ace_error', 120000)
.checkAnnotations('error', 28)
.clickLaunchIcon('udapp')
.checkAnnotationsNotPresent('error')

@ -3,7 +3,7 @@ import { NightwatchBrowser } from 'nightwatch'
import init from '../helpers/init'
const testData = {
validGistId: '1859c97c6e1efc91047d725d5225888e',
validGistId: '02a847917a6a7ecaf4a7e0d4e68715bf',
invalidGistId: '6368b389f9302v32902msk2402'
}
// 99266d6da54cc12f37f11586e8171546c7700d67
@ -20,7 +20,7 @@ module.exports = {
- switch to a file in the new gist
*/
console.log('token', process.env.gist_token)
const gistid = 'c15ed7c182a7991ea0a4dea1544fa254'
const gistid = '17ac9315bc065a3d95cf8dc1b28d71f8'
browser
.refresh()
.pause(10000)
@ -125,9 +125,9 @@ module.exports = {
.waitForElementVisible('*[data-id="modalDialogCustomPromptText"]')
.setValue('*[data-id="modalDialogCustomPromptText"]', testData.validGistId)
.modalFooterOKClick()
.openFile(`gist-${testData.validGistId}/ApplicationRegistry`)
.waitForElementVisible(`div[title='default_workspace/gist-${testData.validGistId}/ApplicationRegistry']`)
.assert.containsText(`div[title='default_workspace/gist-${testData.validGistId}/ApplicationRegistry'] > span`, 'ApplicationRegistry')
.openFile(`gist-${testData.validGistId}/README.txt`)
.waitForElementVisible(`div[title='default_workspace/gist-${testData.validGistId}/README.txt']`)
.assert.containsText(`div[title='default_workspace/gist-${testData.validGistId}/README.txt'] > span`, 'README.txt')
.end()
}
}

@ -65,7 +65,7 @@ export default class HardhatProvider extends Plugin {
if (error) {
this.blocked = true
modalDialogCustom.alert('Hardhat Provider', `Error while connecting to the hardhat provider: ${error.message}`)
await this.call('udapp', 'setEnvironmentMode', 'vm')
await this.call('udapp', 'setEnvironmentMode', { context: 'vm', fork: 'berlin' })
this.provider = null
setTimeout(_ => { this.blocked = false }, 1000) // we wait 1 second for letting remix to switch to vm
return reject(error)

@ -4,7 +4,6 @@ import ReactDOM from 'react-dom'
import * as packageJson from '../../../../../package.json'
import { RemixUiSettings } from '@remix-ui/settings' //eslint-disable-line
const globalRegistry = require('../../global/registry')
const EventManager = require('../../lib/events')
const profile = {
name: 'settings',
@ -21,36 +20,16 @@ const profile = {
}
module.exports = class SettingsTab extends ViewPlugin {
constructor (config, editor, appManager) {
constructor (config, editor) {
super(profile)
this.config = config
this.editor = editor
this.appManager = appManager
this._components = {}
this._deps = {
themeModule: globalRegistry.get('themeModule').api
}
this._view = { /* eslint-disable */
el: null,
optionVM: null,
optionVMLabel: null,
personal: null,
personalLabel: null,
useMatomoAnalytics: null,
useMatomoAnalyticsLabel: null,
useMatomoAnalyticsMode: null,
warnPersonalMode: null,
generateContractMetadata: null,
generateContractMetadataLabel: null,
config: {
general: null, themes: null
},
textWrap: null,
textWrapLabel: null
} /* eslint-enable */
this.event = new EventManager()
this.element = document.createElement('div')
this.element.setAttribute('id', 'settingsTab')
this.useMatomoAnalytics = null
}
onActivation () {
@ -67,6 +46,7 @@ module.exports = class SettingsTab extends ViewPlugin {
config = { this.config }
editor = { this.editor }
_deps = { this._deps }
useMatomoAnalytics = {this.useMatomoAnalytics}
/>,
this.element
)
@ -78,14 +58,7 @@ module.exports = class SettingsTab extends ViewPlugin {
updateMatomoAnalyticsChoice (isChecked) {
this.config.set('settings/matomo-analytics', isChecked)
if (isChecked) {
this._view.useMatomoAnalytics.setAttribute('checked', '')
this._view.useMatomoAnalyticsLabel.classList.remove('text-secondary')
this._view.useMatomoAnalyticsLabel.classList.add('text-dark')
} else {
this._view.useMatomoAnalytics.removeAttribute('checked')
this._view.useMatomoAnalyticsLabel.classList.remove('text-dark')
this._view.useMatomoAnalyticsLabel.classList.add('text-secondary')
}
this.useMatomoAnalytics = isChecked
this.renderComponent()
}
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remix-analyzer",
"version": "0.5.11",
"version": "0.5.12",
"description": "Tool to perform static analysis on Solidity smart contracts",
"main": "index.js",
"types": ".index.d.ts",
@ -23,10 +23,11 @@
"@ethereumjs/tx": "^3.2.1",
"@ethereumjs/vm": "^5.4.1",
"@remix-project/remix-astwalker": "^0.0.26",
"@remix-project/remix-lib": "^0.5.2",
"@remix-project/remix-lib": "^0.5.3",
"async": "^2.6.2",
"ethereumjs-util": "^7.0.10",
"ethers": "^5.1.4",
"string-similarity": "^4.0.4",
"web3": "1.2.4"
},
"publishConfig": {
@ -50,5 +51,5 @@
"typescript": "^3.7.5"
},
"typings": "index.d.ts",
"gitHead": "50b32cc20d2d4dcc793bf7de955957e073e5b5b8"
"gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remix-astwalker",
"version": "0.0.32",
"version": "0.0.33",
"description": "Tool to walk through Solidity AST",
"main": "index.js",
"scripts": {
@ -37,12 +37,13 @@
"@ethereumjs/block": "^3.3.0",
"@ethereumjs/tx": "^3.2.1",
"@ethereumjs/vm": "^5.4.1",
"@remix-project/remix-lib": "^0.5.2",
"@remix-project/remix-lib": "^0.5.3",
"@types/tape": "^4.2.33",
"async": "^2.6.2",
"ethereumjs-util": "^7.0.10",
"ethers": "^5.1.4",
"nyc": "^13.3.0",
"string-similarity": "^4.0.4",
"tape": "^4.10.1",
"ts-node": "^8.0.3",
"typescript": "^3.4.3",
@ -52,5 +53,5 @@
"tap-spec": "^5.0.0"
},
"typings": "index.d.ts",
"gitHead": "50b32cc20d2d4dcc793bf7de955957e073e5b5b8"
"gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remix-debug",
"version": "0.5.2",
"version": "0.5.3",
"description": "Tool to debug Ethereum transactions",
"contributors": [
{
@ -23,12 +23,13 @@
"@ethereumjs/tx": "^3.2.1",
"@ethereumjs/vm": "^5.4.1",
"@remix-project/remix-astwalker": "^0.0.26",
"@remix-project/remix-lib": "^0.5.2",
"@remix-project/remix-lib": "^0.5.3",
"async": "^2.6.2",
"commander": "^2.19.0",
"deep-equal": "^1.0.1",
"ethereumjs-util": "^7.0.10",
"ethers": "^5.1.4",
"string-similarity": "^4.0.4",
"web3": "^1.2.4"
},
"devDependencies": {
@ -60,5 +61,5 @@
},
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
"typings": "src/index.d.ts",
"gitHead": "50b32cc20d2d4dcc793bf7de955957e073e5b5b8"
"gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remix-lib",
"version": "0.5.2",
"version": "0.5.3",
"description": "Library to various Remix tools",
"contributors": [
{
@ -22,6 +22,7 @@
"ethers": "^4.0.40",
"events": "^3.0.0",
"solc": "^0.7.4",
"string-similarity": "^4.0.4",
"web3": "^1.2.4"
},
"devDependencies": {
@ -52,5 +53,5 @@
},
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
"typings": "src/index.d.ts",
"gitHead": "50b32cc20d2d4dcc793bf7de955957e073e5b5b8"
"gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
}

@ -112,18 +112,32 @@ export function checkVMError (execResult, abi, contract) {
// "contract" reprensents the compilation result containing the NATSPEC documentation
if (contract && fn.functions && Object.keys(fn.functions).length) {
const functionSignature = Object.keys(fn.functions)[0]
// we check in the 'devdoc' if there's a developer documentation for this error
devdoc = contract.object.devdoc.errors[functionSignature][0] || {}
// we check in the 'userdoc' if there's an user documentation for this error
const userdoc = contract.object.userdoc.errors[functionSignature][0] || {}
if (userdoc) customError += ' : ' + (userdoc as any).notice // we append the user doc if any
// we check in the 'devdoc' if there's a developer documentation for this error
try {
devdoc = (contract.object.devdoc.errors && contract.object.devdoc.errors[functionSignature][0]) || {}
} catch (e) {
console.error(e.message)
}
// we check in the 'userdoc' if there's an user documentation for this error
try {
const userdoc = (contract.object.userdoc.errors && contract.object.userdoc.errors[functionSignature][0]) || {}
if (userdoc && (userdoc as any).notice) customError += ' : ' + (userdoc as any).notice // we append the user doc if any
} catch (e) {
console.error(e.message)
}
}
let inputIndex = 0
for (const input of functionDesc.inputs) {
const v = decodedCustomErrorInputs[input.name]
decodedCustomErrorInputsClean[input.name] = {
value: v.toString ? v.toString() : v,
documentation: (devdoc as any).params[input.name] // we add the developer documentation for this input parameter if any
const inputKey = input.name || inputIndex
const v = decodedCustomErrorInputs[inputKey]
decodedCustomErrorInputsClean[inputKey] = {
value: v.toString ? v.toString() : v
}
if (devdoc && (devdoc as any).params) {
decodedCustomErrorInputsClean[input.name].documentation = (devdoc as any).params[inputKey] // we add the developer documentation for this input parameter if any
}
inputIndex++
}
break
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remix-simulator",
"version": "0.2.2",
"version": "0.2.3",
"description": "Ethereum IDE and tools for the web",
"contributors": [
{
@ -18,7 +18,7 @@
"@ethereumjs/common": "^2.2.0",
"@ethereumjs/tx": "^3.2.1",
"@ethereumjs/vm": "^5.4.1",
"@remix-project/remix-lib": "^0.5.2",
"@remix-project/remix-lib": "^0.5.3",
"ansi-gray": "^0.1.1",
"async": "^3.1.0",
"body-parser": "^1.18.2",
@ -30,6 +30,7 @@
"express": "^4.16.3",
"express-ws": "^4.0.0",
"merge": "^1.2.0",
"string-similarity": "^4.0.4",
"time-stamp": "^2.0.0",
"web3": "^1.2.4"
},
@ -65,5 +66,5 @@
},
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
"typings": "src/index.d.ts",
"gitHead": "50b32cc20d2d4dcc793bf7de955957e073e5b5b8"
"gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remix-solidity",
"version": "0.4.2",
"version": "0.4.3",
"description": "Tool to load and run Solidity compiler",
"main": "index.js",
"types": "./index.d.ts",
@ -18,12 +18,13 @@
"@ethereumjs/block": "^3.3.0",
"@ethereumjs/tx": "^3.2.1",
"@ethereumjs/vm": "^5.4.1",
"@remix-project/remix-lib": "^0.5.2",
"@remix-project/remix-lib": "^0.5.3",
"async": "^2.6.2",
"eslint-scope": "^5.0.0",
"ethereumjs-util": "^7.0.10",
"ethers": "^5.1.4",
"solc": "^0.7.4",
"string-similarity": "^4.0.4",
"web3": "1.2.4",
"webworkify-webpack": "^2.1.5"
},
@ -58,5 +59,5 @@
},
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
"typings": "index.d.ts",
"gitHead": "50b32cc20d2d4dcc793bf7de955957e073e5b5b8"
"gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remix-tests",
"version": "0.2.2",
"version": "0.2.3",
"description": "Tool to test Solidity smart contracts",
"main": "src/index.js",
"types": "./src/index.d.ts",
@ -39,9 +39,9 @@
"@ethereumjs/common": "^2.2.0",
"@ethereumjs/tx": "^3.2.1",
"@ethereumjs/vm": "^5.4.1",
"@remix-project/remix-lib": "^0.5.2",
"@remix-project/remix-simulator": "^0.2.2",
"@remix-project/remix-solidity": "^0.4.2",
"@remix-project/remix-lib": "^0.5.3",
"@remix-project/remix-simulator": "^0.2.3",
"@remix-project/remix-solidity": "^0.4.3",
"ansi-gray": "^0.1.1",
"async": "^2.6.0",
"axios": ">=0.21.1",
@ -54,6 +54,7 @@
"express-ws": "^4.0.0",
"merge": "^1.2.0",
"signale": "^1.4.0",
"string-similarity": "^4.0.4",
"time-stamp": "^2.2.0",
"tslib": "^2.3.0",
"web3": "^1.2.4",
@ -76,5 +77,5 @@
"typescript": "^3.3.1"
},
"typings": "src/index.d.ts",
"gitHead": "50b32cc20d2d4dcc793bf7de955957e073e5b5b8"
"gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
}

@ -101,7 +101,7 @@ export const FileExplorerContextMenu = (props: FileExplorerContextMenuProps) =>
break
}
hideContextMenu()
}}>{item.name}</li>
}}>{item.label || item.name}</li>
})
}

@ -35,7 +35,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'newFolder',
name: 'New Folder',
@ -43,7 +44,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'rename',
name: 'Rename',
@ -51,7 +53,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'delete',
name: 'Delete',
@ -59,7 +62,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'run',
name: 'Run',
@ -67,7 +71,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: ['.js'],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'pushChangesToGist',
name: 'Push changes to gist',
@ -75,7 +80,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'publishFolderToGist',
name: 'Publish folder to gist',
@ -83,7 +89,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'publishFileToGist',
name: 'Publish file to gist',
@ -91,7 +98,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'copy',
name: 'Copy',
@ -99,7 +107,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}, {
id: 'deleteAll',
name: 'Delete All',
@ -107,7 +116,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: true
multiselect: true,
label: ''
}],
focusContext: {
element: null,
@ -282,7 +292,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}])
} else {
removeMenuItems([{
@ -292,7 +303,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
path: [],
extension: [],
pattern: [],
multiselect: false
multiselect: false,
label: ''
}])
}
}, [canPaste])

@ -266,15 +266,16 @@ const removePath = (root, path: string, pathName, files) => {
return Array.isArray(cur) ? [...acc, ...cur] : [...acc, cur]
}, [])
const prevFiles = _.get(files, _path)
prevFiles && prevFiles.child && prevFiles.child[pathName] && delete prevFiles.child[pathName]
files = _.set(files, _path, {
isDirectory: true,
path,
name: extractNameFromKey(path).indexOf('gist-') === 0 ? extractNameFromKey(path).split('-')[1] : extractNameFromKey(path),
type: extractNameFromKey(path).indexOf('gist-') === 0 ? 'gist' : 'folder',
child: prevFiles ? prevFiles.child : {}
})
if (prevFiles) {
prevFiles.child && prevFiles.child[pathName] && delete prevFiles.child[pathName]
files = _.set(files, _path, {
isDirectory: true,
path,
name: extractNameFromKey(path).indexOf('gist-') === 0 ? extractNameFromKey(path).split('-')[1] : extractNameFromKey(path),
type: extractNameFromKey(path).indexOf('gist-') === 0 ? 'gist' : 'folder',
child: prevFiles ? prevFiles.child : {}
})
}
return files
}

@ -32,7 +32,7 @@ export interface FileExplorerMenuProps {
uploadFile: (target: EventTarget & HTMLInputElement) => void
}
export type action = { name: string, type: string[], path: string[], extension: string[], pattern: string[], id: string, multiselect: boolean }
export type action = { name: string, type: string[], path: string[], extension: string[], pattern: string[], id: string, multiselect: boolean, label: string }
export type MenuItems = action[]
export interface FileExplorerContextMenuProps {

@ -6,7 +6,7 @@ export const gitAccessTokenTitle = 'Github Access Token'
export const gitAccessTokenText = 'Manage the access token used to publish to Gist and retrieve Github contents.'
export const gitAccessTokenText2 = 'Go to github token page (link below) to create a new token and save it in Remix. Make sure this token has only \'create gist\' permission.'
export const gitAccessTokenLink = 'https://github.com/settings/tokens'
export const ethereunVMText = 'Always use Ethereum VM at load'
export const ethereunVMText = 'Always use Javascript VM at load'
export const wordWrapText = 'Word wrap in editor'
export const enablePersonalModeText = ' Enable Personal Mode for web3 provider. Transaction sent over Web3 will use the web3.personal API.\n'
export const matomoAnalytics = 'Enable Matomo Analytics. We do not collect personally identifiable information (PII). The info is used to improve the site’s UX & UI. See more about '

@ -4,7 +4,7 @@ import { CopyToClipboard } from '@remix-ui/clipboard' // eslint-disable-line
import { enablePersonalModeText, ethereunVMText, generateContractMetadataText, gitAccessTokenLink, gitAccessTokenText, gitAccessTokenText2, gitAccessTokenTitle, matomoAnalytics, textDark, textSecondary, warnText, wordWrapText } from './constants'
import './remix-ui-settings.css'
import { etherumVM, generateContractMetadat, personal, textWrapEventAction, useMatomoAnalytics, saveTokenToast, removeTokenToast } from './settingsAction'
import { ethereumVM, generateContractMetadat, personal, textWrapEventAction, useMatomoAnalytics, saveTokenToast, removeTokenToast } from './settingsAction'
import { initialState, toastInitialState, toastReducer, settingReducer } from './settingsReducer'
import { Toaster } from '@remix-ui/toaster'// eslint-disable-line
@ -12,7 +12,8 @@ import { Toaster } from '@remix-ui/toaster'// eslint-disable-line
export interface RemixUiSettingsProps {
config: any,
editor: any,
_deps: any
_deps: any,
useMatomoAnalytics: boolean
}
export const RemixUiSettings = (props: RemixUiSettingsProps) => {
@ -33,24 +34,34 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
}
}, [themeName, state.message])
useEffect(() => {
if (props.useMatomoAnalytics !== null) useMatomoAnalytics(props.config, props.useMatomoAnalytics, dispatch)
}, [props.useMatomoAnalytics])
useEffect(() => {
const javascriptVM = props.config.get('settings/always-use-vm')
if ((javascriptVM === null) || (javascriptVM === undefined)) ethereumVM(props.config, true, dispatch)
}, [props.config])
const onchangeGenerateContractMetadata = (event) => {
generateContractMetadat(props, event, dispatch)
generateContractMetadat(props.config, event.target.checked, dispatch)
}
const onchangeOption = (event) => {
etherumVM(props, event, dispatch)
ethereumVM(props.config, event.target.checked, dispatch)
}
const textWrapEvent = (event) => {
textWrapEventAction(props, event, dispatch)
textWrapEventAction(props.config, props.editor, event.target.checked, dispatch)
}
const onchangePersonal = event => {
personal(props, event, dispatch)
personal(props.config, event.target.checked, dispatch)
}
const onchangeMatomoAnalytics = event => {
useMatomoAnalytics(props, event, dispatch)
useMatomoAnalytics(props.config, event.target.checked, dispatch)
}
const onswitchTheme = (event, name) => {
@ -66,47 +77,55 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
}
}
const generalConfig = () => (
<div className="$border-top">
<div className="card-body pt-3 pb-2">
<h6 className="card-title">General settings</h6>
<div className="mt-2 custom-control custom-checkbox mb-1">
<input onChange={onchangeGenerateContractMetadata} id="generatecontractmetadata" data-id="settingsTabGenerateContractMetadata" type="checkbox" className="custom-control-input" name="contractMetadata" checked = { props.config.get('settings/generate-contract-metadata') }/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/generate-contract-metadata')}`} data-id="settingsTabGenerateContractMetadataLabel" htmlFor="generatecontractmetadata">{generateContractMetadataText}</label>
</div>
<div className="fmt-2 custom-control custom-checkbox mb-1">
<input onChange={onchangeOption} className="custom-control-input" id="alwaysUseVM" data-id="settingsTabAlwaysUseVM" type="checkbox" name="ethereumVM" checked={ props.config.get('settings/always-use-vm') }/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/always-use-vm')}`} htmlFor="alwaysUseVM">{ethereunVMText}</label>
</div>
<div className="mt-2 custom-control custom-checkbox mb-1">
<input id="editorWrap" className="custom-control-input" type="checkbox" onChange={textWrapEvent} checked = { props.config.get('settings/text-wrap')}/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/text-wrap')}`} htmlFor="editorWrap">{wordWrapText}</label>
</div>
<div className="custom-control custom-checkbox mb-1">
<input onChange={onchangePersonal} id="personal" type="checkbox" className="custom-control-input" checked = { props.config.get('settings/personal-mode')}/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/personal-mode')}`} htmlFor="personal">
<i className="fas fa-exclamation-triangle text-warning" aria-hidden="true"></i> <span> </span>
<span> </span>{enablePersonalModeText} {warnText}
</label>
</div>
<div className="custom-control custom-checkbox mb-1">
<input onChange={onchangeMatomoAnalytics} id="settingsMatomoAnalytics" type="checkbox" className="custom-control-input" checked={ props.config.get('settings/matomo-analytics')}/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/matomo-analytics')}`} htmlFor="settingsMatomoAnalytics">
<span>{matomoAnalytics}</span>
<a href="https://medium.com/p/66ef69e14931/" target="_blank"> Analytics in Remix IDE</a> <span>&</span> <a target="_blank" href="https://matomo.org/free-software">Matomo</a>
</label>
const generalConfig = () => {
const isMetadataChecked = props.config.get('settings/generate-contract-metadata') || false
const isEthereumVMChecked = props.config.get('settings/always-use-vm') || false
const isEditorWrapChecked = props.config.get('settings/text-wrap') || false
const isPersonalChecked = props.config.get('settings/personal-mode') || false
const isMatomoChecked = props.config.get('settings/matomo-analytics') || false
return (
<div className="$border-top">
<div className="card-body pt-3 pb-2">
<h6 className="card-title">General settings</h6>
<div className="mt-2 custom-control custom-checkbox mb-1">
<input onChange={onchangeGenerateContractMetadata} id="generatecontractmetadata" data-id="settingsTabGenerateContractMetadata" type="checkbox" className="custom-control-input" name="contractMetadata" checked = { isMetadataChecked }/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/generate-contract-metadata')}`} data-id="settingsTabGenerateContractMetadataLabel" htmlFor="generatecontractmetadata">{generateContractMetadataText}</label>
</div>
<div className="fmt-2 custom-control custom-checkbox mb-1">
<input onChange={onchangeOption} className="custom-control-input" id="alwaysUseVM" data-id="settingsTabAlwaysUseVM" type="checkbox" name="ethereumVM" checked={ isEthereumVMChecked }/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/always-use-vm')}`} htmlFor="alwaysUseVM">{ethereunVMText}</label>
</div>
<div className="mt-2 custom-control custom-checkbox mb-1">
<input id="editorWrap" className="custom-control-input" type="checkbox" onChange={textWrapEvent} checked = { isEditorWrapChecked }/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/text-wrap')}`} htmlFor="editorWrap">{wordWrapText}</label>
</div>
<div className="custom-control custom-checkbox mb-1">
<input onChange={onchangePersonal} id="personal" type="checkbox" className="custom-control-input" checked = { isPersonalChecked }/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/personal-mode')}`} htmlFor="personal">
<i className="fas fa-exclamation-triangle text-warning" aria-hidden="true"></i> <span> </span>
<span> </span>{enablePersonalModeText} {warnText}
</label>
</div>
<div className="custom-control custom-checkbox mb-1">
<input onChange={onchangeMatomoAnalytics} id="settingsMatomoAnalytics" type="checkbox" className="custom-control-input" checked={ isMatomoChecked }/>
<label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/matomo-analytics')}`} htmlFor="settingsMatomoAnalytics">
<span>{matomoAnalytics}</span>
<a href="https://medium.com/p/66ef69e14931/" target="_blank"> Analytics in Remix IDE</a> <span>&</span> <a target="_blank" href="https://matomo.org/free-software">Matomo</a>
</label>
</div>
</div>
</div>
</div>
)
)
}
const saveToken = () => {
saveTokenToast(props, dispatchToast, tokenValue)
saveTokenToast(props.config, dispatchToast, tokenValue)
}
const removeToken = () => {
setTokenValue('')
removeTokenToast(props, dispatchToast)
removeTokenToast(props.config, dispatchToast)
}
const handleSaveTokenState = useCallback(

@ -8,31 +8,31 @@ declare global {
const _paq = window._paq = window._paq || [] //eslint-disable-line
export const generateContractMetadat = (element, event, dispatch) => {
element.config.set('settings/generate-contract-metadata', event.target.checked)
dispatch({ type: 'contractMetadata', payload: { name: event.target.name, isChecked: event.target.checked, textClass: event.target.checked ? textDark : textSecondary } })
export const generateContractMetadat = (config, checked, dispatch) => {
config.set('settings/generate-contract-metadata', checked)
dispatch({ type: 'contractMetadata', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
}
export const etherumVM = (element, event, dispatch) => {
element.config.set('settings/always-use-vm', event.target.checked)
dispatch({ type: 'ethereumVM', payload: { name: event.target.name, isChecked: event.target.checked, textClass: event.target.checked ? textDark : textSecondary } })
export const ethereumVM = (config, checked: boolean, dispatch) => {
config.set('settings/always-use-vm', checked)
dispatch({ type: 'ethereumVM', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
}
export const textWrapEventAction = (element, event, dispatch) => {
element.config.set('settings/text-wrap', event.target.checked)
element.editor.resize(event.target.checked)
dispatch({ type: 'textWrap', payload: { name: event.target.name, isChecked: event.target.checked, textClass: event.target.checked ? textDark : textSecondary } })
export const textWrapEventAction = (config, editor, checked, dispatch) => {
config.set('settings/text-wrap', checked)
editor.resize(checked)
dispatch({ type: 'textWrap', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
}
export const personal = (element, event, dispatch) => {
element.config.set('settings/personal-mode', event.target.checked)
dispatch({ type: 'personal', payload: { name: event.target.name, isChecked: event.target.checked, textClass: event.target.checked ? textDark : textSecondary } })
export const personal = (config, checked, dispatch) => {
config.set('settings/personal-mode', checked)
dispatch({ type: 'personal', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
}
export const useMatomoAnalytics = (element, event, dispatch) => {
element.config.set('settings/matomo-analytics', event.target.checked)
dispatch({ type: 'useMatomoAnalytics', payload: { name: event.target.name, isChecked: event.target.checked, textClass: event.target.checked ? textDark : textSecondary } })
if (event.target.checked) {
export const useMatomoAnalytics = (config, checked, dispatch) => {
config.set('settings/matomo-analytics', checked)
dispatch({ type: 'useMatomoAnalytics', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
if (checked) {
_paq.push(['forgetUserOptOut'])
// @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used
document.cookie = 'mtm_consent_removed=; expires=Thu, 01 Jan 1970 00:00:01 GMT;'
@ -41,12 +41,12 @@ export const useMatomoAnalytics = (element, event, dispatch) => {
}
}
export const saveTokenToast = (props, dispatch, tokenValue) => {
props.config.set('settings/gist-access-token', tokenValue)
export const saveTokenToast = (config, dispatch, tokenValue) => {
config.set('settings/gist-access-token', tokenValue)
dispatch({ type: 'save', payload: { message: 'Access token has been saved' } })
}
export const removeTokenToast = (props, dispatch) => {
props.config.set('settings/gist-access-token', '')
export const removeTokenToast = (config, dispatch) => {
config.set('settings/gist-access-token', '')
dispatch({ type: 'removed', payload: { message: 'Access token removed' } })
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remix-url-resolver",
"version": "0.0.23",
"version": "0.0.24",
"description": "Solidity import url resolver engine",
"main": "index.js",
"types": "./index.d.ts",
@ -42,5 +42,5 @@
"typescript": "^3.1.6"
},
"typings": "index.d.ts",
"gitHead": "50b32cc20d2d4dcc793bf7de955957e073e5b5b8"
"gitHead": "5e91f3010a7198f1b2d90cc7796bda750c58f1ea"
}

@ -1,6 +1,6 @@
{
"name": "@remix-project/remixd",
"version": "0.4.1",
"version": "0.4.2",
"description": "remix server: allow accessing file system from remix.ethereum.org and start a dev environment (see help section)",
"main": "index.js",
"types": "./index.d.ts",

Loading…
Cancel
Save