Skip to content

Commit 46cb0f4

Browse files
authored
Merge branch 'master' into pipelineoptim
2 parents 89ced3a + 68b798c commit 46cb0f4

File tree

218 files changed

+5764
-3789
lines changed

Some content is hidden

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

218 files changed

+5764
-3789
lines changed

.circleci/config.yml

Lines changed: 9 additions & 672 deletions
Large diffs are not rendered by default.

.env.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ WALLET_CONNECT_PROJECT_ID=<project_id>
66
NOIR_COMPILER_BASE_URL_DEV=<dev_base_endpoint>
77
NOIR_COMPILER_BASE_URL_PROD=<prod_base_endpoint>
88
NOIR_COMPILER_WS_URL_DEV=<dev_websocket_url>
9-
NOIR_COMPILER_WS_URL_PROD=<prod_websocket_url>
9+
NOIR_COMPILER_WS_URL_PROD=<prod_websocket_url>

.github/workflows/pr-reminder.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: PRs reviews reminder
33
on:
44
schedule:
55
- cron: "0 8 * * 1-5"
6-
- cron: '55 8 * * 1-5'
6+
- cron: '50 8 * * 1-5'
77
workflow_dispatch:
88

99
jobs:
@@ -19,7 +19,7 @@ jobs:
1919
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
2020
freeze-date: '2025-07-21T18:00:00Z'
2121
- name: Reminder for standup
22-
if: github.event.schedule == '55 8 * * 1-5'
22+
if: github.event.schedule == '50 8 * * 1-5'
2323
uses: Aniket-Engg/pr-reviews-reminder-action@master
2424
env:
2525
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

apps/remix-dapp/src/locales/en/udapp.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@
6363
"udapp.injectedTitle": "Unfortunately it's not possible to create an account using injected provider. Please create the account directly from your provider (i.e metamask or other of the same type).",
6464
"udapp.createSmartAccount": "Create Gnosis Safe Smart Account",
6565
"udapp.createSmartAccountAlpha": "Create Gnosis Safe Smart Account [ALPHA]",
66-
"udapp.createSmartAccountDesc1":"ERC-4337 introduces smart contracts accounts, which are more advanced than traditional EOAs. These accounts offer features like multi-signature functionality, gasless transactions and custom transaction rules.",
67-
"udapp.createSmartAccountDesc2":"These smart contract accounts are often referred to as Smart Accounts. A Safe Smart Account is a Smart Account with the multi-signature functionality of Gnosis Safe at its core.",
68-
"udapp.createSmartAccountDesc3":"A Smart Account will be created with address listed below as the OWNER. The Owner account signs each transaction (user-operation) made using Smart Account.",
69-
"udapp.createSmartAccountDesc4":"A Smart Account will, by default, have a PAYMASTER attached to it to execute GASLESS transactions. Currently, in Remix, the 4337 updates only work on the SEPOLIA testnet. ",
70-
"udapp.createSmartAccountDesc5":"The Smart Account creation will require signing an initial transaction in the next step.",
66+
"udapp.createSmartAccountDesc1":"ERC-4337 introduces smart contract accounts, also referred as Smart Accounts. These accounts are more advanced than traditional EOAs and offer features like multi-signature functionality, gasless transactions and custom transaction rules.",
67+
"udapp.createSmartAccountDesc2":"A Safe Smart Account is a Smart Account with the multi-signature functionality of Gnosis Safe at its core.",
68+
"udapp.createSmartAccountDesc3":"Here, a Smart Account will be created with address listed below as the OWNER. The Owner account signs each transaction (user-operation) made using Smart Account.",
69+
"udapp.createSmartAccountDesc4":"This Smart Account will, by default, have a PAYMASTER attached to it to execute GASLESS transactions. Currently, in Remix, the ERC4337 updates only work for GNOSIS Mainnet & Ethereum SEPOLIA testnet. ",
70+
"udapp.createSmartAccountDesc5":"Please note that the Smart Account creation will require signing an initial transaction on the next step.",
7171
"udapp.continue": "Continue",
7272
"udapp.authorize": "Authorize",
7373
"udapp.createNewAccount": "Create a new account",

apps/remix-ide-e2e/src/commands/assistantClearChat.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ import { NightwatchBrowser } from 'nightwatch'
22
import EventEmitter from 'events'
33

44
class AssistantClearChat extends EventEmitter {
5-
command(this: NightwatchBrowser): NightwatchBrowser {
6-
this.api.perform((done) => {
7-
clearChat(this.api, () => {
8-
done()
9-
this.emit('complete')
10-
})
11-
})
12-
return this
13-
}
5+
command(this: NightwatchBrowser): NightwatchBrowser {
6+
this.api.perform((done) => {
7+
clearChat(this.api, () => {
8+
done()
9+
this.emit('complete')
10+
})
11+
})
12+
return this
13+
}
1414
}
1515

1616
function clearChat(browser: NightwatchBrowser, done: VoidFunction) {
17-
browser
18-
.execute(function () {
19-
(window as any).remixAIChat.current.clearChat();
20-
}, [])
17+
browser
18+
.execute(function () {
19+
(window as any).remixAIChat.current.clearChat();
20+
}, [])
2121

22-
done()
22+
done()
2323
}
2424

2525
module.exports = AssistantClearChat;

apps/remix-ide-e2e/src/commands/assistantSetProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function setAssistant(browser: NightwatchBrowser, provider: string, done: VoidFu
3030
selector: "//*[@data-id='remix-ai-streaming' and @data-streaming='false']",
3131
})
3232
//.pause()
33-
.perform(() => done())
33+
.perform(() => done())
3434
}
3535

3636
module.exports = SetAssistantProvider

apps/remix-ide-e2e/src/commands/createContract.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ function createContract (browser: NightwatchBrowser, inputParams: string, callba
1717
if (inputParams) {
1818
browser.setValue('.udapp_contractActionsContainerSingle > input', inputParams, function () {
1919
browser
20+
.pause(1000) // wait to get the button enabled
2021
.waitForElementVisible('.udapp_contractActionsContainerSingle > div')
2122
.click('.udapp_contractActionsContainerSingle > div').pause(500).perform(function () { callback() })
2223
})

apps/remix-ide-e2e/src/commands/hideToolTips.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import EventEmitter from 'events'
33

44
class HideToolTips extends EventEmitter {
55
command(this: NightwatchBrowser) {
6+
console.log('Hiding tooltips...')
67
browser
78
.perform((done) => {
89
browser.execute(function () {

apps/remix-ide-e2e/src/commands/verifyLoad.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import EventEmitter from 'events'
33

44
class VerifyLoad extends EventEmitter {
55
command(this: NightwatchBrowser) {
6-
browser.waitForElementPresent({
6+
browser.saveScreenshot('./reports/screenshots/verifyLoad.png').waitForElementPresent({
77
selector: "//span[@data-id='typesloaded']",
88
locateStrategy: 'xpath',
99
timeout: 60000

apps/remix-ide-e2e/src/githttpbackend/setup.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ rm -rf git/bare2.git
55
rm -rf git
66
mkdir -p git
77
cd git
8+
git config --global user.name "ci-bot"
9+
git config --global user.email "[email protected]"
810
git clone --bare https://github.com/ethereum/awesome-remix bare.git
911
git clone --bare https://github.com/ethereum/awesome-remix bare2.git

0 commit comments

Comments
 (0)