Revert "feat: Add Authenticator flow for Permissioned Keys (#317)"

This reverts commit bdbab8c.

Author: tyleroooo

v4-client-js/examples/constants.ts

@@ -15,8 +15,6 @@ export const DYDX_LOCAL_ADDRESS = 'dydx199tqg4wdlnu4qjlxchpd7seg454937hjrknju4';
 export const DYDX_LOCAL_MNEMONIC =
   'merge panther lobster crazy road hollow amused security before critic about cliff exhibit cause coyote talent happy where lion river tobacco option coconut small';
 
-export const DYDX_TEST_MNEMONIC_2 = 'movie yard still copper exile wear brisk chest ride dizzy novel future menu finish radar lunar claim hub middle force turtle mouse frequent embark';
-
 export const MARKET_BTC_USD: string = 'BTC-USD';
 export const PERPETUAL_PAIR_BTC_USD: number = 0;
 

v4-client-js/examples/permissioned_keys_example.ts

@@ -38,8 +38,8 @@
     "@cosmjs/stargate": "^0.32.1",
     "@cosmjs/tendermint-rpc": "^0.32.1",
     "@cosmjs/utils": "^0.32.1",
-    "@dydxprotocol/v4-proto": "8.0.0",
     "@osmonauts/lcd": "^0.6.0",
+    "@dydxprotocol/v4-proto": "7.0.0-dev.0",
     "@scure/bip32": "^1.1.5",
     "@scure/bip39": "^1.1.1",
     "axios": "1.1.3",

v4-client-js/package-lock.json

@@ -5,7 +5,6 @@ import {
   BroadcastTxAsyncResponse,
   BroadcastTxSyncResponse,
 } from '@cosmjs/tendermint-rpc/build/tendermint37';
