Skip to content

Commit d1b5d4d

Browse files
joeizangjoeizang
authored
Merge branch 'master' into learnethSl
2 parents 3397ccb + 4ed2409 commit d1b5d4d

File tree

48 files changed

+150
-73
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+150
-73
lines changed

‎apps/etherscan/src/app/views/VerifyView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, {useEffect, useRef, useState} from 'react'
2-
import Web3 from 'web3'
2+
import { Web3 } from 'web3'
33

44
import {PluginClient} from '@remixproject/plugin'
55
import {CustomTooltip} from '@remix-ui/helper'

‎apps/remix-ide-e2e/src/githttpbackend/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"scripts": {
3-
"start:server": "npx ts-node server.ts"
3+
"start:server": "tsc && node ./dist/server.js"
44
},
55
"dependencies": {
66
"body-parser": "^1.20.2",
@@ -9,5 +9,9 @@
99
"git-http-backend": "^1.1.2",
1010
"path": "^0.12.7",
1111
"zlib": "^1.0.5"
12+
},
13+
"devDependencies": {
14+
"@types/node": "^22.5.4",
15+
"typescript": "^5.6.2"
1216
}
1317
}

‎apps/remix-ide-e2e/src/githttpbackend/server.ts renamed to ‎apps/remix-ide-e2e/src/githttpbackend/src/server.ts

File renamed without changes.

‎apps/remix-ide-e2e/src/githttpbackend/tsconfig.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"compilerOptions": {
3+
"target": "ES6", // Set the ECMAScript target version
4+
"module": "commonjs", // Specify module code generation
5+
"strict": true,
6+
"noImplicitAny": false, // Enable all strict type-checking options
7+
"esModuleInterop": true, // Emit additional code to make commonJS and ES modules work together
8+
"skipLibCheck": true, // Skip type checking of all declaration files (.d.ts)
9+
"forceConsistentCasingInFileNames": true, // Ensure file names are treated with case sensitivity
10+
"outDir": "./dist", // Redirect output structure to the 'dist' directory
11+
"rootDir": "./src", // Specify the root directory of input files
12+
"sourceMap": true, // Create source map files
13+
"types": [
14+
"node"
15+
], // Add node types
16+
"moduleResolution": "node", // Ensure TypeScript resolves modules like Node.js
17+
},
18+
"include": [
19+
"src/**/*" // Include all TypeScript files in the src directory
20+
],
21+
"exclude": [
22+
"node_modules", // Exclude the node_modules folder
23+
"**/*.test.ts" // Exclude test files
24+
]
25+
}

‎apps/remix-ide-e2e/src/githttpbackend/yarn.lock

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
# yarn lockfile v1
33

44

5+
"@types/node@^22.5.4":
6+
version "22.5.4"
7+
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.4.tgz#83f7d1f65bc2ed223bdbf57c7884f1d5a4fa84e8"
8+
integrity sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==
9+
dependencies:
10+
undici-types "~6.19.2"
11+
512
accepts@~1.3.8:
613
version "1.3.8"
714
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -483,6 +490,16 @@ type-is@~1.6.18:
483490
media-typer "0.3.0"
484491
mime-types "~2.1.24"
485492

