Skip to content

Commit d9b4347

Browse files
ioedeveloperioedeveloper
authored
Merge branch 'master' into feat/noir-syntax-highlight
2 parents 0403994 + fa078b0 commit d9b4347

File tree

14 files changed

+61
-45
lines changed

14 files changed

+61
-45
lines changed

‎apps/remix-ide-e2e/src/tests/transactionExecution.test.ts‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ module.exports = {
370370
'decoded output': { '0':'bool: true' }
371371
}).perform(() => done())
372372
})
373-
.click('*[data-id="universalDappUiUdappPin"]') // pin the contract for later use by a forked state.
374373
// Should fork the mainnet VM fork and execute some transaction
375374
.click('*[data-id="fork-state-icon"]')
376375
.waitForElementVisible('*[data-id="udappNotifyModalDialogModalTitle-react"]')
@@ -385,7 +384,15 @@ module.exports = {
385384
}
386385
)
387386
.pause(2000)
387+
.perform((done) => {
388+
browser.createContract((currentBlockNumber) + '')
389+
.waitForElementPresent('*[data-shared="universalDappUiInstance"]')
390+
.perform(() => {
391+
done()
392+
})
393+
})
388394
.clickInstance(0)
395+
.click('*[data-id="universalDappUiUdappPin"]') // pin the contract for later use by a forked state.
389396
.clickFunction('getB - call')
390397
.clickFunction('checkBlockNumberIsAdvancing - transact (not payable)')
391398
.perform((done) => {
@@ -442,20 +449,20 @@ module.exports = {
442449
console.log('Test Fork Mainnet', address)
443450
addressRef = address
444451
})
445-
// from Mainnet fork 2, check that block number is at `currentBlockNumber` + 6
446-
.clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '6'})
452+
// from Mainnet fork 2, check that block number is at `currentBlockNumber` + 4
453+
.clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '3'})
447454
.perform((done) => {
448455
browser.testFunction('last',
449456
{
450457
status: '0x1 Transaction mined and execution succeed',
451458
'decoded output': { '0':'bool: true' }
452459
}).perform(() => done())
453460
})
454-
// switch back to Mainnet fork 1 and check that block number is at `currentBlockNumber` + 4
461+
// switch back to Mainnet fork 1 and check that block number is at `currentBlockNumber` + 2
455462
.switchEnvironment('vm-fs-Mainnet fork 1')
456463
.pause(2000)
457464
.clickInstance(0)
458-
.clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '4'})
465+
.clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '1'})
459466
.perform((done) => {
460467
browser.testFunction('last',
461468
{

‎apps/remix-ide/src/blockchain/blockchain.tsx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const profile = {
2525
name: 'blockchain',
2626
displayName: 'Blockchain',
2727
description: 'Blockchain - Logic',
28-
methods: ['getCode', 'getTransactionReceipt', 'addProvider', 'removeProvider', 'getCurrentFork', 'getAccounts', 'web3VM', 'web3', 'getProvider', 'getCurrentProvider', 'getCurrentNetworkStatus', 'getAllProviders', 'getPinnedProviders', 'changeExecutionContext'],
28+
methods: ['getCode', 'getTransactionReceipt', 'addProvider', 'removeProvider', 'getCurrentFork', 'getAccounts', 'web3VM', 'web3', 'getProvider', 'getCurrentProvider', 'getCurrentNetworkStatus', 'getAllProviders', 'getPinnedProviders', 'changeExecutionContext', 'getProviderObject'],
2929
version: packageJson.version
3030
}
3131

@@ -569,6 +569,10 @@ export class Blockchain extends Plugin {
569569
return allProviders[name]
570570
}
571571

572+
getProviderObject() {
573+
return this.executionContext.getProviderObject()
574+
}
575+
572576
getInjectedWeb3Address() {
573577
return this.executionContext.getSelectedAddress()
574578
}
@@ -1020,10 +1024,7 @@ export class Blockchain extends Plugin {
10201024
let stateDetails = await this.call('fileManager', 'readFile', provider.config.statePath)
10211025
stateDetails = JSON.parse(stateDetails)
10221026
state = JSON.parse(state)
1023-
state['stateName'] = stateDetails.stateName
1024-
state['forkName'] = stateDetails.forkName
1025-
state['savingTimestamp'] = stateDetails.savingTimestamp
1026-
state = JSON.stringify(state, null, 2)
1027+
state = JSON.stringify({ ...stateDetails, ...(state as any) }, null, 2)
10271028
}
10281029
this.call('fileManager', 'writeFile', provider.config.statePath, state)
10291030
} else if (isBasicVMState && !isForkedRpcState && !isForkedRpcState) {

‎libs/ghaction-helper/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/ghaction-helper",
3-
"version": "0.1.44",
3+
"version": "0.1.45",
44
"description": "Solidity Tests GitHub Action Helper",
55
"main": "src/index.js",
66
"scripts": {
@@ -19,17 +19,17 @@
1919
},
2020
"homepage": "https://github.com/ethereum/remix-project#readme",
2121
"devDependencies": {
22-
"@remix-project/remix-solidity": "^0.5.50",
22+
"@remix-project/remix-solidity": "^0.5.51",
2323
"@types/chai": "^4.3.4",
2424
"typescript": "^4.9.3"
2525
},
2626
"dependencies": {
2727
"@ethereum-waffle/chai": "^3.4.4",
28-
"@remix-project/remix-simulator": "^0.2.64",
28+
"@remix-project/remix-simulator": "^0.2.65",
2929
"chai": "^4.3.7",
3030
"ethers": "^5.7.2",
3131
"web3": "^4.1.1"
3232
},
3333
"types": "./src/index.d.ts",
34-
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6"
34+
"gitHead": "ac6b8d4bc57398ac3677ce08c188c4f9e69123ed"
3535
}

‎libs/remix-analyzer/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-analyzer",
3-
"version": "0.5.73",
3+
"version": "0.5.74",
44
"description": "Tool to perform static analysis on Solidity smart contracts",
55
"scripts": {
66
"test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts"
@@ -25,8 +25,8 @@
2525
"@ethereumjs/tx": "5.4.0",
2626
"@ethereumjs/util": "9.1.0",
2727
"@ethereumjs/vm": "8.1.1",
28-
"@remix-project/remix-astwalker": "^0.0.94",
29-
"@remix-project/remix-lib": "^0.5.71",
28+
"@remix-project/remix-astwalker": "^0.0.95",
29+
"@remix-project/remix-lib": "^0.5.72",
3030
"async": "^2.6.2",
3131
"ethers": "^5.4.2",
3232
"ethjs-util": "^0.1.6",
@@ -50,6 +50,6 @@
5050
"typescript": "^3.7.5"
5151
},
5252
"typings": "src/index.d.ts",
53-
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
53+
"gitHead": "ac6b8d4bc57398ac3677ce08c188c4f9e69123ed",
5454
"main": "./src/index.js"
5555
}

‎libs/remix-astwalker/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-astwalker",
3-
"version": "0.0.94",
3+
"version": "0.0.95",
44
"description": "Tool to walk through Solidity AST",
55
"main": "src/index.js",
66
"scripts": {
@@ -37,7 +37,7 @@
3737
"@ethereumjs/tx": "5.4.0",
3838
"@ethereumjs/util": "9.1.0",
3939
"@ethereumjs/vm": "8.1.1",
40-
"@remix-project/remix-lib": "^0.5.71",
40+
"@remix-project/remix-lib": "^0.5.72",
4141
"@types/tape": "^4.2.33",
4242
"async": "^2.6.2",
4343
"ethers": "^5.4.2",
@@ -53,6 +53,6 @@
5353
"tap-spec": "^5.0.0"
5454
},
5555
"typings": "src/index.d.ts",
56-
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
56+
"gitHead": "ac6b8d4bc57398ac3677ce08c188c4f9e69123ed",
5757
"types": "./src/index.d.ts"
5858
}

‎libs/remix-debug/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-debug",
3-
"version": "0.5.64",
3+
"version": "0.5.65",
44
"description": "Tool to debug Ethereum transactions",
55
"contributors": [
66
{
@@ -26,10 +26,10 @@
2626
"@ethereumjs/tx": "5.4.0",
2727
"@ethereumjs/util": "9.1.0",
2828
"@ethereumjs/vm": "8.1.1",
29-
"@remix-project/remix-astwalker": "^0.0.94",
30-
"@remix-project/remix-lib": "^0.5.71",
31-
"@remix-project/remix-simulator": "^0.2.64",
32-
"@remix-project/remix-solidity": "^0.5.50",
29+
"@remix-project/remix-astwalker": "^0.0.95",
30+
"@remix-project/remix-lib": "^0.5.72",
31+
"@remix-project/remix-simulator": "^0.2.65",
32+
"@remix-project/remix-solidity": "^0.5.51",
3333
"ansi-gray": "^0.1.1",
3434
"async": "^2.6.2",
3535
"color-support": "^1.1.3",
@@ -69,6 +69,6 @@
6969
},
7070
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
7171
"typings": "src/index.d.ts",
72-
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
72+
"gitHead": "ac6b8d4bc57398ac3677ce08c188c4f9e69123ed",
7373
"types": "./src/index.d.ts"
7474
}

‎libs/remix-lib/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-lib",
3-
"version": "0.5.71",
3+
"version": "0.5.72",
44
"description": "Library to various Remix tools",
55
"contributors": [
66
{
@@ -55,6 +55,6 @@
5555
},
5656
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
5757
"typings": "src/index.d.ts",
58-
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
58+
"gitHead": "ac6b8d4bc57398ac3677ce08c188c4f9e69123ed",
5959
"types": "./src/index.d.ts"
6060
}

‎libs/remix-simulator/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-simulator",
3-
"version": "0.2.64",
3+
"version": "0.2.65",
44
"description": "Ethereum IDE and tools for the web",
55
"contributors": [
66
{
@@ -23,7 +23,7 @@
2323
"@ethereumjs/util": "9.1.0",
2424
"@ethereumjs/vm": "8.1.1",
2525
"@metamask/eth-sig-util": "^7.0.2",
26-
"@remix-project/remix-lib": "^0.5.71",
26+
"@remix-project/remix-lib": "^0.5.72",
2727
"ansi-gray": "^0.1.1",
2828
"async": "^3.1.0",
2929
"body-parser": "^1.18.2",
@@ -71,6 +71,6 @@
7171
},
7272
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
7373
"typings": "src/index.d.ts",
74-
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
74+
"gitHead": "ac6b8d4bc57398ac3677ce08c188c4f9e69123ed",
7575
"types": "./src/index.d.ts"
7676
}

‎libs/remix-solidity/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-solidity",
3-
"version": "0.5.50",
3+
"version": "0.5.51",
44
"description": "Tool to load and run Solidity compiler",
55
"main": "src/index.js",
66
"types": "src/index.d.ts",
@@ -19,7 +19,7 @@
1919
"@ethereumjs/tx": "5.4.0",
2020
"@ethereumjs/util": "9.1.0",
2121
"@ethereumjs/vm": "8.1.1",
22-
"@remix-project/remix-lib": "^0.5.71",
22+
"@remix-project/remix-lib": "^0.5.72",
2323
"async": "^2.6.2",
2424
"eslint-scope": "^5.0.0",
2525
"ethers": "^5.4.2",
@@ -57,5 +57,5 @@
5757
},
5858
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
5959
"typings": "src/index.d.ts",
60-
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6"
60+
"gitHead": "ac6b8d4bc57398ac3677ce08c188c4f9e69123ed"
6161
}

