Merge pull request #164 from hyperweb-io/refactor-eth

Refactor and move utils to packages

Author: Zetazzz

dev-docs/networks-refactoring-analysis.md

@@ -2,13 +2,12 @@ import './setup.test';
 
 import { ChainInfo } from '@chain-registry/client';
 import { Asset } from '@chain-registry/types';
-import { generateMnemonic } from '../src/utils';
 import { OfflineDirectSigner } from '@interchainjs/cosmos';
 import { Secp256k1HDWallet } from '@interchainjs/cosmos/wallets/secp256k1hd';
 import { HDPath } from '@interchainjs/types';
 import { getBalance } from "interchainjs/cosmos/bank/v1beta1/query.rpc.func";
 import { send } from "interchainjs/cosmos/bank/v1beta1/tx.rpc.func";
-import { useChain } from 'starshipjs';
+import { generateMnemonic, useChain } from 'starshipjs';
 import { getSigner, GetSignerOptions } from '../../src/interchain/core/getSigner';
 import { DirectSigner } from '@interchainjs/cosmos';
 import { ICosmosQueryClient, createCosmosQueryClient } from '@interchainjs/cosmos';

docs/advanced/package-functionality-guide.md

@@ -1 +0,0 @@
-export * from './utils';

libs/interchainjs/starship/__tests__/token.test.ts

