@indigo-labs/indigo-sdk 0.2.22 → 0.2.24

package/dist/index.js

@@ -862,7 +862,7 @@ function computeInterestLovelacesFor100PercentCR(collateral, mintedAmt, price) {
 // src/contracts/price-oracle/helpers.ts
 var import_lucid10 = require("@lucid-evolution/lucid");
 function oracleExpirationAwareValidity(currentSlot, biasTime, oracleExpiration, network) {
-  const validateFrom = (0, import_lucid10.slotToUnixTime)(network, currentSlot - 1) - Math.min(120 * ONE_SECOND, biasTime);
+  const validateFrom = (0, import_lucid10.slotToUnixTime)(network, currentSlot - 1) - Math.min(120 * ONE_SECOND, biasTime - ONE_SECOND);
   const defaultValidateTo = validateFrom + biasTime;
   const cappedValidateTo = (0, import_lucid10.slotToUnixTime)(
     network,
@@ -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,9 @@ 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 +4802,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], import_lucid35.Data.to(new import_lucid35.Constr(0, [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",
@@ -4826,7 +4833,7 @@ async function openStakingPosition(amount, params, lucid, stakingManagerRef) {
 }
 async function adjustStakingPosition(stakingPositionRef, amount, params, lucid, currentSlot, stakingManagerRef) {
   const network = lucid.config().network;
-  const currentTime = (0, import_lucid35.slotToUnixTime)(network, currentSlot) - ONE_SECOND;
+  const currentTime = (0, import_lucid35.slotToUnixTime)(network, currentSlot) - 120 * ONE_SECOND;
   const stakingPositionOut = await findStakingPositionByOutRef(
     stakingPositionRef,
     lucid
@@ -4838,8 +4845,6 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
     ]),
     (_) => new Error("Expected a single staking Ref Script UTXO")
   );
-  const stakingToken = params.stakingParams.stakingToken[0].unCurrencySymbol + (0, import_lucid35.fromText)(params.stakingParams.stakingToken[1].unTokenName);
-  const stakingManagerToken = params.stakingParams.stakingManagerNFT[0].unCurrencySymbol + (0, import_lucid35.fromText)(params.stakingParams.stakingManagerNFT[1].unTokenName);
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + (0, import_lucid35.fromText)(params.stakingParams.indyToken[1].unTokenName);
   const existingIndyAmount = stakingPositionOut.utxo.assets[indyToken] ?? 0n;
   const currentSnapshotAda = stakingManagerOut.datum.managerSnapshot.snapshotAda;
@@ -4866,10 +4871,7 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
         totalStake: stakingManagerOut.datum.totalStake + amount
       })
     },
-    {
-      lovelace: stakingManagerOut.utxo.assets.lovelace - adaReward,
-      [stakingManagerToken]: 1n
-    }
+    (0, import_lucid35.addAssets)(stakingManagerOut.utxo.assets, mkLovelacesOf(-adaReward))
   ).pay.ToContract(
     stakingPositionOut.utxo.address,
     {
@@ -4879,10 +4881,16 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
         lockedAmount: newLockedAmount
       })
     },
-    {
-      [stakingToken]: 1n,
-      [indyToken]: stakingPositionOut.utxo.assets[indyToken] + 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) {
@@ -4908,13 +4916,15 @@ async function closeStakingPosition(stakingPositionRef, params, lucid, currentSl
     (_) => new Error("Expected a single staking token policy Ref Script UTXO")
   );
   const stakingToken = params.stakingParams.stakingToken[0].unCurrencySymbol + (0, import_lucid35.fromText)(params.stakingParams.stakingToken[1].unTokenName);
-  const stakingManagerToken = params.stakingParams.stakingManagerNFT[0].unCurrencySymbol + (0, import_lucid35.fromText)(params.stakingParams.stakingManagerNFT[1].unTokenName);
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + (0, import_lucid35.fromText)(params.stakingParams.indyToken[1].unTokenName);
   const existingIndyAmount = stakingPositionOut.utxo.assets[indyToken] ?? 0n;
   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], import_lucid35.Data.to(new import_lucid35.Constr(4, []))).collectFrom([stakingManagerOut.utxo], import_lucid35.Data.to(new import_lucid35.Constr(1, []))).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",
@@ -4923,10 +4933,7 @@ async function closeStakingPosition(stakingPositionRef, params, lucid, currentSl
         totalStake: stakingManagerOut.datum.totalStake - existingIndyAmount
       })
     },
