Merge branch 'master' into foundry

pull/5370/head
bunsenstraat 2 years ago committed by GitHub
commit 1c02856a6f
  1. 2
      apps/remix-ide-e2e/src/tests/recorder.test.ts
  2. 2
      apps/remix-ide-e2e/src/tests/terminal.test.ts
  3. 1
      apps/remix-ide/src/app.js
  4. 2
      apps/remix-ide/src/app/panels/file-panel.js
  5. 7
      apps/remix-ide/src/app/plugins/remixd-handle.tsx
  6. 2
      apps/remix-ide/src/remixAppManager.js
  7. 5
      babel.config.js
  8. 4
      libs/remix-debug/src/solidity-decoder/internalCallTree.ts
  9. 2
      libs/remix-debug/src/solidity-decoder/solidityProxy.ts
  10. 2
      libs/remix-ws-templates/src/templates/remixDefault/contracts/1_Storage.sol

@ -470,7 +470,7 @@ const liveModeScenario = {
const testStorageForLiveMode = `// SPDX-License-Identifier: GPL-3.0 const testStorageForLiveMode = `// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.7.0 <0.9.0; pragma solidity >=0.8.2 <0.9.0;
/** /**
* @title Storage * @title Storage

@ -584,7 +584,7 @@ contract OwnerTest {
const scriptAutoExec = { const scriptAutoExec = {
contract: `// SPDX-License-Identifier: GPL-3.0 contract: `// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.7.0 <0.9.0; pragma solidity >=0.8.2 <0.9.0;
library lib { library lib {
function test () public view returns (uint) { function test () public view returns (uint) {

@ -343,7 +343,6 @@ class AppComponent {
analysis, analysis,
test, test,
filePanel.remixdHandle, filePanel.remixdHandle,
filePanel.gitHandle,
filePanel.hardhatHandle, filePanel.hardhatHandle,
filePanel.foundryHandle, filePanel.foundryHandle,
filePanel.truffleHandle, filePanel.truffleHandle,

@ -5,7 +5,6 @@ import React from 'react' // eslint-disable-line
import { FileSystemProvider } from '@remix-ui/workspace' // eslint-disable-line import { FileSystemProvider } from '@remix-ui/workspace' // eslint-disable-line
import Registry from '../state/registry' import Registry from '../state/registry'
import { RemixdHandle } from '../plugins/remixd-handle' import { RemixdHandle } from '../plugins/remixd-handle'
const { GitHandle } = require('../files/git-handle.js')
const { HardhatHandle } = require('../files/hardhat-handle.js') const { HardhatHandle } = require('../files/hardhat-handle.js')
const { FoundryHandle } = require('../files/foundry-handle.js') const { FoundryHandle } = require('../files/foundry-handle.js')
const { TruffleHandle } = require('../files/truffle-handle.js') const { TruffleHandle } = require('../files/truffle-handle.js')
@ -52,7 +51,6 @@ module.exports = class Filepanel extends ViewPlugin {
this.el.setAttribute('id', 'fileExplorerView') this.el.setAttribute('id', 'fileExplorerView')
this.remixdHandle = new RemixdHandle(this.fileProviders.localhost, appManager) this.remixdHandle = new RemixdHandle(this.fileProviders.localhost, appManager)
this.gitHandle = new GitHandle()
this.hardhatHandle = new HardhatHandle() this.hardhatHandle = new HardhatHandle()
this.foundryHandle = new FoundryHandle() this.foundryHandle = new FoundryHandle()
this.truffleHandle = new TruffleHandle() this.truffleHandle = new TruffleHandle()

@ -6,7 +6,6 @@ import * as packageJson from '../../../../../package.json'
import { version as remixdVersion } from '../../../../../libs/remixd/package.json' import { version as remixdVersion } from '../../../../../libs/remixd/package.json'
import { PluginManager } from '@remixproject/engine' import { PluginManager } from '@remixproject/engine'
import { AppModal, AlertModal } from '@remix-ui/app' import { AppModal, AlertModal } from '@remix-ui/app'
import { CopyToClipboard } from '@remix-ui/clipboard'
const LOCALHOST = ' - connect to localhost - ' const LOCALHOST = ' - connect to localhost - '
@ -25,12 +24,6 @@ const profile = {
authorContact: "" authorContact: ""
} }
enum State {
ok,
cancel,
new
}
export class RemixdHandle extends WebsocketPlugin { export class RemixdHandle extends WebsocketPlugin {
localhostProvider: any localhostProvider: any
appManager: PluginManager appManager: PluginManager

@ -190,7 +190,7 @@ class PluginLoader {
constructor() { constructor() {
const queryParams = new QueryParams() const queryParams = new QueryParams()
this.donotAutoReload = ['remixd', 'git'] // that would be a bad practice to force loading some plugins at page load. this.donotAutoReload = ['remixd'] // that would be a bad practice to force loading some plugins at page load.
this.loaders = {} this.loaders = {}
this.loaders.localStorage = { this.loaders.localStorage = {
set: (plugin, actives) => { set: (plugin, actives) => {

@ -6,5 +6,8 @@ module.exports = {
"@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-nullish-coalescing-operator", "@babel/plugin-proposal-nullish-coalescing-operator",
["@babel/plugin-proposal-private-property-in-object", { "loose": false }], ["@babel/plugin-proposal-private-property-in-object", { "loose": false }],
["@babel/plugin-proposal-private-methods", { "loose": false }]] ["@babel/plugin-proposal-private-methods", { "loose": false }],
["@babel/plugin-transform-runtime", {
"regenerator": true
}]]
} }

@ -82,6 +82,7 @@ export class InternalCallTree {
if (!compResult) { if (!compResult) {
this.event.trigger('noCallTreeAvailable', []) this.event.trigger('noCallTreeAvailable', [])
} else { } else {
try {
buildTree(this, 0, scopeId, isCreation).then((result) => { buildTree(this, 0, scopeId, isCreation).then((result) => {
if (result.error) { if (result.error) {
this.event.trigger('callTreeBuildFailed', [result.error]) this.event.trigger('callTreeBuildFailed', [result.error])
@ -94,6 +95,9 @@ export class InternalCallTree {
console.log('analyzing trace falls ' + reason) console.log('analyzing trace falls ' + reason)
this.event.trigger('callTreeNotReady', [reason]) this.event.trigger('callTreeNotReady', [reason])
}) })
} catch (e) {
console.log(e)
}
} }
}) })
} }

@ -115,7 +115,7 @@ export class SolidityProxy {
for (const source of generatedSources) { for (const source of generatedSources) {
if (source.id === sourceLocation.file) return source.ast if (source.id === sourceLocation.file) return source.ast
} }
} else if (compilationResult.data.sources[file]) { } else if (compilationResult.data.sources && compilationResult.data.sources[file]) {
return compilationResult.data.sources[file].ast return compilationResult.data.sources[file].ast
} }
return null return null

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0 // SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.7.0 <0.9.0; pragma solidity >=0.8.2 <0.9.0;
/** /**
* @title Storage * @title Storage

Loading…
Cancel
Save