493+
typescript@^5.6.2:
494+
version "5.6.2"
495+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
496+
integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
497+
498+
undici-types@~6.19.2:
499+
version "6.19.8"
500+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
501+
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
502+
486503
[email protected], unpipe@~1.0.0:
487504
version "1.0.0"
488505
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ async function createCommitOnLocalServer(path: string, message: string) {
606606
async function spawnGitServer(path: string): Promise<ChildProcess> {
607607
console.log(process.cwd())
608608
try {
609-
const server = spawn('yarn && sh setup.sh && npx ts-node server.ts', [`${path}`], { cwd: process.cwd() + '/apps/remix-ide-e2e/src/githttpbackend/', shell: true, detached: true })
609+
const server = spawn('yarn && sh setup.sh && yarn start:server', [`${path}`], { cwd: process.cwd() + '/apps/remix-ide-e2e/src/githttpbackend/', shell: true, detached: true })
610610
console.log('spawned', server.stdout.closed, server.stderr.closed)
611611
return new Promise((resolve, reject) => {
612612
server.stdout.on('data', function (data) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ module.exports = {
9090
browser
9191
.clickLaunchIcon('solidity')
9292
.setSolidityCompilerVersion('soljson-v0.8.20+commit.a1b79de6.js')
93+
.click('*[data-id="scConfigExpander"]')
94+
.setValue('#evmVersionSelector', 'berlin') // set target EVM for parser to berlin
9395
.addFile('contracts/mytoken.sol', {
9496
content: myToken
9597
}).useXpath().waitForElementVisible("//*[@class='view-line' and contains(.,'gas')]")

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,21 @@ module.exports = {
3131
1: 'uint256: out2 15'
3232
}
3333
})
34-
.end()
34+
},
35+
36+
'Should clear transient storage after tx execution #group1' : function (browser: NightwatchBrowser) {
37+
browser.addFile('clear_transient.sol', { content: clearTransient })
38+
.verifyContracts(['ClearTransient'])
39+
.clickLaunchIcon('udapp')
40+
.createContract('')
41+
.clickInstance(1)
42+
.clickFunction('get - call')
43+
.testFunction('last',
44+
{
45+
'decoded output': {
46+
0: 'uint256: 0'
47+
}
48+
})
3549
}
3650
}
3751

@@ -49,3 +63,22 @@ contract TestTransientStorage {
4963
}
5064
}
5165
}`
66+
67+
const clearTransient = `
68+
// SPDX-License-Identifier: none
69+
pragma solidity 0.8.26;
70+
import "hardhat/console.sol";
71+
72+
contract ClearTransient {
73+
uint p;
74+
constructor() {
75+
uint256 value;
76+
assembly { value := tload(hex"1234") }
77+
p = value;
78+
assembly { tstore(hex"1234", 10) }
79+
}
80+
81+
function get () public view returns (uint) {
82+
return p;
83+
}
84+
}`

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,13 @@ module.exports = {
246246
.waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]', 60000)
247247
.waitForElementContainsText('#solidityUnittestsOutput', 'tests/hhLogs_test.sol', 60000)
248248
.pause(2000)
249-
.assert.containsText('#journal > div:nth-child(4) > span', 'Before all:')
250-
.assert.containsText('#journal > div:nth-child(4) > span', 'Inside beforeAll')
251-
.assert.containsText('#journal > div:nth-child(5) > span', 'Check sender:')
252-
.assert.containsText('#journal > div:nth-child(5) > span', 'msg.sender is 0x5B38Da6a701c568545dCfcB03FcB875f56beddC4')
253-
.assert.containsText('#journal > div:nth-child(6) > span', 'Check int logs:')
254-
.assert.containsText('#journal > div:nth-child(6) > span', '10 20')
255-
.assert.containsText('#journal > div:nth-child(6) > span', 'Number is 25')
249+
.assert.textContains('#journal > div:nth-child(3) > span', 'Before all:')
250+
.assert.textContains('#journal > div:nth-child(3) > span', 'Inside beforeAll')
251+
.assert.textContains('#journal > div:nth-child(4) > span', 'Check sender:')
252+
.assert.textContains('#journal > div:nth-child(4) > span', 'msg.sender is 0x5B38Da6a701c568545dCfcB03FcB875f56beddC4')
253+
.assert.textContains('#journal > div:nth-child(5) > span', 'Check int logs:')
254+
.assert.textContains('#journal > div:nth-child(5) > span', '10 20')
255+
.assert.textContains('#journal > div:nth-child(5) > span', 'Number is 25')
256256
.openFile('tests/hhLogs_test.sol')
257257
.removeFile('tests/hhLogs_test.sol', 'workspace_new')
258258
},

‎apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export default class CodeParserCompiler {
161161
"*": ["evm.gasEstimates"]
162162
}
163163
},
164-
"evmVersion": state.evmVersion && state.evmVersion.toString() || "berlin",
164+
"evmVersion": state.evmVersion && state.evmVersion.toString() || "cancun",
165165
}
166166
}
167167

0 commit comments

Comments
 (0)