Merge pull request #27 from cosmology-tech/ethSecp256k1Auth

Eth secp256k1 auth for ethermint

.vscode/launch.json

@@ -35,6 +35,38 @@
       "console": "integratedTerminal",
       "cwd": "${workspaceFolder}/libs/interchainjs",
       "internalConsoleOptions": "neverOpen"
+   },
+   {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Jest Tests in Interchainjs eth token",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": [
+         "--config",
+         "./jest.starship.config.js",
+         "--verbose",
+         "--bail",
+         "starship/__tests__/token.test.ts"
+      ],
+      "console": "integratedTerminal",
+      "cwd": "${workspaceFolder}/networks/ethermint",
+      "internalConsoleOptions": "neverOpen"
+   },
+   {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Jest Tests in Interchainjs eth gov",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": [
+         "--config",
+         "./jest.starship.config.js",
+         "--verbose",
+         "--bail",
+         "starship/__tests__/gov.test.ts"
+      ],
+      "console": "integratedTerminal",
+      "cwd": "${workspaceFolder}/networks/ethermint",
+      "internalConsoleOptions": "neverOpen"
    }
   ]
 }

libs/interchainjs/src/cosmwasm-stargate.ts

@@ -38,7 +38,7 @@ export class CosmWasmSigningClient extends SigningClient {
     options: SignerOptions = {}
   ): Promise<CosmWasmSigningClient> {
     const signingClient = new CosmWasmSigningClient(
-      new RpcClient(endpoint, undefined, options.prefix),
+      new RpcClient(endpoint, options.prefix),
       signer,
       options
     );

libs/interchainjs/src/signing-client.ts

@@ -2,7 +2,6 @@ import { AminoSigner } from '@interchainjs/cosmos/amino';
 import { DirectSigner } from '@interchainjs/cosmos/direct';
 import { RpcClient } from '@interchainjs/cosmos/query/rpc';
 import {
-  AccountData,
   AminoConverter,
   Encoder,
   isICosmosAccount,
@@ -19,7 +18,13 @@ import { PubKey as Secp256k1PubKey } from '@interchainjs/cosmos-types/cosmos/cry
 import { TxBody, TxRaw } from '@interchainjs/cosmos-types/cosmos/tx/v1beta1/tx';
 import { Any } from '@interchainjs/cosmos-types/google/protobuf/any';
 import { TxRpc } from '@interchainjs/cosmos-types/types';
-import { HttpEndpoint, IKey, Price, StdFee } from '@interchainjs/types';
+import {
+  AccountData,
+  HttpEndpoint,
+  IKey,
+  Price,
+  StdFee,
+} from '@interchainjs/types';
 import { fromBase64 } from '@interchainjs/utils';
 
 import {
@@ -85,7 +90,7 @@ export class SigningClient {
     options: SignerOptions = {}
   ): Promise<SigningClient> {
     const signingClient = new SigningClient(
-      new RpcClient(endpoint, undefined, options.prefix),
+      new RpcClient(endpoint, options.prefix),
       signer,
       options
     );
@@ -133,8 +138,6 @@ export class SigningClient {
         this.directSigners[await signer.getAddress()] = signer;
       }
     }
-
-    this.queryClient.setHashedPubkey(firstPubkey);
   }
 
   private async getAccountData(address: string): Promise<AccountData> {
@@ -183,12 +186,12 @@ export class SigningClient {
     return await this.queryClient.getChainId();
   }
 
-  async getAccountNumber() {
-    return await this.queryClient.getAccountNumber();
+  async getAccountNumber(address: string) {
+    return await this.queryClient.getAccountNumber(address);
   }
 
-  async getSequence() {
-    return await this.queryClient.getSequence();
+  async getSequence(address: string) {
+    return await this.queryClient.getSequence(address);
   }
 
   getSinger(signerAddress: string) {

libs/interchainjs/src/stargate.ts

@@ -38,7 +38,7 @@ export class StargateSigningClient extends SigningClient {
     options: SignerOptions = {}
   ): Promise<StargateSigningClient> {
     const signingClient = new StargateSigningClient(
-      new RpcClient(endpoint, undefined, options.prefix),
+      new RpcClient(endpoint, options.prefix),
       signer,
       options
     );

libs/interchainjs/src/types/wallet.ts

@@ -1,6 +1,4 @@
 
-export type Algo = 'secp256k1' | 'ed25519' | 'sr25519';
-
 export type Bech32Address = string;
 
 export interface Pubkey {

libs/interchainjs/starship/configs/config.local.yaml

@@ -1,6 +1,5 @@
-
 name: interchainjs
-version: v0.2.6
+version: v0.2.12
 
 chains:
   - id: osmosis-1

libs/interchainjs/starship/configs/config.workflow.yaml

@@ -1,5 +1,5 @@
 name: interchainjs
-version: v0.2.6
+version: v0.2.12
 
 chains:
   - id: osmosis-1

libs/interchainjs/starship/configs/config.yaml

@@ -1,5 +1,5 @@
 name: interchainjs
-version: v0.2.6
+version: v0.2.12
 
 chains:
   - id: osmosis-1

networks/cosmos/src/amino.ts

@@ -5,6 +5,7 @@ import { BaseCosmosTxBuilderContext } from './base/builder-context';
 import { AminoSigBuilder, AminoTxBuilder } from './builder/amino-tx-builder';
 import {
   AminoConverter,
+  CosmosAccount,
   CosmosAminoDoc,
   CosmosAminoSigner,
   Encoder,
@@ -82,6 +83,14 @@ export class AminoSigner
     return new AminoTxBuilder(new BaseCosmosTxBuilderContext(this));
   }
 
+  async getAccount() {
+    return new CosmosAccount(
+      await this.getPrefix(),
+      this.auth,
+      this.config.publicKey.isCompressed
+    );
+  }
+
   static async fromWallet(
     signer: OfflineAminoSigner,
     encoders: Encoder[],

networks/cosmos/src/base/base-signer.ts

@@ -10,6 +10,7 @@ import {
   BaseSigner,
   BroadcastOptions,
   HttpEndpoint,
+  IAccount,
   IKey,
   isDocAuth,
   SignDocResponse,
@@ -66,6 +67,7 @@ export abstract class CosmosBaseSigner<SignDoc>
   readonly _encodePublicKey: (key: IKey) => EncodedMessage;
   readonly parseAccount: (encodedAccount: EncodedMessage) => BaseAccount;
   prefix?: string;
+  account?: IAccount;
   declare txBuilder: BaseCosmosTxBuilder<SignDoc>;
 
   constructor(
@@ -98,6 +100,18 @@ export abstract class CosmosBaseSigner<SignDoc>
     this.encoders.push(...encoders);
   };
 
+  getPrefix = async () => {
+    if (this.prefix) {
+      return this.prefix;
+    }
+
+    if (this.queryClient) {
+      return this.queryClient.getPrefix();
+    }
+
+    throw new Error("Can't get prefix because no queryClient is set");
+  };
+
   getEncoder = (typeUrl: string) => {
     const encoder = this.encoders.find(
       (encoder) => encoder.typeUrl === typeUrl
@@ -111,15 +125,17 @@ export abstract class CosmosBaseSigner<SignDoc>
   };
 
   async getAddress() {
-    return await this.queryClient.getAddress();
+    if (!this.account) {
+      this.account = await this.getAccount();
+    }
+
+    return this.account.address;
   }
 
+  abstract getAccount(): Promise<IAccount>;
+
   setEndpoint(endpoint: string | HttpEndpoint) {
-    this._queryClient = new RpcClient(
-      endpoint,
-      this.publicKeyHash,
-      this.prefix
-    );
+    this._queryClient = new RpcClient(endpoint, this.prefix);
     (this._queryClient as RpcClient).setAccountParser(this.parseAccount);
   }
 
@@ -192,7 +208,8 @@ export abstract class CosmosBaseSigner<SignDoc>
     });
     const { signerInfo } = await this.txBuilder.buildSignerInfo(
       this.encodedPublicKey,
-      options?.sequence ?? (await this.queryClient.getSequence()),
+      options?.sequence ??
+        (await this.queryClient.getSequence(await this.getAddress())),
       options?.signMode ?? SignMode.SIGN_MODE_DIRECT
     );
 

networks/cosmos/src/base/tx-builder.ts

@@ -75,7 +75,10 @@ export abstract class BaseCosmosTxBuilder<SignDoc>
     });
     const { signerInfo } = await this.buildSignerInfo(
       this.ctx.signer.encodedPublicKey,
-      options?.sequence ?? (await this.ctx.signer.queryClient.getSequence()),
+      options?.sequence ??
+        (await this.ctx.signer.queryClient.getSequence(
+          await this.ctx.signer.getAddress()
+        )),
       this.signMode
     );
 

networks/cosmos/src/builder/amino-tx-builder.ts

@@ -30,10 +30,15 @@ export class AminoTxBuilder extends BaseCosmosTxBuilder<CosmosAminoDoc> {
         options?.chainId ?? (await this.ctx.signer.queryClient.getChainId()),
       account_number: (
         options?.accountNumber ??
-        (await this.ctx.signer.queryClient.getAccountNumber())
+        (await this.ctx.signer.queryClient.getAccountNumber(
+          await this.ctx.signer.getAddress()
+        ))
       ).toString(),
       sequence: (
-        options?.sequence ?? (await this.ctx.signer.queryClient.getSequence())
+        options?.sequence ??
+        (await this.ctx.signer.queryClient.getSequence(
+          await this.ctx.signer.getAddress()
+        ))
       ).toString(),
       fee,
       msgs: toAminoMsgs(messages, this.ctx.signer.getConverterFromTypeUrl),

networks/cosmos/src/builder/direct-tx-builder.ts

@@ -36,7 +36,9 @@ export class DirectTxBuilder extends BaseCosmosTxBuilder<CosmosDirectDoc> {
         options?.chainId ?? (await this.ctx.signer.queryClient.getChainId()),
       accountNumber:
         options?.accountNumber ??
-        (await this.ctx.signer.queryClient.getAccountNumber()),
+        (await this.ctx.signer.queryClient.getAccountNumber(
+          await this.ctx.signer.getAddress()
+        )),
     });
     return signDoc;
   }

networks/cosmos/src/defaults.ts

@@ -1,4 +1,3 @@
-import { Secp256k1Signature } from '@interchainjs/auth/secp256k1';
 import {
   BaseAccount,
   ModuleAccount,
@@ -44,18 +43,6 @@ export const defaultSignerConfig: SignerConfig = {
       return hashed;
     },
   },
-  signature: {
-    fromCompact: (key: Key, algo: string) => {
-      switch (algo) {
-      case 'secp256k1':
-        return Secp256k1Signature.fromCompact(key);
-      case 'ed25519':
-        throw new Error('Not implemented yet');
-      default:
-        throw new Error(`Unidentified algorithm: ${algo}`);
-      }
-    },
-  },
 };
 
 export const defaultPublicKeyEncoder = (key: IKey): EncodedMessage => {
@@ -89,6 +76,7 @@ export const defaultAccountParser = (
       `No corresponding account found for account type ${encodedAccount.typeUrl}.`
     );
   }
+
   const decoder = toDecoder(codec);
   const account = decoder.fromPartial(decoder.decode(encodedAccount.value));
   const baseAccount =

networks/cosmos/src/direct.ts

@@ -4,6 +4,7 @@ import { BaseCosmosTxBuilder, CosmosBaseSigner, CosmosDocSigner } from './base';
 import { BaseCosmosTxBuilderContext } from './base/builder-context';
 import { DirectSigBuilder, DirectTxBuilder } from './builder/direct-tx-builder';
 import {
+  CosmosAccount,
   CosmosDirectDoc,
   CosmosDirectSigner,
   Encoder,
@@ -28,6 +29,14 @@ export class DirectSignerBase extends CosmosBaseSigner<CosmosDirectDoc> {
     super(auth, encoders, endpoint, options);
   }
 
+  async getAccount() {
+    return new CosmosAccount(
+      await this.getPrefix(),
+      this.auth,
+      this.config.publicKey.isCompressed
+    );
+  }
+
   getTxBuilder(): BaseCosmosTxBuilder<CosmosDirectDoc> {
     return new DirectTxBuilder(new BaseCosmosTxBuilderContext(this));
   }