Merge pull request #101 from OriginTrail/feature/allowance

Add function for getting current allowance and wallet balances
OriginTrail · Sep 6, 2023 · 4ea85ad · 4ea85ad
2 parents ec4b430 + 2967e2b
commit 4ea85ad
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 6 deletions.
diff --git a/dist/dkg.min.js b/dist/dkg.min.js
diff --git a/managers/asset-operations-manager.js b/managers/asset-operations-manager.js
@@ -102,6 +102,24 @@ class AssetOperationsManager {
         };
     }
 
+    async getCurrentAllowance(options = {}) {
+        const blockchain = this.inputService.getBlockchain(options);
+
+        const serviceAgreementV1Address = await this.blockchainService.getContractAddress(
+            'ServiceAgreementV1',
+            blockchain,
+        );
+
+        const allowance = await this.blockchainService.callContractFunction(
+            'Token',
+            'allowance',
+            [blockchain.publicKey, serviceAgreementV1Address],
+            blockchain,
+        );
+
+        return allowance;
+    }
+
     /**
      * Creates a new asset.
      * @async

diff --git a/managers/blockchain-operations-manager.js b/managers/blockchain-operations-manager.js
@@ -6,9 +6,15 @@ class BlockchainOperationsManager {
         this.inputService = services.inputService;
     }
 
-    async getGasPrice(blockchain){
+    async getGasPrice(options = {}){
+        const blockchain = this.inputService.getBlockchain(options);
         return this.blockchainService.getGasPrice(blockchain);
     }
+
+    async getWalletBalances(options = {}){
+        const blockchain = this.inputService.getBlockchain(options);
+        return this.blockchainService.getWalletBalances(blockchain);
+    }
 }
 
 module.exports = BlockchainOperationsManager;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dkg.js",
-    "version": "6.0.9",
+    "version": "6.0.10",
     "description": "Javascript library for interaction with the OriginTrail Decentralized Knowledge Graph",
     "main": "index.js",
     "scripts": {

diff --git a/services/blockchain-service/blockchain-service-base.js b/services/blockchain-service/blockchain-service-base.js
@@ -488,6 +488,24 @@ class BlockchainServiceBase {
         return gasPrice;
     }
 
+    async getWalletBalances(blockchain) {
+        const web3Instance = await this.getWeb3Instance(blockchain);
+        const publicKey = await this.getPublicKey(blockchain);
+
+        const blockchainTokenBalance = await web3Instance.eth.getBalance(publicKey);
+        const tracBalance = await this.callContractFunction(
+            'Token',
+            'balanceOf',
+            [await this.getPublicKey(blockchain)],
+            blockchain,
+        );
+
+        return {
+            blockchainToken: blockchainTokenBalance,
+            trac: tracBalance
+        }
+    }
+
     async getLatestBlock(blockchain) {
         const web3 = await this.getWeb3Instance(blockchain);
         const blockNumber = await web3.eth.getBlockNumber();

diff --git a/services/blockchain-service/implementations/node-blockchain-service.js b/services/blockchain-service/implementations/node-blockchain-service.js
@@ -83,7 +83,10 @@ class NodeBlockchainService extends BlockchainServiceBase {
                 if (
                     !transactionRetried &&
                     blockchain.handleNotMinedError &&
-                    e.message.includes('Transaction was not mined')
+                    (
+                        e.message.includes('Transaction was not mined')
+                        || e.message.includes('Already known')
+                    )
                 ) {
                     transactionRetried = true;
                     // eslint-disable-next-line no-param-reassign