Merge pull request #27 from getsafle/dev

Merging dev code to test

CHANGELOG.md

@@ -37,4 +37,9 @@
 
 ### 1.0.7 (2023-07-05)
 
-- cleaned package structure
+- cleaned package structure
+
+### 1.0.8  (2023-11-30)
+
+- Updated gasFee() method for type 1 transactions and added its test.
+- Changed license to MIT.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getsafle/vault-arbitrum-controller",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "arbitrum controller for safle vault",
   "engines": {
     "node": ">= 10"
@@ -28,7 +28,7 @@
     "keyring"
   ],
   "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/getsafle/vault-arbitrum-controller/issues"
   },

src/index.js

@@ -506,10 +506,22 @@ class KeyringController extends EventEmitter {
     }
 
     async getFees(arbitrumTx, web3) {
-        const { from, to, value, data, gasLimit } = arbitrumTx
-        const estimate = gasLimit ? gasLimit : await web3.eth.estimateGas({ to, from, value, data })
-        const gasPrice = await web3.eth.getGasPrice();
-        return { transactionFees: estimate * gasPrice }
+        const { from, to, value, data, manualLimit } = arbitrumTx
+        const gasLimit = manualLimit ? manualLimit : await web3.eth.estimateGas({ to, from, value, data })
+        const gasPrice = parseInt(await web3.eth.getGasPrice());
+        const fees = {
+            "slow":{
+                "gasPrice": parseInt(gasPrice)
+            },
+            "standard":{
+                "gasPrice": gasPrice + parseInt(gasPrice * 0.05)
+            },
+            "fast":{
+                "gasPrice": gasPrice + parseInt(gasPrice * 0.1)
+            },
+            baseFee: 0
+        }
+        return { gasLimit: gasLimit, fees: fees}
     }
 }
 

test/index.js

@@ -109,6 +109,19 @@ describe('Initialize wallet ', () => {
         console.log(" get balance ", balance, accounts)
     })
 
+    it("Get fees for a arbitrum tx", async () => {
+        const accounts = await arbitrumKeyring.getAccounts()
+        const web3 = new Web3(TESTNET.URL);
+        const tx = {
+            from: accounts[0],
+            to: '0x641BB2596D8c0b32471260712566BF933a2f1a8e',
+            value: 0,
+            data: "0x00"
+        }
+        const getEstimate = await arbitrumKeyring.getFees(tx, web3)
+        console.log(" get gas estimate  ", getEstimate)
+    })
+
     it("sign Transaction ", async () => {
 
         const accounts = await arbitrumKeyring.getAccounts()