Sdk 372 preparesettlement should calculate needed atas create atas #240

Nagaprasadvr · 2023-09-04T11:14:22Z

Fix :
Move MintoOptions logic to prepareSettlement Operation and implement signAllTransaction

linear · 2023-09-04T11:14:24Z

SDK-372 prepareSettlement should calculate needed ATAs, create ATAs, and handle required all txs

For example, should also mint options

changeset-bot · 2023-09-04T11:14:27Z

⚠️ No Changeset found

Latest commit: b655a68

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

codeclimate · 2023-09-05T05:28:33Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

            convergence,
            optionMarket.optionMint,
            caller
          );
-
-          const writerToken = await getOrCreateATA(
+          if (optionToken.instruction) {


Avoid deeply nested control flow statements.

codeclimate · 2023-09-05T05:28:33Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

            convergence,
            optionMarket!.writerTokenMint,
            caller
          );
-
-          const underlyingToken = await getOrCreateATA(
+          if (writerToken.instruction) {


Avoid deeply nested control flow statements.

codeclimate · 2023-09-05T05:28:34Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

            convergence,
            optionMarket!.underlyingAssetMint,
            caller
          );
-
+          if (underlyingToken.instruction) {


Avoid deeply nested control flow statements.

codeclimate · 2023-09-05T05:28:34Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

@@ -166,28 +184,41 @@ export const mintEuropeanOptions = async (
            ? stableMintToken
            : underlyingMintToken;

-        const optionDestination = await getOrCreateATA(
+        const {


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-05T05:28:34Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

+        if (optionDestinationAtaIx) {
+          instructions.push(optionDestinationAtaIx);
+        }
+        const {


Similar blocks of code found in 2 locations. Consider refactoring.

…e-rfq/convergence-sdk into sdk-372-preparesettlement-should-calculate-needed-atas-create-atas

codeclimate · 2023-09-05T08:24:56Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

            convergence,
            optionMarket.optionMint,
            caller
          );
-
-          const writerToken = await getOrCreateATA(
+          if (optionToken.txBuilder) {


Avoid deeply nested control flow statements.

codeclimate · 2023-09-05T08:24:56Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

            convergence,
            optionMarket!.writerTokenMint,
            caller
          );
-
-          const underlyingToken = await getOrCreateATA(
+          if (writerToken.txBuilder) {


Avoid deeply nested control flow statements.

codeclimate · 2023-09-05T08:24:56Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

            convergence,
            optionMarket!.underlyingAssetMint,
            caller
          );
-
+          if (underlyingToken.txBuilder) {


Avoid deeply nested control flow statements.

codeclimate · 2023-09-05T08:24:56Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

-      });
-    });
+  let signedTxs: Transaction[] = [];
+  if (ataTxBuilderArray.length > 0 || mintTxBuilderArray.length > 0) {


Identical blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-05T08:24:56Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

+    }
+  }
+  let signedTxs: Transaction[] = [];
+  if (ataTxBuilderArray.length > 0 || mintTxBuilderArray.length > 0) {


Identical blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-05T08:33:41Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts


-    const sig = await txBuilder.sendAndConfirm(convergence, confirmOptions);
-    return sig;
+  if (ataSignedTx.length > 0) {


Similar blocks of code found in 4 locations. Consider refactoring.

codeclimate · 2023-09-05T08:33:41Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

+          .serializeAndSendTransaction(signedTx, lastValidBlockHeight)
+    );
+  }
+  if (mintSignedTx.length > 0) {


Similar blocks of code found in 4 locations. Consider refactoring.

codeclimate · 2023-09-05T08:33:42Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

+  const ataSignedTx = signedTxs.slice(0, ataTxBuilderArray.length);
+  const mintSignedTx = signedTxs.slice(ataTxBuilderArray.length);
+
+  if (ataSignedTx.length > 0) {


Similar blocks of code found in 4 locations. Consider refactoring.

codeclimate · 2023-09-05T08:33:42Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

+          .serializeAndSendTransaction(signedTx, lastValidBlockHeight)
+    );
+  }
+  if (mintSignedTx.length > 0) {


Similar blocks of code found in 4 locations. Consider refactoring.

codeclimate · 2023-09-05T08:33:42Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

      }
    }
+    if (mintInstructions.length > 0) {


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-05T13:59:49Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

        }
      }
    }
+    if (mintInstructions.length > 0) {


Similar blocks of code found in 2 locations. Consider refactoring.

into sdk-372-preparesettlement-should-calculate-needed-atas-create-atas

codeclimate · 2023-09-05T14:35:15Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts


-    const sig = await txBuilder.sendAndConfirm(convergence, confirmOptions);
-    return sig;
+  if (ataSignedTx.length > 0) {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-05T14:35:15Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

+      )
+    );
+  }
+  if (mintSignedTx.length > 0) {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-05T14:35:15Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

+  const ataSignedTx = signedTxs.slice(0, ataTxBuilderArray.length);
+  const mintSignedTx = signedTxs.slice(ataTxBuilderArray.length);
+
+  if (ataSignedTx.length > 0) {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-07T12:58:53Z

packages/js/src/plugins/rfqModule/operations/prepareSettlement.ts

+  );
+};
+
+const doesRfqLegContainsPsyoptionsEuropean = (rfq: Rfq) => {


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-07T12:58:54Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

@@ -117,150 +99,140 @@ export const createEuropeanProgram = async (convergence: Convergence) => {
  );
 };

