Merge pull request #47 from cosmology-tech/sign-mode-names

change sign mode names
cosmology-tech · Oct 21, 2024 · 817d034 · 817d034
2 parents 3f5af37 + dfefb2f
commit 817d034
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/networks/cosmos/src/base/base-wallet.ts b/networks/cosmos/src/base/base-wallet.ts
@@ -147,14 +147,14 @@ implements ICosmosWallet, OfflineAminoSigner, OfflineDirectSigner
    */
   toGeneralOfflineSigner(signMode: string): ICosmosGeneralOfflineSigner {
     switch (signMode) {
-      case SIGN_MODE.SIGN_MODE_DIRECT:
+      case SIGN_MODE.DIRECT:
         return {
           signMode: signMode,
           getAccounts: async () => this.getAccounts(),
           sign: async ({ signerAddress, signDoc }: IGeneralOfflineSignArgs<string, CosmosDirectDoc>) =>
             this.signDirect(signerAddress, signDoc),
         };
-      case SIGN_MODE.SIGN_MODE_LEGACY_AMINO_JSON:
+      case SIGN_MODE.AMINO:
         return {
           signMode: signMode,
           getAccounts: async () => this.getAccounts(),

diff --git a/networks/cosmos/src/signing-client.ts b/networks/cosmos/src/signing-client.ts
@@ -92,7 +92,7 @@ export class SigningClient {
     let signers;
 
     switch (this.offlineSigner.signMode) {
-      case SIGN_MODE.SIGN_MODE_DIRECT:
+      case SIGN_MODE.DIRECT:
         signers = await DirectSigner.fromWalletToSigners(
           this.offlineSigner as IDirectGeneralOfflineSigner,
           this.encoders,
@@ -103,7 +103,7 @@ export class SigningClient {
         )
         break;
 
-      case SIGN_MODE.SIGN_MODE_LEGACY_AMINO_JSON:
+      case SIGN_MODE.AMINO:
         signers = await AminoSigner.fromWalletToSigners(
           this.offlineSigner as IAminoGeneralOfflineSigner,
           this.encoders,

diff --git a/networks/cosmos/src/types/docAuth.ts b/networks/cosmos/src/types/docAuth.ts
@@ -67,7 +67,7 @@ export class AminoDocAuth extends BaseDocAuth<OfflineAminoSigner | IAminoGeneral
   }
 
   static async fromGeneralOfflineSigner(offlineSigner: IAminoGeneralOfflineSigner) {
-    if(offlineSigner.signMode !== SIGN_MODE.SIGN_MODE_LEGACY_AMINO_JSON) {
+    if(offlineSigner.signMode !== SIGN_MODE.AMINO) {
       throw new Error('not an amino general offline signer');
     }
 
@@ -126,7 +126,7 @@ export class DirectDocAuth extends BaseDocAuth<OfflineDirectSigner | IDirectGene
   }
 
   static async fromGeneralOfflineSigner(offlineSigner: IDirectGeneralOfflineSigner) {
-    if(offlineSigner.signMode !== SIGN_MODE.SIGN_MODE_DIRECT) {
+    if(offlineSigner.signMode !== SIGN_MODE.DIRECT) {
       throw new Error('not a direct general offline signer');
     }
 

diff --git a/networks/cosmos/src/types/wallet.ts b/networks/cosmos/src/types/wallet.ts
@@ -115,7 +115,7 @@ export class AminoGeneralOfflineSigner implements IAminoGeneralOfflineSigner {
 
   }
 
-  readonly signMode: string = SIGN_MODE.SIGN_MODE_LEGACY_AMINO_JSON;
+  readonly signMode: string = SIGN_MODE.AMINO;
   getAccounts(): Promise<readonly AccountData[]> {
     return this.offlineSigner.getAccounts();
   }
@@ -133,7 +133,7 @@ export class DirectGeneralOfflineSigner implements IDirectGeneralOfflineSigner {
 
   }
 
-  readonly signMode: string = SIGN_MODE.SIGN_MODE_DIRECT;
+  readonly signMode: string = SIGN_MODE.DIRECT;
   getAccounts(): Promise<readonly AccountData[]> {
     return this.offlineSigner.getAccounts();
   }

diff --git a/networks/injective/src/signing-client.ts b/networks/injective/src/signing-client.ts
@@ -31,7 +31,7 @@ export class InjSigningClient extends SigningClient {
     let signers;
 
     switch (this.offlineSigner.signMode) {
-      case SIGN_MODE.SIGN_MODE_DIRECT:
+      case SIGN_MODE.DIRECT:
         signers = await DirectSigner.fromWalletToSigners(
           this.offlineSigner as IDirectGeneralOfflineSigner,
           this.encoders,
@@ -42,7 +42,7 @@ export class InjSigningClient extends SigningClient {
         )
         break;
 
-      case SIGN_MODE.SIGN_MODE_LEGACY_AMINO_JSON:
+      case SIGN_MODE.AMINO:
         signers = await AminoSigner.fromWalletToSigners(
           this.offlineSigner as IAminoGeneralOfflineSigner,
           this.encoders,

diff --git a/packages/types/src/signer.ts b/packages/types/src/signer.ts
@@ -244,9 +244,14 @@ export class BaseSigner {
  * SIGN_MODE for IGeneralOfflineSigner
  */
 export const SIGN_MODE = {
-  SIGN_MODE_DIRECT: 'SIGN_MODE_DIRECT',
-  SIGN_MODE_LEGACY_AMINO_JSON: 'SIGN_MODE_LEGACY_AMINO_JSON',
-  SIGN_MODE_EIP712_V2: 'SIGN_MODE_EIP712_V2',
+  /**
+   * SIGN_MODE for (cosmos_)direct
+   */
+  DIRECT: 'direct',
+  /**
+   * SIGN_MODE for (cosmos_)amino
+   */
+  AMINO: 'amino',
 };
 
 /**