Merge pull request #290 from convergence-rfq/squads-integration

Squads integration
convergence-rfq · Apr 1, 2024 · 43522c0 · 43522c0
2 parents 8a74598 + 8f12480
commit 43522c0
Show file tree

Hide file tree

Showing 50 changed files with 595 additions and 2,605 deletions.
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @convergence-rfq/cli
 
+## 6.5.0
+
+### Minor Changes
+
+- Replace risk engine program with a simplified one, add squads integration
+
+### Patch Changes
+
+- Updated dependencies
+  - @convergence-rfq/sdk@6.5.0
+
 ## 6.4.2
 
 ### Patch Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@convergence-rfq/cli",
   "description": "Official Convergence CLI",
-  "version": "6.4.2",
+  "version": "6.5.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
     "cli": "ts-node src/index.ts"
   },
   "dependencies": {
-    "@convergence-rfq/sdk": "6.4.2",
+    "@convergence-rfq/sdk": "6.5.0",
     "@solana/web3.js": "^1.87.6",
     "@types/cookie": "^0.5.1",
     "commander": "^10.0.0"

diff --git a/packages/cli/src/actions.ts b/packages/cli/src/actions.ts
@@ -1,8 +1,6 @@
 import { PublicKey, LAMPORTS_PER_SOL } from '@solana/web3.js';
 import {
   token,
-  toRiskCategoryInfo,
-  toScenario,
   devnetAirdrops,
   PriceOracle,
   SpotLegInstrument,
@@ -33,7 +31,6 @@ import {
   logTx,
   logError,
   logTokenAccount,
-  logRiskEngineConfig,
   logRegisteredMint,
   logCollateral,
   logToken,
@@ -497,121 +494,6 @@ export const getCollateral = async (opts: Opts) => {
   }
 };
 
-// Risk engine
-
-export const initializeRiskEngine = async (opts: Opts) => {
-  const cvg = await createCvg(opts);
-  try {
-    const { response } = await expirationRetry(
-      () =>
-        cvg.riskEngine().initializeConfig({
-          collateralMintDecimals: opts.collateralMintDecimals,
-          minCollateralRequirement: opts.minCollateralRequirement,
-          collateralForFixedQuoteAmountRfqCreation:
-            opts.collateralForFixedQuoteAmountRfqCreation,
-          safetyPriceShiftFactor: opts.safetyPriceShiftFactor,
-          overallSafetyFactor: opts.overallSafetyFace,
-          acceptedOracleStaleness: opts.acceptedOracleStaleness,
-          acceptedOracleConfidenceIntervalPortion:
-            opts.acceptedOracleConfidenceIntervalPortion,
-        }),
-      opts
-    );
-    logResponse(response);
-  } catch (e) {
-    logError(e);
-  }
-};
-
-export const updateRiskEngine = async (opts: Opts) => {
-  const cvg = await createCvg(opts);
-  try {
-    const { response } = await expirationRetry(
-      () =>
-        cvg.riskEngine().updateConfig({
-          collateralMintDecimals: opts.collateralMintDecimals,
-          minCollateralRequirement: opts.minCollateralRequirement,
-          collateralForFixedQuoteAmountRfqCreation:
-            opts.collateralForFixedQuoteAmountRfqCreation,
-          safetyPriceShiftFactor: opts.safetyPriceShiftFactor,
-          overallSafetyFactor: opts.overallSafetyFace,
-          acceptedOracleStaleness: opts.acceptedOracleStaleness,
-          acceptedOracleConfidenceIntervalPortion:
-            opts.acceptedOracleConfidenceIntervalPortion,
-        }),
-      opts
-    );
-    logResponse(response);
-  } catch (e) {
-    logError(e);
-  }
-};
-export const closeRiskEngine = async (opts: Opts) => {
-  const cvg = await createCvg(opts);
-  try {
-    const { response } = await cvg.riskEngine().closeConfig();
-    logResponse(response);
-  } catch (e) {
-    logError(e);
-  }
-};
-
-export const getRiskEngineConfig = async (opts: Opts) => {
-  const cvg = await createCvg(opts);
-  try {
-    const config = await cvg.riskEngine().fetchConfig();
-    logRiskEngineConfig(config);
-  } catch (e) {
-    logError(e);
-  }
-};
-
-export const setRiskEngineInstrumentType = async (opts: Opts) => {
-  const cvg = await createCvg(opts);
-  try {
-    const { response } = await expirationRetry(
-      () =>
-        cvg.riskEngine().setInstrumentType({
-          instrumentProgram: new PublicKey(opts.program),
-          instrumentType: opts.type,
-        }),
-      opts
-    );
-    logResponse(response);
-  } catch (e) {
-    logError(e);
-  }
-};
-
-export const setRiskEngineCategoriesInfo = async (opts: Opts) => {
-  const newValue = opts.newValue.split(',').map((x: string) => parseFloat(x));
-  const cvg = await createCvg(opts);
-  try {
-    const { response } = await expirationRetry(
-      () =>
-        cvg.riskEngine().setRiskCategoriesInfo({
-          changes: [
-            {
-              value: toRiskCategoryInfo(newValue[0], newValue[1], [
-                toScenario(newValue[2], newValue[3]),
-                toScenario(newValue[4], newValue[5]),
-                toScenario(newValue[6], newValue[7]),
-                toScenario(newValue[8], newValue[9]),
-                toScenario(newValue[10], newValue[11]),
-                toScenario(newValue[12], newValue[13]),
-              ]),
-              category: opts.category,
-            },
-          ],
-        }),
-      opts
-    );
-    logResponse(response);
-  } catch (e) {
-    logError(e);
-  }
-};
-
 // Devnet and localnet helpers
 
 export const airdrop = async (opts: Opts) => {

diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
@@ -1,7 +1,6 @@
 import { Command } from 'commander';
 
 import {
-  riskEngineGroup,
   protocolGroup,
   collateralGroup,
   airdropGroup,
@@ -16,7 +15,6 @@ export const makeCli = (): Command => {
     airdropGroup,
     tokenGroup,
     protocolGroup,
-    riskEngineGroup,
     collateralGroup,
     rfqGroup,
     hxroGroup,

diff --git a/packages/cli/src/groups/index.ts b/packages/cli/src/groups/index.ts
@@ -2,7 +2,6 @@ export * from './airdrop';
 export * from './collateral';
 export * from './protocol';
 export * from './rfq';
-export * from './riskEngine';
 export * from './token';
 export * from './hxro';
 export * from './spotInstrument';
diff --git a/packages/cli/src/groups/riskEngine.ts b/packages/cli/src/groups/riskEngine.ts
diff --git a/packages/cli/src/logger.ts b/packages/cli/src/logger.ts
@@ -120,22 +120,6 @@ export const logProtocol = (p: Protocol): void => {
   });
 };
 
-export const logRiskEngineConfig = (r: any): void => {
-  l('Address:', r.address.toString());
-  l(
-    'Minimal collateral requirement:',
-    N(r.minCollateralRequirement.toString())
-  );
-  l(
-    'Collateral for fixed quote amount RFQ creation:',
-    N(r.collateralForFixedQuoteAmountRfqCreation.toString())
-  );
-  l('Collateral mint decimals:', N(r.collateralMintDecimals.toString()));
-  l('Safety price shift factor:', N(r.safetyPriceShiftFactor.toString()));
-  l('Overall safety factor:', r.overallSafetyFactor);
-  r.riskCategoriesInfo.map(logRiskCategoryInfo);
-};
-
 export const logRiskCategoryInfo = (c: any): void => {
   const formatRatio = (x: any) => {
     return [x.baseAssetPriceChange, x.volatilityChange].join('/');