add tests

packages/eth-providers/src/__tests__/BlockCache.test.ts

@@ -2,7 +2,7 @@ import { TransactionReceipt } from '@ethersproject/abstract-provider';
 
 import { BlockCache } from '../utils/BlockCache';
 import { describe, expect, it } from 'vitest';
-import { mockChain } from './utils/testUtils';
+import { mockChain } from './utils';
 
 const sortReceipt = (r1: TransactionReceipt, r2: TransactionReceipt) => {
   if (r1.blockNumber !== r2.blockNumber) {

packages/eth-providers/src/__tests__/MaxSizeSet.test.ts

@@ -1,6 +1,7 @@
-import { MaxSizeSet } from '../utils/MaxSizeSet';
 import { describe, expect, it } from 'vitest';
-import { mockChain } from './utils/testUtils';
+
+import { MaxSizeSet } from '../utils/MaxSizeSet';
+import { mockChain } from './utils';
 
 describe('MaxSizeSet', () => {
   const MAX_CACHED_BLOCK = 5;

packages/eth-providers/src/__tests__/decimals.test.ts

@@ -1,6 +1,7 @@
 import { BigNumber } from '@ethersproject/bignumber';
 import { describe, expect, it } from 'vitest';
 import { hexValue } from '@ethersproject/bytes';
+
 import { nativeToEthDecimal } from '../utils';
 
 describe('decimals', () => {

packages/eth-providers/src/__tests__/dispatch-error-match.test.ts

@@ -1,6 +1,7 @@
-import { ERROR_PATTERN } from '../consts';
 import { describe, expect, it } from 'vitest';
 
+import { ERROR_PATTERN } from '../consts';
+
 describe('filterLog', () => {
   const err0 =
     'Error: -32603: execution fatal: Module(ModuleError { index: 180, error: [11, 0, 0, 0], message: None })';

packages/eth-providers/src/__tests__/evm-rpc-provider.test.ts

@@ -1,8 +1,9 @@
-import { EvmRpcProvider } from '../rpc-provider';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import { runWithTiming, sleep } from '../utils';
 import dotenv from 'dotenv';
 
+import { EvmRpcProvider } from '../rpc-provider';
+import { sleep } from '../utils';
+
 dotenv.config();
 
 const ACALA_NODE_URL = 'wss://acala-rpc.dwellir.com';

packages/eth-providers/src/__tests__/getTransactionReceipt.test.ts

@@ -1,16 +1,15 @@
 import { Contract } from '@ethersproject/contracts';
 import { Wallet } from '@ethersproject/wallet';
 import { afterAll, describe, expect, it } from 'vitest';
+import { parseUnits } from 'ethers/lib/utils';
 import ACAABI from '@acala-network/contracts/build/contracts/Token.json';
 import ADDRESS from '@acala-network/contracts/utils/AcalaAddress';
 
 import { EvmRpcProvider } from '../rpc-provider';
-import { parseUnits } from 'ethers/lib/utils';
-import evmAccounts from './utils/evmAccounts';
+import { evmAccounts, nodeUrl } from './utils';
 
 describe('TransactionReceipt', async () => {
-  const endpoint = process.env.ENDPOINT_URL || 'ws://127.0.0.1:9944';
-  const provider = EvmRpcProvider.from(endpoint);
+  const provider = EvmRpcProvider.from(nodeUrl);
   await provider.isReady();
 
   afterAll(async () => {

packages/eth-providers/src/__tests__/json-rpc-provider.test.ts

@@ -4,11 +4,9 @@ import { describe, expect, it } from 'vitest';
 import { hexZeroPad, parseEther } from 'ethers/lib/utils';
 
 import { AcalaJsonRpcProvider } from '../json-rpc-provider';
+import { ethRpc, evmAccounts } from './utils';
 import echoJson from './abis/Echo.json';
 import erc20Json from './abis/IERC20.json';
-import evmAccounts from './utils/evmAccounts';
-
-const localEthRpc = process.env.ETH_RPC || 'http://localhost:8545';
 
 describe('JsonRpcProvider', async () => {
   /* --------- karura --------- */
@@ -20,7 +18,7 @@ describe('JsonRpcProvider', async () => {
 
   /* --------- local --------- */
   const testKey = evmAccounts[0].privateKey;   // 0x75E480dB528101a381Ce68544611C169Ad7EB342
-  const providerLocal = new AcalaJsonRpcProvider(localEthRpc);
+  const providerLocal = new AcalaJsonRpcProvider(ethRpc);
   const wallet = new Wallet(testKey, providerLocal);
 
   describe.concurrent('get chain data', () => {

packages/eth-providers/src/__tests__/logs.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it } from 'vitest';
+
 import { filterLog } from '../utils';
 
 describe('filterLog', () => {

packages/eth-providers/src/__tests__/parseBlock.test.ts

@@ -3,8 +3,7 @@ import { TransactionReceipt } from '@ethersproject/abstract-provider';
 import { afterAll, beforeAll, describe, it } from 'vitest';
 import { options } from '@acala-network/api';
 
-import { getAllReceiptsAtBlock } from '../utils/parseBlock';
-import { hexlifyRpcResult, sleep } from '../utils';
+import { getAllReceiptsAtBlock, hexlifyRpcResult } from '../utils';
 
 interface FormatedReceipt {
   to?: string;

packages/eth-providers/src/__tests__/safemode.test.ts

@@ -1,11 +1,11 @@
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { EvmRpcProvider } from '../rpc-provider';
+import { nodeUrl } from './utils';
 import { sleep } from '../utils';
 
-const endpoint = process.env.ENDPOINT_URL || 'ws://127.0.0.1:9944';
-const safeProvider = EvmRpcProvider.from(endpoint, { safeMode: true });
-const provider = EvmRpcProvider.from(endpoint, { safeMode: false });
+const safeProvider = EvmRpcProvider.from(nodeUrl, { safeMode: true });
+const provider = EvmRpcProvider.from(nodeUrl, { safeMode: false });
 
 const newBlock = async (finalize: boolean): Promise<void> => {
   await provider.api.rpc.engine.createBlock(true /* create empty */, finalize);

packages/eth-providers/src/__tests__/tx.test.ts

@@ -10,13 +10,11 @@ import ACAABI from '@acala-network/contracts/build/contracts/Token.json';
 import ADDRESS from '@acala-network/contracts/utils/MandalaAddress';
 
 import { EvmRpcProvider } from '../rpc-provider';
-import { calcEthereumTransactionParams } from '../utils';
-import { computeDefaultSubstrateAddress } from '../utils/address';
-import evmAccounts from './utils/evmAccounts';
+import { calcEthereumTransactionParams, computeDefaultSubstrateAddress } from '../utils';
+import { evmAccounts, nodeUrl } from './utils';
 
 describe('transaction tests', () => {
-  const endpoint = process.env.ENDPOINT_URL || 'ws://127.0.0.1:9944';
-  const provider = EvmRpcProvider.from(endpoint);
+  const provider = EvmRpcProvider.from(nodeUrl);
 
   const account1 = evmAccounts[0];
   const account2 = evmAccounts[1];

packages/eth-providers/src/__tests__/utils.test.ts

@@ -1,6 +1,9 @@
-import { describe, expect, it, vi } from 'vitest';
+import { ApiPromise, WsProvider } from '@polkadot/api';
+import { FrameSystemAccountInfo } from '@polkadot/types/lookup';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 import { hexValue } from '@ethersproject/bytes';
 
+import { ALICE_ADDR, nodeUrl } from './utils';
 import { CacheInspect } from '../utils/BlockCache';
 import {
   EthCallTimingResult,
@@ -13,8 +16,11 @@ import {
   runWithTiming,
   sleep,
 } from '../utils';
+import { EvmRpcProvider } from '../rpc-provider';
 import { HeadsInfo } from '../base-provider';
 import { _Metadata } from '../utils/gqlTypes';
+import { queryStorage } from '../utils/queryStoarge';
+
 
 describe('utils', () => {
   it('connect chain', async () => {
@@ -507,3 +513,68 @@ describe('eth call error handling', () => {
     });
   });
 });
+
+describe.only('query storage', () => {
+  let api: ApiPromise;
+
+
+  beforeAll(async () => {
+    api = await ApiPromise.create({ provider: new WsProvider(nodeUrl) });
+  });
+
+  afterAll(async () => {
+    await api.disconnect();
+  });
+
+  it.only('timestamp.now', async () => {
+    const _testQueryStorage = async (blockHash: string) => {
+      const timestamp = await queryStorage(
+        api,
+        'timestamp.now',
+        [],
+        blockHash
+      );
+
+      const timestampReal = await (await api.at(blockHash)).query.timestamp.now();
+
+      console.log(timestamp.toJSON(), timestampReal.toJSON());
+      expect(timestamp.toJSON()).to.deep.eq(timestampReal.toJSON());
+    };
+
+    const curBlockHash = (await api.rpc.chain.getBlockHash()).toString();
+    const curBlockNum = (await api.rpc.chain.getHeader()).number.toNumber();
+    const randBlock = curBlockNum - Math.floor(Math.random() * 1000);
+    console.log(curBlockNum, randBlock);
+    const randBlockHash = (await api.rpc.chain.getBlockHash(randBlock)).toString();
+
+    await _testQueryStorage(curBlockHash);
+    await _testQueryStorage(randBlockHash);
+  });
+
+  it('system.account', async () => {
+    const _testQueryStorage = async (blockHash: string) => {
+      const accountInfo = await queryStorage<FrameSystemAccountInfo>(
+        api,
+        'system.account',
+        [ALICE_ADDR],
+        blockHash
+      );
+
+      const accountInfoReal = await (await api.at(blockHash)).query.system.account(ALICE_ADDR);
+
+      console.log(accountInfo.toJSON(), accountInfoReal.toJSON());
+      expect(accountInfo.toJSON()).to.deep.eq(accountInfoReal.toJSON());
+    };
+
+    const curBlockHash = (await api.rpc.chain.getBlockHash()).toString();
+    const curBlockNum = (await api.rpc.chain.getHeader()).number.toNumber();
+    const randBlock = curBlockNum - Math.floor(Math.random() * 1000);
+    const randBlockHash = (await api.rpc.chain.getBlockHash(randBlock)).toString();
+
+    console.log(curBlockNum, randBlock);
+    console.log(curBlockHash, randBlockHash);
+
+    await _testQueryStorage(curBlockHash);
+    await _testQueryStorage(randBlockHash);   // fails on 7332027
+  });
+});

packages/eth-providers/src/__tests__/utils/evmAccounts.ts

@@ -1,4 +1,4 @@
-export default [
+export const evmAccounts = [
   {
     privateKey: '0xa872f6cbd25a0e04a08b1e21098017a9e6194d101d75e13111f71410c59cd57f',
     evmAddress: '0x75E480dB528101a381Ce68544611C169Ad7EB342',

packages/eth-providers/src/__tests__/utils/index.ts

@@ -0,0 +1,2 @@
+export * from './testUtils';
+export * from './evmAccounts';

packages/eth-providers/src/__tests__/utils/testUtils.ts

@@ -1,5 +1,10 @@
 import { TransactionReceipt } from '@ethersproject/abstract-provider';
 
+export const nodeUrl = process.env.ENDPOINT_URL || 'ws://localhost:9944';
+export const ethRpc = process.env.ETH_RPC || 'http://localhost:8545';
+
+export const ALICE_ADDR = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY';
+
 type MochBlock = {
   blockHash: string;
   blockNumber: number;