Merge pull request #22 from Bhutan-NDI/ethr-integration

Update package version

Author: devdgna

package.json

@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@ayanworks/credo-polygon-w3c-module": "1.0.0",
-    "@ayanworks/credo-ethr-module": "0.0.1",
+    "@bhutan-ndi/ethr-credo-module": "1.0.2",
     "@credo-ts/anoncreds": "0.5.3",
     "@credo-ts/askar": "0.5.3",
     "@credo-ts/core": "0.5.3",

src/cliAgent.ts

@@ -3,8 +3,9 @@ import type { WalletConfig } from '@credo-ts/core/build/types'
 import type { IndyVdrPoolConfig } from '@credo-ts/indy-vdr'
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { EthereumDidRegistrar, EthereumDidResolver, EthereumModule } from '@ayanworks/credo-ethr-module'
 import { PolygonDidRegistrar, PolygonDidResolver, PolygonModule } from '@ayanworks/credo-polygon-w3c-module'
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { EthereumDidRegistrar, EthereumDidResolver, EthereumModule } from '@bhutan-ndi/ethr-credo-module'
 import {
   AnonCredsCredentialFormatService,
   AnonCredsModule,
@@ -192,8 +193,7 @@ const getModules = (networkConfig: [IndyVdrPoolConfig, ...IndyVdrPoolConfig[]])
     polygon: new PolygonModule({
       didContractAddress: '0xcB80F37eDD2bE3570c6C9D5B0888614E04E1e49E',
       schemaManagerContractAddress: '0x4742d43C2dFCa5a1d4238240Afa8547Daf87Ee7a',
-      fileServerToken:
-        'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJBeWFuV29ya3MiLCJpZCI6IjliZjNiODFlLTA0ZDEtNDdmYy1iZTIwLWE2MTBiZDE5NTZlZiJ9.suWGau_pvNhGSGHRMqomqWoYhwMA7pcRt0kyHhaRZhM',
+      fileServerToken: 'ACCESS-TOKEN',
       rpcUrl: 'https://rpc-amoy.polygon.technology',
       serverUrl: 'https://dev-schema.ngotag.com',
     }),
@@ -203,16 +203,15 @@ const getModules = (networkConfig: [IndyVdrPoolConfig, ...IndyVdrPoolConfig[]])
           {
             name: 'sepolia',
             chainId: 11155111,
-            rpcUrl: 'https://eth-sepolia.g.alchemy.com/v2/XUo--fMnn250sIOxldOhx1J9-rput18B',
+            rpcUrl: 'https://eth-sepolia.g.alchemy.com/v2/API-KEY',
             registry: '0x485cFb9cdB84c0a5AfE69b75E2e79497Fc2256Fc',
           },
         ],
       },
-      schemaManagerContractAddress: '0x1930977f040844021f5C13b42AA8b296f0cb52DB',
+      schemaManagerContractAddress: '0xa95ACF3119791F65b2192267836df9A472785c15',
       serverUrl: 'https://dev-schema.ngotag.com',
-      fileServerToken:
-        'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJBeWFuV29ya3MiLCJpZCI6ImU3NGFkMWQyLTY5NGYtNGI3Ny05Mjk2LWY5NTdhY2YxNGE4NSJ9.wNd6OUveLZlJoN5ys68lPOX8aSY1HwVJaMW4K36sY4k',
-      rpcUrl: 'https://eth-sepolia.g.alchemy.com/v2/XUo--fMnn250sIOxldOhx1J9-rput18B',
+      fileServerToken: 'ACCESS-TOKEN',
+      rpcUrl: 'https://eth-sepolia.g.alchemy.com/v2/API-KEY',
     }),
   }
 }

src/controllers/did/DidController.ts

@@ -1,6 +1,6 @@
 import type { DidResolutionResultProps } from '../types'
-import type { EthereumDidCreateOptions } from '@ayanworks/credo-ethr-module/build/dids'
 import type { PolygonDidCreateOptions } from '@ayanworks/credo-polygon-w3c-module/build/dids'
+import type { EthereumDidCreateOptions } from '@bhutan-ndi/ethr-credo-module/build/dids'
 import type { KeyDidCreateOptions } from '@credo-ts/core'
 
 import {

src/controllers/ethereum/EthereumController.ts

@@ -2,7 +2,6 @@ import type { RestAgentModules } from '../../cliAgent'
 import type { SchemaMetadata } from '../types'
 
 import { generateSecp256k1KeyPair } from '@ayanworks/credo-polygon-w3c-module'
-// import { DidOperation } from '@ayanworks/credo-polygon-w3c-module/build/ledger'
 import { Agent, CredoError } from '@credo-ts/core'
 import * as fs from 'fs'
 import { injectable } from 'tsyringe'
@@ -69,16 +68,6 @@ export class Ethereum extends Controller {
         schemaName,
         schema,
       })
