From 264ad5ae8d4dc6c0c8e809c8674ac26757527c95 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 15 Feb 2023 10:44:17 +0100 Subject: [PATCH 1/8] enable the custom fork --- .../app/providers/custom-vm-fork-provider.tsx | 56 +++++++++++++------ apps/remix-ide/src/app/udapp/run-tab.js | 2 +- libs/remix-simulator/src/vm-context.ts | 4 +- 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx index 26218a4656..51caf86950 100644 --- a/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx +++ b/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx @@ -2,6 +2,7 @@ import React, { useRef } from 'react' // eslint-disable-line import * as packageJson from '../../../../../package.json' import { AppModal, ModalTypes } from '@remix-ui/app' import { BasicVMProvider } from './vm-provider' +import { Hardfork } from '@ethereumjs/common' export class CustomForkVMProvider extends BasicVMProvider { nodeUrl: string @@ -11,9 +12,9 @@ export class CustomForkVMProvider extends BasicVMProvider { constructor (blockchain) { super({ name: 'vm-custom-fork', - displayName: 'Custom fork - Remix VM (London)', + displayName: 'Custom fork - Remix VM', kind: 'provider', - description: 'Remix VM (London)', + description: 'Custom fork - Remix VM', methods: ['sendAsync', 'init'], version: packageJson.version }, blockchain) @@ -25,33 +26,52 @@ export class CustomForkVMProvider extends BasicVMProvider { } async init () { - this.inputs = {nodeUrl: '', evm: '', blockNumber: '' } const body = () => { return
+ Please provide information about the custom fork:
- - + +
- - + +
- - + +
} - await ((): Promise => { + const result = await ((): Promise => { return new Promise((resolve, reject) => { const modalContent: AppModal = { id: this.profile.name, title: this.profile.displayName, message: body(), - modalType: ModalTypes.default, + validationFn: (data: any) => { + if(!data.nodeUrl.startsWith("http")) { + return { + valid: false, + message: 'node URL should be a valid URL' + } + } + if (data.blockNumber !== 'latest' && isNaN(data.blockNumber)) { + return { + valid: false, + message: 'blockNumber should be a number or "latest"' + } + } + return { + valid: true, + message: '' + } + }, + modalType: ModalTypes.form, okLabel: 'Connect', cancelLabel: 'Cancel', okFn: (value: string) => { @@ -64,12 +84,12 @@ export class CustomForkVMProvider extends BasicVMProvider { setTimeout(() => reject(new Error('Hide')), 0) } } - this.call('notification', 'modal', modalContent) + return this.call('notification', 'modal', modalContent) }) })() - this.fork = this.inputs.evm - this.nodeUrl = this.inputs.nodeUrl - const block = this.inputs.blockNumber + this.fork = result.evmType + this.nodeUrl = result.nodeUrl + const block = result.blockNumber this.blockNumber = block === 'latest' ? 'latest' : parseInt(block) return { 'fork': this.fork, diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js index a96db8a3a8..869e600170 100644 --- a/apps/remix-ide/src/app/udapp/run-tab.js +++ b/apps/remix-ide/src/app/udapp/run-tab.js @@ -136,7 +136,7 @@ export class RunTab extends ViewPlugin { await addProvider('vm-london', 'Remix VM (London)', false, true, 'london', 'settingsVMLondonMode', titleVM) await addProvider('vm-berlin', 'Remix VM (Berlin)', false, true, 'berlin', 'settingsVMBerlinMode', titleVM) await addProvider('vm-mainnet-fork', 'Remix VM - Mainnet fork', false, true, 'london', 'settingsVMMainnetMode', titleVM) - // await addProvider('vm-custom-fork', 'Remix VM - Custom fork', false, true, '', 'settingsVMCustomMode', titleVM) + await addProvider('vm-custom-fork', 'Remix VM - Custom fork', false, true, '', 'settingsVMCustomMode', titleVM) // external provider await addProvider('hardhat-provider', 'Hardhat Provider', false, false) diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts index c2bf935afa..dc420c931a 100644 --- a/libs/remix-simulator/src/vm-context.ts +++ b/libs/remix-simulator/src/vm-context.ts @@ -168,13 +168,13 @@ export class VMContext { async createVm (hardfork) { let stateManager: StateManager - + console.log('creating a new VM', hardfork, this.nodeUrl, this.blockNumber) if (this.nodeUrl) { let block = this.blockNumber if (this.blockNumber === 'latest') { const provider = new ethers.providers.StaticJsonRpcProvider(this.nodeUrl) block = await provider.getBlockNumber() - } + } stateManager = new CustomEthersStateManager({ provider: this.nodeUrl, blockTag: BigInt(block) From 44f6948a578cf19f0996c5895f78a5c2beb5d704 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 15 Feb 2023 11:17:01 +0100 Subject: [PATCH 2/8] add Sepolia and Goerli provider --- apps/remix-ide/src/app.js | 6 ++++ .../app/providers/goerli-vm-fork-provider.tsx | 29 +++++++++++++++++++ .../providers/sepolia-vm-fork-provider.tsx | 29 +++++++++++++++++++ apps/remix-ide/src/app/udapp/run-tab.js | 2 ++ libs/remix-simulator/src/genesis.ts | 7 ++++- 5 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 apps/remix-ide/src/app/providers/goerli-vm-fork-provider.tsx create mode 100644 apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 403de27733..635d377246 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -29,6 +29,8 @@ import { NotificationPlugin } from './app/plugins/notification' import { Blockchain } from './blockchain/blockchain.js' import { BerlinVMProvider, LondonVMProvider } from './app/providers/vm-provider' import { MainnetForkVMProvider } from './app/providers/mainnet-vm-fork-provider' +import { SepoliaForkVMProvider } from './app/providers/sepolia-vm-fork-provider' +import { GoerliForkVMProvider } from './app/providers/goerli-vm-fork-provider' import { CustomForkVMProvider } from './app/providers/custom-vm-fork-provider' import { HardhatProvider } from './app/providers/hardhat-provider' import { GanacheProvider } from './app/providers/ganache-provider' @@ -207,6 +209,8 @@ class AppComponent { const web3Provider = new Web3ProviderModule(blockchain) const vmProviderCustomFork = new CustomForkVMProvider(blockchain) const vmProviderMainnetFork = new MainnetForkVMProvider(blockchain) + const vmProviderSepoliaFork = new SepoliaForkVMProvider(blockchain) + const vmProviderGoerliFork = new GoerliForkVMProvider(blockchain) const vmProviderBerlin = new BerlinVMProvider(blockchain) const vmProviderLondon = new LondonVMProvider(blockchain) const hardhatProvider = new HardhatProvider(blockchain) @@ -277,6 +281,8 @@ class AppComponent { storagePlugin, vmProviderBerlin, vmProviderLondon, + vmProviderSepoliaFork, + vmProviderGoerliFork, vmProviderMainnetFork, vmProviderCustomFork, hardhatProvider, diff --git a/apps/remix-ide/src/app/providers/goerli-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/goerli-vm-fork-provider.tsx new file mode 100644 index 0000000000..8de9aa832a --- /dev/null +++ b/apps/remix-ide/src/app/providers/goerli-vm-fork-provider.tsx @@ -0,0 +1,29 @@ +import * as packageJson from '../../../../../package.json' +import { BasicVMProvider } from './vm-provider' + +export class GoerliForkVMProvider extends BasicVMProvider { + nodeUrl: string + blockNumber: number | 'latest' + constructor (blockchain) { + super({ + name: 'vm-goerli-fork', + displayName: 'Goerli fork - Remix VM (London)', + kind: 'provider', + description: 'Remix VM (London)', + methods: ['sendAsync', 'init'], + version: packageJson.version + }, blockchain) + this.blockchain = blockchain + this.fork = 'merge' + this.nodeUrl = 'https://remix-sepolia.ethdevops.io' + this.blockNumber = 'latest' + } + + async init () { + return { + 'fork': this.fork, + 'nodeUrl': this.nodeUrl, + 'blockNumber': this.blockNumber + } + } +} diff --git a/apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx new file mode 100644 index 0000000000..9f3fa374ae --- /dev/null +++ b/apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx @@ -0,0 +1,29 @@ +import * as packageJson from '../../../../../package.json' +import { BasicVMProvider } from './vm-provider' + +export class SepoliaForkVMProvider extends BasicVMProvider { + nodeUrl: string + blockNumber: number | 'latest' + constructor (blockchain) { + super({ + name: 'vm-sepolia-fork', + displayName: 'Sepolia fork - Remix VM (London)', + kind: 'provider', + description: 'Remix VM (London)', + methods: ['sendAsync', 'init'], + version: packageJson.version + }, blockchain) + this.blockchain = blockchain + this.fork = 'merge' + this.nodeUrl = 'https://remix-sepolia.ethdevops.io' + this.blockNumber = 'latest' + } + + async init () { + return { + 'fork': this.fork, + 'nodeUrl': this.nodeUrl, + 'blockNumber': this.blockNumber + } + } +} diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js index 869e600170..00a49c4308 100644 --- a/apps/remix-ide/src/app/udapp/run-tab.js +++ b/apps/remix-ide/src/app/udapp/run-tab.js @@ -136,6 +136,8 @@ export class RunTab extends ViewPlugin { await addProvider('vm-london', 'Remix VM (London)', false, true, 'london', 'settingsVMLondonMode', titleVM) await addProvider('vm-berlin', 'Remix VM (Berlin)', false, true, 'berlin', 'settingsVMBerlinMode', titleVM) await addProvider('vm-mainnet-fork', 'Remix VM - Mainnet fork', false, true, 'london', 'settingsVMMainnetMode', titleVM) + await addProvider('vm-sepolia-fork', 'Remix VM - Sepolia fork', false, true, '', 'settingsVMSepoliaMode', titleVM) + await addProvider('vm-goerli-fork', 'Remix VM - Goerli fork', false, true, '', 'settingsVMGoerliMode', titleVM) await addProvider('vm-custom-fork', 'Remix VM - Custom fork', false, true, '', 'settingsVMCustomMode', titleVM) // external provider diff --git a/libs/remix-simulator/src/genesis.ts b/libs/remix-simulator/src/genesis.ts index e62e4e4432..a17ea904c2 100644 --- a/libs/remix-simulator/src/genesis.ts +++ b/libs/remix-simulator/src/genesis.ts @@ -1,13 +1,18 @@ import { Block } from '@ethereumjs/block' +import { ConsensusType } from '@ethereumjs/common' export function generateBlock (vmContext) { + const common = vmContext.vmObject().common + + const difficulty = common.consensusType() === ConsensusType.ProofOfStake ? 0 : 69762765929000 + return new Promise((resolve, reject) => { const block: Block = Block.fromBlockData({ header: { timestamp: (new Date().getTime() / 1000 | 0), number: 0, coinbase: '0x0e9281e9c6a0808672eaba6bd1220e144c9bb07a', - difficulty: 69762765929000, + difficulty, gasLimit: 8000000 } }, { common: vmContext.vmObject().common }) From 913e84883e0f9a462865d7316d321892b757f9f4 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 15 Feb 2023 11:29:56 +0100 Subject: [PATCH 3/8] only keep the "merge" provider --- apps/remix-ide-e2e/src/tests/plugin_api.ts | 2 +- .../src/tests/runAndDeploy.test.ts | 2 +- apps/remix-ide-e2e/src/tests/terminal.test.ts | 2 +- .../src/tests/transactionExecution.test.ts | 2 +- apps/remix-ide/src/app.js | 8 +++--- .../src/app/providers/abstract-provider.tsx | 2 +- .../src/app/providers/vm-provider.tsx | 25 ++++--------------- apps/remix-ide/src/app/udapp/run-tab.js | 9 +++---- .../src/blockchain/execution-context.js | 6 ++--- .../run-tab/src/lib/components/account.tsx | 11 ++------ .../run-tab/src/lib/reducers/runTab.ts | 4 +-- 11 files changed, 24 insertions(+), 49 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/plugin_api.ts b/apps/remix-ide-e2e/src/tests/plugin_api.ts index fabb8d1b44..a30def5ef0 100644 --- a/apps/remix-ide-e2e/src/tests/plugin_api.ts +++ b/apps/remix-ide-e2e/src/tests/plugin_api.ts @@ -183,7 +183,7 @@ module.exports = { }, 'Should select another provider #group1': async function (browser: NightwatchBrowser) { - await clickAndCheckLog(browser, 'udapp:setEnvironmentMode', null, null, { context: 'vm-berlin' }) + await clickAndCheckLog(browser, 'udapp:setEnvironmentMode', null, null, { context: 'vm-merge' }) await browser .frameParent() .useCss() diff --git a/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts b/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts index 15e1eb5e30..39ba9f3e5c 100644 --- a/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts +++ b/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts @@ -32,7 +32,7 @@ module.exports = { 'Should sign message using account key #group2': function (browser: NightwatchBrowser) { browser.waitForElementVisible('*[data-id="settingsRemixRunSignMsg"]') - .switchEnvironment('vm-berlin') + .switchEnvironment('vm-merge') .pause(2000) .click('*[data-id="settingsRemixRunSignMsg"]') .pause(2000) diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index 9f84d684bb..1145fc5d05 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -94,7 +94,7 @@ module.exports = { browser .clickLaunchIcon('settings') .clickLaunchIcon('udapp') - .switchEnvironment('vm-london') + .switchEnvironment('vm-merge') .click('*[data-id="terminalClearConsole"]') // clear the terminal .clickLaunchIcon('filePanel') .click('*[data-id="treeViewDivtreeViewItem"]') // make sure we create the file at the root folder diff --git a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts index f22f843e9e..da0ce80d35 100644 --- a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts +++ b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts @@ -159,7 +159,7 @@ module.exports = { browser .clickLaunchIcon('udapp') .clearTransactions() - .switchEnvironment('vm-london') // switch to London fork + .switchEnvironment('vm-merge') // switch to London fork .selectAccount('0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c') // this account will be used for this test suite .click('.udapp_contractActionsContainerSingle > button') .clickInstance(0) diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 635d377246..3bceb50c10 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -27,7 +27,7 @@ import { StoragePlugin } from './app/plugins/storage' import { Layout } from './app/panels/layout' import { NotificationPlugin } from './app/plugins/notification' import { Blockchain } from './blockchain/blockchain.js' -import { BerlinVMProvider, LondonVMProvider } from './app/providers/vm-provider' +import { MergeVMProvider } from './app/providers/vm-provider' import { MainnetForkVMProvider } from './app/providers/mainnet-vm-fork-provider' import { SepoliaForkVMProvider } from './app/providers/sepolia-vm-fork-provider' import { GoerliForkVMProvider } from './app/providers/goerli-vm-fork-provider' @@ -211,8 +211,7 @@ class AppComponent { const vmProviderMainnetFork = new MainnetForkVMProvider(blockchain) const vmProviderSepoliaFork = new SepoliaForkVMProvider(blockchain) const vmProviderGoerliFork = new GoerliForkVMProvider(blockchain) - const vmProviderBerlin = new BerlinVMProvider(blockchain) - const vmProviderLondon = new LondonVMProvider(blockchain) + const vmProviderMerge = new MergeVMProvider(blockchain) const hardhatProvider = new HardhatProvider(blockchain) const ganacheProvider = new GanacheProvider(blockchain) const foundryProvider = new FoundryProvider(blockchain) @@ -279,8 +278,7 @@ class AppComponent { fetchAndCompile, dGitProvider, storagePlugin, - vmProviderBerlin, - vmProviderLondon, + vmProviderMerge, vmProviderSepoliaFork, vmProviderGoerliFork, vmProviderMainnetFork, diff --git a/apps/remix-ide/src/app/providers/abstract-provider.tsx b/apps/remix-ide/src/app/providers/abstract-provider.tsx index c4a5d65077..a83b435e2b 100644 --- a/apps/remix-ide/src/app/providers/abstract-provider.tsx +++ b/apps/remix-ide/src/app/providers/abstract-provider.tsx @@ -113,7 +113,7 @@ export abstract class AbstractProvider extends Plugin implements IProvider { } this.call('notification', 'alert', modalContent) } - await this.call('udapp', 'setEnvironmentMode', { context: 'vm-london'}) + await this.call('udapp', 'setEnvironmentMode', { context: 'vm-merge'}) return } diff --git a/apps/remix-ide/src/app/providers/vm-provider.tsx b/apps/remix-ide/src/app/providers/vm-provider.tsx index 40e3214f0f..390da923c2 100644 --- a/apps/remix-ide/src/app/providers/vm-provider.tsx +++ b/apps/remix-ide/src/app/providers/vm-provider.tsx @@ -42,32 +42,17 @@ export class BasicVMProvider extends Plugin implements IProvider { } } -export class BerlinVMProvider extends BasicVMProvider { +export class MergeVMProvider extends BasicVMProvider { constructor (blockchain) { super({ - name: 'vm-berlin', - displayName: 'Remix VM (Berlin)', + name: 'vm-merge', + displayName: 'Remix VM (Merge)', kind: 'provider', - description: 'Remix VM (Berlin)', + description: 'Remix VM (Merge)', methods: ['sendAsync', 'init'], version: packageJson.version }, blockchain) this.blockchain = blockchain - this.fork = 'berlin' - } -} - -export class LondonVMProvider extends BasicVMProvider { - constructor (blockchain) { - super({ - name: 'vm-london', - displayName: 'Remix VM (London)', - kind: 'provider', - description: 'Remix VM (London)', - methods: ['sendAsync', 'init'], - version: packageJson.version - }, blockchain) - this.blockchain = blockchain - this.fork = 'london' + this.fork = 'merge' } } \ No newline at end of file diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js index 00a49c4308..179299ff74 100644 --- a/apps/remix-ide/src/app/udapp/run-tab.js +++ b/apps/remix-ide/src/app/udapp/run-tab.js @@ -133,11 +133,10 @@ export class RunTab extends ViewPlugin { // VM const titleVM = 'Execution environment is local to Remix. Data is only saved to browser memory and will vanish upon reload.' - await addProvider('vm-london', 'Remix VM (London)', false, true, 'london', 'settingsVMLondonMode', titleVM) - await addProvider('vm-berlin', 'Remix VM (Berlin)', false, true, 'berlin', 'settingsVMBerlinMode', titleVM) - await addProvider('vm-mainnet-fork', 'Remix VM - Mainnet fork', false, true, 'london', 'settingsVMMainnetMode', titleVM) - await addProvider('vm-sepolia-fork', 'Remix VM - Sepolia fork', false, true, '', 'settingsVMSepoliaMode', titleVM) - await addProvider('vm-goerli-fork', 'Remix VM - Goerli fork', false, true, '', 'settingsVMGoerliMode', titleVM) + await addProvider('vm-merge', 'Remix VM (Merge)', false, true, 'merge', 'settingsVMMergeMode', titleVM) + await addProvider('vm-mainnet-fork', 'Remix VM - Mainnet fork', false, true, 'merge', 'settingsVMMainnetMode', titleVM) + await addProvider('vm-sepolia-fork', 'Remix VM - Sepolia fork', false, true, 'merge', 'settingsVMSepoliaMode', titleVM) + await addProvider('vm-goerli-fork', 'Remix VM - Goerli fork', false, true, 'merge', 'settingsVMGoerliMode', titleVM) await addProvider('vm-custom-fork', 'Remix VM - Custom fork', false, true, '', 'settingsVMCustomMode', titleVM) // external provider diff --git a/apps/remix-ide/src/blockchain/execution-context.js b/apps/remix-ide/src/blockchain/execution-context.js index 692396265d..b762f91484 100644 --- a/apps/remix-ide/src/blockchain/execution-context.js +++ b/apps/remix-ide/src/blockchain/execution-context.js @@ -20,7 +20,7 @@ if (typeof window !== 'undefined' && typeof window.ethereum !== 'undefined') { export class ExecutionContext { constructor () { this.event = new EventManager() - this.executionContext = 'vm-london' + this.executionContext = 'vm-merge' this.lastBlock = null this.blockGasLimitDefault = 4300000 this.blockGasLimit = this.blockGasLimitDefault @@ -35,7 +35,7 @@ export class ExecutionContext { init (config) { if (config.get('settings/always-use-vm')) { - this.executionContext = 'vm-london' + this.executionContext = 'vm-merge' } } @@ -102,7 +102,7 @@ export class ExecutionContext { removeProvider (name) { if (name && this.customNetWorks[name]) { - if (this.executionContext === name) this.setContext('vm-london', null, null, null) + if (this.executionContext === name) this.setContext('vm-merge', null, null, null) delete this.customNetWorks[name] this.event.trigger('removeProvider', [name]) } diff --git a/libs/remix-ui/run-tab/src/lib/components/account.tsx b/libs/remix-ui/run-tab/src/lib/components/account.tsx index 46c611ce50..e36efa3432 100644 --- a/libs/remix-ui/run-tab/src/lib/components/account.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/account.tsx @@ -30,14 +30,7 @@ export function AccountUI (props: AccountProps) { }) break - case 'vm-london': - setPlusOpt({ - classList: '', - title: 'Create a new account' - }) - break - - case 'vm-berlin': + case 'vm-merge': setPlusOpt({ classList: '', title: 'Create a new account' @@ -76,7 +69,7 @@ export function AccountUI (props: AccountProps) { return props.tooltip('Account list is empty, please make sure the current provider is properly connected to remix') } - if (props.selectExEnv !== 'vm-london' && props.selectExEnv !== 'vm-berlin' && props.selectExEnv !== 'injected') { + if (props.selectExEnv !== 'vm-merge' && props.selectExEnv !== 'injected') { return props.modal('Passphrase to sign a message', Date: Wed, 15 Feb 2023 11:37:42 +0100 Subject: [PATCH 4/8] allow starting the custom fork with an empty state --- .../src/app/providers/custom-vm-fork-provider.tsx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx index 51caf86950..aa4cad5144 100644 --- a/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx +++ b/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx @@ -28,7 +28,7 @@ export class CustomForkVMProvider extends BasicVMProvider { async init () { const body = () => { return
- Please provide information about the custom fork: + Please provide information about the custom fork. If the node URL is not provided, the VM will start with an empty state.
@@ -54,7 +54,7 @@ export class CustomForkVMProvider extends BasicVMProvider { title: this.profile.displayName, message: body(), validationFn: (data: any) => { - if(!data.nodeUrl.startsWith("http")) { + if(data.nodeUrl !== '' && !data.nodeUrl.startsWith("http")) { return { valid: false, message: 'node URL should be a valid URL' @@ -89,8 +89,14 @@ export class CustomForkVMProvider extends BasicVMProvider { })() this.fork = result.evmType this.nodeUrl = result.nodeUrl - const block = result.blockNumber - this.blockNumber = block === 'latest' ? 'latest' : parseInt(block) + if (this.nodeUrl) { + const block = result.blockNumber + this.blockNumber = block === 'latest' ? 'latest' : parseInt(block) + } else { + this.nodeUrl = undefined + this.blockNumber = undefined + } + return { 'fork': this.fork, 'nodeUrl': this.nodeUrl, From 3d427260ed7ac4e052e175a2315e0826332f7a36 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 15 Feb 2023 11:45:17 +0100 Subject: [PATCH 5/8] readd berlin and london VM --- apps/remix-ide/src/app.js | 6 +++- .../src/app/providers/vm-provider.tsx | 30 +++++++++++++++++++ apps/remix-ide/src/app/udapp/run-tab.js | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 3bceb50c10..1386443818 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -27,7 +27,7 @@ import { StoragePlugin } from './app/plugins/storage' import { Layout } from './app/panels/layout' import { NotificationPlugin } from './app/plugins/notification' import { Blockchain } from './blockchain/blockchain.js' -import { MergeVMProvider } from './app/providers/vm-provider' +import { MergeVMProvider, LondonVMProvider, BerlinVMProvider} from './app/providers/vm-provider' import { MainnetForkVMProvider } from './app/providers/mainnet-vm-fork-provider' import { SepoliaForkVMProvider } from './app/providers/sepolia-vm-fork-provider' import { GoerliForkVMProvider } from './app/providers/goerli-vm-fork-provider' @@ -212,6 +212,8 @@ class AppComponent { const vmProviderSepoliaFork = new SepoliaForkVMProvider(blockchain) const vmProviderGoerliFork = new GoerliForkVMProvider(blockchain) const vmProviderMerge = new MergeVMProvider(blockchain) + const vmProviderBerlin = new BerlinVMProvider(blockchain) + const vmProviderLondon = new LondonVMProvider(blockchain) const hardhatProvider = new HardhatProvider(blockchain) const ganacheProvider = new GanacheProvider(blockchain) const foundryProvider = new FoundryProvider(blockchain) @@ -279,6 +281,8 @@ class AppComponent { dGitProvider, storagePlugin, vmProviderMerge, + vmProviderBerlin, + vmProviderLondon, vmProviderSepoliaFork, vmProviderGoerliFork, vmProviderMainnetFork, diff --git a/apps/remix-ide/src/app/providers/vm-provider.tsx b/apps/remix-ide/src/app/providers/vm-provider.tsx index 390da923c2..6cd154d31f 100644 --- a/apps/remix-ide/src/app/providers/vm-provider.tsx +++ b/apps/remix-ide/src/app/providers/vm-provider.tsx @@ -55,4 +55,34 @@ export class MergeVMProvider extends BasicVMProvider { this.blockchain = blockchain this.fork = 'merge' } +} + +export class LondonVMProvider extends BasicVMProvider { + constructor (blockchain) { + super({ + name: 'vm-london', + displayName: 'Remix VM (London)', + kind: 'provider', + description: 'Remix VM (London)', + methods: ['sendAsync', 'init'], + version: packageJson.version + }, blockchain) + this.blockchain = blockchain + this.fork = 'london' + } +} + +export class BerlinVMProvider extends BasicVMProvider { + constructor (blockchain) { + super({ + name: 'vm-berlin', + displayName: 'Remix VM (Berlin)', + kind: 'provider', + description: 'Remix VM (Berlin)', + methods: ['sendAsync', 'init'], + version: packageJson.version + }, blockchain) + this.blockchain = blockchain + this.fork = 'berlin' + } } \ No newline at end of file diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js index 179299ff74..539089ff24 100644 --- a/apps/remix-ide/src/app/udapp/run-tab.js +++ b/apps/remix-ide/src/app/udapp/run-tab.js @@ -134,6 +134,8 @@ export class RunTab extends ViewPlugin { // VM const titleVM = 'Execution environment is local to Remix. Data is only saved to browser memory and will vanish upon reload.' await addProvider('vm-merge', 'Remix VM (Merge)', false, true, 'merge', 'settingsVMMergeMode', titleVM) + await addProvider('vm-london', 'Remix VM (London)', false, true, 'london', 'settingsVMLondonMode', titleVM) + await addProvider('vm-berlin', 'Remix VM (Berlin)', false, true, 'berlin', 'settingsVMBerlinMode', titleVM) await addProvider('vm-mainnet-fork', 'Remix VM - Mainnet fork', false, true, 'merge', 'settingsVMMainnetMode', titleVM) await addProvider('vm-sepolia-fork', 'Remix VM - Sepolia fork', false, true, 'merge', 'settingsVMSepoliaMode', titleVM) await addProvider('vm-goerli-fork', 'Remix VM - Goerli fork', false, true, 'merge', 'settingsVMGoerliMode', titleVM) From f310772c45fcef1bf2596125ebecb8571d693b2b Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 15 Feb 2023 11:57:35 +0100 Subject: [PATCH 6/8] add e2e test --- apps/remix-ide-e2e/src/tests/terminal.test.ts | 18 +++++++++++++++++- .../app/providers/custom-vm-fork-provider.tsx | 6 +++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index 1145fc5d05..bc17df00c3 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -288,16 +288,30 @@ module.exports = { }) }, - 'Should connect to the mainnet fork and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) { + 'Should connect to a custom fork, set it to sepolia and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) { browser .clickLaunchIcon('udapp') .switchEnvironment('vm-mainnet-fork') .executeScriptInTerminal(`web3.eth.getCode('0x180587b00c8642e2c7ac3a758712d97e6f7bdcc7')`) // mainnet contract .waitForElementContainsText('*[data-id="terminalJournal"]', '0x608060405260043610601f5760003560e01c80635c60da1b14603157602b565b36602b576029605f565b005b6029605f565b348015603c57600080fd5b5060436097565b6040516001600160a01b03909116815260200160405180910390f35b609560917f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b60d1565b565b600060c97f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b905090565b90565b3660008037600080366000845af43d6000803e80801560ef573d6000f35b3d6000fdfea2646970667358221220969dbb4b1d8aec2bb348e26488dc1a33b6bcf0190f567d161312ab7ca9193d8d64736f6c63430008110033', 120000) }, + + 'Should connect to the mainnet fork and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) { + const bytecode = `` + browser + .clickLaunchIcon('udapp') + .switchEnvironment('vm-custom-fork') + .setValue('*[data-id="CustomForkNodeUrl"]', 'https://remix-sepolia.ethdevops.io') + .setValue('*[data-id="CustomForkBlockNumber"]', 'latest') + .setValue('*[data-id="CustomForkEvmType"]', 'merge') + .executeScriptInTerminal(`web3.eth.getCode('0x75F509A4eDA030470272DfBAf99A47D587E76709')`) // mainnet contract + .waitForElementContainsText('*[data-id="terminalJournal"]', byteCodeInSepolia, 120000) + }, } + + const asyncAwait = ` var p = function () { return new Promise(function (resolve, reject) { @@ -714,3 +728,5 @@ const scriptBlockAndTransaction = ` } })() ` + +const byteCodeInSepolia = `0x6080604052600436106102ae5760003560e01c80637edb2c8111610175578063ba1842c5116100dc578063d2241c2711610095578063f2fde38b1161006f578063f2fde38b14610ab2578063f31b5b3314610adb578063f5839de114610af7578063f69b1b2914610b13576102ae565b8063d2241c2714610a21578063d5abeb0114610a4a578063e985e9c514610a75576102ae565b8063ba1842c5146108fd578063ba70e07514610926578063bd32fb6614610951578063c062977d1461097a578063c7eb4522146109bb578063c87b56dd146109e4576102ae565b8063a0bcfc7f1161012e578063a0bcfc7f14610803578063a22cb4651461082c578063aa98e0c614610855578063b37ee32814610880578063b61aa0e214610897578063b88d4fde146108d4576102ae565b80637edb2c811461070757806383b043e8146107305780638da5cb5b14610759578063938e15d51461078457806395d89b41146107ad5780639abc8320146107d8576102ae565b806342966c68116102195780636c302394116101d25780636c302394146105e75780636f8b44b01461062457806370a082311461064d578063715018a61461068a57806375fea21b146106a15780637696e088146106de576102ae565b806342966c68146104b5578063438b6300146104de578063451cadf61461051b578063474ffc47146105445780634f6ccce71461056d5780636352211e146105aa576102ae565b806318160ddd1161026b57806318160ddd146103c857806323b872dd146103f35780632f745c591461041c5780633ca81826146104595780633ccfd60b1461047557806342842e0e1461048c576102ae565b806301ffc9a7146102b357806306fdde03146102f0578063078a4cae1461031b578063081812fc14610337578063095ea7b314610374578063160e84321461039d575b600080fd5b3480156102bf57600080fd5b506102da60048036038101906102d59190613f85565b610b3e565b6040516102e79190613fcd565b60405180910390f35b3480156102fc57600080fd5b50610305610b50565b6040516103129190614078565b60405180910390f35b61033560048036038101906103309190614135565b610be2565b005b34801561034357600080fd5b5061035e60048036038101906103599190614195565b610ef5565b60405161036b9190614203565b60405180910390f35b34801561038057600080fd5b5061039b6004803603810190610396919061424a565b610f3b565b005b3480156103a957600080fd5b506103b2611052565b6040516103bf91906142a3565b60405180910390f35b3480156103d457600080fd5b506103dd611058565b6040516103ea91906142cd565b60405180910390f35b3480156103ff57600080fd5b5061041a600480360381019061041591906142e8565b611065565b005b34801561042857600080fd5b50610443600480360381019061043e919061424a565b6110c5565b60405161045091906142cd565b60405180910390f35b610473600480360381019061046e9190614135565b61116a565b005b34801561048157600080fd5b5061048a61147e565b005b34801561049857600080fd5b506104b360048036038101906104ae91906142e8565b611521565b005b3480156104c157600080fd5b506104dc60048036038101906104d79190614195565b611541565b005b3480156104ea57600080fd5b506105056004803603810190610500919061433b565b6115da565b6040516105129190614426565b60405180910390f35b34801561052757600080fd5b50610542600480360381019061053d9190614586565b611688565b005b34801561055057600080fd5b5061056b600480360381019061056691906145e2565b61177e565b005b34801561057957600080fd5b50610594600480360381019061058f9190614195565b6117a5565b6040516105a191906142cd565b60405180910390f35b3480156105b657600080fd5b506105d160048036038101906105cc9190614195565b611816565b6040516105de9190614203565b60405180910390f35b3480156105f357600080fd5b5061060e6004803603810190610609919061433b565b61189c565b60405161061b9190613fcd565b60405180910390f35b34801561063057600080fd5b5061064b60048036038101906106469190614195565b611946565b005b34801561065957600080fd5b50610674600480360381019061066f919061433b565b611958565b60405161068191906142cd565b60405180910390f35b34801561069657600080fd5b5061069f611a0f565b005b3480156106ad57600080fd5b506106c860048036038101906106c39190614195565b611a23565b6040516106d59190614203565b60405180910390f35b3480156106ea57600080fd5b50610705600480360381019061070091906145e2565b611a62565b005b34801561071357600080fd5b5061072e600480360381019061072991906145e2565b611a89565b005b34801561073c57600080fd5b506107576004803603810190610752919061464e565b611ab0565b005b34801561076557600080fd5b5061076e611ac2565b60405161077b9190614203565b60405180910390f35b34801561079057600080fd5b506107ab60048036038101906107a69190614730565b611aec565b005b3480156107b957600080fd5b506107c2611b8c565b6040516107cf9190614078565b60405180910390f35b3480156107e457600080fd5b506107ed611c1e565b6040516107fa9190614078565b60405180910390f35b34801561080f57600080fd5b5061082a600480360381019061082591906147d9565b611cac565b005b34801561083857600080fd5b50610853600480360381019061084e919061484e565b611cc7565b005b34801561086157600080fd5b5061086a611cdd565b60405161087791906142a3565b60405180910390f35b34801561088c57600080fd5b50610895611ce3565b005b3480156108a357600080fd5b506108be60048036038101906108b9919061433b565b611cfb565b6040516108cb91906142cd565b60405180910390f35b3480156108e057600080fd5b506108fb60048036038101906108f6919061492f565b611d13565b005b34801561090957600080fd5b50610924600480360381019061091f91906145e2565b611d75565b005b34801561093257600080fd5b5061093b611d9c565b60405161094891906142a3565b60405180910390f35b34801561095d57600080fd5b506109786004803603810190610973919061464e565b611da2565b005b34801561098657600080fd5b506109a1600480360381019061099c9190614195565b611db4565b6040516109b29594939291906149b2565b60405180910390f35b3480156109c757600080fd5b506109e260048036038101906109dd919061433b565b611e72565b005b3480156109f057600080fd5b50610a0b6004803603810190610a069190614195565b611ebe565b604051610a189190614078565b60405180910390f35b348015610a2d57600080fd5b50610a486004803603810190610a43919061464e565b611f26565b005b348015610a5657600080fd5b50610a5f611f38565b604051610a6c91906142cd565b60405180910390f35b348015610a8157600080fd5b50610a9c6004803603810190610a979190614a0c565b611f3e565b604051610aa99190613fcd565b60405180910390f35b348015610abe57600080fd5b50610ad96004803603810190610ad4919061433b565b611fd2565b005b610af56004803603810190610af09190614195565b612055565b005b610b116004803603810190610b0c9190614135565b6122d3565b005b348015610b1f57600080fd5b50610b286125e7565b604051610b359190614203565b60405180910390f35b6000610b498261260d565b9050919050565b606060008054610b5f90614a7b565b80601f0160208091040260200160405190810160405280929190818152602001828054610b8b90614a7b565b8015610bd85780601f10610bad57610100808354040283529160200191610bd8565b820191906000526020600020905b815481529060010190602001808311610bbb57829003601f168201915b5050505050905090565b8282600e54610c59838380806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050508233604051602001610c3e9190614af4565b60405160208183030381529060405280519060200120612687565b610c98576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610c8f90614b81565b60405180910390fd5b610ca13361189c565b15610ce1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610cd890614bed565b60405180910390fd5b600084600d5481610cf0611058565b610cfa9190614c3c565b1115610d3b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d3290614cbc565b60405180910390fd5b600081118015610d61575060116000838152602001908152602001600020600201548111155b610da0576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d9790614d28565b60405180910390fd5b42601160008481526020019081526020016000206003015411158015610ddb5750426011600084815260200190815260200160002060040154115b610e1a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e1190614d94565b60405180910390fd5b856011600080815260200190815260200160002060010154610e3c9190614db4565b341015610e7e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e7590614e42565b60405180910390fd5b610e88338761269e565b6014339080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505050565b6000610f00826126de565b6004600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b6000610f4682611816565b90508073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610fb6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610fad90614ed4565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff16610fd5612729565b73ffffffffffffffffffffffffffffffffffffffff161480611004575061100381610ffe612729565b611f3e565b5b611043576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161103a90614f66565b60405180910390fd5b61104d8383612731565b505050565b600e5481565b6000600880549050905090565b611076611070612729565b826127ea565b6110b5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016110ac90614ff8565b60405180910390fd5b6110c083838361287f565b505050565b60006110d083611958565b8210611111576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016111089061508a565b60405180910390fd5b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600083815260200190815260200160002054905092915050565b82826010546111e1838380806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f8201169050808301925050505050505082336040516020016111c69190614af4565b60405160208183030381529060405280519060200120612687565b611220576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161121790614b81565b60405180910390fd5b6112293361189c565b15611269576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161126090614bed565b60405180910390fd5b600284600d5481611278611058565b6112829190614c3c565b11156112c3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112ba90614cbc565b60405180910390fd5b6000811180156112e9575060116000838152602001908152602001600020600201548111155b611328576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161131f90614d28565b60405180910390fd5b426011600084815260200190815260200160002060030154111580156113635750426011600084815260200190815260200160002060040154115b6113a2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161139990614d94565b60405180910390fd5b856011600060028152602001908152602001600020600101546113c59190614db4565b341015611407576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113fe90614e42565b60405180910390fd5b611411338761269e565b6014339080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505050565b611486612b78565b6000601360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16476040516114ce906150db565b60006040518083038185875af1925050503d806000811461150b576040519150601f19603f3d011682016040523d82523d6000602084013e611510565b606091505b505090508061151e57600080fd5b50565b61153c83838360405180602001604052806000815250611d13565b505050565b61155261154c612729565b826127ea565b8061158f5750611560611ac2565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b6115ce576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016115c590614ff8565b60405180910390fd5b6115d781612bf6565b50565b606060006115e783611958565b905060008167ffffffffffffffff81111561160557611604614448565b5b6040519080825280602002602001820160405280156116335781602001602082028036833780820191505090505b50905060005b8281101561167d5761164b85826110c5565b82828151811061165e5761165d6150f0565b5b60200260200101818152505080806116759061511f565b915050611639565b508092505050919050565b611690612b78565b600d548151836116a09190614db4565b6116a8611058565b6116b29190614c3c565b11156116f3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116ea90614cbc565b60405180910390fd5b60008211611736576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161172d90614d28565b60405180910390fd5b60005b815181101561177957611766828281518110611758576117576150f0565b5b60200260200101518461269e565b80806117719061511f565b915050611739565b505050565b611786612b78565b8060116000848152602001908152602001600020600401819055505050565b60006117af611058565b82106117f0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016117e7906151d9565b60405180910390fd5b60088281548110611804576118036150f0565b5b90600052602060002001549050919050565b60008061182283612d44565b9050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603611893576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161188a90615245565b60405180910390fd5b80915050919050565b6000805b60148054905081101561193b578273ffffffffffffffffffffffffffffffffffffffff16601482815481106118d8576118d76150f0565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611928576001915050611941565b80806119339061511f565b9150506118a0565b50600090505b919050565b61194e612b78565b80600d8190555050565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036119c8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119bf906152d7565b60405180910390fd5b600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b611a17612b78565b611a216000612d81565b565b60148181548110611a3357600080fd5b906000526020600020016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b611a6a612b78565b8060116000848152602001908152602001600020600101819055505050565b611a91612b78565b8060116000848152602001908152602001600020600301819055505050565b611ab8612b78565b8060108190555050565b6000600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b611af4612b78565b84601160008881526020019081526020016000206000019081611b1791906154a3565b50836011600088815260200190815260200160002060010181905550826011600088815260200190815260200160002060020181905550816011600088815260200190815260200160002060030181905550806011600088815260200190815260200160002060040181905550505050505050565b606060018054611b9b90614a7b565b80601f0160208091040260200160405190810160405280929190818152602001828054611bc790614a7b565b8015611c145780601f10611be957610100808354040283529160200191611c14565b820191906000526020600020905b815481529060010190602001808311611bf757829003601f168201915b5050505050905090565b600c8054611c2b90614a7b565b80601f0160208091040260200160405190810160405280929190818152602001828054611c5790614a7b565b8015611ca45780601f10611c7957610100808354040283529160200191611ca4565b820191906000526020600020905b815481529060010190602001808311611c8757829003601f168201915b505050505081565b611cb4612b78565b80600c9081611cc391906154a3565b5050565b611cd9611cd2612729565b8383612e47565b5050565b600f5481565b611ceb612b78565b60146000611cf99190613edb565b565b60126020528060005260406000206000915090505481565b611d24611d1e612729565b836127ea565b611d63576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611d5a90614ff8565b60405180910390fd5b611d6f84848484612fb3565b50505050565b611d7d612b78565b8060116000848152602001908152602001600020600201819055505050565b60105481565b611daa612b78565b80600f8190555050565b6011602052806000526040600020600091509050806000018054611dd790614a7b565b80601f0160208091040260200160405190810160405280929190818152602001828054611e0390614a7b565b8015611e505780601f10611e2557610100808354040283529160200191611e50565b820191906000526020600020905b815481529060010190602001808311611e3357829003601f168201915b5050505050908060010154908060020154908060030154908060040154905085565b611e7a612b78565b80601360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6060611ec9826126de565b6000611ed361300f565b90506000815111611ef35760405180602001604052806000815250611f1e565b80611efd846130a1565b604051602001611f0e9291906155b1565b6040516020818303038152906040525b915050919050565b611f2e612b78565b80600e8190555050565b600d5481565b6000600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b611fda612b78565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603612049576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161204090615647565b60405180910390fd5b61205281612d81565b50565b600381600d5481612064611058565b61206e9190614c3c565b11156120af576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016120a690614cbc565b60405180910390fd5b6000811180156120d5575060116000838152602001908152602001600020600201548111155b612114576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161210b90614d28565b60405180910390fd5b4260116000848152602001908152602001600020600301541115801561214f5750426011600084815260200190815260200160002060040154115b61218e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161218590614d94565b60405180910390fd5b42600f601260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546121db9190614c3c565b1061221b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612212906156b3565b60405180910390fd5b8260116000600381526020019081526020016000206001015461223e9190614db4565b341015612280576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161227790614e42565b60405180910390fd5b61228a338461269e565b42601260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550505050565b8282600f5461234a838380806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050823360405160200161232f9190614af4565b60405160208183030381529060405280519060200120612687565b612389576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161238090614b81565b60405180910390fd5b6123923361189c565b156123d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016123c990614bed565b60405180910390fd5b600184600d54816123e1611058565b6123eb9190614c3c565b111561242c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161242390614cbc565b60405180910390fd5b600081118015612452575060116000838152602001908152602001600020600201548111155b612491576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161248890614d28565b60405180910390fd5b426011600084815260200190815260200160002060030154111580156124cc5750426011600084815260200190815260200160002060040154115b61250b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161250290614d94565b60405180910390fd5b8560116000600181526020019081526020016000206001015461252e9190614db4565b341015612570576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161256790614e42565b60405180910390fd5b61257a338761269e565b6014339080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505050565b601360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60007f780e9d63000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161480612680575061267f8261316f565b5b9050919050565b6000826126948584613251565b1490509392505050565b60005b818110156126d9576126b3600b6132a7565b6126c6836126c1600b6132bd565b6132cb565b80806126d19061511f565b9150506126a1565b505050565b6126e7816132e9565b612726576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161271d90615245565b60405180910390fd5b50565b600033905090565b816004600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff166127a483611816565b73ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560405160405180910390a45050565b6000806127f683611816565b90508073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16148061283857506128378185611f3e565b5b8061287657508373ffffffffffffffffffffffffffffffffffffffff1661285e84610ef5565b73ffffffffffffffffffffffffffffffffffffffff16145b91505092915050565b8273ffffffffffffffffffffffffffffffffffffffff1661289f82611816565b73ffffffffffffffffffffffffffffffffffffffff16146128f5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016128ec90615745565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603612964576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161295b906157d7565b60405180910390fd5b612971838383600161332a565b8273ffffffffffffffffffffffffffffffffffffffff1661299182611816565b73ffffffffffffffffffffffffffffffffffffffff16146129e7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016129de90615745565b60405180910390fd5b6004600082815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055506001600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540192505081905550816002600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4612b738383836001613488565b505050565b612b80612729565b73ffffffffffffffffffffffffffffffffffffffff16612b9e611ac2565b73ffffffffffffffffffffffffffffffffffffffff1614612bf4576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612beb90615843565b60405180910390fd5b565b6000612c0182611816565b9050612c1181600084600161332a565b612c1a82611816565b90506004600083815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055506002600083815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905581600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4612d40816000846001613488565b5050565b60006002600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b6000600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081600a60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35050565b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603612eb5576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612eac906158af565b60405180910390fd5b80600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3183604051612fa69190613fcd565b60405180910390a3505050565b612fbe84848461287f565b612fca8484848461348e565b613009576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161300090615941565b60405180910390fd5b50505050565b6060600c805461301e90614a7b565b80601f016020809104026020016040519081016040528092919081815260200182805461304a90614a7b565b80156130975780601f1061306c57610100808354040283529160200191613097565b820191906000526020600020905b81548152906001019060200180831161307a57829003601f168201915b5050505050905090565b6060600060016130b084613615565b01905060008167ffffffffffffffff8111156130cf576130ce614448565b5b6040519080825280601f01601f1916602001820160405280156131015781602001600182028036833780820191505090505b509050600082602001820190505b600115613164578080600190039150507f3031323334353637383961626364656600000000000000000000000000000000600a86061a8153600a858161315857613157615961565b5b0494506000850361310f575b819350505050919050565b60007f80ac58cd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916148061323a57507f5b5e139f000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916145b8061324a575061324982613768565b5b9050919050565b60008082905060005b845181101561329c576132878286838151811061327a576132796150f0565b5b60200260200101516137d2565b915080806132949061511f565b91505061325a565b508091505092915050565b6001816000016000828254019250508190555050565b600081600001549050919050565b6132e58282604051806020016040528060008152506137fd565b5050565b60008073ffffffffffffffffffffffffffffffffffffffff1661330b83612d44565b73ffffffffffffffffffffffffffffffffffffffff1614159050919050565b61333684848484613858565b600181111561337a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161337190615a02565b60405180910390fd5b6000829050600073ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16036133c1576133bc8161397e565b613400565b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16146133ff576133fe85826139c7565b5b5b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16036134425761343d81613b34565b613481565b8473ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16146134805761347f8482613c05565b5b5b5050505050565b50505050565b60006134af8473ffffffffffffffffffffffffffffffffffffffff16613c84565b15613608578373ffffffffffffffffffffffffffffffffffffffff1663150b7a026134d8612729565b8786866040518563ffffffff1660e01b81526004016134fa9493929190615a77565b6020604051808303816000875af192505050801561353657506040513d601f19601f820116820180604052508101906135339190615ad8565b60015b6135b8573d8060008114613566576040519150601f19603f3d011682016040523d82523d6000602084013e61356b565b606091505b5060008151036135b0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016135a790615941565b60405180910390fd5b805181602001fd5b63150b7a0260e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161491505061360d565b600190505b949350505050565b600080600090507a184f03e93ff9f4daa797ed6e38ed64bf6a1f0100000000000000008310613673577a184f03e93ff9f4daa797ed6e38ed64bf6a1f010000000000000000838161366957613668615961565b5b0492506040810190505b6d04ee2d6d415b85acef810000000083106136b0576d04ee2d6d415b85acef810000000083816136a6576136a5615961565b5b0492506020810190505b662386f26fc1000083106136df57662386f26fc1000083816136d5576136d4615961565b5b0492506010810190505b6305f5e1008310613708576305f5e10083816136fe576136fd615961565b5b0492506008810190505b612710831061372d57612710838161372357613722615961565b5b0492506004810190505b60648310613750576064838161374657613745615961565b5b0492506002810190505b600a831061375f576001810190505b80915050919050565b60007f01ffc9a7000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916149050919050565b60008183106137ea576137e58284613ca7565b6137f5565b6137f48383613ca7565b5b905092915050565b6138078383613cbe565b613814600084848461348e565b613853576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161384a90615941565b60405180910390fd5b505050565b600181111561397857600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16146138ec5780600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546138e49190615b05565b925050819055505b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16146139775780600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825461396f9190614c3c565b925050819055505b5b50505050565b6008805490506009600083815260200190815260200160002081905550600881908060018154018082558091505060019003906000526020600020016000909190919091505550565b600060016139d484611958565b6139de9190615b05565b9050600060076000848152602001908152602001600020549050818114613ac3576000600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600084815260200190815260200160002054905080600660008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600084815260200190815260200160002081905550816007600083815260200190815260200160002081905550505b6007600084815260200190815260200160002060009055600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008381526020019081526020016000206000905550505050565b60006001600880549050613b489190615b05565b9050600060096000848152602001908152602001600020549050600060088381548110613b7857613b776150f0565b5b906000526020600020015490508060088381548110613b9a57613b996150f0565b5b906000526020600020018190555081600960008381526020019081526020016000208190555060096000858152602001908152602001600020600090556008805480613be957613be8615b39565b5b6001900381819060005260206000200160009055905550505050565b6000613c1083611958565b905081600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600083815260200190815260200160002081905550806007600084815260200190815260200160002081905550505050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b600082600052816020526040600020905092915050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603613d2d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401613d2490615bb4565b60405180910390fd5b613d36816132e9565b15613d76576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401613d6d90615c20565b60405180910390fd5b613d8460008383600161332a565b613d8d816132e9565b15613dcd576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401613dc490615c20565b60405180910390fd5b6001600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540192505081905550816002600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4613ed7600083836001613488565b5050565b5080546000825590600052602060002090810190613ef99190613efc565b50565b5b80821115613f15576000816000905550600101613efd565b5090565b6000604051905090565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b613f6281613f2d565b8114613f6d57600080fd5b50565b600081359050613f7f81613f59565b92915050565b600060208284031215613f9b57613f9a613f23565b5b6000613fa984828501613f70565b91505092915050565b60008115159050919050565b613fc781613fb2565b82525050565b6000602082019050613fe26000830184613fbe565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015614022578082015181840152602081019050614007565b60008484015250505050565b6000601f19601f8301169050919050565b600061404a82613fe8565b6140548185613ff3565b9350614064818560208601614004565b61406d8161402e565b840191505092915050565b60006020820190508181036000830152614092818461403f565b905092915050565b600080fd5b600080fd5b600080fd5b60008083601f8401126140bf576140be61409a565b5b8235905067ffffffffffffffff8111156140dc576140db61409f565b5b6020830191508360208202830111156140f8576140f76140a4565b5b9250929050565b6000819050919050565b614112816140ff565b811461411d57600080fd5b50565b60008135905061412f81614109565b92915050565b60008060006040848603121561414e5761414d613f23565b5b600084013567ffffffffffffffff81111561416c5761416b613f28565b5b614178868287016140a9565b9350935050602061418b86828701614120565b9150509250925092565b6000602082840312156141ab576141aa613f23565b5b60006141b984828501614120565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006141ed826141c2565b9050919050565b6141fd816141e2565b82525050565b600060208201905061421860008301846141f4565b92915050565b614227816141e2565b811461423257600080fd5b50565b6000813590506142448161421e565b92915050565b6000806040838503121561426157614260613f23565b5b600061426f85828601614235565b925050602061428085828601614120565b9150509250929050565b6000819050919050565b61429d8161428a565b82525050565b60006020820190506142b86000830184614294565b92915050565b6142c7816140ff565b82525050565b60006020820190506142e260008301846142be565b92915050565b60008060006060848603121561430157614300613f23565b5b600061430f86828701614235565b935050602061432086828701614235565b925050604061433186828701614120565b9150509250925092565b60006020828403121561435157614350613f23565b5b600061435f84828501614235565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b61439d816140ff565b82525050565b60006143af8383614394565b60208301905092915050565b6000602082019050919050565b60006143d382614368565b6143dd8185614373565b93506143e883614384565b8060005b8381101561441957815161440088826143a3565b975061440b836143bb565b9250506001810190506143ec565b5085935050505092915050565b6000602082019050818103600083015261444081846143c8565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6144808261402e565b810181811067ffffffffffffffff8211171561449f5761449e614448565b5b80604052505050565b60006144b2613f19565b90506144be8282614477565b919050565b600067ffffffffffffffff8211156144de576144dd614448565b5b602082029050602081019050919050565b60006145026144fd846144c3565b6144a8565b90508083825260208201905060208402830185811115614525576145246140a4565b5b835b8181101561454e578061453a8882614235565b845260208401935050602081019050614527565b5050509392505050565b600082601f83011261456d5761456c61409a565b5b813561457d8482602086016144ef565b91505092915050565b6000806040838503121561459d5761459c613f23565b5b60006145ab85828601614120565b925050602083013567ffffffffffffffff8111156145cc576145cb613f28565b5b6145d885828601614558565b9150509250929050565b600080604083850312156145f9576145f8613f23565b5b600061460785828601614120565b925050602061461885828601614120565b9150509250929050565b61462b8161428a565b811461463657600080fd5b50565b60008135905061464881614622565b92915050565b60006020828403121561466457614663613f23565b5b600061467284828501614639565b91505092915050565b600080fd5b600067ffffffffffffffff82111561469b5761469a614448565b5b6146a48261402e565b9050602081019050919050565b82818337600083830152505050565b60006146d36146ce84614680565b6144a8565b9050828152602081018484840111156146ef576146ee61467b565b5b6146fa8482856146b1565b509392505050565b600082601f8301126147175761471661409a565b5b81356147278482602086016146c0565b91505092915050565b60008060008060008060c0878903121561474d5761474c613f23565b5b600061475b89828a01614120565b965050602087013567ffffffffffffffff81111561477c5761477b613f28565b5b61478889828a01614702565b955050604061479989828a01614120565b94505060606147aa89828a01614120565b93505060806147bb89828a01614120565b92505060a06147cc89828a01614120565b9150509295509295509295565b6000602082840312156147ef576147ee613f23565b5b600082013567ffffffffffffffff81111561480d5761480c613f28565b5b61481984828501614702565b91505092915050565b61482b81613fb2565b811461483657600080fd5b50565b60008135905061484881614822565b92915050565b6000806040838503121561486557614864613f23565b5b600061487385828601614235565b925050602061488485828601614839565b9150509250929050565b600067ffffffffffffffff8211156148a9576148a8614448565b5b6148b28261402e565b9050602081019050919050565b60006148d26148cd8461488e565b6144a8565b9050828152602081018484840111156148ee576148ed61467b565b5b6148f98482856146b1565b509392505050565b600082601f8301126149165761491561409a565b5b81356149268482602086016148bf565b91505092915050565b6000806000806080858703121561494957614948613f23565b5b600061495787828801614235565b945050602061496887828801614235565b935050604061497987828801614120565b925050606085013567ffffffffffffffff81111561499a57614999613f28565b5b6149a687828801614901565b91505092959194509250565b600060a08201905081810360008301526149cc818861403f565b90506149db60208301876142be565b6149e860408301866142be565b6149f560608301856142be565b614a0260808301846142be565b9695505050505050565b60008060408385031215614a2357614a22613f23565b5b6000614a3185828601614235565b9250506020614a4285828601614235565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680614a9357607f821691505b602082108103614aa657614aa5614a4c565b5b50919050565b60008160601b9050919050565b6000614ac482614aac565b9050919050565b6000614ad682614ab9565b9050919050565b614aee614ae9826141e2565b614acb565b82525050565b6000614b008284614add565b60148201915081905092915050565b7f4164647265737320646f6573206e6f7420657869737420696e204d696e746c6960008201527f7374210000000000000000000000000000000000000000000000000000000000602082015250565b6000614b6b602383613ff3565b9150614b7682614b0f565b604082019050919050565b60006020820190508181036000830152614b9a81614b5e565b9050919050565b7f416c65616479204d696e74656421000000000000000000000000000000000000600082015250565b6000614bd7600e83613ff3565b9150614be282614ba1565b602082019050919050565b60006020820190508181036000830152614c0681614bca565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000614c47826140ff565b9150614c52836140ff565b9250828201905080821115614c6a57614c69614c0d565b5b92915050565b7f4d617820737570706c7920657863656564656421000000000000000000000000600082015250565b6000614ca6601483613ff3565b9150614cb182614c70565b602082019050919050565b60006020820190508181036000830152614cd581614c99565b9050919050565b7f496e76616c6964206d696e7420616d6f756e7421000000000000000000000000600082015250565b6000614d12601483613ff3565b9150614d1d82614cdc565b602082019050919050565b60006020820190508181036000830152614d4181614d05565b9050919050565b7f53616c6573206973206e6f742079657421000000000000000000000000000000600082015250565b6000614d7e601183613ff3565b9150614d8982614d48565b602082019050919050565b60006020820190508181036000830152614dad81614d71565b9050919050565b6000614dbf826140ff565b9150614dca836140ff565b9250828202614dd8816140ff565b91508282048414831517614def57614dee614c0d565b5b5092915050565b7f496e73756666696369656e742066756e64732100000000000000000000000000600082015250565b6000614e2c601383613ff3565b9150614e3782614df6565b602082019050919050565b60006020820190508181036000830152614e5b81614e1f565b9050919050565b7f4552433732313a20617070726f76616c20746f2063757272656e74206f776e6560008201527f7200000000000000000000000000000000000000000000000000000000000000602082015250565b6000614ebe602183613ff3565b9150614ec982614e62565b604082019050919050565b60006020820190508181036000830152614eed81614eb1565b9050919050565b7f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60008201527f6b656e206f776e6572206f7220617070726f76656420666f7220616c6c000000602082015250565b6000614f50603d83613ff3565b9150614f5b82614ef4565b604082019050919050565b60006020820190508181036000830152614f7f81614f43565b9050919050565b7f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560008201527f72206f7220617070726f76656400000000000000000000000000000000000000602082015250565b6000614fe2602d83613ff3565b9150614fed82614f86565b604082019050919050565b6000602082019050818103600083015261501181614fd5565b9050919050565b7f455243373231456e756d657261626c653a206f776e657220696e646578206f7560008201527f74206f6620626f756e6473000000000000000000000000000000000000000000602082015250565b6000615074602b83613ff3565b915061507f82615018565b604082019050919050565b600060208201905081810360008301526150a381615067565b9050919050565b600081905092915050565b50565b60006150c56000836150aa565b91506150d0826150b5565b600082019050919050565b60006150e6826150b8565b9150819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600061512a826140ff565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361515c5761515b614c0d565b5b600182019050919050565b7f455243373231456e756d657261626c653a20676c6f62616c20696e646578206f60008201527f7574206f6620626f756e64730000000000000000000000000000000000000000602082015250565b60006151c3602c83613ff3565b91506151ce82615167565b604082019050919050565b600060208201905081810360008301526151f2816151b6565b9050919050565b7f4552433732313a20696e76616c696420746f6b656e2049440000000000000000600082015250565b600061522f601883613ff3565b915061523a826151f9565b602082019050919050565b6000602082019050818103600083015261525e81615222565b9050919050565b7f4552433732313a2061646472657373207a65726f206973206e6f74206120766160008201527f6c6964206f776e65720000000000000000000000000000000000000000000000602082015250565b60006152c1602983613ff3565b91506152cc82615265565b604082019050919050565b600060208201905081810360008301526152f0816152b4565b9050919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b6000600883026153597fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8261531c565b615363868361531c565b95508019841693508086168417925050509392505050565b6000819050919050565b60006153a061539b615396846140ff565b61537b565b6140ff565b9050919050565b6000819050919050565b6153ba83615385565b6153ce6153c6826153a7565b848454615329565b825550505050565b600090565b6153e36153d6565b6153ee8184846153b1565b505050565b5b81811015615412576154076000826153db565b6001810190506153f4565b5050565b601f82111561545757615428816152f7565b6154318461530c565b81016020851015615440578190505b61545461544c8561530c565b8301826153f3565b50505b505050565b600082821c905092915050565b600061547a6000198460080261545c565b1980831691505092915050565b60006154938383615469565b9150826002028217905092915050565b6154ac82613fe8565b67ffffffffffffffff8111156154c5576154c4614448565b5b6154cf8254614a7b565b6154da828285615416565b600060209050601f83116001811461550d57600084156154fb578287015190505b6155058582615487565b86555061556d565b601f19841661551b866152f7565b60005b828110156155435784890151825560018201915060208501945060208101905061551e565b86831015615560578489015161555c601f891682615469565b8355505b6001600288020188555050505b505050505050565b600081905092915050565b600061558b82613fe8565b6155958185615575565b93506155a5818560208601614004565b80840191505092915050565b60006155bd8285615580565b91506155c98284615580565b91508190509392505050565b7f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160008201527f6464726573730000000000000000000000000000000000000000000000000000602082015250565b6000615631602683613ff3565b915061563c826155d5565b604082019050919050565b6000602082019050818103600083015261566081615624565b9050919050565b7f426f74206973206e6f7420616c6c6f7765643a00000000000000000000000000600082015250565b600061569d601383613ff3565b91506156a882615667565b602082019050919050565b600060208201905081810360008301526156cc81615690565b9050919050565b7f4552433732313a207472616e736665722066726f6d20696e636f72726563742060008201527f6f776e6572000000000000000000000000000000000000000000000000000000602082015250565b600061572f602583613ff3565b915061573a826156d3565b604082019050919050565b6000602082019050818103600083015261575e81615722565b9050919050565b7f4552433732313a207472616e7366657220746f20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b60006157c1602483613ff3565b91506157cc82615765565b604082019050919050565b600060208201905081810360008301526157f0816157b4565b9050919050565b7f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572600082015250565b600061582d602083613ff3565b9150615838826157f7565b602082019050919050565b6000602082019050818103600083015261585c81615820565b9050919050565b7f4552433732313a20617070726f766520746f2063616c6c657200000000000000600082015250565b6000615899601983613ff3565b91506158a482615863565b602082019050919050565b600060208201905081810360008301526158c88161588c565b9050919050565b7f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560008201527f63656976657220696d706c656d656e7465720000000000000000000000000000602082015250565b600061592b603283613ff3565b9150615936826158cf565b604082019050919050565b6000602082019050818103600083015261595a8161591e565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b7f455243373231456e756d657261626c653a20636f6e736563757469766520747260008201527f616e7366657273206e6f7420737570706f727465640000000000000000000000602082015250565b60006159ec603583613ff3565b91506159f782615990565b604082019050919050565b60006020820190508181036000830152615a1b816159df565b9050919050565b600081519050919050565b600082825260208201905092915050565b6000615a4982615a22565b615a538185615a2d565b9350615a63818560208601614004565b615a6c8161402e565b840191505092915050565b6000608082019050615a8c60008301876141f4565b615a9960208301866141f4565b615aa660408301856142be565b8181036060830152615ab88184615a3e565b905095945050505050565b600081519050615ad281613f59565b92915050565b600060208284031215615aee57615aed613f23565b5b6000615afc84828501615ac3565b91505092915050565b6000615b10826140ff565b9150615b1b836140ff565b9250828203905081811115615b3357615b32614c0d565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b7f4552433732313a206d696e7420746f20746865207a65726f2061646472657373600082015250565b6000615b9e602083613ff3565b9150615ba982615b68565b602082019050919050565b60006020820190508181036000830152615bcd81615b91565b9050919050565b7f4552433732313a20746f6b656e20616c7265616479206d696e74656400000000600082015250565b6000615c0a601c83613ff3565b9150615c1582615bd4565b602082019050919050565b60006020820190508181036000830152615c3981615bfd565b905091905056fea2646970667358221220cab453c54d0f54378c32d8041ca80fa3466bf7165db0242b387ea2433b3f619264736f6c63430008110033` diff --git a/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx index aa4cad5144..1257433c17 100644 --- a/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx +++ b/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx @@ -31,15 +31,15 @@ export class CustomForkVMProvider extends BasicVMProvider { Please provide information about the custom fork. If the node URL is not provided, the VM will start with an empty state.
- +
- +
- {Object.keys(Hardfork).map((value, index) => { return })} From 5383f1482c2649666baf309b86043dee547a2c51 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 15 Feb 2023 12:30:14 +0100 Subject: [PATCH 7/8] fix e2e test --- apps/remix-ide-e2e/src/tests/terminal.test.ts | 2 +- apps/remix-ide-e2e/src/tests/transactionExecution.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index bc17df00c3..bea99c7011 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -94,7 +94,7 @@ module.exports = { browser .clickLaunchIcon('settings') .clickLaunchIcon('udapp') - .switchEnvironment('vm-merge') + .switchEnvironment('vm-london') .click('*[data-id="terminalClearConsole"]') // clear the terminal .clickLaunchIcon('filePanel') .click('*[data-id="treeViewDivtreeViewItem"]') // make sure we create the file at the root folder diff --git a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts index da0ce80d35..f22f843e9e 100644 --- a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts +++ b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts @@ -159,7 +159,7 @@ module.exports = { browser .clickLaunchIcon('udapp') .clearTransactions() - .switchEnvironment('vm-merge') // switch to London fork + .switchEnvironment('vm-london') // switch to London fork .selectAccount('0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c') // this account will be used for this test suite .click('.udapp_contractActionsContainerSingle > button') .clickInstance(0) From 5141e3e040f8e4be3eec23fcec5cf09012587f82 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 15 Feb 2023 13:42:37 +0100 Subject: [PATCH 8/8] fix test --- apps/remix-ide-e2e/src/tests/plugin_api.ts | 2 +- apps/remix-ide-e2e/src/tests/terminal.test.ts | 27 +++++++++++++------ .../app/providers/custom-vm-fork-provider.tsx | 4 +-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/plugin_api.ts b/apps/remix-ide-e2e/src/tests/plugin_api.ts index a30def5ef0..fabb8d1b44 100644 --- a/apps/remix-ide-e2e/src/tests/plugin_api.ts +++ b/apps/remix-ide-e2e/src/tests/plugin_api.ts @@ -183,7 +183,7 @@ module.exports = { }, 'Should select another provider #group1': async function (browser: NightwatchBrowser) { - await clickAndCheckLog(browser, 'udapp:setEnvironmentMode', null, null, { context: 'vm-merge' }) + await clickAndCheckLog(browser, 'udapp:setEnvironmentMode', null, null, { context: 'vm-berlin' }) await browser .frameParent() .useCss() diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index bea99c7011..0ce9c70b7a 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -288,7 +288,7 @@ module.exports = { }) }, - 'Should connect to a custom fork, set it to sepolia and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) { + 'Should connect to mainnet fork and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) { browser .clickLaunchIcon('udapp') .switchEnvironment('vm-mainnet-fork') @@ -296,15 +296,26 @@ module.exports = { .waitForElementContainsText('*[data-id="terminalJournal"]', '0x608060405260043610601f5760003560e01c80635c60da1b14603157602b565b36602b576029605f565b005b6029605f565b348015603c57600080fd5b5060436097565b6040516001600160a01b03909116815260200160405180910390f35b609560917f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b60d1565b565b600060c97f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b905090565b90565b3660008037600080366000845af43d6000803e80801560ef573d6000f35b3d6000fdfea2646970667358221220969dbb4b1d8aec2bb348e26488dc1a33b6bcf0190f567d161312ab7ca9193d8d64736f6c63430008110033', 120000) }, - 'Should connect to the mainnet fork and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) { - const bytecode = `` + 'Should connect to the sepolia fork and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) { browser - .clickLaunchIcon('udapp') .switchEnvironment('vm-custom-fork') - .setValue('*[data-id="CustomForkNodeUrl"]', 'https://remix-sepolia.ethdevops.io') - .setValue('*[data-id="CustomForkBlockNumber"]', 'latest') - .setValue('*[data-id="CustomForkEvmType"]', 'merge') - .executeScriptInTerminal(`web3.eth.getCode('0x75F509A4eDA030470272DfBAf99A47D587E76709')`) // mainnet contract + .waitForElementPresent('[data-id="vm-custom-fork-modal-footer-ok-react"]') + .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://remix-sepolia.ethdevops.io') + .execute(() => { + (document.querySelector('*[data-id="vm-custom-forkModalDialogContainer-react"] input[data-id="CustomForkBlockNumber"]') as any).focus() + }, [], () => { }) + .clearValue('*[data-id="CustomForkBlockNumber"]').setValue('*[data-id="CustomForkBlockNumber"]', 'latest') + .execute(() => { + (document.querySelector('*[data-id="vm-custom-forkModalDialogContainer-react"] input[data-id="CustomForkEvmType"]') as any).focus() + }, [], () => { }) + .click('*[data-id="CustomForkEvmType"] [value="merge"]') + .pause(5000) + .modalFooterOKClick('vm-custom-fork') + .pause(5000) + .executeScriptInTerminal(`web3.eth.getCode('0x75F509A4eDA030470272DfBAf99A47D587E76709')`) // sepolia contract .waitForElementContainsText('*[data-id="terminalJournal"]', byteCodeInSepolia, 120000) }, } diff --git a/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx index 1257433c17..de275ff0f2 100644 --- a/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx +++ b/apps/remix-ide/src/app/providers/custom-vm-fork-provider.tsx @@ -31,11 +31,11 @@ export class CustomForkVMProvider extends BasicVMProvider { Please provide information about the custom fork. If the node URL is not provided, the VM will start with an empty state.
- +
- +