-import { GetAuthenticatorsResponse } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/accountplus/query';
 import {
   Order_ConditionType,
   Order_TimeInForce,
@@ -18,7 +17,6 @@ import { bigIntToBytes } from '../lib/helpers';
 import { isStatefulOrder, verifyOrderFlags } from '../lib/validation';
 import { GovAddNewMarketParams, OrderFlags } from '../types';
 import {
-  AuthenticatorType,
   Network,
   OrderExecution,
   OrderSide,
@@ -68,11 +66,6 @@ export interface OrderBatchWithMarketId {
   clientIds: number[];
 }
 
-export interface PermissionedKeysAccountAuth {
-  authenticators: Long[];
-  accountForOrder: SubaccountInfo;
-}
-
 export class CompositeClient {
   public readonly network: Network;
   public gasDenom: SelectedGasDenom = SelectedGasDenom.USDC;
@@ -158,7 +151,6 @@ export class CompositeClient {
     memo?: string,
     broadcastMode?: BroadcastMode,
     account?: () => Promise<Account>,
-    authenticators?: Long[],
   ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
     return this.validatorClient.post.send(
       wallet,
@@ -168,8 +160,6 @@ export class CompositeClient {
       memo,
       broadcastMode,
       account,
-      undefined,
-     authenticators,
     );
   }
 
@@ -307,15 +297,10 @@ export class CompositeClient {
     timeInForce: Order_TimeInForce,
     reduceOnly: boolean,
     memo?: string,
-    permissionedKeysAccountAuth?: PermissionedKeysAccountAuth,
   ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
-    // For permissioned orders, use the permissioning account details instead of the subaccount
-    // This allows placing orders on behalf of another account when using permissioned keys
-    const accountForOrder = permissionedKeysAccountAuth ? permissionedKeysAccountAuth.accountForOrder : subaccount;
     const msgs: Promise<EncodeObject[]> = new Promise((resolve, reject) => {
-
       const msg = this.placeShortTermOrderMessage(
-        accountForOrder,
+        subaccount,
         marketId,
         side,
         price,
@@ -326,16 +311,14 @@ export class CompositeClient {
         reduceOnly,
       );
       msg
-        .then((it) => {
-          resolve([it]);
-        })
+        .then((it) => resolve([it]))
         .catch((err) => {
           console.log(err);
           reject(err);
         });
     });
     const account: Promise<Account> = this.validatorClient.post.account(
-      accountForOrder.address,
+      subaccount.address,
       undefined,
     );
     return this.send(
@@ -346,7 +329,6 @@ export class CompositeClient {
       memo,
       undefined,
       () => account,
-      permissionedKeysAccountAuth?.authenticators,
     );
   }
 
@@ -1235,23 +1217,4 @@ export class CompositeClient {
   ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
     return this.validatorClient.post.createMarketPermissionless(ticker, subaccount, broadcastMode, gasAdjustment, memo);
   }
-
-  async addAuthenticator(
-    subaccount: SubaccountInfo,
-    authenticatorType: AuthenticatorType,
-    data: Uint8Array,
-  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
-    return this.validatorClient.post.addAuthenticator(subaccount, authenticatorType, data)
-  }
-
-  async removeAuthenticator(
-    subaccount: SubaccountInfo,
-    id: Long,
-  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
-    return this.validatorClient.post.removeAuthenticator(subaccount, id)
-  }
-
-  async getAuthenticators(address: string): Promise<GetAuthenticatorsResponse>{
-    return this.validatorClient.get.getAuthenticators(address);
-  }
 }

v4-client-js/package.json

@@ -116,10 +116,6 @@ export const TYPE_URL_MSG_UNDELEGATE = '/cosmos.staking.v1beta1.MsgUndelegate';
 export const TYPE_URL_MSG_WITHDRAW_DELEGATOR_REWARD =
   '/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward';
 
-// x/accountplus
-export const TYPE_URL_MSG_ADD_AUTHENTICATOR = '/dydxprotocol.accountplus.MsgAddAuthenticator'
-export const TYPE_URL_MSG_REMOVE_AUTHENTICATOR = '/dydxprotocol.accountplus.MsgRemoveAuthenticator'
-
 // ------------ Chain Constants ------------
 // The following are same across different networks / deployments.
 export const GOV_MODULE_ADDRESS = 'dydx10d07y265gmmuvt4z0w9aw880jnsr700jnmapky';
@@ -200,17 +196,6 @@ export enum PnlTickInterval {
   day = 'day',
 }
 
-// ----------- Authenticators -------------
-
-export enum AuthenticatorType {
-  ALL_OF = 'AllOf',
-  ANY_OF = 'AnyOf',
-  SIGNATURE_VERIFICATION = 'SignatureVerification',
-  MESSAGE_FILTER = 'MessageFilter',
-  CLOB_PAIR_ID_FILTER = 'ClobPairIdFilter',
-  SUBACCOUNT_FILTER = 'SubaccountFilter',
-}
-
 export enum TradingRewardAggregationPeriod {
   DAILY = 'DAILY',
   WEEKLY = 'WEEKLY',
@@ -300,7 +285,7 @@ export class Network {
     const indexerConfig = new IndexerConfig(IndexerApiHost.STAGING, IndexerWSHost.STAGING);
     const validatorConfig = new ValidatorConfig(
       ValidatorApiHost.STAGING,
-      STAGING_CHAIN_ID,
+      TESTNET_CHAIN_ID,
       {
         CHAINTOKEN_DENOM: 'adv4tnt',
         USDC_DENOM: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',

v4-client-js/src/clients/composite-client.ts

@@ -1,6 +1,5 @@
 import { GeneratedType, Registry } from '@cosmjs/proto-signing';
 import { defaultRegistryTypes } from '@cosmjs/stargate';
-import { MsgAddAuthenticator, MsgRemoveAuthenticator } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/accountplus/tx';
 import { MsgRegisterAffiliate } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/affiliates/tx';
 import {
   MsgPlaceOrder,
@@ -39,8 +38,6 @@ import {
   TYPE_URL_MSG_WITHDRAW_FROM_MEGAVAULT,
   TYPE_URL_MSG_REGISTER_AFFILIATE,
   TYPE_URL_MSG_CREATE_MARKET_PERMISSIONLESS,
-  TYPE_URL_MSG_ADD_AUTHENTICATOR,
-  TYPE_URL_MSG_REMOVE_AUTHENTICATOR,
 } from '../constants';
 
 export const registry: ReadonlyArray<[string, GeneratedType]> = [];
@@ -77,11 +74,6 @@ export function generateRegistry(): Registry {
     // affiliates
     [TYPE_URL_MSG_REGISTER_AFFILIATE, MsgRegisterAffiliate as GeneratedType],
 
-
-    // authentication
-    [TYPE_URL_MSG_ADD_AUTHENTICATOR, MsgAddAuthenticator as GeneratedType],
-    [TYPE_URL_MSG_REMOVE_AUTHENTICATOR, MsgRemoveAuthenticator as GeneratedType],
-
     // default types
     ...defaultRegistryTypes,
   ]);