Merge branch 'master' into add-contract-verification-checkbox

Author: hsy822

apps/learneth/src/pages/StepDetail/index.tsx

@@ -72,6 +72,40 @@ function StepDetailPage() {
     )
   }
 
+  const VideoRenderer = ({
+    node,
+    src,
+    alt,
+    ...props
+  }: {
+    node?: any;
+    src?: string;
+    alt?: string;
+    [key: string]: any;
+  }) => {
+    if (alt === 'youtube') {
+      /*
+        <iframe width="560" height="315" src="https://www.youtube.com/embed/Eh1qgOurDxU?si=lz1JypmIJZ15OY4g" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
+      */
+      return (
+        <div className="position-relative overflow-hidden" style={{ paddingBottom: '56.25%', maxWidth: '100%', height: '0' }}>
+          <iframe
+            style={{ width: '100%', height: '100%', position: 'absolute', top: 0, left: 0 }}
+            src={src}
+            title="YouTube video player"
+            frameBorder="0"
+            allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+            allowFullScreen
+          />
+        </div>
+      );
+    }
+    if (alt === 'video') {
+      return <video controls src={src} style={{ maxWidth: '100%' }} />;
+    }
+    return <img src={src} alt={alt} {...props} />;
+  };
+
   return (
     <div className='pb-4'>
       <div className="fixed-top">
@@ -104,7 +138,7 @@ function StepDetailPage() {
         </>
       )}
       <div className="container-fluid">
-        <Markdown rehypePlugins={[rehypeRaw]}>{clonedStep.markdown?.content}</Markdown>
+        <Markdown components={{ img:VideoRenderer }} rehypePlugins={[rehypeRaw]}>{clonedStep.markdown?.content}</Markdown>
       </div>
       {clonedStep.test?.content ? (
         <>

apps/remix-ide-e2e/src/tests/etherscan_api.test.ts

@@ -33,7 +33,7 @@ const tests = {
       .execute(() => {
         (document.querySelector('*[data-id="basic-http-providerModalDialogContainer-react"] input[data-id="modalDialogCustomPromp"]') as any).focus()
       }, [], () => {})
-      .setValue('[data-id="modalDialogCustomPromp"]', 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9') // sepolia
+      .setValue('[data-id="modalDialogCustomPromp"]', 'https://go.getblock.io/7fbe62b139884d2c9c1616ca0de8b5b2') // sepolia
       .modalFooterOKClick('basic-http-provider')
       .clickLaunchIcon('solidity') // compile
       .testContracts('Owner_1.sol', { content: verifiedContract }, ['Owner'])

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

@@ -247,7 +247,7 @@ module.exports = {
         .execute(() => {
           (document.querySelector('*[data-id="basic-http-providerModalDialogContainer-react"] input[data-id="modalDialogCustomPromp"]') as any).focus()
         }, [], () => { })
-        .setValue('[data-id="modalDialogCustomPromp"]', 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9')
+        .setValue('[data-id="modalDialogCustomPromp"]', 'https://go.getblock.io/7fbe62b139884d2c9c1616ca0de8b5b2')
         .modalFooterOKClick('basic-http-provider')
         .clickLaunchIcon('filePanel')
         .openFile('README.txt')
@@ -345,7 +345,7 @@ module.exports = {
         .execute(() => {
           (document.querySelector('*[data-id="vm-custom-forkModalDialogContainer-react"] input[data-id="CustomForkNodeUrl"]') as any).focus()
         }, [], () => { })
-        .clearValue('*[data-id="CustomForkNodeUrl"]').pause(1000).setValue('*[data-id="CustomForkNodeUrl"]', 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9')
+        .clearValue('*[data-id="CustomForkNodeUrl"]').pause(1000).setValue('*[data-id="CustomForkNodeUrl"]', 'https://go.getblock.io/7fbe62b139884d2c9c1616ca0de8b5b2')
         .execute(() => {
           (document.querySelector('*[data-id="vm-custom-forkModalDialogContainer-react"] input[data-id="CustomForkBlockNumber"]') as any).focus()
         }, [], () => { })

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

@@ -343,7 +343,7 @@ module.exports = {
       .perform(async (done) => {
         try {
           console.log('getting the provider up..')
-          const provider = new JsonRpcProvider('https://go.getblock.io/56f8bc5187aa4ac696348f67545acf38')
+          const provider = new JsonRpcProvider('https://go.getblock.io/1552e4e35bcf4efe8a78897cba5557f9')
           currentBlockNumber = (await provider.getBlockNumber()) as number
           console.log('getBlockNumber', currentBlockNumber)
           done()

apps/remix-ide/src/app/providers/mainnet-vm-fork-provider.tsx

@@ -18,7 +18,7 @@ export class MainnetForkVMProvider extends BasicVMProvider {
     )
     this.blockchain = blockchain
     this.fork = 'prague'
-    this.nodeUrl = 'https://go.getblock.io/56f8bc5187aa4ac696348f67545acf38'
+    this.nodeUrl = 'https://go.getblock.io/1552e4e35bcf4efe8a78897cba5557f9'
     this.blockNumber = 'latest'
   }
 

apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx

@@ -18,7 +18,7 @@ export class SepoliaForkVMProvider extends BasicVMProvider {
     )
     this.blockchain = blockchain
     this.fork = 'prague'
-    this.nodeUrl = 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9'
+    this.nodeUrl = 'https://go.getblock.io/7fbe62b139884d2c9c1616ca0de8b5b2'
     this.blockNumber = 'latest'
   }
 

libs/remix-debug/src/init.ts

@@ -22,12 +22,8 @@ export function setProvider (web3, url) {
 
 export function web3DebugNode (network) {
   const web3DebugNodes = {
-    Main: 'https://go.getblock.io/56f8bc5187aa4ac696348f67545acf38',
-    Holesky: 'https://go.getblock.io/7b91c53809fb49c787087e02ef84820b',
-    Rinkeby: 'https://remix-rinkeby.ethdevops.io',
-    Ropsten: 'https://remix-ropsten.ethdevops.io',
-    Goerli: 'https://remix-goerli.ethdevops.io',
-    Sepolia: 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9'
+    Main: 'https://go.getblock.io/1552e4e35bcf4efe8a78897cba5557f9',
+    Sepolia: 'https://go.getblock.io/7fbe62b139884d2c9c1616ca0de8b5b2'
   }
   if (web3DebugNodes[network]) {
     return loadWeb3(web3DebugNodes[network])

libs/remix-lib/src/helpers/aaConstants.ts

@@ -4,7 +4,7 @@ import { ZeroAddress } from 'ethers'
 export const aaSupportedNetworks = {
   "11155111": {
     name: "sepolia",
-    publicNodeUrl: "https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9"
+    publicNodeUrl: "https://go.getblock.io/7fbe62b139884d2c9c1616ca0de8b5b2"
   },
   "100": {
     name: "gnosis",