@indigo-labs/indigo-sdk 0.2.23 → 0.2.25

package/dist/index.js

@@ -1489,6 +1489,7 @@ function serialiseTreasuryRedeemer(redeemer) {
 
 // src/contracts/treasury/transactions.ts
 async function treasuryFeeTx(fee, lucid, sysParams, tx, treasuryOref) {
+  if (fee <= 0n) return;
   const treasuryUtxo = matchSingle(
     await lucid.utxosByOutRef([treasuryOref]),
     (_) => new Error("Expected a single treasury UTXO")
@@ -1501,8 +1502,15 @@ async function treasuryFeeTx(fee, lucid, sysParams, tx, treasuryOref) {
     ]),
     (_) => new Error("Expected a single treasury Ref Script UTXO")
   );
+  const stakeCredential = sysParams.treasuryParams.treasuryUtxosStakeCredential ? fromSysParamsScriptCredential(
+    sysParams.treasuryParams.treasuryUtxosStakeCredential
+  ) : void 0;
   tx.readFrom([treasuryRefScriptUtxo]).collectFrom([treasuryUtxo], serialiseTreasuryRedeemer("CollectAda")).pay.ToContract(
-    treasuryUtxo.address,
+    createScriptAddress(
+      lucid.config().network,
+      sysParams.validatorHashes.treasuryHash,
+      stakeCredential
+    ),
     { kind: "inline", value: import_lucid17.Data.void() },
     (0, import_lucid17.addAssets)(treasuryUtxo.assets, mkLovelacesOf(fee))
   );
@@ -4800,7 +4808,12 @@ async function openStakingPosition(amount, params, lucid, stakingManagerRef) {
   };
   const stakingToken = params.stakingParams.stakingToken[0].unCurrencySymbol + (0, import_lucid35.fromText)(params.stakingParams.stakingToken[1].unTokenName);
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + (0, import_lucid35.fromText)(params.stakingParams.indyToken[1].unTokenName);
-  return lucid.newTx().collectFrom([stakingManagerOut.utxo], serialiseStakingRedeemer({ CreateStakingPosition: { creatorPkh: pkh.hash } })).readFrom([stakingRefScriptUtxo]).pay.ToContract(
+  return lucid.newTx().collectFrom(
+    [stakingManagerOut.utxo],
+    serialiseStakingRedeemer({
+      CreateStakingPosition: { creatorPkh: pkh.hash }
+    })
+  ).readFrom([stakingRefScriptUtxo]).pay.ToContract(
     stakingManagerOut.utxo.address,
     {
       kind: "inline",
@@ -4871,10 +4884,20 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
       kind: "inline",
       value: serialiseStakingDatum({
         ...stakingPositionOut.datum,
-        lockedAmount: newLockedAmount
+        lockedAmount: newLockedAmount,
+        positionSnapshot: stakingManagerOut.datum.managerSnapshot
       })
     },
-    (0, import_lucid35.addAssets)(stakingPositionOut.utxo.assets, mkAssetsOf({ currencySymbol: params.stakingParams.indyToken[0].unCurrencySymbol, tokenName: (0, import_lucid35.fromText)(params.stakingParams.indyToken[1].unTokenName) }, amount))
+    (0, import_lucid35.addAssets)(
+      stakingPositionOut.utxo.assets,
+      mkAssetsOf(
+        {
+          currencySymbol: params.stakingParams.indyToken[0].unCurrencySymbol,
+          tokenName: (0, import_lucid35.fromText)(params.stakingParams.indyToken[1].unTokenName)
+        },
+        amount
+      )
+    )
   ).addSignerKey((0, import_lucid35.toHex)(stakingPositionOut.datum.owner));
 }
 async function closeStakingPosition(stakingPositionRef, params, lucid, currentSlot, stakingManagerRef) {
@@ -4905,7 +4928,10 @@ async function closeStakingPosition(stakingPositionRef, params, lucid, currentSl
   const currentSnapshotAda = stakingManagerOut.datum.managerSnapshot.snapshotAda;
   const oldSnapshotAda = stakingPositionOut.datum.positionSnapshot.snapshotAda;
   const adaReward = (currentSnapshotAda - oldSnapshotAda) * existingIndyAmount / (1000000n * 1000000n);
-  return lucid.newTx().validFrom(currentTime).readFrom([stakingRefScriptUtxo, stakingTokenPolicyRefScriptUtxo]).collectFrom([stakingPositionOut.utxo], serialiseStakingRedeemer("Unstake")).collectFrom([stakingManagerOut.utxo], serialiseStakingRedeemer("UpdateTotalStake")).pay.ToContract(
+  return lucid.newTx().validFrom(currentTime).readFrom([stakingRefScriptUtxo, stakingTokenPolicyRefScriptUtxo]).collectFrom([stakingPositionOut.utxo], serialiseStakingRedeemer("Unstake")).collectFrom(
+    [stakingManagerOut.utxo],
+    serialiseStakingRedeemer("UpdateTotalStake")
+  ).pay.ToContract(
     stakingManagerOut.utxo.address,
     {
       kind: "inline",

package/dist/index.mjs

@@ -1260,6 +1260,7 @@ function serialiseTreasuryRedeemer(redeemer) {
 
 // src/contracts/treasury/transactions.ts
 async function treasuryFeeTx(fee, lucid, sysParams, tx, treasuryOref) {
+  if (fee <= 0n) return;
   const treasuryUtxo = matchSingle(
     await lucid.utxosByOutRef([treasuryOref]),
     (_) => new Error("Expected a single treasury UTXO")
@@ -1272,8 +1273,15 @@ async function treasuryFeeTx(fee, lucid, sysParams, tx, treasuryOref) {
     ]),
     (_) => new Error("Expected a single treasury Ref Script UTXO")
   );
+  const stakeCredential = sysParams.treasuryParams.treasuryUtxosStakeCredential ? fromSysParamsScriptCredential(
+    sysParams.treasuryParams.treasuryUtxosStakeCredential
+  ) : void 0;
   tx.readFrom([treasuryRefScriptUtxo]).collectFrom([treasuryUtxo], serialiseTreasuryRedeemer("CollectAda")).pay.ToContract(
-    treasuryUtxo.address,
+    createScriptAddress(
+      lucid.config().network,
+      sysParams.validatorHashes.treasuryHash,
+      stakeCredential
+    ),
     { kind: "inline", value: Data12.void() },
     addAssets2(treasuryUtxo.assets, mkLovelacesOf(fee))
   );
@@ -4612,7 +4620,12 @@ async function openStakingPosition(amount, params, lucid, stakingManagerRef) {
   };
   const stakingToken = params.stakingParams.stakingToken[0].unCurrencySymbol + fromText6(params.stakingParams.stakingToken[1].unTokenName);
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + fromText6(params.stakingParams.indyToken[1].unTokenName);
-  return lucid.newTx().collectFrom([stakingManagerOut.utxo], serialiseStakingRedeemer({ CreateStakingPosition: { creatorPkh: pkh.hash } })).readFrom([stakingRefScriptUtxo]).pay.ToContract(
+  return lucid.newTx().collectFrom(
+    [stakingManagerOut.utxo],
+    serialiseStakingRedeemer({
+      CreateStakingPosition: { creatorPkh: pkh.hash }
+    })
+  ).readFrom([stakingRefScriptUtxo]).pay.ToContract(
     stakingManagerOut.utxo.address,
     {
       kind: "inline",
@@ -4683,10 +4696,20 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
       kind: "inline",
       value: serialiseStakingDatum({
         ...stakingPositionOut.datum,
-        lockedAmount: newLockedAmount
+        lockedAmount: newLockedAmount,
+        positionSnapshot: stakingManagerOut.datum.managerSnapshot
       })
     },
-    addAssets6(stakingPositionOut.utxo.assets, mkAssetsOf({ currencySymbol: params.stakingParams.indyToken[0].unCurrencySymbol, tokenName: fromText6(params.stakingParams.indyToken[1].unTokenName) }, amount))
+    addAssets6(
+      stakingPositionOut.utxo.assets,
+      mkAssetsOf(
+        {
+          currencySymbol: params.stakingParams.indyToken[0].unCurrencySymbol,
+          tokenName: fromText6(params.stakingParams.indyToken[1].unTokenName)
+        },
+        amount
+      )
+    )
   ).addSignerKey(toHex2(stakingPositionOut.datum.owner));
 }
 async function closeStakingPosition(stakingPositionRef, params, lucid, currentSlot, stakingManagerRef) {
@@ -4717,7 +4740,10 @@ async function closeStakingPosition(stakingPositionRef, params, lucid, currentSl
   const currentSnapshotAda = stakingManagerOut.datum.managerSnapshot.snapshotAda;
   const oldSnapshotAda = stakingPositionOut.datum.positionSnapshot.snapshotAda;
   const adaReward = (currentSnapshotAda - oldSnapshotAda) * existingIndyAmount / (1000000n * 1000000n);
-  return lucid.newTx().validFrom(currentTime).readFrom([stakingRefScriptUtxo, stakingTokenPolicyRefScriptUtxo]).collectFrom([stakingPositionOut.utxo], serialiseStakingRedeemer("Unstake")).collectFrom([stakingManagerOut.utxo], serialiseStakingRedeemer("UpdateTotalStake")).pay.ToContract(
+  return lucid.newTx().validFrom(currentTime).readFrom([stakingRefScriptUtxo, stakingTokenPolicyRefScriptUtxo]).collectFrom([stakingPositionOut.utxo], serialiseStakingRedeemer("Unstake")).collectFrom(
+    [stakingManagerOut.utxo],
+    serialiseStakingRedeemer("UpdateTotalStake")
+  ).pay.ToContract(
     stakingManagerOut.utxo.address,
     {
       kind: "inline",
@@ -4799,7 +4825,7 @@ import {
 // src/contracts/one-shot/transactions.ts
 import {
   addAssets as addAssets7,
-  Constr as Constr4,
+  Constr as Constr3,
   Data as Data24,
   mintingPolicyToId,
   toUnit as toUnit2
@@ -4868,7 +4894,7 @@ async function oneShotMintTx(lucid, params) {
           [toUnit2(policyId, entry.tokenName)]: entry.amount
         })
       )(params.mintAmounts),
-      Data24.to(new Constr4(0, []))
+      Data24.to(new Constr3(0, []))
     ).attach.MintingPolicy(oneShotPolicy),
     policyId
   ];
@@ -5049,7 +5075,7 @@ var mkVersionRegistryValidator = () => {
 // src/contracts/collector/scripts.ts
 import {
   applyParamsToScript as applyParamsToScript9,
-  Constr as Constr5,
+  Constr as Constr4,
   fromText as fromText8
 } from "@lucid-evolution/lucid";
 
@@ -5065,16 +5091,16 @@ var mkCollectorValidatorFromSP = (params) => {
   return {
     type: "PlutusV2",
     script: applyParamsToScript9(_collectorValidator.cborHex, [
-      new Constr5(0, [
-        new Constr5(0, [
+      new Constr4(0, [
+        new Constr4(0, [
           params.stakingManagerNFT[0].unCurrencySymbol,
           fromText8(params.stakingManagerNFT[1].unTokenName)
         ]),
-        new Constr5(0, [
+        new Constr4(0, [
           params.stakingToken[0].unCurrencySymbol,
           fromText8(params.stakingToken[1].unTokenName)
         ]),
-        new Constr5(0, [
+        new Constr4(0, [
           params.versionRecordToken[0].unCurrencySymbol,
           fromText8(params.versionRecordToken[1].unTokenName)
         ])
@@ -5086,7 +5112,7 @@ var mkCollectorValidatorFromSP = (params) => {
 // src/contracts/treasury/scripts.ts
 import {
   applyParamsToScript as applyParamsToScript10,
-  Constr as Constr6,
+  Constr as Constr5,
   fromText as fromText9
 } from "@lucid-evolution/lucid";
 
@@ -5102,22 +5128,22 @@ var mkTreasuryValidatorFromSP = (params) => {
   return {
     type: "PlutusV2",
     script: applyParamsToScript10(_treasuryValidator.cborHex, [
-      new Constr6(0, [
-        new Constr6(0, [
+      new Constr5(0, [
+        new Constr5(0, [
           params.upgradeToken[0].unCurrencySymbol,
           fromText9(params.upgradeToken[1].unTokenName)
         ]),
-        new Constr6(0, [
+        new Constr5(0, [
           params.versionRecordToken[0].unCurrencySymbol,
           fromText9(params.versionRecordToken[1].unTokenName)
         ]),
-        params.treasuryUtxosStakeCredential ? new Constr6(0, [
-          new Constr6(0, [
-            new Constr6(1, [
+        params.treasuryUtxosStakeCredential ? new Constr5(0, [
+          new Constr5(0, [
+            new Constr5(1, [
               params.treasuryUtxosStakeCredential.contents.contents
             ])
           ])
-        ]) : new Constr6(1, [])
+        ]) : new Constr5(1, [])
       ])
     ])
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigo-labs/indigo-sdk",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "Indigo SDK for interacting with Indigo endpoints via lucid-evolution",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/contracts/gov/transactions.ts

@@ -446,7 +446,9 @@ export async function vote(
     fromSystemParamsAsset(sysParams.govParams.indyAsset),
   );
 
-  const validityFrom = Number(currentTime) - Math.min(120 * ONE_SECOND, Number(sysParams.govParams.gBiasTime));
+  const validityFrom =
+    Number(currentTime) -
+    Math.min(120 * ONE_SECOND, Number(sysParams.govParams.gBiasTime));
 
   if (stakingPosDatum.lockedAmount.has(pollShardDatum.pollId)) {
     throw new Error('Already voted for that proposal.');

package/src/contracts/staking/transactions.ts

@@ -1,6 +1,5 @@
 import {
   addAssets,
-  Constr,
   Data,
   fromHex,
   fromText,
@@ -85,7 +84,12 @@ export async function openStakingPosition(
     fromText(params.stakingParams.indyToken[1].unTokenName);
   return lucid
     .newTx()
-    .collectFrom([stakingManagerOut.utxo], serialiseStakingRedeemer({CreateStakingPosition: { creatorPkh: pkh.hash }}))
+    .collectFrom(
+      [stakingManagerOut.utxo],
+      serialiseStakingRedeemer({
+        CreateStakingPosition: { creatorPkh: pkh.hash },
+      }),
+    )
     .readFrom([stakingRefScriptUtxo])
     .pay.ToContract(
       stakingManagerOut.utxo.address,
@@ -125,7 +129,7 @@ export async function adjustStakingPosition(
   stakingManagerRef?: OutRef,
 ): Promise<TxBuilder> {
   const network = lucid.config().network!;
-  const currentTime = slotToUnixTime(network, currentSlot) - (120 * ONE_SECOND);
+  const currentTime = slotToUnixTime(network, currentSlot) - 120 * ONE_SECOND;
 
   const stakingPositionOut = await findStakingPositionByOutRef(
     stakingPositionRef,
@@ -191,9 +195,19 @@ export async function adjustStakingPosition(
         value: serialiseStakingDatum({
           ...stakingPositionOut.datum,
           lockedAmount: newLockedAmount,
+          positionSnapshot: stakingManagerOut.datum.managerSnapshot
         }),
       },
-      addAssets(stakingPositionOut.utxo.assets, mkAssetsOf({ currencySymbol: params.stakingParams.indyToken[0].unCurrencySymbol, tokenName: fromText(params.stakingParams.indyToken[1].unTokenName) }, amount)),
+      addAssets(
+        stakingPositionOut.utxo.assets,
+        mkAssetsOf(
+          {
+            currencySymbol: params.stakingParams.indyToken[0].unCurrencySymbol,
+            tokenName: fromText(params.stakingParams.indyToken[1].unTokenName),
+          },
+          amount,
+        ),
+      ),
     )
     .addSignerKey(toHex(stakingPositionOut.datum.owner));
 }
@@ -251,7 +265,10 @@ export async function closeStakingPosition(
     .validFrom(currentTime)
     .readFrom([stakingRefScriptUtxo, stakingTokenPolicyRefScriptUtxo])
     .collectFrom([stakingPositionOut.utxo], serialiseStakingRedeemer('Unstake'))
-    .collectFrom([stakingManagerOut.utxo], serialiseStakingRedeemer('UpdateTotalStake'))
+    .collectFrom(
+      [stakingManagerOut.utxo],
+      serialiseStakingRedeemer('UpdateTotalStake'),
+    )
     .pay.ToContract(
       stakingManagerOut.utxo.address,
       {

package/src/contracts/treasury/transactions.ts

@@ -6,12 +6,14 @@ import {
   TxBuilder,
 } from '@lucid-evolution/lucid';
 import {
+  fromSysParamsScriptCredential,
   fromSystemParamsScriptRef,
   SystemParams,
 } from '../../types/system-params';
 import { matchSingle } from '../../utils/utils';
 import { mkLovelacesOf } from '../../utils/value-helpers';
 import { serialiseTreasuryRedeemer } from './types';
+import { createScriptAddress } from '../../utils/lucid-utils';
 
 export async function treasuryFeeTx(
   fee: bigint,
@@ -20,6 +22,8 @@ export async function treasuryFeeTx(
   tx: TxBuilder,
   treasuryOref: OutRef,
 ): Promise<void> {
+  if (fee <= 0n) return;
+
   const treasuryUtxo = matchSingle(
     await lucid.utxosByOutRef([treasuryOref]),
     (_) => new Error('Expected a single treasury UTXO'),
@@ -34,10 +38,20 @@ export async function treasuryFeeTx(
     (_) => new Error('Expected a single treasury Ref Script UTXO'),
   );
 
+  const stakeCredential = sysParams.treasuryParams.treasuryUtxosStakeCredential
+    ? fromSysParamsScriptCredential(
+        sysParams.treasuryParams.treasuryUtxosStakeCredential,
+      )
+    : undefined;
+
   tx.readFrom([treasuryRefScriptUtxo])
     .collectFrom([treasuryUtxo], serialiseTreasuryRedeemer('CollectAda'))
     .pay.ToContract(
-      treasuryUtxo.address,
+      createScriptAddress(
+        lucid.config().network!,
+        sysParams.validatorHashes.treasuryHash,
+        stakeCredential,
+      ),
       { kind: 'inline', value: Data.void() },
       addAssets(treasuryUtxo.assets, mkLovelacesOf(fee)),
     );

package/tests/gov.test.ts

@@ -575,7 +575,13 @@ describe('Gov', () => {
 
     await runAndAwaitTx(
       context.lucid,
-      adjustStakingPosition(stakingPosUtxo.utxo, 500_000_000n, sysParams, context.lucid, context.emulator.slot),
+      adjustStakingPosition(
+        stakingPosUtxo.utxo,
+        500_000_000n,
+        sysParams,
+        context.lucid,
+        context.emulator.slot,
+      ),
     );
   });