Skip to content

Commit b6024d4

Browse files
joeizangjoeizang
authored
Merge branch 'master' into move-appManager-tots
2 parents 17b57bf + 2b9a1e3 commit b6024d4

File tree

23 files changed

+73
-67
lines changed

23 files changed

+73
-67
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ async function installFoundry(): Promise<void> {
527527
server.stdout.on('data', function (data) {
528528
console.log(data.toString())
529529
if (
530-
data.toString().includes("foundryup: done!")
530+
data.toString().includes("foundryup: use - chisel 0.3.0")
531531
) {
532532
console.log('resolving')
533533
resolve()

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ module.exports = {
195195
.journalChildIncludes('inside getOwner', { shouldHaveOnlyOneOccurrence: true })
196196
},
197197

198-
'Emit 2 similar events and check the filtering is done properly #group4': function (browser: NightwatchBrowser) {
198+
'Emit 2 similar events and check the filtering is done properly #group11': function (browser: NightwatchBrowser) {
199199
let addressRef: string
200200
browser
201201
.addFile('contracts/contract_with_event.sol', { content: contract_with_event })
@@ -204,7 +204,6 @@ module.exports = {
204204
.clickLaunchIcon('solidity')
205205
.click('*[data-id="compilerContainerCompileBtn"]')
206206
.clickLaunchIcon('udapp')
207-
.click('*[data-id="deployAndRunClearInstances"]')
208207
.selectContract('Example')
209208
.createContract('')
210209
.getAddressAtPosition(0, (address) => {

‎apps/remix-ide/src/app/providers/style/environment-explorer.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.EECellStyle {
2-
min-height: 6rem;
2+
min-height: 8rem;
33
max-width: 12rem;
44
min-width: 12rem;
55
}

‎apps/remix-ide/src/app/tabs/locale-module.js

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ export class LocaleModule extends Plugin {
7777
const next = localeCode || this.active // Name
7878
if (next === this.active) return // --> exit out of this method
7979
_paq.push(['trackEvent', 'localeModule', 'switchTo', next])
80+
8081
const nextLocale = this.locales[next] // Locale
8182
if (!this.forced) this._deps.config.set('settings/locale', next)
8283

‎apps/remix-ide/src/app/tabs/script-runner-ui.tsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
7171
})
7272

7373
this.plugin.on('fileManager', 'fileSaved', async (file: string) => {
74-
7574
if (file === configFileName && this.enableCustomScriptRunner) {
7675
await this.loadCustomConfig()
7776
this.renderComponent()
@@ -114,7 +113,8 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
114113
activateCustomScriptRunner={this.activateCustomScriptRunner.bind(this)}
115114
saveCustomConfig={this.saveCustomConfig.bind(this)}
116115
openCustomConfig={this.openCustomConfig.bind(this)}
117-
loadScriptRunner={this.selectScriptRunner.bind(this)} />
116+
loadScriptRunner={this.selectScriptRunner.bind(this)}
117+
/>
118118
)
119119
}
120120

@@ -184,7 +184,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
184184
this.setIsLoading(config.name, false)
185185
this.renderComponent()
186186
return result
187-
188187
}
189188

190189
async execute(script: string, filePath: string) {
@@ -289,7 +288,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
289288
}
290289
}
291290
}
292-
293291
}
294292

295293
async openCustomConfig() {

‎apps/remix-ide/src/app/tabs/theme-module.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export class ThemeModule extends Plugin {
118118
}
119119
const next = themeName || this.active // Name
120120
if (next === this.active) return // --> exit out of this method
121-
_paq.push(['trackEvent', 'themeModule', 'switchTo', next])
121+
_paq.push(['trackEvent', 'themeModule', 'switchThemeTo', next])
122122
const nextTheme = this.themes[next] // Theme
123123
if (!this.forced) this._deps.config.set('settings/theme', next)
124124
document.getElementById('theme-link') ? document.getElementById('theme-link').remove() : null

‎apps/remixdesktop/test/tests/app/foundry.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ async function installFoundry(): Promise<void> {
8989
server.stdout.on('data', function (data) {
9090
console.log(data.toString())
9191
if (
92-
data.toString().includes("foundryup: done!")
92+
data.toString().includes("foundryup: use - chisel 0.3.0")
9393
) {
9494
console.log('resolving')
9595
resolve()

‎libs/ghaction-helper/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/ghaction-helper",
3-
"version": "0.1.42",
3+
"version": "0.1.43",
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.48",
22+
"@remix-project/remix-solidity": "^0.5.49",
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.62",
28+
"@remix-project/remix-simulator": "^0.2.63",
2929
"chai": "^4.3.7",
3030
"ethers": "^5.7.2",
3131
"web3": "^4.1.1"
3232
},
3333
"types": "./src/index.d.ts",
34-
"gitHead": "baa8abc9b912288b7a2546bedc717a9229f652c4"
34+
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
3535
}

‎libs/remix-analyzer/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-analyzer",
3-
"version": "0.5.71",
3+
"version": "0.5.72",
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.92",
29-
"@remix-project/remix-lib": "^0.5.69",
28+
"@remix-project/remix-astwalker": "^0.0.93",
29+
"@remix-project/remix-lib": "^0.5.70",
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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
53+
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
5454
"main": "./src/index.js"
5555
}

‎libs/remix-astwalker/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-astwalker",
3-
"version": "0.0.92",
3+
"version": "0.0.93",
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.69",
40+
"@remix-project/remix-lib": "^0.5.70",
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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
56+
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
5757
"types": "./src/index.d.ts"
5858
}

‎libs/remix-debug/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-debug",
3-
"version": "0.5.62",
3+
"version": "0.5.63",
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.92",
30-
"@remix-project/remix-lib": "^0.5.69",
31-
"@remix-project/remix-simulator": "^0.2.62",
32-
"@remix-project/remix-solidity": "^0.5.48",
29+
"@remix-project/remix-astwalker": "^0.0.93",
30+
"@remix-project/remix-lib": "^0.5.70",
31+
"@remix-project/remix-simulator": "^0.2.63",
32+
"@remix-project/remix-solidity": "^0.5.49",
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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
72+
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
7373
"types": "./src/index.d.ts"
7474
}

‎libs/remix-lib/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-lib",
3-
"version": "0.5.69",
3+
"version": "0.5.70",
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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
58+
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
5959
"types": "./src/index.d.ts"
6060
}

‎libs/remix-simulator/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-simulator",
3-
"version": "0.2.62",
3+
"version": "0.2.63",
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.69",
26+
"@remix-project/remix-lib": "^0.5.70",
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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
74+
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
7575
"types": "./src/index.d.ts"
7676
}

‎libs/remix-solidity/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-solidity",
3-
"version": "0.5.48",
3+
"version": "0.5.49",
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.69",
22+
"@remix-project/remix-lib": "^0.5.70",
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": "baa8abc9b912288b7a2546bedc717a9229f652c4"
60+
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
6161
}

‎libs/remix-tests/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-tests",
3-
"version": "0.2.62",
3+
"version": "0.2.63",
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.69",
45-
"@remix-project/remix-simulator": "^0.2.62",
46-
"@remix-project/remix-solidity": "^0.5.48",
44+
"@remix-project/remix-lib": "^0.5.70",
45+
"@remix-project/remix-simulator": "^0.2.63",
46+
"@remix-project/remix-solidity": "^0.5.49",
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": "baa8abc9b912288b7a2546bedc717a9229f652c4"
92+
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
9393
}

‎libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
.remixui_grid_cell_pin {
2828
width: 1rem;
2929
height: 1rem;
30-
position: relative;
31-
right: 2.1rem;
32-
top: 4.7rem;
3330
background: transparent;
3431
z-index: 1000;
3532
}

‎libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx

+12-11
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => {
8686
{ anyEnabled && <div className='mr-2 mt-3 pb-1 d-flex flex-column'>
8787
<div className='d-flex flex-grid'>
8888
<div className={ `${pinned ? "" : "border-dark "}` + "d-flex mx-0 p-2 bg-light border border-secondary remixui_grid_cell_container " + props.classList || ''} data-id={"remixUIGS" + props.title}>
89-
<div className="d-flex remixui_grid_cell w-100 flex-column">
90-
{ !props.hideTitle && <div className='d-flex flex-row pb-1 mb-1 align-items-end' style={{ minWidth: '8rem', height: '1rem' }}>
89+
<div className="d-flex remixui_grid_cell w-100 space-between justify-content-between flex-column">
90+
{ !props.hideTitle && <div className='d-flex flex-row pb-1 my-1 align-items-end' style={{ minWidth: '8rem', height: '1rem' }}>
9191
{ props.logo ? props.logoURL !== '' ?
9292
<a href={props.logoURL} target="__blank">
9393
<img className='remixui_grid_view_logo mr-1' src={props.logo} style={{ width: '1rem', height: '1rem' }}/>
@@ -110,17 +110,18 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => {
110110
}
111111
</div> }
112112
{ props.children }
113+
{ filterCon.showPin && <button
114+
className={`${pinned ? 'fas fa-toggle-on fa-lg text-dark' : 'fas fa-toggle-off fa-lg text-secondary'}` + ` fa-regular border-0 p-0 mt-2 align-self-end mr-1 remixui_grid_cell_pin`}
115+
style={{ fontSize: 'large' }}
116+
data-id={`${pinned ? `${props.id}-pinned` : `${props.id}-unpinned`}`}
117+
onClick={async () => {
118+
if (!props.pinStateCallback) setPinned(!pinned)
119+
if (await props.pinStateCallback(!pinned)) setPinned(!pinned)
120+
}}
121+
></button>}
113122
</div>
114123
</div>
115-
{ filterCon.showPin && <button
116-
className={`${pinned ? 'fas fa-toggle-on fa-lg text-dark' : 'fas fa-toggle-off fa-lg text-secondary'}` + ` fa-regular border-0 mb-0 remixui_grid_cell_pin`}
117-
style={{ fontSize: 'large' }}
118-
data-id={`${pinned ? `${props.id}-pinned` : `${props.id}-unpinned`}`}
119-
onClick={async () => {
120-
if (!props.pinStateCallback) setPinned(!pinned)
121-
if (await props.pinStateCallback(!pinned)) setPinned(!pinned)
122-
}}
123-
></button>}
124+
124125
{ props.tagList && <div className={`d-flex flex-column align-items-begin ` +`${filterCon.showPin ? 'remixui_grid_cell_tags' : 'remixui_grid_cell_tags_no_pin'}`}>
125126
{ Object.keys(props.tagList).map((key) => (
126127
filterCon.keyValueMap[props.tagList[key]]?.enabled && (

‎libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ function HomeTabFeatured(props:HomeTabFeaturedProps) {
5050
autoPlaySpeed={10000}
5151
dotListClass="position-relative mt-2"
5252
>
53-
<div
54-
className="mx-1 px-1 d-flex" // Please do not delete. just comment this out. To be used every year.
53+
{false && <div // no this is not a mistake. keep it false until next year ;)
54+
className="mx-1 px-1 d-flex d-none" // Please do not delete. just comment this out or keep hidden. To be used every year.
5555
>
5656
<a href="https://cryptpad.fr/form/#/2/form/view/pV-DdryeJoYUWvW+gXsFaMNynEY7t5mUsgeD1urgwSE/" target="__blank">
5757
<img className="remixui_carouselImage" src={'/assets/img/solSurvey2024.webp'} alt=""></img>
@@ -83,7 +83,7 @@ function HomeTabFeatured(props:HomeTabFeaturedProps) {
8383
</a>
8484
</p>
8585
</div>
86-
</div>
86+
</div> }
8787
<div className="mr-1 pr-1 d-flex align-items-center justify-content-center h-100">
8888
<a href={releaseDetails.moreLink} target="__blank">
8989
<img src={'assets/img/remi_drums_whatsnew.webp'} className="remixui_carouselImage" alt=""></img>

0 commit comments

Comments
 (0)