@@ -1,4 +1,5 @@
-import { fromBase64, fromHex } from '@interchainjs/encoding';
+import { apiToNumber as encApiToNumber, apiToBigInt as encApiToBigInt, maybeFromBase64 as encMaybeFromBase64, safeFromBase64 as encSafeFromBase64, maybeFromHex as encMaybeFromHex } from '@interchainjs/encoding';
+import { snakeToCamel, snakeCaseRecursive } from '@interchainjs/utils';
 import { RpcMethod, ProtocolVersion, ProtocolInfo, ProtocolCapabilities } from '../types/protocol';
 import {
   AbciInfoResponse
@@ -239,72 +240,17 @@ export interface ICosmosProtocolAdapter extends IProtocolAdapter, RequestEncoder
 export abstract class BaseAdapter implements RequestEncoder, ResponseDecoder, ICosmosProtocolAdapter {
   constructor(protected version: ProtocolVersion) {}
 
-  // Recursive snake_case to camelCase transformation
-  protected toCamelCase(str: string): string {
-    return str.replace(/_([a-z])/g, (match, letter) => letter.toUpperCase());
-  }
-
+  // Use shared utilities from @interchainjs/utils
   protected transformKeys(obj: any): any {
-    if (obj === null || obj === undefined) {
-      return obj;
-    }
-
-    if (Array.isArray(obj)) {
-      return obj.map(item => this.transformKeys(item));
-    }
-
-    if (typeof obj === 'object') {
-      const transformed: any = {};
-      for (const [key, value] of Object.entries(obj)) {
-        const camelKey = this.toCamelCase(key);
-        transformed[camelKey] = this.transformKeys(value);
-      }
-      return transformed;
-    }
-
-    return obj;
+    return snakeCaseRecursive(obj);
   }
 
-  protected apiToNumber(value: string | undefined | null): number {
-    if (!value) return 0;
-    const num = parseInt(value, 10);
-    if (Number.isNaN(num)) return 0;
-    return num;
-  }
-
-  protected apiToBigInt(value: string | undefined | null): bigint {
-    if (!value) return BigInt(0);
-    return BigInt(value);
-  }
-
-  protected maybeFromBase64(value: string | undefined | null): Uint8Array | undefined {
-    if (!value) return undefined;
-    return this.safeFromBase64(value);
-  }
-
-  protected safeFromBase64(value: string): Uint8Array {
-    if (!value) return new Uint8Array(0);
+  protected apiToNumber(value: string | undefined | null): number { return encApiToNumber(value as any); }
+  protected apiToBigInt(value: string | undefined | null): bigint { return encApiToBigInt(value as any); }
+  protected maybeFromBase64(value: string | undefined | null): Uint8Array | undefined { return encMaybeFromBase64(value as any); }
+  protected safeFromBase64(value: string): Uint8Array { return encSafeFromBase64(value); }
+  protected maybeFromHex(value: string | undefined | null): Uint8Array | undefined { return encMaybeFromHex(value as any); }
 
-    // Fix base64 padding if needed
-    let paddedValue = value;
-    const remainder = value.length % 4;
-    if (remainder > 0) {
-      paddedValue = value + '='.repeat(4 - remainder);
-    }
-
-    try {
-      return fromBase64(paddedValue);
-    } catch (error) {
-      // If base64 decoding fails, return empty array
-      console.warn(`Failed to decode base64 value: ${value}`, error);
-      return new Uint8Array(0);
-    }
-  }
-
-  protected maybeFromHex(value: string | undefined | null): Uint8Array | undefined {
-    if (!value) return undefined;
-    return fromHex(value);
-  }
 
   protected decodeTime(timestamp: string): Date {
     return new Date(timestamp);
@@ -444,31 +390,6 @@ export abstract class BaseAdapter implements RequestEncoder, ResponseDecoder, IC
     return true; // All versions support basic consensus queries
   }
 
-  private camelToSnake(str: string): string {
-    return str.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
-  }
-
-  private snakeToCamel(str: string): string {
-    return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
-  }
-
-  private convertKeysToCamelCase(obj: any): any {
-    if (obj === null || typeof obj !== 'object') {
-      return obj;
-    }
-
-    if (Array.isArray(obj)) {
-      return obj.map(item => this.convertKeysToCamelCase(item));
-    }
-
-    const converted: any = {};
-    for (const [key, value] of Object.entries(obj)) {
-      const camelKey = this.snakeToCamel(key);
-      converted[camelKey] = this.convertKeysToCamelCase(value);
-    }
-    return converted;
-  }
-
   // Common decode methods that work across all versions
   decodeAbciInfo<T extends AbciInfoResponse = AbciInfoResponse>(response: unknown): T {
     const resp = response as Record<string, unknown>;

libs/interchainjs/starship/src/index.ts

@@ -1,2 +1 @@
-export { COSMOS_ADDRESS_STRATEGY } from './strategy';
 export { createCosmosConfig } from './config';

libs/interchainjs/starship/src/utils.ts

@@ -2,35 +2,20 @@
  * Common converter functions for API response transformation
  */
 
-import { fromBase64, fromHex } from '@interchainjs/encoding';
+import { fromBase64, fromHex, apiToNumber as encApiToNumber, apiToBigInt as encApiToBigInt } from '@interchainjs/encoding';
 
-/**
- * Convert API value to number (handles string numbers)
- */
-export const apiToNumber = (value: unknown): number | undefined => {
-  if (value === null || value === undefined) return undefined;
-  if (typeof value === 'number') return value;
-  if (typeof value === 'string') {
-    const num = parseInt(value, 10);
-    return isNaN(num) ? undefined : num;
-  }
-  return undefined;
+// Create wrapper functions that match the expected signatures for backward compatibility
+export const apiToNumber = (value: unknown): number => {
+  return encApiToNumber(value as string | number | undefined | null);
 };
 
-/**
- * Convert API value to bigint (handles string numbers)
- */
 export const apiToBigInt = (value: unknown): bigint | undefined => {
   if (value === null || value === undefined) return undefined;
-  if (typeof value === 'bigint') return value;
-  if (typeof value === 'string' || typeof value === 'number') {
-    try {
-      return BigInt(value);
-    } catch {
-      return undefined;
-    }
+  try {
+    return encApiToBigInt(value as string | number | undefined | null);
+  } catch {
+    return undefined;
   }
-  return undefined;
 };
 
 /**

networks/cosmos/src/adapters/base.ts

@@ -1,12 +1,8 @@
-import { Bip39, Random } from '@interchainjs/crypto';
+import { generateMnemonic } from '@interchainjs/crypto';
 import { AminoConverter, Encoder } from './types/signing-client';
 import { TelescopeGeneratedCodec } from '@interchainjs/types';
 import { assertEmpty } from '@interchainjs/utils';
 
-export function generateMnemonic(): string {
-  return Bip39.encode(Random.getBytes(16)).toString();
-}
-
 /**
  * from telescope generated codec to AminoConverter
  */