Use solidity mapper to get value for mapping and nested mapping (balance and allowance) (#48)

* Implement getting value for basic mapping type.

* Add test for basic mapping type.

* Implement getting value for nested mapping type.

Co-authored-by: nikugogoi <95nikass@gmail.com>

package.json

@@ -4,7 +4,9 @@
   "workspaces": [
     "packages/*"
   ],
-  "devDependencies": {},
+  "devDependencies": {
+    "lerna": "^4.0.0"
+  },
   "scripts": {
     "test": "lerna run test --stream --no-bail",
     "lint": "lerna run lint --stream"

packages/solidity-mapper/src/storage.test.ts

@@ -309,4 +309,33 @@ describe('Get value from storage', () => {
     ({ value } = await getStorageValue(storageLayout, getStorageAt, blockHash, testFixedArrays.address, 'uintArray'));
     expect(value).to.eql(expectedValue.map(el => BigInt(el)));
   });
+
+  describe('mapping type', () => {
+    let testMappingTypes: Contract, storageLayout: StorageLayout;
+
+    before(async () => {
+      const TestMappingTypes = await ethers.getContractFactory('TestMappingTypes');
+      testMappingTypes = await TestMappingTypes.deploy();
+      await testMappingTypes.deployed();
+      storageLayout = await getStorageLayout('TestMappingTypes');
+    });
+
+    it('get value for basic mapping type', async () => {
+      const expectedValue = 123;
+      const [, signer1] = await ethers.getSigners();
+      await testMappingTypes.connect(signer1).setAddressUintMap(expectedValue);
+      const blockHash = await getBlockHash();
+      const { value } = await getStorageValue(storageLayout, getStorageAt, blockHash, testMappingTypes.address, 'addressUintMap', signer1.address);
+      expect(value).to.equal(BigInt(expectedValue));
+    });
+
+    it('get value for nested mapping type', async () => {
+      const expectedValue = 123;
+      const [, signer1, signer2] = await ethers.getSigners();
+      await testMappingTypes.connect(signer1).setNestedAddressUintMap(signer2.address, expectedValue);
+      const blockHash = await getBlockHash();
+      const { value } = await getStorageValue(storageLayout, getStorageAt, blockHash, testMappingTypes.address, 'addressUintMap', signer1.address, signer2.address);
+      expect(value).to.equal(BigInt(expectedValue));
+    });
+  });
 });

packages/solidity-mapper/src/storage.ts

@@ -13,6 +13,7 @@ interface Types {
     numberOfBytes: string;
     label: string;
     base?: string;
+    value?: string;
   };
 }
 
