@hawksightco/hawk-sdk 1.2.128 → 1.2.130

package/dist/src/idl/iyf-extension-idl.js

@@ -4967,6 +4967,72 @@ exports.IDL = {
             ],
             "args": []
         },
+        {
+            "name": "orcaAutoClosePositionWithTokenExtension",
+            "docs": [
+                "Orca whirlpool - Auto close position with Token2022 (Automation)"
+            ],
+            "discriminator": [
+                184,
+                162,
+                77,
+                124,
+                203,
+                145,
+                143,
+                112
+            ],
+            "accounts": [
+                {
+                    "name": "userPda",
+                    "docs": [
+                        "Hawksight user pda (FIRST account - required by iyf_extension_execute_v2)"
+                    ]
+                },
+                {
+                    "name": "hawksightAuthority",
+                    "docs": [
+                        "Hawksight authority (SECOND account - required by iyf_extension_execute_v2)"
+                    ],
+                    "signer": true
+                },
+                {
+                    "name": "position",
+                    "docs": [
+                        "Position account to be closed"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "positionMint",
+                    "docs": [
+                        "Position mint"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "positionTokenAccount",
+                    "docs": [
+                        "Position token account to be closed"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "token2022Program",
+                    "docs": [
+                        "Token2022 program"
+                    ]
+                },
+                {
+                    "name": "orcaWhirlpoolProgram",
+                    "docs": [
+                        "Orca Whirlpool program"
+                    ],
+                    "address": "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "orcaAutoDeposit",
             "docs": [
@@ -5593,6 +5659,113 @@ exports.IDL = {
                 }
             ]
         },
+        {
+            "name": "orcaAutoOpenPositionWithTokenExtension",
+            "docs": [
+                "Orca whirlpool - Auto open position with Token2022 (Automation)"
+            ],
+            "discriminator": [
+                109,
+                130,
+                108,
+                211,
+                187,
+                233,
+                251,
+                196
+            ],
+            "accounts": [
+                {
+                    "name": "userPda",
+                    "docs": [
+                        "Hawksight user pda (FIRST account - required by iyf_extension_execute_v2)"
+                    ]
+                },
+                {
+                    "name": "hawksightAuthority",
+                    "docs": [
+                        "Hawksight authority (for automation instructions)"
+                    ],
+                    "signer": true
+                },
+                {
+                    "name": "position",
+                    "docs": [
+                        "Position account to be created"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "positionMint",
+                    "docs": [
+                        "Position mint (signer for creation)"
+                    ],
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "positionTokenAccount",
+                    "docs": [
+                        "Position token account to be created (uninitialized)"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "whirlpool",
+                    "docs": [
+                        "Whirlpool account"
+                    ]
+                },
+                {
+                    "name": "token2022Program",
+                    "docs": [
+                        "Token2022 program"
+                    ]
+                },
+                {
+                    "name": "systemProgram",
+                    "docs": [
+                        "System program"
+                    ],
+                    "address": "11111111111111111111111111111111"
+                },
+                {
+                    "name": "associatedTokenProgram",
+                    "docs": [
+                        "Associated token program"
+                    ],
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "metadataUpdateAuth",
+                    "docs": [
+                        "Metadata update authority"
+                    ],
+                    "address": "3axbTs2z5GBy6usVbNVoqEgZMng3vZvMnAoX29BFfwhr"
+                },
+                {
+                    "name": "orcaWhirlpoolProgram",
+                    "docs": [
+                        "Orca Whirlpool program"
+                    ],
+                    "address": "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc"
+                }
+            ],
+            "args": [
+                {
+                    "name": "tickLowerIndex",
+                    "type": "i32"
+                },
+                {
+                    "name": "tickUpperIndex",
+                    "type": "i32"
+                },
+                {
+                    "name": "withTokenMetadata",
+                    "type": "bool"
+                }
+            ]
+        },
         {
             "name": "orcaAutoWithdraw",
             "docs": [
@@ -6243,6 +6416,75 @@ exports.IDL = {
             ],
             "args": []
         },
+        {
+            "name": "orcaClosePositionWithTokenExtension",
+            "docs": [
+                "Orca whirlpool - Close position with Token2022 (User)"
+            ],
+            "discriminator": [
+                37,
+                88,
+                149,
+                116,
+                68,
+                45,
+                159,
+                64
+            ],
+            "accounts": [
+                {
+                    "name": "userPda",
+                    "docs": [
+                        "Hawksight user pda (FIRST account - required by iyf_extension_execute_v2)"
+                    ]
+                },
+                {
+                    "name": "authority",
+                    "docs": [
+                        "Authority (SECOND account - required by iyf_extension_execute_v2)"
+                    ],
+                    "signer": true,
+                    "relations": [
+                        "userPda"
+                    ]
+                },
+                {
+                    "name": "position",
+                    "docs": [
+                        "Position account to be closed"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "positionMint",
+                    "docs": [
+                        "Position mint"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "positionTokenAccount",
+                    "docs": [
+                        "Position token account to be closed"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "token2022Program",
+                    "docs": [
+                        "Token2022 program"
+                    ]
+                },
+                {
+                    "name": "orcaWhirlpoolProgram",
+                    "docs": [
+                        "Orca Whirlpool program"
+                    ],
+                    "address": "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "orcaCompound",
             "docs": [
@@ -8123,6 +8365,116 @@ exports.IDL = {
                 }
             ]
         },
+        {
+            "name": "orcaOpenPositionWithTokenExtension",
+            "docs": [
+                "Orca whirlpool - Open position with Token2022 (User)"
+            ],
+            "discriminator": [
+                89,
+                88,
+                26,
+                171,
+                10,
+                192,
+                49,
+                250
+            ],
+            "accounts": [
+                {
+                    "name": "userPda",
+                    "docs": [
+                        "Hawksight user pda (FIRST account - required by iyf_extension_execute_v2)"
+                    ]
+                },
+                {
+                    "name": "authority",
+                    "docs": [
+                        "Authority (SECOND account - required by iyf_extension_execute_v2)"
+                    ],
+                    "signer": true,
+                    "relations": [
+                        "userPda"
+                    ]
+                },
+                {
+                    "name": "position",
+                    "docs": [
+                        "Position account to be created"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "positionMint",
+                    "docs": [
+                        "Position mint (signer for creation)"
+                    ],
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "positionTokenAccount",
+                    "docs": [
+                        "Position token account to be created (uninitialized)"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "whirlpool",
+                    "docs": [
+                        "Whirlpool account"
+                    ]
+                },
+                {
+                    "name": "token2022Program",
+                    "docs": [
+                        "Token2022 program"
+                    ]
+                },
+                {
+                    "name": "systemProgram",
+                    "docs": [
+                        "System program"
+                    ],
+                    "address": "11111111111111111111111111111111"
+                },
+                {
+                    "name": "associatedTokenProgram",
+                    "docs": [
+                        "Associated token program"
+                    ],
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "metadataUpdateAuth",
+                    "docs": [
+                        "Metadata update authority"
+                    ],
+                    "address": "3axbTs2z5GBy6usVbNVoqEgZMng3vZvMnAoX29BFfwhr"
+                },
+                {
+                    "name": "orcaWhirlpoolProgram",
+                    "docs": [
+                        "Orca Whirlpool program"
+                    ],
+                    "address": "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc"
+                }
+            ],
+            "args": [
+                {
+                    "name": "tickLowerIndex",
+                    "type": "i32"
+                },
+                {
+                    "name": "tickUpperIndex",
+                    "type": "i32"
+                },
+                {
+                    "name": "withTokenMetadata",
+                    "type": "bool"
+                }
+            ]
+        },
         {
             "name": "orcaRebalance",
             "docs": [

package/dist/src/ixGenerator/OrcaIxGenerator.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="@meteora-ag/dlmm/node_modules/@solana/web3.js" />
 import * as web3 from "@solana/web3.js";
 import { IyfMainIxGenerator } from "./IyfMainIxGenerator";
+import { SimplePdaGenerator } from "../classes/SimplePdaGenerator";
 type OrcaLimitClosePositionAutomation = {
     connection: web3.Connection;
     userWallet: web3.PublicKey;
@@ -8,17 +9,67 @@ type OrcaLimitClosePositionAutomation = {
     minBinId: number;
     maxBinId: number;
     useAta?: boolean;
+    is2022Position?: boolean;
+};
+type OrcaAutoOpenPositionWithTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    positionMint: web3.PublicKey;
+    whirlpool: web3.PublicKey;
+    tickLowerIndex: number;
+    tickUpperIndex: number;
+    withTokenMetadata: boolean;
+    is2022Position?: boolean;
+};
+type OrcaAutoClosePositionWithTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    positionMint: web3.PublicKey;
+    is2022Position?: boolean;
+};
+type OrcaOpenPositionWithTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    positionMint: web3.PublicKey;
+    whirlpool: web3.PublicKey;
+    tickLowerIndex: number;
+    tickUpperIndex: number;
+    withTokenMetadata: boolean;
+    is2022Position?: boolean;
+};
+type OrcaClosePositionWithTokenExtension = {
+    connection: web3.Connection;
+    userWallet: web3.PublicKey;
+    positionMint: web3.PublicKey;
+    is2022Position?: boolean;
 };
 /**
  * Orca IX Generator
  */
 export declare class OrcaIxGenerator {
     private iyfMain;
-    constructor(iyfMain: IyfMainIxGenerator);
+    private pda;
+    constructor(iyfMain: IyfMainIxGenerator, pda: SimplePdaGenerator);
     /**
      * Orca limit close position automation
      */
-    orcaLimitClosePositionAutomation({ connection, userWallet, position, minBinId, maxBinId, useAta, }: OrcaLimitClosePositionAutomation): Promise<web3.TransactionInstruction>;
+    orcaLimitClosePositionAutomation({ connection, userWallet, position, minBinId, maxBinId, useAta, is2022Position, }: OrcaLimitClosePositionAutomation): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca auto open position with Token2022 (Automation)
+     */
+    orcaAutoOpenPositionWithTokenExtension({ connection, userWallet, positionMint, whirlpool, tickLowerIndex, tickUpperIndex, withTokenMetadata, is2022Position, }: OrcaAutoOpenPositionWithTokenExtension): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca auto close position with Token2022 (Automation)
+     */
+    orcaAutoClosePositionWithTokenExtension({ connection, userWallet, positionMint, is2022Position, }: OrcaAutoClosePositionWithTokenExtension): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca open position with Token2022 (User)
+     */
+    orcaOpenPositionWithTokenExtension({ connection, userWallet, positionMint, whirlpool, tickLowerIndex, tickUpperIndex, withTokenMetadata, is2022Position, }: OrcaOpenPositionWithTokenExtension): Promise<web3.TransactionInstruction>;
+    /**
+     * Orca close position with Token2022 (User)
+     */
+    orcaClosePositionWithTokenExtension({ connection, userWallet, positionMint, is2022Position, }: OrcaClosePositionWithTokenExtension): Promise<web3.TransactionInstruction>;
 }
 export {};
 //# sourceMappingURL=OrcaIxGenerator.d.ts.map

package/dist/src/ixGenerator/OrcaIxGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OrcaIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/OrcaIxGenerator.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,KAAK,gCAAgC,GAAG;IACtC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAA;AAED;;GAEG;AACH,qBAAa,eAAe;IAGxB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,kBAAkB;IAGrC;;OAEG;IACG,gCAAgC,CAAC,EACrC,UAAU,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,MAAa,GACd,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;CAsE3E"}
+{"version":3,"file":"OrcaIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/OrcaIxGenerator.ts"],"names":[],"mappings":"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"}

package/dist/src/ixGenerator/OrcaIxGenerator.js

@@ -42,14 +42,15 @@ const orca_1 = require("../orca");
  * Orca IX Generator
  */
 class OrcaIxGenerator {
-    constructor(iyfMain) {
+    constructor(iyfMain, pda) {
         this.iyfMain = iyfMain;
+        this.pda = pda;
     }
     /**
      * Orca limit close position automation
      */
     orcaLimitClosePositionAutomation(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, position, minBinId, maxBinId, useAta = true, }) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, position, minBinId, maxBinId, useAta = true, is2022Position = false, }) {
             // Initialize anchor
             anchor_1.Anchor.initialize(connection);
             // Generate user pda
@@ -58,7 +59,7 @@ class OrcaIxGenerator {
             const whirlpoolInfo = yield anchor_1.Anchor.instance().orcaProgram.account.whirlpool.fetch(positionInfo.whirlpool);
             const whirlpool = positionInfo.whirlpool;
             const positionMint = positionInfo.positionMint;
-            const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
             const tokenOwnerAccountA = useAta ? (0, functions_1.generateAta)(userPda, whirlpoolInfo.tokenMintA) : (0, functions_1.generateUserPdaStorageAccount)(userPda, whirlpoolInfo.tokenMintA);
             const tokenOwnerAccountB = useAta ? (0, functions_1.generateAta)(userPda, whirlpoolInfo.tokenMintB) : (0, functions_1.generateUserPdaStorageAccount)(userPda, whirlpoolInfo.tokenMintB);
             const tokenVaultA = whirlpoolInfo.tokenVaultA;
@@ -115,5 +116,153 @@ class OrcaIxGenerator {
             });
         });
     }
+    /**
+     * Orca auto open position with Token2022 (Automation)
+     */
+    orcaAutoOpenPositionWithTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, positionMint, whirlpool, tickLowerIndex, tickUpperIndex, withTokenMetadata, is2022Position = true, }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet);
+            // Generate position and position token account
+            const position = this.pda.orca.generateOrcaPositionPDA(positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            // Generate orca auto open position with token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaAutoOpenPositionWithTokenExtension(tickLowerIndex, tickUpperIndex, withTokenMetadata)
+                .accounts({
+                userPda,
+                hawksightAuthority: addresses_1.HS_AUTHORITY,
+                position,
+                positionMint,
+                positionTokenAccount,
+                whirlpool,
+                token2022Program: addresses_1.TOKEN_2022,
+                systemProgram: web3.SystemProgram.programId,
+                associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
+                metadataUpdateAuth: addresses_1.ORCA_METADATA_UPDATE_AUTH,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main)
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: addresses_1.HS_AUTHORITY,
+                ix
+            });
+        });
+    }
+    /**
+     * Orca auto close position with Token2022 (Automation)
+     */
+    orcaAutoClosePositionWithTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, positionMint, is2022Position = true, }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet);
+            // Generate position and position token account
+            const position = this.pda.orca.generateOrcaPositionPDA(positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            // Generate orca auto close position with token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaAutoClosePositionWithTokenExtension()
+                .accounts({
+                userPda,
+                hawksightAuthority: addresses_1.HS_AUTHORITY,
+                position,
+                positionMint,
+                positionTokenAccount,
+                token2022Program: addresses_1.TOKEN_2022,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main)
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: addresses_1.HS_AUTHORITY,
+                ix
+            });
+        });
+    }
+    /**
+     * Orca open position with Token2022 (User)
+     */
+    orcaOpenPositionWithTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, positionMint, whirlpool, tickLowerIndex, tickUpperIndex, withTokenMetadata, is2022Position = true, }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet);
+            // Generate position and position token account
+            const position = this.pda.orca.generateOrcaPositionPDA(positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            // Generate orca open position with token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaOpenPositionWithTokenExtension(tickLowerIndex, tickUpperIndex, withTokenMetadata)
+                .accounts({
+                userPda,
+                authority: userWallet,
+                position,
+                positionMint,
+                positionTokenAccount,
+                whirlpool,
+                token2022Program: addresses_1.TOKEN_2022,
+                systemProgram: web3.SystemProgram.programId,
+                associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
+                metadataUpdateAuth: addresses_1.ORCA_METADATA_UPDATE_AUTH,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main)
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: userWallet,
+                ix
+            });
+        });
+    }
+    /**
+     * Orca close position with Token2022 (User)
+     */
+    orcaClosePositionWithTokenExtension(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, positionMint, is2022Position = true, }) {
+            // Initialize anchor
+            anchor_1.Anchor.initialize(connection);
+            // Generate user pda
+            const userPda = (0, functions_1.generateUserPda)(userWallet);
+            // Generate position and position token account
+            const position = this.pda.orca.generateOrcaPositionPDA(positionMint);
+            const positionTokenAccount = this.pda.orca.generatePositionTokenAccount(userPda, positionMint, is2022Position);
+            // Generate orca close position with token extension instruction
+            // @ts-ignore
+            const ix = yield anchor_1.Anchor.instance().iyfExtension
+                .methods
+                .orcaClosePositionWithTokenExtension()
+                .accounts({
+                userPda,
+                authority: userWallet,
+                position,
+                positionMint,
+                positionTokenAccount,
+                token2022Program: addresses_1.TOKEN_2022,
+                orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
+            })
+                .instruction();
+            // Wrap instruction in iyf extension executeV2 (iyf-main)
+            return yield this.iyfMain.iyfExtensionExecuteV2(connection, {
+                userPda,
+                authority: userWallet,
+                ix
+            });
+        });
+    }
 }
 exports.OrcaIxGenerator = OrcaIxGenerator;