-    {
-      lovelace: stakingManagerOut.utxo.assets.lovelace - adaReward,
-      [stakingManagerToken]: 1n
-    }
+    (0, import_lucid35.addAssets)(stakingManagerOut.utxo.assets, mkLovelacesOf(-adaReward))
   ).mintAssets(
     {
       [stakingToken]: -1n

package/dist/index.mjs

@@ -628,7 +628,7 @@ import {
   unixTimeToSlot
 } from "@lucid-evolution/lucid";
 function oracleExpirationAwareValidity(currentSlot, biasTime, oracleExpiration, network) {
-  const validateFrom = slotToUnixTime(network, currentSlot - 1) - Math.min(120 * ONE_SECOND, biasTime);
+  const validateFrom = slotToUnixTime(network, currentSlot - 1) - Math.min(120 * ONE_SECOND, biasTime - ONE_SECOND);
   const defaultValidateTo = validateFrom + biasTime;
   const cappedValidateTo = slotToUnixTime(
     network,
@@ -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,9 @@ 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))
   );
@@ -4574,7 +4576,6 @@ async function annulRequest(accountUtxo, params, lucid) {
 // src/contracts/staking/transactions.ts
 import {
   addAssets as addAssets6,
-  Constr as Constr3,
   Data as Data22,
   fromHex as fromHex3,
   fromText as fromText6,
@@ -4613,7 +4614,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], Data22.to(new Constr3(0, [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",
@@ -4639,7 +4645,7 @@ async function openStakingPosition(amount, params, lucid, stakingManagerRef) {
 }
 async function adjustStakingPosition(stakingPositionRef, amount, params, lucid, currentSlot, stakingManagerRef) {
   const network = lucid.config().network;
-  const currentTime = slotToUnixTime5(network, currentSlot) - ONE_SECOND;
+  const currentTime = slotToUnixTime5(network, currentSlot) - 120 * ONE_SECOND;
   const stakingPositionOut = await findStakingPositionByOutRef(
     stakingPositionRef,
     lucid
@@ -4651,8 +4657,6 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
     ]),
     (_) => new Error("Expected a single staking Ref Script UTXO")
   );
-  const stakingToken = params.stakingParams.stakingToken[0].unCurrencySymbol + fromText6(params.stakingParams.stakingToken[1].unTokenName);
-  const stakingManagerToken = params.stakingParams.stakingManagerNFT[0].unCurrencySymbol + fromText6(params.stakingParams.stakingManagerNFT[1].unTokenName);
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + fromText6(params.stakingParams.indyToken[1].unTokenName);
   const existingIndyAmount = stakingPositionOut.utxo.assets[indyToken] ?? 0n;
   const currentSnapshotAda = stakingManagerOut.datum.managerSnapshot.snapshotAda;
@@ -4679,10 +4683,7 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
         totalStake: stakingManagerOut.datum.totalStake + amount
       })
     },
-    {
-      lovelace: stakingManagerOut.utxo.assets.lovelace - adaReward,
-      [stakingManagerToken]: 1n
-    }
+    addAssets6(stakingManagerOut.utxo.assets, mkLovelacesOf(-adaReward))
   ).pay.ToContract(
     stakingPositionOut.utxo.address,
     {
@@ -4692,10 +4693,16 @@ async function adjustStakingPosition(stakingPositionRef, amount, params, lucid,
         lockedAmount: newLockedAmount
       })
     },
-    {
-      [stakingToken]: 1n,
-      [indyToken]: stakingPositionOut.utxo.assets[indyToken] + 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) {
@@ -4721,13 +4728,15 @@ async function closeStakingPosition(stakingPositionRef, params, lucid, currentSl
     (_) => new Error("Expected a single staking token policy Ref Script UTXO")
   );
   const stakingToken = params.stakingParams.stakingToken[0].unCurrencySymbol + fromText6(params.stakingParams.stakingToken[1].unTokenName);
-  const stakingManagerToken = params.stakingParams.stakingManagerNFT[0].unCurrencySymbol + fromText6(params.stakingParams.stakingManagerNFT[1].unTokenName);
   const indyToken = params.stakingParams.indyToken[0].unCurrencySymbol + fromText6(params.stakingParams.indyToken[1].unTokenName);
   const existingIndyAmount = stakingPositionOut.utxo.assets[indyToken] ?? 0n;
   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], Data22.to(new Constr3(4, []))).collectFrom([stakingManagerOut.utxo], Data22.to(new Constr3(1, []))).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",
