Merge branch 'master' into typo

oliveredget · web-flow · commit c3e8e6b4be6f · 2025-01-06T23:08:01.000+08:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.gg/mh9hFCKkEq).
+Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.com/invite/nfv6ZYjAeP).
 
 ## Development
 Remix libraries work closely with [Remix IDE](https://remix.ethereum.org). Each library has a README to explain its application.
@@ -72,7 +72,7 @@ import panelJson from './panel.json';
 import enJson from '../en';
 
 // There may have some untranslated content. Always fill in the gaps with EN JSON.
-// No need for a defaultMessage prop when render a FormattedMessage component.
+// No need for a defaultMessage prop when rendering a FormattedMessage component.
 export default Object.assign({}, enJson, {
   ...panelJson,
 })
diff --git a/apps/doc-viewer/webpack.config.js b/apps/doc-viewer/webpack.config.js
@@ -28,7 +28,7 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
     new webpack.DefinePlugin({})
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/learneth/src/pages/StepDetail/index.tsx b/apps/learneth/src/pages/StepDetail/index.tsx
@@ -85,7 +85,7 @@ function StepDetailPage() {
           <div className="errorloadingspacer"></div>
           <h1 className="pl-3 pr-3 pt-3 pb-1">{clonedStep.name}</h1>
           <button
-            className="w-100nav-item rounded-0 nav-link btn btn-success test"
+            className="w-100 nav-item rounded-0 nav-link btn btn-success test"
             onClick={() => {
               dispatch({
                 type: 'remixide/displayFile',
diff --git a/apps/remix-dapp/src/locales/en/udapp.json b/apps/remix-dapp/src/locales/en/udapp.json
@@ -133,7 +133,7 @@
   "udapp.contractCreation": "Contract Creation",
   "udapp.transactionFee": "Transaction is invalid. Max fee should not be less than Base fee",
   "udapp.title1": "Represents the part of the tx fee that goes to the miner.",
-  "udapp.title2": "Represents the maximum amount of fee that you will pay for this transaction. The minimun needs to be set to base fee.",
+  "udapp.title2": "Represents the maximum amount of fee that you will pay for this transaction. The minimum needs to be set to base fee.",
   "udapp.gasPrice": "Gas price",
   "udapp.gweiText": "visit {a} for current gas price info.",
   "udapp.maxTransactionFee": "Max transaction fee",
diff --git a/apps/remix-ide-e2e/src/tests/layout.test.ts b/apps/remix-ide-e2e/src/tests/layout.test.ts
@@ -26,7 +26,7 @@ module.exports = {
       .assert.containsText('.sidepanel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
       .waitForElementNotVisible('.pinned-panel h6[data-id="sidePanelSwapitTitle"]')
   },
-  'Should pin a plugin while a another plugin is already pinned': function (browser: NightwatchBrowser) {
+  'Should pin a plugin while an another plugin is already pinned': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('[data-id="movePluginToRight"]')
       .click('[data-id="movePluginToRight"]')
       .waitForElementVisible('[data-id="movePluginToLeft"]')
diff --git a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
@@ -101,7 +101,7 @@ module.exports = {
         browser.assert.equal(content, 'testing')
       })
   },
-  'Should have a artifacts file with JSON test data #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
+  'Should have an artifacts file with JSON test data #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .click('*[data-id="treeViewLitreeViewItemtest_contracts/artifacts"]')
       .openFile('test_contracts/artifacts/Storage_metadata.json')
@@ -111,7 +111,7 @@ module.exports = {
         browser.assert.equal(metadata.test, 'data')
       })
   },
-  'Should have a empty workspace #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
+  'Should have an empty workspace #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .switchWorkspace('emptyspace')
   },
diff --git a/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts b/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts
@@ -7,7 +7,7 @@ module.exports = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     // this test suite also contribute testing https://github.com/ethereum/remix/pull/1497 and https://github.com/ethereum/remix-ide/pull/2898
     // quick explanation:
-    // the goal of https://github.com/ethereum/remix-ide/pull/2898 is to keep track of all the compiled contracts an not only the last one.
+    // the goal of https://github.com/ethereum/remix-ide/pull/2898 is to keep track of all the compiled contracts a not only the last one.
     // this introduce an issue: if 2 compiled contracts have the same name, the second one override the first which is not wanted.
     // fix's delivered by https://github.com/ethereum/remix/pull/1497: instead of getting contract by name,
     // which result in name clashing we process the whole contract object (which contain bytecode, deployedbytecode, ...)
diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts
diff --git a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -434,7 +434,7 @@ module.exports = {
       .click('*[data-id="saveGitHubCredentials"]')
       .modalFooterOKClick('github-credentials-error')
   },
-  'check source controle panel #group5': function (browser: NightwatchBrowser) {
+  'check source control panel #group5': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
       .click('*[data-id="sourcecontrol-panel"]')
@@ -448,7 +448,7 @@ module.exports = {
       .clickLaunchIcon('filePanel')
       .switchWorkspace('default_workspace')
   },
-  'check source controle panel again #group5': function (browser: NightwatchBrowser) {
+  'check source control panel again #group5': function (browser: NightwatchBrowser) {
     browser
       .pause(1000)
       .clickLaunchIcon('dgit')
@@ -485,7 +485,7 @@ module.exports = {
           'Incorrect content')
       })
   },
-  'check source controle panel for uniswap #group5': function (browser: NightwatchBrowser) {
+  'check source control panel for uniswap #group5': function (browser: NightwatchBrowser) {
     browser
       .pause(5000)
       .clickLaunchIcon('dgit')
diff --git a/libs/remix-ai-core/src/helpers/streamHandler.ts b/libs/remix-ai-core/src/helpers/streamHandler.ts
@@ -58,6 +58,6 @@ export const HandleStreamResponse = async (streamResponse,
   }
 }
 
-export const UpdtateChatHistory = (userPromptprompt: string, AIAnswer: string) => {
-  ChatHistory.pushHistory(userPromptprompt, AIAnswer)
-}
+export const UpdateChatHistory = (userPrompt: string, AIAnswer: string) => {
+  ChatHistory.pushHistory(userPrompt, AIAnswer)
+}
diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/functionCallGraph.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/functionCallGraph.ts
@@ -33,7 +33,7 @@ function buildLocalFuncCallGraphInternal (functions: FunctionHLAst[], nodeFilter
  *    "functions": {
  *      "KingOfTheEtherThrone.claimThrone(string memory)": {    // function in KingOfEtherThrone
  *        "node": {...},                                        // function node as defined in abstractAstView.js
- *        "calls": {                                            // list of full qualified function names which are called form this function
+ *        "calls": {                                            // list of full qualified function names which are called from this function
  *        }
  *      }
  *    }
diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts
@@ -179,7 +179,7 @@ function getFunctionCallType (func: FunctionCallAstNode): string {
 }
 
 /**
- * Get the variable name written to by a effect node, except for inline assembly because there is no information to find out where we write to. Trows if not a effect node or is inlineassmbly.
+ * Get the variable name written to by a effect node, except for inline assembly because there is no information to find out where we write to. Throws if not a effect node or is inline assembly.
  * Example: x = 10; => x
  * @effectNode {ASTNode} Assignment node
  * @return {string} variable name written to
diff --git a/libs/remix-astwalker/src/sourceMappings.ts b/libs/remix-astwalker/src/sourceMappings.ts
@@ -8,7 +8,7 @@ export declare interface SourceMappings {
 }
 
 /**
- * Turn an character offset into a "LineColPosition".
+ * Turn a character offset into a "LineColPosition".
  *
  * @param offset  The character offset to convert.
  */
diff --git a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
@@ -19,7 +19,7 @@ export class OpenZeppelinProxy extends Plugin {
   }
 
   async isConcerned(ast: ContractAST = {} as ContractAST): Promise<boolean> {
-    // check in the AST if it's an upgradable contract
+    // check in the AST if it's an upgradeable contract
     const UUPSSymbol = ast.exportedSymbols && ast.exportedSymbols[UUPS] ? ast.exportedSymbols[UUPS][0] : null
 
     if (UUPSSymbol) {
diff --git a/libs/remix-lib/src/execution/logsManager.ts b/libs/remix-lib/src/execution/logsManager.ts
@@ -52,7 +52,21 @@ export class LogsManager {
   }
 
   eventMatchesFilter (changeEvent, queryType, queryFilter) {
-    if (queryFilter.topics.filter((logTopic) => changeEvent.log.topics.indexOf(logTopic) >= 0).length === 0) return false
+    // topics should match
+    let noMatch = false
+    for (let i = 0; i < queryFilter.topics.length; i++) {
+      if (!queryFilter.topics[i]) {
+        continue // if the topic isn't defined, we consider it a match.
+      }
+      if (Array.isArray(queryFilter.topics[i])) {
+        if (queryFilter.topics[i].indexOf(changeEvent.log.topics[i]) === -1) {
+          noMatch = true
+        }
+        continue
+      }
+      if (queryFilter.topics[i] !== changeEvent.log.topics[i]) noMatch = true
+    }
+    if (noMatch) return false
 
     if (queryType === 'logs') {
       const fromBlock = parseInt(queryFilter.fromBlock || '0x0')
diff --git a/libs/remix-lib/src/hash.ts b/libs/remix-lib/src/hash.ts
@@ -37,7 +37,7 @@ export const keccak256 = function(a: Buffer): Uint8Array {
 }
 
 /**
- * Creates Keccak hash of a utf-8 string input
+ * Creates Keccak hash of an utf-8 string input
  * @param a The input data (String)
  * @param bits (number = 256) The Keccak width
  */
diff --git a/libs/remix-simulator/test/events.ts b/libs/remix-simulator/test/events.ts
@@ -38,14 +38,14 @@ describe('Events', () => {
         address: receiptTest.contractAddress,
         fromBlock: 3,
         toBlock: 'latest',
-        topics: ['0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc', '0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735']
+        topics: ['0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']
       })
 
       let ownerLogs = await web3.eth.getPastLogs({
         address: receiptOwner.contractAddress,
         fromBlock: 3,
         toBlock: 'latest',
-        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']
+        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735']
       })
 
       // this should include the event triggered by the "set" transaction call.
@@ -56,7 +56,7 @@ describe('Events', () => {
         address: receiptOwner.contractAddress,
         fromBlock: 2,
         toBlock: 'latest',
-        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']
+        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735']
       })
       // this should include the event triggered from the ctor.
       assert.equal(ownerLogs.length, 2, '3) ownerLogs length should be equal to 2')
@@ -65,10 +65,19 @@ describe('Events', () => {
         address: receiptOwner.contractAddress,
         fromBlock: 1,
         toBlock: 2,
-        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']
+        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735']
       })
       // this should only include the event triggered from the ctor.
       assert.equal(ownerLogs.length, 1, '4) ownerLogs length should be equal to 1')
+
+      ownerLogs = await web3.eth.getPastLogs({
+        address: receiptOwner.contractAddress,
+        fromBlock: 1,
+        toBlock: 2,
+        topics: [['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']]
+      })
+      // 0xdcd9c7fa0342f01013b is a topic from a event emitted by the other contract and should not be take into account.
+      assert.equal(ownerLogs.length, 1, '5) ownerLogs length should be equal to 1')
     })
   })
 })
diff --git a/libs/remix-ui/git/src/lib/listeners.ts b/libs/remix-ui/git/src/lib/listeners.ts
@@ -36,7 +36,7 @@ class AsyncDebouncedQueue {
   }
 }
 
-export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<gitActionDispatch>, appDispatcher: React.Dispatch<AppAction>, loaderDispatcher: React.Dispatch<any>, setAtivePanel: React.Dispatch<React.SetStateAction<string>>, platform: appPlatformTypes) => {
+export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<gitActionDispatch>, appDispatcher: React.Dispatch<AppAction>, loaderDispatcher: React.Dispatch<any>, setActivePanel: React.Dispatch<React.SetStateAction<string>>, platform: appPlatformTypes) => {
   plugin = viewPlugin
   gitDispatch = gitDispatcher
   loaderDispatch = loaderDispatcher
@@ -200,7 +200,7 @@ export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<g
   })
 
   plugin.on('dgit' as any, 'openPanel', async (panel: string) => {
-    setAtivePanel(panel)
+    setActivePanel(panel)
   })
 
   plugin.on('dgit' as any, 'init', async () => {
diff --git a/libs/remix-ui/plugin-manager/src/types.d.ts b/libs/remix-ui/plugin-manager/src/types.d.ts
@@ -20,7 +20,7 @@ export class RemixEngine extends Engine {
 export function isNative(name: any): any
 /**
  * Checks if plugin caller 'from' is allowed to activate plugin 'to'
- * The caller can have 'canActivate' as a optional property in the plugin profile.
+ * The caller can have 'canActivate' as an optional property in the plugin profile.
  * This is an array containing the 'name' property of the plugin it wants to call.
  * canActivate = ['plugin1-to-call','plugin2-to-call',....]
  * or the plugin is allowed by default because it is native

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {`
`28`	`28`	`new webpack.DefinePlugin({})`
`29`	`29`	`)`
`30`	`30`
`31`		`- // souce-map loader`
	`31`	`+ // source-map loader`
`32`	`32`	`config.module.rules.push({`
`33`	`33`	`test: /\.js$/,`
`34`	`34`	`use: ['source-map-loader'],`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,6 @@ export const HandleStreamResponse = async (streamResponse,`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`-export const UpdtateChatHistory = (userPromptprompt: string, AIAnswer: string) => {`
`62`		`- ChatHistory.pushHistory(userPromptprompt, AIAnswer)`
`63`		`-}`
	`61`	`+export const UpdateChatHistory = (userPrompt: string, AIAnswer: string) => {`
	`62`	`+ ChatHistory.pushHistory(userPrompt, AIAnswer)`
	`63`	`+}`