package/dist/src/pdaGenerator/OrcaPdaGenerator.d.ts

@@ -12,5 +12,13 @@ export declare class OrcaPdaGenerator {
      * @returns
      */
     generateOrcaPositionPDA(positionMint: web3.PublicKey): web3.PublicKey;
+    /**
+     * Generate position token account based on token program type
+     * @param userPda - User PDA account
+     * @param positionMint - Position mint (NFT mint)
+     * @param is2022Position - Whether this is a Token2022 position (default: false)
+     * @returns Position token account address
+     */
+    generatePositionTokenAccount(userPda: web3.PublicKey, positionMint: web3.PublicKey, is2022Position?: boolean): web3.PublicKey;
 }
 //# sourceMappingURL=OrcaPdaGenerator.d.ts.map

package/dist/src/pdaGenerator/OrcaPdaGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OrcaPdaGenerator.d.ts","sourceRoot":"","sources":["../../../src/pdaGenerator/OrcaPdaGenerator.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC;;GAEG;AACH,qBAAa,gBAAgB;IAE3B;;;;;;OAMG;IACH,uBAAuB,CACrB,YAAY,EAAE,IAAI,CAAC,SAAS,GAC3B,IAAI,CAAC,SAAS;CAOlB"}
+{"version":3,"file":"OrcaPdaGenerator.d.ts","sourceRoot":"","sources":["../../../src/pdaGenerator/OrcaPdaGenerator.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAIxC;;GAEG;AACH,qBAAa,gBAAgB;IAE3B;;;;;;OAMG;IACH,uBAAuB,CACrB,YAAY,EAAE,IAAI,CAAC,SAAS,GAC3B,IAAI,CAAC,SAAS;IAQjB;;;;;;OAMG;IACH,4BAA4B,CAC1B,OAAO,EAAE,IAAI,CAAC,SAAS,EACvB,YAAY,EAAE,IAAI,CAAC,SAAS,EAC5B,cAAc,GAAE,OAAe,GAC9B,IAAI,CAAC,SAAS;CAKlB"}