@@ -4736,10 +4745,7 @@ async function closeStakingPosition(stakingPositionRef, params, lucid, currentSl
         totalStake: stakingManagerOut.datum.totalStake - existingIndyAmount
       })
     },
-    {
-      lovelace: stakingManagerOut.utxo.assets.lovelace - adaReward,
-      [stakingManagerToken]: 1n
-    }
+    addAssets6(stakingManagerOut.utxo.assets, mkLovelacesOf(-adaReward))
   ).mintAssets(
     {
       [stakingToken]: -1n
@@ -4812,7 +4818,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
@@ -4881,7 +4887,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
   ];
@@ -5062,7 +5068,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";
 
@@ -5078,16 +5084,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)
         ])
@@ -5099,7 +5105,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";
 
@@ -5115,22 +5121,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.22",
+  "version": "0.2.24",
   "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/price-oracle/helpers.ts

@@ -20,7 +20,7 @@ export function oracleExpirationAwareValidity(
 } {
   const validateFrom =
     slotToUnixTime(network, currentSlot - 1) -
-    Math.min(120 * ONE_SECOND, biasTime);
+    Math.min(120 * ONE_SECOND, biasTime - ONE_SECOND);
   const defaultValidateTo = validateFrom + biasTime;
   /// Take the oracle expiration time - 1 slot which is the last acceptable non-expired valid_to time
   /// for the current oracle.

package/src/contracts/staking/transactions.ts

@@ -1,6 +1,5 @@
 import {
   addAssets,
-  Constr,
   Data,
   fromHex,
   fromText,
@@ -32,7 +31,7 @@ import {
 import { matchSingle } from '../../utils/utils';
 import { serialiseStakingRedeemer } from './types';
 import { serialiseCollectorRedeemer } from '../collector/types';
-import { mkLovelacesOf } from '../../utils/value-helpers';
+import { mkAssetsOf, mkLovelacesOf } from '../../utils/value-helpers';
 import { ONE_SECOND } from '../../utils/time-helpers';
 
 export async function openStakingPosition(
@@ -85,7 +84,12 @@ export async function openStakingPosition(
     fromText(params.stakingParams.indyToken[1].unTokenName);
   return lucid
     .newTx()
-    .collectFrom([stakingManagerOut.utxo], Data.to(new Constr(0, [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) - ONE_SECOND;
+  const currentTime = slotToUnixTime(network, currentSlot) - 120 * ONE_SECOND;
 
   const stakingPositionOut = await findStakingPositionByOutRef(
     stakingPositionRef,
@@ -142,12 +146,6 @@ export async function adjustStakingPosition(
     (_) => new Error('Expected a single staking Ref Script UTXO'),
   );
 
-  const stakingToken =
-    params.stakingParams.stakingToken[0].unCurrencySymbol +
-    fromText(params.stakingParams.stakingToken[1].unTokenName);
-  const stakingManagerToken =
-    params.stakingParams.stakingManagerNFT[0].unCurrencySymbol +
-    fromText(params.stakingParams.stakingManagerNFT[1].unTokenName);
   const indyToken =
     params.stakingParams.indyToken[0].unCurrencySymbol +
     fromText(params.stakingParams.indyToken[1].unTokenName);
@@ -188,10 +186,7 @@ export async function adjustStakingPosition(
           totalStake: stakingManagerOut.datum.totalStake + amount,
         }),
       },
-      {
-        lovelace: stakingManagerOut.utxo.assets.lovelace - adaReward,
-        [stakingManagerToken]: 1n,
-      },
+      addAssets(stakingManagerOut.utxo.assets, mkLovelacesOf(-adaReward)),
     )
     .pay.ToContract(
       stakingPositionOut.utxo.address,
@@ -202,10 +197,16 @@ export async function adjustStakingPosition(
           lockedAmount: newLockedAmount,
         }),
       },
-      {
-        [stakingToken]: 1n,
-        [indyToken]: stakingPositionOut.utxo.assets[indyToken] + 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));
 }
@@ -246,9 +247,6 @@ export async function closeStakingPosition(
   const stakingToken =
     params.stakingParams.stakingToken[0].unCurrencySymbol +
     fromText(params.stakingParams.stakingToken[1].unTokenName);
-  const stakingManagerToken =
-    params.stakingParams.stakingManagerNFT[0].unCurrencySymbol +
-    fromText(params.stakingParams.stakingManagerNFT[1].unTokenName);
   const indyToken =
     params.stakingParams.indyToken[0].unCurrencySymbol +
     fromText(params.stakingParams.indyToken[1].unTokenName);
@@ -265,8 +263,11 @@ export async function closeStakingPosition(
     .newTx()
     .validFrom(currentTime)
     .readFrom([stakingRefScriptUtxo, stakingTokenPolicyRefScriptUtxo])
-    .collectFrom([stakingPositionOut.utxo], Data.to(new Constr(4, [])))
-    .collectFrom([stakingManagerOut.utxo], Data.to(new Constr(1, [])))
+    .collectFrom([stakingPositionOut.utxo], serialiseStakingRedeemer('Unstake'))
+    .collectFrom(
+      [stakingManagerOut.utxo],
+      serialiseStakingRedeemer('UpdateTotalStake'),
+    )
     .pay.ToContract(
       stakingManagerOut.utxo.address,
       {
@@ -276,10 +277,7 @@ export async function closeStakingPosition(
           totalStake: stakingManagerOut.datum.totalStake - existingIndyAmount,
         }),
       },
-      {
-        lovelace: stakingManagerOut.utxo.assets.lovelace - adaReward,
-        [stakingManagerToken]: 1n,
-      },
+      addAssets(stakingManagerOut.utxo.assets, mkLovelacesOf(-adaReward)),
     )
     .mintAssets(
       {

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,12 @@ 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/endpoints/initialize.ts

@@ -666,7 +666,7 @@ export async function init(
     govNFT: toSystemParamsAsset(govNftAsset),
     minCollateralInLovelace: 10_000_000,
     partialRedemptionExtraFeeLovelace: 10_000_000,
-    biasTime: 120_000,
+    biasTime: 180_000,
     treasuryValHash: treasuryValHash,
   };
   const cdpValHash = validatorToScriptHash(mkCdpValidatorFromSP(cdpParams));
@@ -680,7 +680,7 @@ export async function init(
     cdpScriptHash: cdpValHash,
     collectorValHash: collectorValHash,
     minCollateralInLovelace: 10_000_000,
-    biasTime: 8_000n,
+    biasTime: 180_000n,
   };
   const cdpCreatorValidator = mkCDPCreatorValidatorFromSP(cdpCreatorParams);
   const cdpCreatorValHash = validatorToScriptHash(cdpCreatorValidator);

package/tests/gov.test.ts

@@ -21,6 +21,7 @@ import { findGov } from './queries/governance-queries';
 import {
   addrDetails,
   addressFromBech32,
+  adjustStakingPosition,
   createProposal,
   createScriptAddress,
   createShardsChunks,
@@ -530,6 +531,60 @@ describe('Gov', () => {
     await runVote(pollId, 'Yes', sysParams, context);
   });
 
+  test<MyContext>('Vote on proposal, then deposit more INDY', async (context: MyContext) => {
+    context.lucid.selectWallet.fromSeed(context.users.admin.seedPhrase);
+
+    const [sysParams, _] = await init(context.lucid, [iusdInitialAssetCfg]);
+
+    const govUtxo = await findGov(
+      context.lucid,
+      sysParams.validatorHashes.govHash,
+      fromSystemParamsAsset(sysParams.govParams.govNFT),
+    );
+
+    const [tx, pollId] = await createProposal(
+      { TextProposal: { bytes: fromText('smth') } },
+      null,
+      sysParams,
+      context.lucid,
+      context.emulator.slot,
+      govUtxo.utxo,
+      [],
+    );
+
+    await runAndAwaitTxBuilder(context.lucid, tx);
+
+    await runCreateAllShards(pollId, sysParams, context);
+
+    await runAndAwaitTx(
+      context.lucid,
+      openStakingPosition(1_000_000n, sysParams, context.lucid),
+    );
+
+    await runVote(pollId, 'Yes', sysParams, context);
+
+    const [pkh, _skh] = await addrDetails(context.lucid);
+    const stakingPosUtxo = await findStakingPosition(
+      context.lucid,
+      sysParams.validatorHashes.stakingHash,
+      fromSystemParamsAsset(sysParams.stakingParams.stakingToken),
+      pkh.hash,
+    );
+
+    context.emulator.awaitSlot(60);
+
+    await runAndAwaitTx(
+      context.lucid,
+      adjustStakingPosition(
+        stakingPosUtxo.utxo,
+        500_000_000n,
+        sysParams,
+        context.lucid,
+        context.emulator.slot,
+      ),
+    );
+  });
+
   test<MyContext>('Vote on 2 proposals sequentially (lower pollID first)', async (context: MyContext) => {
     context.lucid.selectWallet.fromSeed(context.users.admin.seedPhrase);