Merge pull request #170 from Juneo-io/dev

v0.0.134
Juneo-io · Aug 29, 2024 · 4521682 · 4521682
2 parents 53c1898 + 4ab52d1
commit 4521682
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juneojs",
-  "version": "0.0.133",
+  "version": "0.0.134",
   "description": "Juneo JS Library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/network/socotra.ts b/src/network/socotra.ts
@@ -2,7 +2,7 @@ import { JEVMGasToken, JNTAsset, JRC20Asset, WrappedAsset } from '../asset'
 import { JEVMBlockchain, JVMBlockchain, PlatformBlockchain, RewardConfig, StakeConfig } from '../chain'
 import { MCN, PrimarySupernet } from './network'
 
-const SocotraNetworkName = 'SocotraTestnet'
+const SocotraNetworkName = 'Socotra Testnet'
 const SocotraNetworkId = 46
 const SocotraHrp = 'socotra'
 const SocotraStakeConfig = new StakeConfig(

diff --git a/src/wallet/transaction/cross/cross.ts b/src/wallet/transaction/cross/cross.ts
@@ -136,7 +136,7 @@ export class CrossManager {
     )
   }
 
-  async export (
+  async crossExport (
     provider: MCNProvider,
     source: Blockchain,
     destination: Blockchain,
@@ -197,7 +197,7 @@ export class CrossManager {
     throw new CrossError(`source vm id does not support cross: ${source.vm.id}`)
   }
 
-  async import (
+  async crossImport (
     provider: MCNProvider,
     source: Blockchain,
     destination: Blockchain,
@@ -411,7 +411,7 @@ export class CrossManager {
       sourceUtxos = (sourceAccount as UtxoAccount).utxoSet
     }
     const destinationAccount: ChainAccount = account.getAccount(cross.destination.id)
-    const exportTransactionId: string = await this.export(
+    const exportTransactionId: string = await this.crossExport(
       provider,
       cross.source,
       cross.destination,
@@ -454,7 +454,7 @@ export class CrossManager {
     if (!cross.sendImportFee && (destinationVmId === JVM_ID || destinationVmId === PLATFORMVM_ID)) {
       destinationUtxos.push(...(destinationAccount as UtxoAccount).utxoSet)
     }
-    const importTransactionId: string = await this.import(
+    const importTransactionId: string = await this.crossImport(
       provider,
       cross.source,
       cross.destination,
@@ -671,7 +671,7 @@ export class CrossManager {
   async executeCrossResumeOperation (summary: CrossResumeOperationSummary, account: ChainAccount): Promise<void> {
     const resumeOperation: CrossResumeOperation = summary.operation
     const executable: ExecutableOperation = summary.getExecutable()
-    const importTransactionId: string = await this.import(
+    const importTransactionId: string = await this.crossImport(
       executable.provider,
       resumeOperation.source,
       resumeOperation.destination,