Merge pull request #26 from getsafle/dev

integrating 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 the getFees() method for gas estimation and added its test.
+- Changed the License to MIT.

package.json

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

src/index.js

@@ -522,11 +522,24 @@ class KeyringController extends EventEmitter {
     }
 
     async getFees(optimismTx, web3) {
-        const { from, to, value, data, gasLimit } = optimismTx
-        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 } = optimismTx
+        const gasLimit = await web3.eth.estimateGas({ from, to, 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}
     }
+
 }
 
 const getBalance = async (address, web3) => {

test/index.js

@@ -91,7 +91,6 @@ describe('Initialize wallet ', () => {
     console.log(" with manual gasLimit ", fees)
 
     const privateKey = await optimismKeyring.exportAccount(accounts[0])
-    //console.log('privateKey=',privateKey)
     const tx3 = await optimismKeyring.sign(TESTING_MESSAGE_1, privateKey, web3)
     console.log("tx3 ", tx3)
 })
@@ -109,6 +108,19 @@ describe('Initialize wallet ', () => {
         console.log(" get balance ", balance, accounts)
     })
 
+    it("Get fees for a optimism tx", async () => {
+        const accounts = await optimismKeyring.getAccounts()
+        const web3 = new Web3(TESTNET.URL);
+        const tx = {
+            from:accounts[0], 
+            to:'0x641BB2596D8c0b32471260712566BF933a2f1a8e',
+            value:0,
+            data:"0x00"
+        }
+        const getEstimate = await optimismKeyring.getFees(tx, web3)
+        console.log(" get gas estimate  ", getEstimate)
+
+    })
     it("sign Transaction ", async () => {
 
         const accounts = await optimismKeyring.getAccounts()
@@ -136,8 +148,6 @@ describe('Initialize wallet ', () => {
         const signedTX = await optimismKeyring.signTransaction(rawTx, privateKey)
         console.log("signedTX ", signedTX)
 
-       // const sentTX = await optimismKeyring.sendTransaction(signedTX, web3)
-        //console.log("sentTX ", sentTX)
     })
 
 })