add eth_getStorageAt

5 years ago · 61e8922f1e
parent a1d4be80ce
commit 61e8922f1e
4 changed files with 224 additions and 38 deletions
--- a/remix-simulator/README.md
+++ b/remix-simulator/README.md
@ -16,7 +16,7 @@ Implemented:
 * [~] eth_accounts
 * [X] eth_blockNumber
 * [X] eth_getBalance
-* [_] eth_getStorageAt
+* [~] eth_getStorageAt
 * [X] eth_getTransactionCount
 * [X] eth_getBlockTransactionCountByHash
 * [X] eth_getBlockTransactionCountByNumber
--- a/remix-simulator/src/methods/accounts.js
+++ b/remix-simulator/src/methods/accounts.js
@ -65,7 +65,7 @@ Accounts.prototype.eth_sign = function (payload, cb) {
  let message = payload.params[1]

  let privateKey = this.accountsKeys[address]
-  let account = Web3.eth.accounts.privateKeyToAccount(privateKey)
+  let account = this.web3.eth.accounts.privateKeyToAccount(privateKey)

  let data = account.sign(message)

--- a/remix-simulator/src/methods/blocks.js
+++ b/remix-simulator/src/methods/blocks.js
@ -17,7 +17,8 @@ Blocks.prototype.methods = function () {
    eth_getBlockTransactionCountByHash: this.eth_getBlockTransactionCountByHash.bind(this),
    eth_getBlockTransactionCountByNumber: this.eth_getBlockTransactionCountByNumber.bind(this),
    eth_getUncleCountByBlockHash: this.eth_getUncleCountByBlockHash.bind(this),
-    eth_getUncleCountByBlockNumber: this.eth_getUncleCountByBlockNumber.bind(this)
+    eth_getUncleCountByBlockNumber: this.eth_getUncleCountByBlockNumber.bind(this),
+    eth_getStorageAt: this.eth_getStorageAt.bind(this)
  }
 }

@ -117,4 +118,17 @@ Blocks.prototype.eth_getUncleCountByBlockNumber = function (payload, cb) {
  cb(null, 0)
 }

+Blocks.prototype.eth_getStorageAt = function (payload, cb) {
+  const [address, position, blockNumber] = payload.params
+
+  executionContext.web3().debug.storageRangeAt(blockNumber, 'latest', address.toLowerCase(), position, 1, (err, result) => {
+    if (err || (result.storage && Object.values(result.storage).length === 0)) {
+      return cb(err, '')
+    }
+
+    let value = Object.values(result.storage)[0].value
+    cb(err, value)
+  })
+}
+
 module.exports = Blocks
--- a/remix-simulator/test/blocks.js
+++ b/remix-simulator/test/blocks.js
@ -12,40 +12,212 @@ describe('blocks', function () {
    web3.setProvider(provider)
  })

