Merge pull request #16 from getsafle/bugfix-changed-package.json

Bugfix changed package.json and fixed signTransaction

CHANGELOG.md

@@ -1,6 +1,7 @@
 ### 1.0.0 (2023-12-07)
 
 ##### Implemented Keyring Controller for Base Chain and Added Support for legacy transactions.
+
 - Added method to generate keyring
 - Added method to restore a keyring
 - Added method to add a new account to the keyring object
@@ -13,4 +14,10 @@
 - Added getBalance() to fetch the balance in native currency.
 - Added getFee() method for gas estimation for Legacy transactions.
 - Added support for Legacy transactions.
-- Updated README.md.
+- Updated README.md.
+
+
+##### Updated 'main' path and Updated signTransaction Method. 
+
+- Updated 'main' path to "src/index.js" .
+- Removed signTransaction() dependency from getFees().

package.json

@@ -2,7 +2,7 @@
   "name": "@getsafle/vault-polygon-zkevm-controller",
   "version": "1.0.0",
   "description": "Polygon zkEVM controller for Safle Vault",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "lint": "eslint . --ext .js",
     "lint:fix": "eslint --fix . --ext .js",

src/index.js

@@ -10,13 +10,12 @@ const { normalize: normalizeAddress } = require('eth-sig-util')
 
 const SimpleKeyring = require('eth-simple-keyring')
 const HdKeyring = require('eth-hd-keyring')
+
 const { LegacyTransaction } = require('@ethereumjs/tx')
 const { Common, Hardfork } = require('@ethereumjs/common')
 const { bufferToHex } = require('ethereumjs-util')
 
 const axios = require('axios')
-let chainId;
-
 
 const keyringTypes = [
     SimpleKeyring,
@@ -266,6 +265,8 @@ class KeyringController extends EventEmitter {
     async signTransaction(rawTx, privateKey) {
 
         const pkey = Buffer.from(privateKey, 'hex');
+
+        const chainId = rawTx.chainId; 
 
         const common = Common.custom({ chainId: chainId }, { hardfork: Hardfork.Istanbul })
 
@@ -538,8 +539,7 @@ class KeyringController extends EventEmitter {
     * @returns {Object} - gasLimit for the transaction and an Object of fees for the transaction
     */
     async getFees(rawTx, web3) {
-        const { from, to, value, data } = rawTx
-        chainId = await web3.eth.getChainId();
+        const { from, to, value, data, chainId} = rawTx
         const gasLimit = await web3.eth.estimateGas({ to, from, value, data });
         let URL = (chainId === 1101) ? 'https://gasstation.polygon.technology/zkevm' : 'https://gasstation-testnet.polygon.technology/zkevm';
 

test/index.js

@@ -139,6 +139,7 @@ describe('Initialize wallet ', () => {
             gasPrice: getFeeEstimate.fees.slow.gasPrice,
             nonce: defaultNonce,
             data: '0x',
+            chainId:TESTNET.CHAIN_ID
         };
 
         const privateKey = await zkEVMkeyring.exportAccount(accounts[0])