Merge pull request #833 from MoralisWeb3/main-to-beta-merge-2

merge main to beta.

packages/common/evmUtils/src/operations/defi/getPairAddressOperation.ts

@@ -65,7 +65,7 @@ type TokenJSONResponse = GetPairAddressJSONResponse['token0'] | GetPairAddressJS
 function createErc20Token(token: TokenJSONResponse, core: Core, chain?: EvmChainish) {
   return Erc20Token.create(
     {
-      contractAddress: token?.address ? EvmAddress.create(token?.address) : '',
+      contractAddress: token?.address ? EvmAddress.create(token?.address, core) : '',
       decimals: token?.decimals ?? 0,
       name: token?.name ?? '',
       symbol: token?.symbol ?? '',
@@ -92,7 +92,7 @@ function deserializeResponse(jsonResponse: GetPairAddressJSONResponse, request:
       validated: jsonResponse.token1?.validated,
       createdAt: jsonResponse.token1?.created_at ? new Date(jsonResponse.token1?.created_at) : undefined,
     },
-    pairAddress: jsonResponse.pairAddress ? EvmAddress.create(jsonResponse.pairAddress) : undefined,
+    pairAddress: jsonResponse.pairAddress ? EvmAddress.create(jsonResponse.pairAddress, core) : undefined,
   };
 }
 

packages/common/evmUtils/src/operations/ipfs/uploadFolderOperation.ts

@@ -48,9 +48,7 @@ function getRequestUrlParams(_: UploadFolderRequest) {
 }
 
 function getRequestBody(request: UploadFolderRequest) {
-  return {
-    abi: request.abi,
-  };
+  return request.abi;
 }
 
 function deserializeResponse(jsonResponse: UploadFolderJSONResponse) {

packages/common/evmUtils/src/operations/transaction/getWalletTransactionsOperation.ts

@@ -100,25 +100,28 @@ function deserializeResponse(
   core: Core,
 ) {
   return (jsonResponse.result ?? []).map((transfer) =>
-    EvmTransaction.create({
-      cumulativeGasUsed: transfer.receipt_cumulative_gas_used,
-      gasPrice: transfer.gas_price,
-      gasUsed: transfer.receipt_gas_used,
-      index: +transfer.transaction_index,
-      contractAddress: transfer.receipt_contract_address,
-      receiptRoot: transfer.receipt_root,
-      receiptStatus: +transfer.receipt_status,
-      chain: EvmChainResolver.resolve(request.chain, core),
-      data: transfer.input,
-      from: transfer.from_address,
-      hash: transfer.hash,
-      nonce: transfer.nonce,
-      value: transfer.value,
-      blockHash: transfer.block_hash,
-      blockNumber: +transfer.block_number,
-      blockTimestamp: new Date(transfer.block_timestamp),
-      gas: BigNumber.create(transfer.gas),
-      to: transfer.to_address,
-    }),
+    EvmTransaction.create(
+      {
+        cumulativeGasUsed: transfer.receipt_cumulative_gas_used,
+        gasPrice: transfer.gas_price,
+        gasUsed: transfer.receipt_gas_used,
+        index: +transfer.transaction_index,
+        contractAddress: transfer.receipt_contract_address,
+        receiptRoot: transfer.receipt_root,
+        receiptStatus: +transfer.receipt_status,
+        chain: EvmChainResolver.resolve(request.chain, core),
+        data: transfer.input,
+        from: transfer.from_address,
+        hash: transfer.hash,
+        nonce: transfer.nonce,
+        value: transfer.value,
+        blockHash: transfer.block_hash,
+        blockNumber: +transfer.block_number,
+        blockTimestamp: new Date(transfer.block_timestamp),
+        gas: BigNumber.create(transfer.gas),
+        to: transfer.to_address,
+      },
+      core,
+    ),
   );
 }

packages/evmApi/integration/mocks/endpoints/endpointWeights.ts

@@ -1,26 +1,38 @@
-import { rest } from 'msw';
-import { EVM_API_ROOT, MOCK_API_KEY } from '../config';
+import { MockScenarios } from '@moralisweb3/test-utils';
 
-// TODO: we need to fix this test.
-const mockEndpointWeightss = 'getBlock';
+const response = [
+  {
+    endpoint: 'getBlock',
+    path: '/block/{block_number_or_hash}',
+    price: 5,
+    rateLimitCost: 5,
+  },
+  {
+    endpoint: 'getContractEvents',
+    path: '/{address}/events',
+    price: 2,
+    rateLimitCost: 2,
+  },
+  {
+    endpoint: 'getTransactions',
+    path: '/transaction/{transaction_hash}',
+    price: 1,
+    rateLimitCost: 1,
+  },
+  // ...
+];
 
-export const mockEndpointWeights = rest.get(`${EVM_API_ROOT}/info/endpointWeights`, (req, res, ctx) => {
-  const apiKey = req.headers.get('x-api-key');
-
-  if (apiKey !== MOCK_API_KEY) {
-    return res(ctx.status(401));
-  }
-
-  const value = mockEndpointWeightss;
-
-  if (!value) {
-    return res(ctx.status(404));
-  }
-
-  return res(
-    ctx.status(200),
-    ctx.json({
-      endpoint: value,
-    }),
-  );
-});
+export const mockEndpointWeights = MockScenarios.create(
+  {
+    name: 'mockEndpointWeights',
+    getParams: () => ({}),
+    url: '/info/endpointWeights',
+    method: 'get',
+  },
+  [
+    {
+      condition: {},
+      response: response as never,
+    },
+  ],
+);

packages/evmApi/integration/mocks/endpoints/getBlock.ts

@@ -1,26 +1,40 @@
-import { rest } from 'msw';
-import { EVM_API_ROOT, MOCK_API_KEY } from '../config';
+import { MockScenarios } from '@moralisweb3/test-utils';
+import { createErrorResponse } from '../response/errorResponse';
 
-export const mockGetBlock = rest.get(`${EVM_API_ROOT}/block/:block_number_or_hash`, (req, res, ctx) => {
-  const blockNumberOrHash = req.params.block_number_or_hash as string;
-  const apiKey = req.headers.get('x-api-key');
-
-  if (apiKey !== MOCK_API_KEY) {
-    return res(ctx.status(401));
-  }
-
-  if (blockNumberOrHash === '404') {
-    return res(ctx.status(404));
-  }
-
-  if (blockNumberOrHash === '200404') {
-    return res(ctx.status(200), ctx.json({}));
-  }
-
-  if (blockNumberOrHash === '15416422') {
-    return res(
-      ctx.status(200),
-      ctx.json({
+export const mockGetBlock = MockScenarios.create(
+  {
+    name: 'mockGetBlock',
+    getParams: (req) => ({
+      chain: req.url.searchParams.get('chain'),
+      block_number_or_hash: req.params.block_number_or_hash,
+      subdomain: req.url.searchParams.get('subdomain'),
+    }),
+    url: '/block/:block_number_or_hash',
+    method: 'get',
+  },
+  [
+    {
+      condition: {
+        block_number_or_hash: '200404',
+        chain: '0x5',
+      },
+      response: createErrorResponse('null'),
+      responseStatus: 404,
+    },
+    {
+      condition: {
+        block_number_or_hash: '404',
+        chain: '0x5',
+      },
+      response: createErrorResponse('Block not found'),
+      responseStatus: 404,
+    },
+    {
+      condition: {
+        block_number_or_hash: '15416422',
+        chain: '0x5',
+      },
+      response: {
         timestamp: '2022-08-26T16:29:16.000Z',
         number: '15416422',
         hash: '0xea1f77d395510ac0ef2db2aed828caf92d2c7ba4ce5632ab23b5f7078a5d6a49',
@@ -63,9 +77,7 @@ export const mockGetBlock = rest.get(`${EVM_API_ROOT}/block/:block_number_or_has
             transfer_index: [15416422, 185],
           },
         ],
-      }),
-    );
-  }
-
-  throw new Error('getBlock: Not supported scenario');
-});
+      },
+    },
+  ],
+);

packages/evmApi/integration/mocks/endpoints/getContractEvents.ts

@@ -1,5 +1,4 @@
-import { rest } from 'msw';
-import { EVM_API_ROOT, MOCK_API_KEY } from '../config';
+import { MockScenarios } from '@moralisweb3/test-utils';
 
 const createResponse = (address: string) => ({
   total: 12,
@@ -22,49 +21,33 @@ const createResponse = (address: string) => ({
   ],
 });
 
-const scenarios = [
+export const mockGetContractEvents = MockScenarios.create(
   {
-    condition: {
-      chain: '0x89',
-      address: '0x2953399124f0cbb46d2cbacd8a89cf0599974963',
-      topic: '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62',
-      fromBlock: '14327217',
-      toBlock: '14327217',
-      fromDate: '2022-03-05T13:45:42.000Z',
-      toDate: '2022-03-05T13:45:42.000Z',
-    },
-    response: createResponse('0x2953399124f0cbb46d2cbacd8a89cf0599974963'),
-    responseStatus: 200,
+    name: 'mockGetContractEvents',
+    method: 'post',
+    getParams: (req) => ({
+      address: req.params.address,
+      chain: req.url.searchParams.get('chain'),
+      topic: req.url.searchParams.get('topic'),
+      from_block: req.url.searchParams.get('from_block'),
+      to_block: req.url.searchParams.get('to_block'),
+      from_date: req.url.searchParams.get('from_date'),
+      to_date: req.url.searchParams.get('to_date'),
+    }),
+    url: '/:address/events',
   },
-];
-
-export const mockGetContractEvents = rest.post(`${EVM_API_ROOT}/:address/events`, (req, res, ctx) => {
-  const address = req.params.address as string;
-  const chain = req.url.searchParams.get('chain') as string | null;
-  const topic = req.url.searchParams.get('topic') as string | null;
-  const fromBlock = req.url.searchParams.get('from_block') as string | null;
-  const toBlock = req.url.searchParams.get('to_block') as string | null;
-  const fromDate = req.url.searchParams.get('from_date') as string | null;
-  const toDate = req.url.searchParams.get('to_date') as string | null;
-  const apiKey = req.headers.get('x-api-key');
-
-  if (apiKey !== MOCK_API_KEY) {
-    return res(ctx.status(401));
-  }
-  const scenario = scenarios.find(
-    (s) =>
-      s.condition.address === address &&
-      s.condition.chain === chain &&
-      s.condition.toBlock === toBlock &&
-      s.condition.fromBlock === fromBlock &&
-      s.condition.topic === topic &&
-      s.condition.fromDate === fromDate &&
-      s.condition.toDate === toDate,
-  );
-
-  if (scenario) {
-    return res(ctx.status(scenario.responseStatus), ctx.json(scenario.response));
-  }
-
-  throw new Error('getContractEvents: Not supported scenario');
-});
+  [
+    {
+      condition: {
+        chain: '0x89',
+        address: '0x2953399124f0cbb46d2cbacd8a89cf0599974963',
+        topic: '0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62',
+        from_block: '14327217',
+        to_block: '14327217',
+        from_date: '2022-03-05T13:45:42.000Z',
+        to_date: '2022-03-05T13:45:42.000Z',
+      },
+      response: createResponse('0x2953399124f0cbb46d2cbacd8a89cf0599974963'),
+    },
+  ],
+);