File tree Expand file tree Collapse file tree 7 files changed +2
-22
lines changed
Expand file tree Collapse file tree 7 files changed +2
-22
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ export class MainnetForkVMProvider extends BasicVMProvider {
88 super (
99 {
1010 name : 'vm-mainnet-fork' ,
11- displayName : 'Mainet fork - Remix VM (Cancun)' ,
11+ displayName : 'Mainnet fork - Remix VM (Cancun)' ,
1212 kind : 'provider' ,
1313 description : 'Remix VM (London)' ,
1414 methods : [ 'sendAsync' , 'init' ] ,
Original file line number Diff line number Diff line change 55 */
66import 'core-js/stable'
77import 'regenerator-runtime/runtime'
8- // import 'text-encoding'
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ const version = require('../../package.json').version
66const fs = require ( 'fs' )
77const TerserPlugin = require ( 'terser-webpack-plugin' )
88const CssMinimizerPlugin = require ( 'css-minimizer-webpack-plugin' )
9- const rustbnWasm = require ( 'rustbn-wasm' )
109const path = require ( 'path' )
1110
1211const versionData = {
Original file line number Diff line number Diff line change @@ -375,7 +375,7 @@ export class TxListener {
375375
376376 _decodeInputParams ( data , abi ) {
377377 data = toBytes ( addHexPrefix ( data ) )
378- if ( ! data . length ) data = new Uint8Array ( 32 * abi . inputs . length ) // ensuring the data is at least filled by 0 cause `AbiCoder` throws if there's not engouh data
378+ if ( ! data . length ) data = new Uint8Array ( 32 * abi . inputs . length ) // ensuring the data is at least filled by 0 cause `AbiCoder` throws if there's not enough data
379379
380380 const inputTypes = [ ]
381381 for ( let i = 0 ; i < abi . inputs . length ; i ++ ) {
Original file line number Diff line number Diff line change @@ -46,7 +46,6 @@ export class VmProxy {
4646 stateCopy : EVMStateManagerInterface
4747 flagrecordVMSteps : boolean
4848 lastMemoryUpdate : Array < string >
49- randomCallHash : bigint
5049 callIncrement : bigint
5150 txRunning : boolean
5251
@@ -93,26 +92,13 @@ export class VmProxy {
9392 this . blocks = { }
9493 this . lastMemoryUpdate = [ ]
9594 this . flagrecordVMSteps = true
96- this . randomCallHash = BigInt ( '0x34c5f87d9ac75c4b2a3ba8fba43c30456a346c6a9e250bf48f29167fc6798826' )
9795 this . callIncrement = BigInt ( 1 )
9896 this . txRunning = false
9997 }
10098
10199 setVM ( vm ) {
102100 if ( this . vm === vm ) return
103101 this . vm = vm
104- /*this.vm.evm.events.on('beforeMessage', async (data: Message, resolve: (result?: any) => void) => {
105- if (!this.txRunning) {
106- await this.messageWillProcess(data)
107- }
108- resolve()
109- })
110- this.vm.evm.events.on('afterMessage', async (data: EVMResult, resolve: (result?: any) => void) => {
111- if (!this.txRunning) {
112- await this.messageProcessed(data)
113- }
114- resolve()
115- })*/
116102 this . vm . evm . events . on ( 'step' , async ( data : InterpreterStep , resolve : ( result ?: any ) => void ) => {
117103 await this . pushTrace ( data )
118104 resolve ( )
Original file line number Diff line number Diff line change @@ -148,7 +148,6 @@ export class Transactions {
148148 }
149149
150150 eth_estimateGas ( payload , cb ) {
151- // return cb(null, 3000000)
152151 // from might be lowercased address (web3)
153152 if ( payload . params && payload . params . length > 0 && payload . params [ 0 ] . from ) {
154153 payload . params [ 0 ] . from = toChecksumAddress ( payload . params [ 0 ] . from )
Original file line number Diff line number Diff line change @@ -15,20 +15,17 @@ describe('Events', () => {
1515 it ( 'should deploy 2 contracts which emit events and retrieve these events using different block ranges' , async function ( ) {
1616 const accounts : string [ ] = await web3 . eth . getAccounts ( )
1717 // deploy the contract "test".
18- console . log ( 'sendTransaction for receiptTest' )
1918 const receiptTest = await web3 . eth . sendTransaction ( {
2019 from : accounts [ 0 ] ,
2120 gas : 1000000 ,
2221 data : '0x608060405234801561001057600080fd5b506101ea806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80632801617e14610030575b600080fd5b61004a6004803603810190610045919061015d565b61004c565b005b8073ffffffffffffffffffffffffffffffffffffffff1663a6f9dae1306040518263ffffffff1660e01b81526004016100859190610199565b600060405180830381600087803b15801561009f57600080fd5b505af11580156100b3573d6000803e3d6000fd5b50505050607b7fdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc60405160405180910390a250565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610118826100ed565b9050919050565b600061012a8261010d565b9050919050565b61013a8161011f565b811461014557600080fd5b50565b60008135905061015781610131565b92915050565b600060208284031215610173576101726100e8565b5b600061018184828501610148565b91505092915050565b6101938161010d565b82525050565b60006020820190506101ae600083018461018a565b9291505056fea2646970667358221220cf5368dd204d44a75752e8ba7512b73d2f54b09f6ca6147e376dd3cf2942b96464736f6c63430008120033'
2322 } , null , { checkRevertBeforeSending : false , ignoreGasPricing : true } )
24- console . log ( 'receiptTest' , receiptTest . contractAddress )
2523 // deploy the contract "owner", this will trigger an event.
2624 const receiptOwner = await web3 . eth . sendTransaction ( {
2725 from : accounts [ 0 ] ,
2826 gas : 1000000 ,
2927 data : '0x608060405234801561001057600080fd5b5061005a6040518060400160405280601b81526020017f4f776e657220636f6e7472616374206465706c6f7965642062793a00000000008152503361011a60201b61015b1760201c565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167f342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a73560405160405180910390a361034d565b6101b882826040516024016101309291906102ee565b6040516020818303038152906040527f319af333000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506101bc60201b60201c565b5050565b6101dd816101d86101e060201b6101f71761020160201b60201c565b60201c565b50565b60006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b61021360201b61023d17819050919050565b61021b61031e565b565b600081519050919050565b600082825260208201905092915050565b60005b8381101561025757808201518184015260208101905061023c565b60008484015250505050565b6000601f19601f8301169050919050565b600061027f8261021d565b6102898185610228565b9350610299818560208601610239565b6102a281610263565b840191505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102d8826102ad565b9050919050565b6102e8816102cd565b82525050565b600060408201905081810360008301526103088185610274565b905061031760208301846102df565b9392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052605160045260246000fd5b6104268061035c6000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063893d20e81461003b578063a6f9dae114610059575b600080fd5b610043610075565b6040516100509190610288565b60405180910390f35b610073600480360381019061006e91906102d4565b61009e565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b8073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a73560405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6101f38282604051602401610171929190610391565b6040516020818303038152906040527f319af333000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050610218565b5050565b60006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b61022f816102276101f7610232565b63ffffffff16565b50565b61023d819050919050565b6102456103c1565b565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061027282610247565b9050919050565b61028281610267565b82525050565b600060208201905061029d6000830184610279565b92915050565b600080fd5b6102b181610267565b81146102bc57600080fd5b50565b6000813590506102ce816102a8565b92915050565b6000602082840312156102ea576102e96102a3565b5b60006102f8848285016102bf565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561033b578082015181840152602081019050610320565b60008484015250505050565b6000601f19601f8301169050919050565b600061036382610301565b61036d818561030c565b935061037d81856020860161031d565b61038681610347565b840191505092915050565b600060408201905081810360008301526103ab8185610358565b90506103ba6020830184610279565b9392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052605160045260246000fdfea2646970667358221220cb7beb012e0831cc632ed85a11a8652f72efc03360c81beb1fcd842a7782c3cb64736f6c63430008120033'
3028 } , null , { checkRevertBeforeSending : false , ignoreGasPricing : true } )
31- console . log ( 'receiptOwner' , receiptOwner . contractAddress )
3229 // call function set(Owner p) from "test", this will trigger 2 events, one from each contract.
3330 await web3 . eth . sendTransaction ( {
3431 from : accounts [ 0 ] ,
You can’t perform that action at this time.
0 commit comments