HOTFIX: somewhere in the code we left old domains

Internet-of-People · Mar 29, 2021 · 61318a4 · 61318a4
1 parent e8dcc89
commit 61318a4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/src/components/ConfirmTXModal/ConfirmTXModal.vue b/src/components/ConfirmTXModal/ConfirmTXModal.vue
@@ -190,7 +190,7 @@ export default class ConfirmTxModal extends Vue {
     account.pub.key(this.params.senderAddressIndex); // create all keys up until this one.
 
     const api = await sdk.Layer1.createApi(
-      sdk.NetworkConfig.fromNetwork(networkKindToSDKNetwork(this.selectedNetwork.kind)),
+      sdk.NetworkConfig.fromUrl(networkKindToNetworkURL(this.selectedNetwork.kind), 4705),
     );
     const hydraPrivate = account.priv(this.unlockPassword);
     const amount = BigInt(this.params.flakesToSend);

diff --git a/src/utils/api.ts b/src/utils/api.ts
@@ -1,10 +1,9 @@
 import axios from 'axios';
 import { WalletNetworkKind } from '@/types';
-import { sdk } from '@/sdk';
-import { networkKindToSDKNetwork } from './convert';
+import { networkKindToNetworkURL } from './convert';
 
 export const getApi = (networkKind: WalletNetworkKind) => axios.create({
-  baseURL: `${sdk.getHostByNetwork(networkKindToSDKNetwork(networkKind))}:4705/`,
+  baseURL: `${networkKindToNetworkURL(networkKind)}:4705/`,
   headers: {
     'Content-Type': 'application/json',
   },

diff --git a/src/utils/convert.ts b/src/utils/convert.ts
@@ -43,7 +43,18 @@ export const networkKindToSDKNetwork = (networkKind: WalletNetworkKind): any =>
 
 export const networkKindToNetworkURL = (
   networkKind: WalletNetworkKind,
-): string => sdk.getHostByNetwork(networkKindToSDKNetwork(networkKind));
+): string => {
+  switch (networkKind) {
+    case WalletNetworkKind.HydraTestnet:
+      return 'https://test.explorer.hydraledger.io';
+    case WalletNetworkKind.HydraDevnet:
+      return 'https://dev.explorer.hydraledger.io';
+    case WalletNetworkKind.HydraMainnet:
+      return 'https://explorer.hydraledger.io';
+    default:
+      throw new Error(`Unknown network ${networkKind}`);
+  }
+};
 
 export const networkKindToTicker = (networkKind: WalletNetworkKind): string => {
   switch (networkKind) {

diff --git a/src/utils/rewind.ts b/src/utils/rewind.ts
@@ -1,11 +1,11 @@
 import { Store } from 'vuex';
-import { NetworkConfig, Types } from '@internet-of-people/sdk';
+import { Types } from '@internet-of-people/sdk';
 import { sdk } from '@/sdk';
 import { WalletNetworkKind, AddressInfo } from '@/types';
 import { WalletRootState } from '@/store/types';
 import { PersistedState } from '@/store/persisted/types';
 import { namespace as persisted } from '@/store/persisted';
-import { networkKindToSDKNetwork, networkKindToCoin, networkKindToNetworkInfo } from './convert';
+import { networkKindToCoin, networkKindToNetworkInfo, networkKindToNetworkURL } from './convert';
 
 const REWIND_GAP = 5;
 
@@ -22,23 +22,8 @@ export class DefaultNetworkAccessorFactory {
     serializedVault: string,
     unlockPassword: string,
   ): Promise<NetworkAccess> {
-    let host;
-    switch (networkKind) {
-      case WalletNetworkKind.HydraTestnet:
-        host = 'https://test.explorer.hydraledger.io';
-        break;
-      case WalletNetworkKind.HydraDevnet:
-        host = 'https://dev.explorer.hydraledger.io';
-        break;
-      case WalletNetworkKind.HydraMainnet:
-        host = 'https://explorer.hydraledger.io';
-        break;
-      default:
-        throw new Error(`Unknown network ${networkKind}`);
-    }
-
     const api = await sdk.Layer1.createApi(
-      sdk.NetworkConfig.fromUrl(host, 4705),
+      sdk.NetworkConfig.fromUrl(networkKindToNetworkURL(networkKind), 4705),
     );
     const vault = sdk.Crypto.Vault.load(JSON.parse(serializedVault));