Unverified Commit 0fc07cbe authored by David Zagi's avatar David Zagi Committed by GitHub

Merge branch 'master' into remixd_terminal

parents 7a8c3641 cfc338f4
...@@ -218,11 +218,12 @@ class ContractDropdownUI { ...@@ -218,11 +218,12 @@ class ContractDropdownUI {
if (this.selectContractNames.value === '') this.enableAtAddress(false) if (this.selectContractNames.value === '') this.enableAtAddress(false)
} else { } else {
this.loadType = 'other' this.loadType = 'other'
this.createPanel.style.display = 'none' this.createPanel.style.display = 'block'
this.orLabel.style.display = 'none' this.orLabel.style.display = 'block'
this.compFails.style.display = 'none' this.contractNamesContainer.style.display = 'block'
this.contractNamesContainer.style.display = 'none' this.selectContractNames.style.display = 'block'
this.abiLabel.style.display = 'none' this.abiLabel.style.display = 'none'
if (this.selectContractNames.value === '') this.enableAtAddress(false)
} }
} }
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
} }
], ],
"dependencies": { "dependencies": {
"@ethereumjs/block": "^3.4.0", "@ethereumjs/block": "^3.5.1",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.2",
"@ethereumjs/vm": "^5.5.0", "@ethereumjs/vm": "^5.5.3",
"@remix-project/remix-astwalker": "^0.0.37", "@remix-project/remix-astwalker": "^0.0.37",
"@remix-project/remix-lib": "^0.5.7", "@remix-project/remix-lib": "^0.5.7",
"async": "^2.6.2", "async": "^2.6.2",
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
] ]
}, },
"dependencies": { "dependencies": {
"@ethereumjs/block": "^3.4.0", "@ethereumjs/block": "^3.5.1",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.2",
"@ethereumjs/vm": "^5.5.0", "@ethereumjs/vm": "^5.5.3",
"@remix-project/remix-lib": "^0.5.7", "@remix-project/remix-lib": "^0.5.7",
"@types/tape": "^4.2.33", "@types/tape": "^4.2.33",
"async": "^2.6.2", "async": "^2.6.2",
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
], ],
"main": "src/index.js", "main": "src/index.js",
"dependencies": { "dependencies": {
"@ethereumjs/block": "^3.4.0", "@ethereumjs/block": "^3.5.1",
"@ethereumjs/common": "^2.2.0", "@ethereumjs/common": "^2.5.0",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.2",
"@ethereumjs/vm": "^5.5.0", "@ethereumjs/vm": "^5.5.3",
"@remix-project/remix-astwalker": "^0.0.37", "@remix-project/remix-astwalker": "^0.0.37",
"@remix-project/remix-lib": "^0.5.7", "@remix-project/remix-lib": "^0.5.7",
"@remix-project/remix-simulator": "^0.2.7", "@remix-project/remix-simulator": "^0.2.7",
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
], ],
"main": "src/index.js", "main": "src/index.js",
"dependencies": { "dependencies": {
"@ethereumjs/block": "^3.4.0", "@ethereumjs/block": "^3.5.1",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.2",
"@ethereumjs/vm": "^5.5.0", "@ethereumjs/vm": "^5.5.3",
"async": "^2.1.2", "async": "^2.1.2",
"ethereumjs-util": "^7.0.10", "ethereumjs-util": "^7.0.10",
"ethers": "^4.0.40", "ethers": "^4.0.40",
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
], ],
"main": "src/index.js", "main": "src/index.js",
"dependencies": { "dependencies": {
"@ethereumjs/block": "^3.4.0", "@ethereumjs/block": "^3.5.1",
"@ethereumjs/common": "^2.2.0", "@ethereumjs/common": "^2.5.0",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.2",
"@ethereumjs/vm": "^5.5.0", "@ethereumjs/vm": "^5.5.3",
"@remix-project/remix-lib": "^0.5.7", "@remix-project/remix-lib": "^0.5.7",
"ansi-gray": "^0.1.1", "ansi-gray": "^0.1.1",
"async": "^3.1.0", "async": "^3.1.0",
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
} }
], ],
"dependencies": { "dependencies": {
"@ethereumjs/block": "^3.4.0", "@ethereumjs/block": "^3.5.1",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.2",
"@ethereumjs/vm": "^5.5.0", "@ethereumjs/vm": "^5.5.3",
"@remix-project/remix-lib": "^0.5.7", "@remix-project/remix-lib": "^0.5.7",
"async": "^2.6.2", "async": "^2.6.2",
"eslint-scope": "^5.0.0", "eslint-scope": "^5.0.0",
......
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
}, },
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-tests#readme", "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-tests#readme",
"dependencies": { "dependencies": {
"@ethereumjs/block": "^3.4.0", "@ethereumjs/block": "^3.5.1",
"@ethereumjs/common": "^2.2.0", "@ethereumjs/common": "^2.5.0",
"@ethereumjs/tx": "^3.3.0", "@ethereumjs/tx": "^3.3.2",
"@ethereumjs/vm": "^5.5.0", "@ethereumjs/vm": "^5.5.3",
"@remix-project/remix-lib": "^0.5.7", "@remix-project/remix-lib": "^0.5.7",
"@remix-project/remix-simulator": "^0.2.7", "@remix-project/remix-simulator": "^0.2.7",
"@remix-project/remix-solidity": "^0.4.7", "@remix-project/remix-solidity": "^0.4.7",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment