Merge pull request #198 from ERC725Alliance/develop

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.14.2](https://github.com/ERC725Alliance/erc725.js/compare/v0.14.1...v0.14.2) (2022-06-24)
+
+### Bug Fixes
+
+* Update JsonRpc eth_call parameters ([470e846](https://github.com/ERC725Alliance/erc725.js/commit/470e8461e581f0763fe3fddc8f604cc55002f7a1))
+
+
 ### [0.14.1](https://github.com/ERC725Alliance/erc725.js/compare/v0.14.0...v0.14.1) (2022-06-15)
 
 Minor update to update the LSP-2 schemas.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@erc725/erc725.js",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "Library to interact with ERC725 smart contracts",
   "main": "build/main/src/index.js",
   "typings": "build/main/src/index.d.ts",

src/lib/provider-wrapper-utils.ts

@@ -64,10 +64,10 @@ export function constructJSONRPC(
       {
         to: address,
         gas: METHODS[method].gas,
-        gasPrice: METHODS[method].gasPrice,
         value: METHODS[method].value,
         data,
       },
+      'latest',
     ],
     id: idCount,
   };

src/providers/ethereumProviderWrapper.ts

@@ -30,7 +30,7 @@ import {
   METHODS,
 } from '../lib/constants';
 import { decodeResult as decodeResultUtils } from '../lib/provider-wrapper-utils';
-import { JsonRpcEthereumProvider } from '../types/JsonRpc';
+import { JsonRpcEthereumProviderParams } from '../types/JsonRpc';
 import { Method } from '../types/Method';
 import { ProviderTypes } from '../types/provider';
 
@@ -53,7 +53,7 @@ export class EthereumProviderWrapper {
 
   async getOwner(address: string) {
     const params = this.constructJSONRPC(address, Method.OWNER);
-    const result = await this.callContract([params]);
+    const result = await this.callContract(params);
     if (result.error) {
       throw result.error;
     }
@@ -102,13 +102,13 @@ export class EthereumProviderWrapper {
   async supportsInterface(address: string, interfaceId: string) {
     return this.decodeResult(
       Method.SUPPORTS_INTERFACE,
-      await this.callContract([
+      await this.callContract(
         this.constructJSONRPC(
           address,
           Method.SUPPORTS_INTERFACE,
           `${interfaceId}${'00000000000000000000000000000000000000000000000000000000'}`,
         ),
-      ]),
+      ),
     );
   }
 
@@ -125,9 +125,9 @@ export class EthereumProviderWrapper {
       [hash, signature],
     );
 
-    const result = await this.callContract([
+    const result = await this.callContract(
       this.constructJSONRPC(address, Method.IS_VALID_SIGNATURE, encodedParams),
-    ]);
+    );
 
     if (result.error) {
       throw result.error;
@@ -172,13 +172,13 @@ export class EthereumProviderWrapper {
     address: string,
     keyHashes: string[],
   ): Promise<GetDataReturn[]> {
-    const encodedResults = await this.callContract([
+    const encodedResults = await this.callContract(
       this.constructJSONRPC(
         address,
         Method.GET_DATA,
         abiCoder.encodeParameter('bytes32[]', keyHashes),
       ),
-    ]);
+    );
 
     const decodedValues = this.decodeResult(Method.GET_DATA, encodedResults);
 
@@ -195,9 +195,9 @@ export class EthereumProviderWrapper {
     // Here we could use `getDataMultiple` instead of sending multiple calls to `getData`
     // But this is already legacy and it won't be used anymore..
     const encodedResultsPromises = keyHashes.map((keyHash) =>
-      this.callContract([
+      this.callContract(
         this.constructJSONRPC(address, Method.GET_DATA_LEGACY, keyHash),
-      ]),
+      ),
     );
 
     const decodedResults = await Promise.all(encodedResultsPromises);
@@ -213,18 +213,20 @@ export class EthereumProviderWrapper {
     address: string,
     method: Method,
     methodParam?: string,
-  ): JsonRpcEthereumProvider {
+  ): (JsonRpcEthereumProviderParams | string)[] {
     const data = methodParam
       ? METHODS[method].sig + methodParam.replace('0x', '')
       : METHODS[method].sig;
 
-    return {
-      to: address,
-      gas: METHODS[method].gas,
-      gasPrice: METHODS[method].gasPrice,
-      value: METHODS[method].value,
-      data,
-    };
+    return [
+      {
+        to: address,
+        value: METHODS[method].value,
+        gas: METHODS[method].gas,
+        data,
+      },
+      'latest',
+    ];
   }
 
   private async callContract(params: any) {

src/providers/web3ProviderWrapper.ts

@@ -99,16 +99,15 @@ export class Web3ProviderWrapper {
     address: string,
     interfaceId: string,
   ): Promise<boolean> {
-    return decodeResult(
-      Method.SUPPORTS_INTERFACE,
-      await this.callContract(
-        constructJSONRPC(
-          address,
-          Method.SUPPORTS_INTERFACE,
-          `${interfaceId}${'00000000000000000000000000000000000000000000000000000000'}`,
-        ),
+    const result = await this.callContract(
+      constructJSONRPC(
+        address,
+        Method.SUPPORTS_INTERFACE,
+        `${interfaceId}${'00000000000000000000000000000000000000000000000000000000'}`,
       ),
     );
+
+    return decodeResult(Method.SUPPORTS_INTERFACE, result);
   }
 
   /**
@@ -200,6 +199,7 @@ export class Web3ProviderWrapper {
         constructJSONRPC(address, Method.GET_DATA_LEGACY, keyHashes[index]),
       );
     }
+
     const results: any = await this.callContract(payload);
 
     return payload.map<GetDataReturn>((payloadCall, index) => ({
@@ -215,6 +215,7 @@ export class Web3ProviderWrapper {
     return new Promise((resolve, reject) => {
       // Send old web3 method with callback to resolve promise
       // This is deprecated: https://docs.metamask.io/guide/ethereum-provider.html#ethereum-send-deprecated
+
       this.provider.send(payload, (e, r) => {
         if (e) {
           reject(e);

src/types/JsonRpc.ts

@@ -5,18 +5,17 @@ export interface JsonRpc {
     {
       to: string;
       gas: string;
-      gasPrice: string;
       value: string;
       data;
     },
+    'latest',
   ];
   id: number;
 }
 
-export interface JsonRpcEthereumProvider {
+export interface JsonRpcEthereumProviderParams {
   to: string;
   gas: string;
-  gasPrice: string;
   value: string;
   data;
 }