‎libs/remix-tests/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-tests",
3-
"version": "0.2.64",
3+
"version": "0.2.65",
44
"description": "Tool to test Solidity smart contracts",
55
"main": "src/index.js",
66
"types": "./src/index.d.ts",
@@ -41,9 +41,9 @@
4141
"@ethereumjs/tx": "5.4.0",
4242
"@ethereumjs/util": "9.1.0",
4343
"@ethereumjs/vm": "8.1.1",
44-
"@remix-project/remix-lib": "^0.5.71",
45-
"@remix-project/remix-simulator": "^0.2.64",
46-
"@remix-project/remix-solidity": "^0.5.50",
44+
"@remix-project/remix-lib": "^0.5.72",
45+
"@remix-project/remix-simulator": "^0.2.65",
46+
"@remix-project/remix-solidity": "^0.5.51",
4747
"@remix-project/remix-url-resolver": "^0.0.42",
4848
"ansi-gray": "^0.1.1",
4949
"async": "^2.6.0",
@@ -89,5 +89,5 @@
8989
"@ethereumjs/trie": "6.2.1"
9090
},
9191
"typings": "src/index.d.ts",
92-
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6"
92+
"gitHead": "ac6b8d4bc57398ac3677ce08c188c4f9e69123ed"
9393
}

0 commit comments

Comments
 (0)