-export const mintEuropeanOptions = async (
+// create European Option ATAs and mint options
+export const prepareEuropeanOptions = async (


Function prepareEuropeanOptions has 121 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2023-09-07T12:58:54Z

packages/js/src/plugins/rfqModule/operations/prepareSettlement.ts

@@ -308,3 +357,15 @@ export const prepareSettlementBuilder = async (
      }
    );
 };
+
+const doesRfqLegContainsPsyoptionsAmerican = (rfq: Rfq) => {


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-07T12:58:54Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

-// used in UI
-export const getOrCreateAmericanOptionATAs = async (
+//create American Options ATAs and mint Options
+export const prepareAmericanOptions = async (


Function prepareAmericanOptions has 113 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2023-09-07T12:58:54Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

+      )
+    );
+  }
+  if (mintSignedTx.length > 0) {


Similar blocks of code found in 4 locations. Consider refactoring.

codeclimate · 2023-09-07T16:20:08Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

+  const ataSignedTx = signedTxs.slice(0, ataTxBuilderArray.length);
+  const mintSignedTx = signedTxs.slice(ataTxBuilderArray.length);
+
+  if (ataSignedTx.length > 0) {


Similar blocks of code found in 4 locations. Consider refactoring.

codeclimate · 2023-09-07T16:20:08Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

-    return ATAExistence.EXISTS;
+  let signedTxs: Transaction[] = [];
+  const lastValidBlockHeight = await convergence.rpc().getLatestBlockhash();
+  if (ataTxBuilderArray.length > 0 || mintTxBuilderArray.length > 0) {


Identical blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-07T16:20:08Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

-// used in UI
-export const getOrCreateAmericanOptionATAs = async (
+//create American Options ATAs and mint Options
+export const prepareAmericanOptions = async (


Function prepareAmericanOptions has a Cognitive Complexity of 21 (exceeds 5 allowed). Consider refactoring.

codeclimate · 2023-09-07T16:20:08Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

    new PublicKey(psyoptionsEuropean.programId)
  );
 };

-export const mintEuropeanOptions = async (
+// create European Option ATAs and mint options
+export const prepareEuropeanOptions = async (


Function prepareEuropeanOptions has a Cognitive Complexity of 20 (exceeds 5 allowed). Consider refactoring.

EquilateralDelta · 2023-09-08T12:05:05Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts


-        const optionMarket = await psyoptionsAmerican.getOptionByKey(
+    const optionMarket = await leg.getOptionMeta();


Why do we skip all the logic if this returns null?

EquilateralDelta · 2023-09-08T12:06:42Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts


-        const optionMarket = await psyoptionsAmerican.getOptionByKey(
+    const optionMarket = await leg.getOptionMeta();
+    if (optionMarket) {


We can reverse this logic to remove the amount of nesting

EquilateralDelta · 2023-09-08T12:12:32Z

packages/js/src/utils/classes.ts

+    );
+  };
+  private matchInstruction = (ixToBeAdded: TransactionInstruction): boolean => {
+    this.IxArray.forEach((ix) => {


Why not just return every as in the method above?

bcos we are checking if one of the ix in IxArray match the passed ix and return true in that case

You can still use it. Just check if every instruction differs using every and return false in that case. Otherwise, return true.

EquilateralDelta · 2023-09-08T12:14:20Z

packages/js/src/utils/classes.ts

+          checked++;
+        }
+      });
+      return checked === ixLength;


This wouldn't work correctly in a case when this returns false, but still adds some of the instruction to the inner tracking list

EquilateralDelta · 2023-09-08T12:16:17Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

+    }
+    const euroMeta = await leg.getOptionMeta();
+    const { stableMint } = euroMeta;
+    const { underlyingMint } = euroMeta;


Two deconstructions of the same object

codeclimate · 2023-09-08T15:15:31Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

    new PublicKey(psyoptionsEuropean.programId)
  );
 };

-export const mintEuropeanOptions = async (
+// create European Option ATAs and mint options
+export const prepareEuropeanOptions = async (


Function prepareEuropeanOptions has 120 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2023-09-08T15:15:31Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

-// used in UI
-export const getOrCreateAmericanOptionATAs = async (
+//create American Options ATAs and mint Options
+export const prepareAmericanOptions = async (


Function prepareAmericanOptions has 108 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2023-09-08T15:15:31Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

-// used in UI
-export const getOrCreateAmericanOptionATAs = async (
+//create American Options ATAs and mint Options
+export const prepareAmericanOptions = async (


Function prepareAmericanOptions has a Cognitive Complexity of 18 (exceeds 5 allowed). Consider refactoring.

codeclimate · 2023-09-08T15:15:31Z

packages/js/src/utils/classes.ts

+    });
+    return false;
+  };
+  checkedAdd(ix: TransactionInstruction | TransactionBuilder): boolean {


Function checkedAdd has a Cognitive Complexity of 6 (exceeds 5 allowed). Consider refactoring.

EquilateralDelta · 2023-09-11T10:11:27Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

-        }
-      }
+    const optionMarket = await leg.getOptionMeta();
+    if (!optionMarket) {


In which cases this is null?

removing this check

EquilateralDelta · 2023-09-11T10:16:55Z

packages/js/src/utils/classes.ts

+    );
+  };
+  private matchInstruction = (ixToBeAdded: TransactionInstruction): boolean => {
+    this.IxArray.forEach((ix) => {


You can still use it. Just check if every instruction differs using every and return false in that case. Otherwise, return true.

EquilateralDelta · 2023-09-11T10:17:35Z

packages/js/src/utils/classes.ts

+      const instructions = ix.getInstructions();
+      const ixLength = instructions.length;
+      let checked = 0;
+      instructions.forEach((ix) => {


Why not use every here also?

EquilateralDelta · 2023-09-11T10:19:55Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

+    tx.recentBlockhash = latestBlockHash.blockhash;
+    tx.feePayer = convergence.rpc().getDefaultFeePayer().publicKey;
+    await convergence.identity().signTransaction(tx);
+    await convergence.rpc().serializeAndSendTransaction(tx, latestBlockHash);


Can't we use a regular sign and send tx rpc call here?

EquilateralDelta · 2023-09-11T10:20:03Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts

+    const signedTx = await convergence.identity().signTransaction(createTx);
+    await convergence
+      .rpc()
+      .serializeAndSendTransaction(signedTx, latestBlockHash);


Can't we use a regular sign and send tx rpc call here?

codeclimate · 2023-09-11T12:30:50Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

-// used in UI
-export const getOrCreateAmericanOptionATAs = async (
+//create American Options ATAs and mint Options
+export const prepareAmericanOptions = async (


Function prepareAmericanOptions has 105 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2023-09-11T12:30:50Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/helpers.ts

-// used in UI
-export const getOrCreateAmericanOptionATAs = async (
+//create American Options ATAs and mint Options
+export const prepareAmericanOptions = async (


Function prepareAmericanOptions has a Cognitive Complexity of 16 (exceeds 5 allowed). Consider refactoring.

EquilateralDelta · 2023-09-14T10:15:59Z

packages/js/src/utils/classes.ts

+    if (ix instanceof TransactionBuilder) {
+      const instructions = ix.getInstructions();
+      const ixLength = instructions.length;
+      let checked = 0;


Why do we need this variable? We can just use the return value of instructions.every in the next line

EquilateralDelta · 2023-09-14T10:48:09Z

packages/js/src/utils/classes.ts

+      const instructions = ix.getInstructions();
+      const uniqueIxs = instructions.every((ix) => {
+        return !this.matchInstruction(ix);
+      });


Let's rework lambda from a block to a simple expression and rename a uniqueIxs because this name implies a list of unique instructions, but it's actually a boolean value

codeclimate · 2023-09-14T10:54:36Z

Code Climate has analyzed commit b655a68 and detected 18 issues on this pull request.

Here's the issue category breakdown:

Category	Count
Complexity	8
Duplication	10

View more on Code Climate.

Nagaprasadvr added 5 commits August 29, 2023 14:28

need to fix mintAmericanOptions

252658e

add logs to find error

6ad852c

testing

b4140d4

add mintOptions logic to prepareSettlement operation

c1e9a55

american mintOptions not working

abebda0

Nagaprasadvr changed the base branch from main to dev September 4, 2023 11:14

Nagaprasadvr marked this pull request as draft September 4, 2023 11:14

Nagaprasadvr added 2 commits September 5, 2023 10:44

testing

76fe7a8

fix build errors

f54300f

codeclimate bot reviewed Sep 5, 2023

View reviewed changes

Nagaprasadvr added 7 commits September 5, 2023 11:03

fix more build errors

4c0c659

Merge branch 'sdk-408-fix-cli-tests' of https://github.com/convergenc…

743b8bd

…e-rfq/convergence-sdk into sdk-372-preparesettlement-should-calculate-needed-atas-create-atas

add cvgWallet

9c3c6bc

fix circular deps

5f8f6f3

change defaultFeePayer to identity in CvgWallet

32ab68a

add convergence.identity() as signer

d498542

fixed

22e1227

codeclimate bot reviewed Sep 5, 2023

View reviewed changes

reduce expiry

a3e4ac6

codeclimate bot reviewed Sep 5, 2023

View reviewed changes

replace sol with btc mint

7fbacd8

codeclimate bot reviewed Sep 5, 2023

View reviewed changes

Nagaprasadvr added 4 commits September 5, 2023 19:35

add long and short legs to straddle test

cc61a70

Merge branch 'dev' of https://github.com/convergence-rfq/convergence-sdk

5b27ca6

into sdk-372-preparesettlement-should-calculate-needed-atas-create-atas

add more randomness to expiry

85e9a71

use Promise.all

ba41ad9

codeclimate bot reviewed Sep 5, 2023

View reviewed changes

fix promise.all

3b384c6

cleanup

d627b60

Nagaprasadvr marked this pull request as ready for review September 5, 2023 16:06

Nagaprasadvr added 4 commits September 7, 2023 15:51

optimise and cleanup

ae5ae1c

fix createEuropeanProgram

2dfa4f7

cleanup

c769c1f

fix settlementResult tests

fa7b6d3

codeclimate bot reviewed Sep 7, 2023

View reviewed changes

EquilateralDelta suggested changes Sep 8, 2023

View reviewed changes

resolve comments

6937fb7

codeclimate bot reviewed Sep 8, 2023

View reviewed changes

Nagaprasadvr requested a review from EquilateralDelta September 8, 2023 15:16

pull dev

9dd996d

EquilateralDelta suggested changes Sep 11, 2023

View reviewed changes

Nagaprasadvr added 3 commits September 11, 2023 17:06

resolve comments

85aa453

add sendAndConfirmTx fn when signing individual txs

df69c67

remove convergence.identity() as explicit signer

ba5afa6

codeclimate bot reviewed Sep 11, 2023

View reviewed changes

Nagaprasadvr added 4 commits September 11, 2023 19:03

fix signature verification error

d28abd9

add more randomness to expiry

c7c16dc

simplify UniqueInstructionTracker logic

344a832

optimize UnqueInstructionTracker code

b655a68

EquilateralDelta suggested changes Sep 14, 2023

View reviewed changes

EquilateralDelta approved these changes Sep 14, 2023

View reviewed changes

pindaroso merged commit 9e94493 into dev Sep 20, 2023
1 check passed


		const optionMarket = await psyoptionsAmerican.getOptionByKey(
		const optionMarket = await leg.getOptionMeta();

Sdk 372 preparesettlement should calculate needed atas create atas #240

Sdk 372 preparesettlement should calculate needed atas create atas #240

Conversation

Nagaprasadvr commented Sep 4, 2023 • edited Loading

linear bot commented Sep 4, 2023

changeset-bot bot commented Sep 4, 2023 • edited Loading

⚠️ No Changeset found

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 5, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Nagaprasadvr Sep 8, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codeclimate bot Sep 8, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 8, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 8, 2023

Nagaprasadvr commented Sep 4, 2023 •

edited

Loading

changeset-bot bot commented Sep 4, 2023 •

edited

Loading

Nagaprasadvr Sep 8, 2023 •

edited

Loading