-  it('should get block given its number', async function () {
-    let block = await web3.eth.getBlock(0)
-
-    let expectedBlock = {
-      difficulty: '69762765929000',
-      extraData: '0x0',
-      gasLimit: 8000000,
-      gasUsed: 0,
-      hash: block.hash.toString('hex'),
-      logsBloom: '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331',
-      miner: '0x0000000000000000000000000000000000000001',
-      nonce: '0x0000000000000000',
-      number: 0,
-      parentHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
-      sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
-      size: 163591,
-      stateRoot: '0xa633ca0e8f0ae4e86d4d572b048ea93d84eb4b11e2c988b48cb3a5f6f10b3c68',
-      timestamp: block.timestamp,
-      totalDifficulty: '0',
-      transactions: [],
-      transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421',
-      uncles: []
-    }
-
-    assert.deepEqual(block, expectedBlock)
-  })
-
-  it('should get gas price', async function () {
-    let gasPrice = await web3.eth.getGasPrice()
-    assert.equal(gasPrice, 1)
-  })
-
-  it('should get coinbase', async function () {
-    let coinbase = await web3.eth.getCoinbase()
-    assert.equal(coinbase, '0x0000000000000000000000000000000000000001')
+  describe('eth_getBlockByNumber', () => {
+    it('should get block given its number', async function () {
+      let block = await web3.eth.getBlock(0)
+
+      let expectedBlock = {
+        difficulty: '69762765929000',
+        extraData: '0x0',
+        gasLimit: 8000000,
+        gasUsed: 0,
+        hash: block.hash.toString('hex'),
+        logsBloom: '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331',
+        miner: '0x0000000000000000000000000000000000000001',
+        nonce: '0x0000000000000000',
+        number: 0,
+        parentHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
+        sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
+        size: 163591,
+        stateRoot: '0xa633ca0e8f0ae4e86d4d572b048ea93d84eb4b11e2c988b48cb3a5f6f10b3c68',
+        timestamp: block.timestamp,
+        totalDifficulty: '0',
+        transactions: [],
+        transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421',
+        uncles: []
+      }
+
+      assert.deepEqual(block, expectedBlock)
+    })
+  })
+
+  describe('eth_getGasPrice', () => {
+    it('should get gas price', async function () {
+      let gasPrice = await web3.eth.getGasPrice()
+      assert.equal(gasPrice, 1)
+    })
+  })
+
+  describe('eth_coinbase', () => {
+    it('should get coinbase', async function () {
+      let coinbase = await web3.eth.getCoinbase()
+      assert.equal(coinbase, '0x0000000000000000000000000000000000000001')
+    })
+  })
+
+  describe('eth_blockNumber', () => {
+    it('should get current block number', async function () {
+      let number = await web3.eth.getBlockNumber()
+      assert.equal(number, 0)
+    })
+  })
+
+  describe('eth_getBlockByHash', () => {
+    it('should get block given its hash', async function () {
+      let correctBlock = await web3.eth.getBlock(0)
+      let block = await web3.eth.getBlock(correctBlock.hash)
+
+      assert.deepEqual(block, correctBlock)
+    })
+  })
+
+  describe('eth_getBlockTransactionCountByHash', () => {
+    it('should get block given its hash', async function () {
+      let correctBlock = await web3.eth.getBlock(0)
+      let numberTransactions = await web3.eth.getBlockTransactionCount(correctBlock.hash)
+
+      assert.deepEqual(numberTransactions, 0)
+    })
+  })
+
+  describe('eth_getBlockTransactionCountByNumber', () => {
+    it('should get block given its hash', async function () {
+      let numberTransactions = await web3.eth.getBlockTransactionCount(0)
+
+      assert.deepEqual(numberTransactions, 0)
+    })
+  })
+
+  describe('eth_getUncleCountByBlockHash', () => {
+    it('should get block given its hash', async function () {
+      let correctBlock = await web3.eth.getBlock(0)
+      let numberTransactions = await (new Promise((resolve, reject) => {
+        web3._requestManager.send({method: 'eth_getUncleCountByBlockHash', params: [correctBlock.hash]}, (err, numberTransactions) => {
+          if (err) return reject(err)
+          resolve(numberTransactions)
+        })
+      }))
+      assert.deepEqual(numberTransactions, correctBlock.uncles.length)
+    })
+  })
+
+  describe('eth_getUncleCountByBlockNumber', () => {
+    it('should get block given its number', async function () {
+      let correctBlock = await web3.eth.getBlock(0)
+      let numberTransactions = await (new Promise((resolve, reject) => {
+        web3._requestManager.send({method: 'eth_getUncleCountByBlockHash', params: [0]}, (err, numberTransactions) => {
+          if (err) return reject(err)
+          resolve(numberTransactions)
+        })
+      }))
+      assert.deepEqual(numberTransactions, correctBlock.uncles.length)
+    })
+  })
+
+  describe('eth_getStorageAt', () => {
+    it('should get storage at position at given address', async function () {
+      let abi = [
+        {
+          'constant': false,
+          'inputs': [
+            {
+              'name': 'x',
+              'type': 'uint256'
+            }
+          ],
+          'name': 'set',
+          'outputs': [],
+          'payable': false,
+          'stateMutability': 'nonpayable',
+          'type': 'function'
+        },
+        {
+          'constant': false,
+          'inputs': [
+            {
+              'name': 'x',
+              'type': 'uint256'
+            }
+          ],
+          'name': 'set2',
+          'outputs': [],
+          'payable': false,
+          'stateMutability': 'nonpayable',
+          'type': 'function'
+        },
+        {
+          'inputs': [
+            {
+              'name': 'initialValue',
+              'type': 'uint256'
+            }
+          ],
+          'payable': false,
+          'stateMutability': 'nonpayable',
+          'type': 'constructor'
+        },
+        {
+          'anonymous': false,
+          'inputs': [
+            {
+              'indexed': true,
+              'name': 'value',
+              'type': 'uint256'
+            }
+          ],
+          'name': 'Test',
+          'type': 'event'
+        },
+        {
+          'constant': true,
+          'inputs': [],
+          'name': 'get',
+          'outputs': [
+            {
+              'name': 'retVal',
+              'type': 'uint256'
+            }
+          ],
+          'payable': false,
+          'stateMutability': 'view',
+          'type': 'function'
+        },
+        {
+          'constant': true,
+          'inputs': [],
+          'name': 'storedData',
+          'outputs': [
+            {
+              'name': '',
+              'type': 'uint256'
+            }
+          ],
+          'payable': false,
+          'stateMutability': 'view',
+          'type': 'function'
+        }
+      ]
+
+      let code = '0x608060405234801561001057600080fd5b506040516020806102018339810180604052602081101561003057600080fd5b810190808051906020019092919050505080600081905550506101a9806100586000396000f3fe60806040526004361061005c576000357c0100000000000000000000000000000000000000000000000000000000900480632a1afcd91461006157806360fe47b11461008c5780636d4ce63c146100c7578063ce01e1ec146100f2575b600080fd5b34801561006d57600080fd5b5061007661012d565b6040518082815260200191505060405180910390f35b34801561009857600080fd5b506100c5600480360360208110156100af57600080fd5b8101908080359060200190929190505050610133565b005b3480156100d357600080fd5b506100dc61013d565b6040518082815260200191505060405180910390f35b3480156100fe57600080fd5b5061012b6004803603602081101561011557600080fd5b8101908080359060200190929190505050610146565b005b60005481565b8060008190555050565b60008054905090565b80600081905550807f63a242a632efe33c0e210e04e4173612a17efa4f16aa4890bc7e46caece80de060405160405180910390a25056fea165627a7a7230582063160eb16dc361092a85ced1a773eed0b63738b83bea1e1c51cf066fa90e135d0029'
+
+      const contract = new web3.eth.Contract(abi)
+      const accounts = await web3.eth.getAccounts()
+
+      const contractInstance = await contract.deploy({ data: code, arguments: [100] }).send({ from: accounts[0], gas: 400000 })
+      contractInstance.currentProvider = web3.eth.currentProvider
+      contractInstance.givenProvider = web3.eth.currentProvider
+
+      await contractInstance.methods.set(100).send({ from: accounts[0], gas: 400000 })
+      let storage = await web3.eth.getStorageAt(contractInstance.options.address, 0)
+      assert.deepEqual(storage, '0x64')
+
+      await contractInstance.methods.set(200).send({ from: accounts[0], gas: 400000 })
+      storage = await web3.eth.getStorageAt(contractInstance.options.address, 0)
+      assert.deepEqual(storage, '0x64')
+
+      await contractInstance.methods.set(200).send({ from: accounts[0], gas: 400000 })
+      storage = await web3.eth.getStorageAt(contractInstance.options.address, 0)
+      assert.deepEqual(storage, '0xc8')
+    })
  })
 })