-
-      if (schemaResponse.schemaState?.state === 'failed') {
-        const reason = schemaResponse.schemaState?.reason?.toLowerCase()
-        if (reason && reason.includes('insufficient') && reason.includes('funds')) {
-          throw new Error('Insufficient funds to the address, Please add funds to perform this operation')
-        } else {
-          throw new Error(schemaResponse.schemaState?.reason)
-        }
-      }
-
       const schemaServerConfig = fs.readFileSync('config.json', 'utf-8')
       const configJson = JSON.parse(schemaServerConfig)
       if (!configJson.schemaFileServerURL) {

src/controllers/multi-tenancy/MultiTenancyController.ts

@@ -7,8 +7,8 @@ import type {
   SchemaMetadata,
   SignDataOptions,
 } from '../types'
-import type { EthereumDidCreateOptions } from '@ayanworks/credo-ethr-module/build/dids'
 import type { PolygonDidCreateOptions } from '@ayanworks/credo-polygon-w3c-module/build/dids'
+import type { EthereumDidCreateOptions } from '@bhutan-ndi/ethr-credo-module/build/dids'
 import type {
   AcceptProofRequestOptions,
   ConnectionRecordProps,
@@ -592,7 +592,7 @@ export class MultiTenancyController extends Controller {
       if (!privatekey || typeof privatekey !== 'string' || !privatekey.trim() || privatekey.length !== 64) {
         throw Error('Invalid private key or not supported')
       }
-      this.agent.config.logger.info("creating did-ether")
+      this.agent.config.logger.info('creating did-ether')
 
       createDidResponse = await tenantAgent.dids.create<EthereumDidCreateOptions>({
         method: DidMethod.Ethereum,
@@ -1115,15 +1115,6 @@ export class MultiTenancyController extends Controller {
         })
       })
 
-      if (schemaResponse.schemaState?.state === 'failed') {
-        const reason = schemaResponse.schemaState?.reason?.toLowerCase()
-        if (reason && reason.includes('insufficient') && reason.includes('funds')) {
-          throw new Error('Insufficient funds to the address, Please add funds to perform this operation')
-        } else {
-          throw new Error(schemaResponse.schemaState?.reason)
-        }
-      }
-
       const configFileData = fs.readFileSync('config.json', 'utf-8')
       const config = JSON.parse(configFileData)
       if (!config.schemaFileServerURL) {

yarn.lock

@@ -44,20 +44,6 @@
   dependencies:
     static-eval "2.0.2"
 
-"@ayanworks/credo-ethr-module@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ayanworks/credo-ethr-module/-/credo-ethr-module-0.0.1.tgz#ea4f7741aae72a51dd7e2a5737e5c87b670c772d"
-  integrity sha512-KbuSGertPYttBx1CEUFA/wjC0EolL7fTegVtsBAlCKGNynIf9XGyjIDLgtjBmlptEq2R0a2nxJ9ErScLTY4BVQ==
-  dependencies:
-    "@credo-ts/askar" "0.5.3"
-    "@credo-ts/core" "0.5.3"
-    axios "^1.6.3"
-    did-resolver "^4.1.0"
-    ethers "^6.9.0"
-    ethr-did "^3.0.38"
-    ethr-did-resolver "^11.0.4"
-    keccak256 "^1.0.6"
-
 "@ayanworks/credo-polygon-w3c-module@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@ayanworks/credo-polygon-w3c-module/-/credo-polygon-w3c-module-1.0.0.tgz#e48dcb48f8708b2959ebe02fcf3a5e08b168d479"
@@ -434,6 +420,20 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@bhutan-ndi/ethr-credo-module@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@bhutan-ndi/ethr-credo-module/-/ethr-credo-module-1.0.2.tgz#b694c0bbe83867579eef92f34fd6c9e05b884683"
+  integrity sha512-ymYyhTOGYfnmi3Ke80DD9+x1rJS1U5RsBopMXxoaQpumwC77pMx0Ocv9e/AZ5y4QVLVrJzXjBhZlZBmFAhJtUw==
+  dependencies:
+    "@credo-ts/askar" "0.5.3"
+    "@credo-ts/core" "0.5.3"
+    axios "^1.6.3"
+    did-resolver "^4.1.0"
+    ethers "^6.9.0"
+    ethr-did "^3.0.38"
+    ethr-did-resolver "^11.0.4"
+    keccak256 "^1.0.6"
+
 "@credo-ts/anoncreds@0.5.3":
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/@credo-ts/anoncreds/-/anoncreds-0.5.3.tgz#3e6775b461fc34e377bebe2c0ca53c34ee630a26"