@@ -57,10 +58,10 @@ export const getStorageInfo = (storageLayout: StorageLayout, variableName: strin
  * @param variableName
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-export const getStorageValue = async (storageLayout: StorageLayout, getStorageAt: GetStorageAt, blockHash: string, address: string, variableName: string): Promise<{ value: any, proof: { data: string } }> => {
+export const getStorageValue = async (storageLayout: StorageLayout, getStorageAt: GetStorageAt, blockHash: string, address: string, variableName: string, ...mappingKeys: Array<string>): Promise<{ value: any, proof: { data: string } }> => {
   const { slot, offset, type, types } = getStorageInfo(storageLayout, variableName);
 
-  return getDecodedValue(getStorageAt, blockHash, address, types, { slot, offset, type });
+  return getDecodedValue(getStorageAt, blockHash, address, types, { slot, offset, type }, mappingKeys);
 };
 
 /**
@@ -96,9 +97,9 @@ export const getValueByType = (storageValue: string, typeLabel: string): bigint
  * @param storageInfo
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-const getDecodedValue = async (getStorageAt: GetStorageAt, blockHash: string, address: string, types: Types, storageInfo: { slot: string, offset: number, type: string }): Promise<{ value: any, proof: { data: string } }> => {
+const getDecodedValue = async (getStorageAt: GetStorageAt, blockHash: string, address: string, types: Types, storageInfo: { slot: string, offset: number, type: string }, mappingKeys: Array<string>): Promise<{ value: any, proof: { data: string } }> => {
   const { slot, offset, type } = storageInfo;
-  const { encoding, numberOfBytes, label: typeLabel, base } = types[type];
+  const { encoding, numberOfBytes, label: typeLabel, base, value: mappingValueType } = types[type];
 
   const [isArray, arraySize] = typeLabel.match(/\[([0-9]*)\]/) || [false];
   let value: string, proof: { data: string };
@@ -114,7 +115,7 @@ const getDecodedValue = async (getStorageAt: GetStorageAt, blockHash: string, ad
     for (let i = 0; i < Number(baseNumberOfBytes) * Number(arraySize); i = i + Number(baseNumberOfBytes)) {
       const arraySlot = BigNumber.from(slot).add(Math.floor(i / 32)).toHexString();
       const slotOffset = i % 32;
-      const { value, proof } = await getDecodedValue(getStorageAt, blockHash, address, types, { slot: arraySlot, offset: slotOffset, type: base });
+      ({ value, proof } = await getDecodedValue(getStorageAt, blockHash, address, types, { slot: arraySlot, offset: slotOffset, type: base }, []));
       resultArray.push(value);
       proofs.push(JSON.parse(proof.data));
     }
@@ -140,6 +141,18 @@ const getDecodedValue = async (getStorageAt: GetStorageAt, blockHash: string, ad
       ({ value, proof } = await getBytesValue(blockHash, address, slot, getStorageAt));
       break;
 
+    case 'mapping': {
+      const mappingSlot = await getMappingSlot(slot, mappingKeys[0]);
+
+      if (mappingValueType) {
+        ({ value, proof } = await getDecodedValue(getStorageAt, blockHash, address, types, { slot: mappingSlot, offset: 0, type: mappingValueType }, mappingKeys.slice(1)));
+      } else {
+        throw new Error(`Mapping value type not specified for ${mappingKeys[0]}`);
+      }
+
+      break;
+    }
+
     default:
       throw new Error(`Encoding ${encoding} not implemented.`);
   }
@@ -150,6 +163,25 @@ const getDecodedValue = async (getStorageAt: GetStorageAt, blockHash: string, ad
   };
 };
 
+/**
+ * Function to get slot for mapping types.
+ * @param mappingSlot
+ * @param key
+ */
+export const getMappingSlot = (mappingSlot: string, key: string): string => {
+  // https://github.com/ethers-io/ethers.js/issues/1079#issuecomment-703056242
+  const mappingSlotPadded = utils.hexZeroPad(BigNumber.from(mappingSlot).toHexString(), 32);
+  const keyPadded = utils.hexZeroPad(key, 32);
+
+  const fullKey = utils.concat([
+    keyPadded,
+    mappingSlotPadded
+  ]);
+
+  const slot = utils.keccak256(fullKey);
+  return slot;
+};
+
 /**
  * Function to get value for inplace encoding.
  * @param address

packages/solidity-mapper/test/contracts/TestMappingTypes.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.7.0;
+
+contract TestMappingTypes {
+    // Mapping type variable occupies one single slot but the actual elements are stored at a different storage slot that is computed using a Keccak-256 hash.
+    // https://docs.soliditylang.org/en/v0.8.4/internals/layout_in_storage.html#mappings-and-dynamic-arrays
+    mapping (address => mapping (address => uint)) private nestedAddressUintMap;
+
+    // Mapping type variable occupies the next single slot.
+    mapping(address => uint) public addressUintMap;
+
+    // Set variable addressUintMap.
+    function setAddressUintMap(uint value) external {
+        addressUintMap[msg.sender] = value;
+    }
+
+    // Set variable nestedAddressUintMap.
+    function setNestedAddressUintMap(address addressValue, uint uintValue) external {
+        nestedAddressUintMap[msg.sender][addressValue] = uintValue;
+    }
+}

packages/watcher/src/database.ts

@@ -150,7 +150,7 @@ export class Database {
         .getCount();
 
       if (numRows === 0) {
-        const entity = repo.create({ address, startingBlock });
+        const entity = repo.create({ address, startingBlock: BigInt(startingBlock) });
         await repo.save(entity);
       }
     });

packages/watcher/src/entity/Allowance.ts

@@ -19,7 +19,7 @@ export class Allowance {
   spender!: string;
 
   @Column('numeric')
-  value!: BigInt;
+  value!: bigint;
 
   @Column('text')
   proof!: string;

packages/watcher/src/entity/Balance.ts

@@ -16,7 +16,7 @@ export class Balance {
   owner!: string;
 
   @Column('numeric')
-  value!: BigInt;
+  value!: bigint;
 
   @Column('text')
   proof!: string;

packages/watcher/src/entity/Contract.ts

@@ -10,5 +10,5 @@ export class Contract {
   address!: string;
 
   @Column('numeric')
-  startingBlock!: BigInt;
+  startingBlock!: bigint;
 }

packages/watcher/src/entity/Event.ts

@@ -31,7 +31,7 @@ export class Event {
   transferTo!: string;
 
   @Column('numeric', { nullable: true })
-  transferValue!: BigInt;
+  transferValue!: bigint;
 
   // Approval event columns.
   @Column('varchar', { length: 42, nullable: true })
@@ -41,5 +41,5 @@ export class Event {
   approvalSpender!: string;
 
   @Column('numeric', { nullable: true })
-  approvalValue!: BigInt;
+  approvalValue!: bigint;
 }

packages/watcher/src/indexer.ts

@@ -6,8 +6,8 @@ import { DeepPartial } from 'typeorm';
 import JSONbig from 'json-bigint';
 import { ethers } from 'ethers';
 
-import { EthClient, getMappingSlot, topictoAddress } from '@vulcanize/ipld-eth-client';
-import { getStorageInfo, getEventNameTopics, getStorageValue, GetStorageAt, StorageLayout } from '@vulcanize/solidity-mapper';
+import { EthClient, topictoAddress } from '@vulcanize/ipld-eth-client';
+import { getEventNameTopics, getStorageValue, GetStorageAt, StorageLayout } from '@vulcanize/solidity-mapper';
 
 import { Database } from './database';
 import { Event } from './entity/Event';
@@ -20,7 +20,7 @@ interface Artifacts {
 }
 
 export interface ValueResult {
-  value: string | BigInt;
+  value: string | bigint;
   proof: {
     data: string;
   }
@@ -85,17 +85,8 @@ export class Indexer {
       };
     }
 
-    // TODO: Use getStorageValue when it supports mappings.
-    const { slot: balancesSlot } = getStorageInfo(this._storageLayout, '_balances');
-    const slot = getMappingSlot(balancesSlot, owner);
+    const result = await this._getStorageValue(blockHash, token, '_balances', owner);
 
-    const vars = {
-      blockHash,
-      contract: token,
-      slot
-    };
-
-    const result = await this._getStorageAt(vars);
     log(JSONbig.stringify(result, null, 2));
 
     const { value, proof } = result;
@@ -113,17 +104,8 @@ export class Indexer {
       };
     }
 
-    // TODO: Use getStorageValue when it supports nested mappings.
-    const { slot: allowancesSlot } = getStorageInfo(this._storageLayout, '_allowances');
-    const slot = getMappingSlot(getMappingSlot(allowancesSlot, owner), spender);
+    const result = await this._getStorageValue(blockHash, token, '_allowances', owner, spender);
 
-    const vars = {
-      blockHash,
-      contract: token,
-      slot
-    };
-
-    const result = await this._getStorageAt(vars);
     log(JSONbig.stringify(result, null, 2));
 
     const { value, proof } = result;
@@ -250,13 +232,14 @@ export class Indexer {
   }
 
   // TODO: Move into base/class or framework package.
-  async _getStorageValue (blockHash: string, token: string, variable: string): Promise<ValueResult> {
+  async _getStorageValue (blockHash: string, token: string, variable: string, ...mappingKeys: string[]): Promise<ValueResult> {
     return getStorageValue(
       this._storageLayout,
       this._getStorageAt,
       blockHash,
       token,
-      variable
+      variable,
+      ...mappingKeys
     );
   }