@midnight-ntwrk/wallet-sdk-shielded 1.0.0-beta.13 → 1.0.0-beta.14

package/dist/ShieldedWallet.d.ts

@@ -1,6 +1,6 @@
 import { ProtocolState, ProtocolVersion } from '@midnight-ntwrk/wallet-sdk-abstractions';
 import { BaseV1Configuration, DefaultV1Configuration, V1Variant, CoreWallet } from './v1/index.js';
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import * as rx from 'rxjs';
 import { ProvingRecipe } from './v1/ProvingRecipe.js';
 import { SerializationCapability } from './v1/Serialization.js';

package/dist/ShieldedWallet.js

@@ -12,7 +12,7 @@
 // limitations under the License.
 import { ProtocolVersion } from '@midnight-ntwrk/wallet-sdk-abstractions';
 import { V1Builder, V1Tag, CoreWallet } from './v1/index.js';
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Effect, Either } from 'effect';
 import * as rx from 'rxjs';
 import { WalletBuilder } from '@midnight-ntwrk/wallet-sdk-runtime';

package/dist/v1/CoinsAndBalances.d.ts

@@ -1,5 +1,5 @@
 import { CoreWallet } from './CoreWallet.js';
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 export type AvailableCoin = {
     coin: ledger.QualifiedShieldedCoinInfo;
     commitment: ledger.CoinCommitment;

package/dist/v1/CoreWallet.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { ProtocolVersion } from '@midnight-ntwrk/wallet-sdk-abstractions';
 import { Either } from 'effect';
 import { SyncProgress, SyncProgressData } from './SyncProgress.js';

package/dist/v1/CoreWallet.js

@@ -10,7 +10,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { ProtocolVersion } from '@midnight-ntwrk/wallet-sdk-abstractions';
 import { Either, Iterable, pipe, Record, Array as Arr } from 'effect';
 import { createSyncProgress } from './SyncProgress.js';

package/dist/v1/Proving.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Effect } from 'effect';
 import { ProvingRecipe } from './ProvingRecipe.js';
 import { WalletError } from './WalletError.js';

package/dist/v1/Proving.js

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { HttpProverClient, ProverClient } from '@midnight-ntwrk/wallet-sdk-prover-client/effect';
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Effect, pipe } from 'effect';
 import { ProvingError } from './WalletError.js';
 export const makeDefaultProvingService = (configuration) => {

package/dist/v1/ProvingRecipe.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 export declare const TRANSACTION_TO_PROVE = "TransactionToProve";
 export declare const BALANCE_TRANSACTION_TO_PROVE = "BalanceTransactionToProve";
 export declare const NOTHING_TO_PROVE = "NothingToProve";

package/dist/v1/RunningV1Variant.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Effect, Scope, Stream } from 'effect';
 import { WalletRuntimeError, Variant, StateChange } from '@midnight-ntwrk/wallet-sdk-runtime/abstractions';
 import { ProvingService } from './Proving.js';

package/dist/v1/Serialization.js

@@ -12,7 +12,7 @@
 // limitations under the License.
 import { Effect, ParseResult, Either, pipe, Schema } from 'effect';
 import { WalletError } from './WalletError.js';
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { CoreWallet } from './CoreWallet.js';
 const TxSchema = Schema.declare((input) => input instanceof ledger.Transaction).annotations({
     identifier: 'ledger.Transaction',

package/dist/v1/Simulator.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Array as Arr, Effect, Scope, Stream, SubscriptionRef } from 'effect';
 export type SimulatorState = Readonly<{
     ledger: ledger.LedgerState;

package/dist/v1/Simulator.js

@@ -10,7 +10,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Array as Arr, Effect, Encoding, pipe, Stream, SubscriptionRef, Clock } from 'effect';
 import { ArrayOps, EitherOps } from '@midnight-ntwrk/wallet-sdk-utilities';
 import * as crypto from 'crypto';

package/dist/v1/Submission.d.ts

@@ -1,5 +1,5 @@
 import { Effect } from 'effect';
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { WalletError } from './WalletError.js';
 import { Simulator } from './Simulator.js';
 import { SubmissionEvent as SubmissionEventImported } from '@midnight-ntwrk/wallet-sdk-node-client/effect';

package/dist/v1/Sync.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Scope, Stream, Schema } from 'effect';
 import { CoreWallet } from './CoreWallet.js';
 import { Simulator, SimulatorState } from './Simulator.js';

package/dist/v1/Sync.js

@@ -10,7 +10,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Effect, ParseResult, Stream, Schema, pipe, Either, Duration } from 'effect';
 import { CoreWallet } from './CoreWallet.js';
 import { ZswapEvents } from '@midnight-ntwrk/wallet-sdk-indexer-client';

package/dist/v1/Transacting.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { NetworkId } from '@midnight-ntwrk/wallet-sdk-abstractions';
 import { Array as Arr, Either } from 'effect';
 import { ProvingRecipe } from './ProvingRecipe.js';

package/dist/v1/Transacting.js

@@ -10,9 +10,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import * as ledger from '@midnight-ntwrk/ledger-v6';
-import { Array as Arr, Data, Either, Option, pipe, Record } from 'effect';
-import { ArrayOps, EitherOps } from '@midnight-ntwrk/wallet-sdk-utilities';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
+import { Array as Arr, Either, Option, pipe, Record } from 'effect';
+import { ArrayOps } from '@midnight-ntwrk/wallet-sdk-utilities';
 import { BALANCE_TRANSACTION_TO_PROVE, NOTHING_TO_PROVE, TRANSACTION_TO_PROVE, } from './ProvingRecipe.js';
 import { CoreWallet } from './CoreWallet.js';
 import { AddressError, InsufficientFundsError, OtherWalletError } from './WalletError.js';
@@ -26,8 +26,6 @@ export const makeDefaultTransactingCapability = (config, getContext) => {
 export const makeSimulatorTransactingCapability = (config, getContext) => {
     return new TransactingCapabilityImplementation(config.networkId, () => getContext().coinSelection, () => getContext().coinsAndBalancesCapability, () => getContext().keysCapability, TransactionTrait.proofErased);
 };
-class NoSelfOutputsError extends Data.TaggedError('NoSelfOutputs') {
-}
 export class TransactingCapabilityImplementation {
     networkId;
     getCoinSelection;
@@ -56,7 +54,7 @@ export class TransactingCapabilityImplementation {
                 };
             }
             const { newState: afterFallible, offer: maybeFallible } = yield* this.balanceFallibleSection(secretKeys, state, initialImbalances, coinSelection);
-            const { newState: afterGuaranteed, offer: guaranteed } = yield* this.#balanceGuaranteedSection(secretKeys, afterFallible, initialImbalances, coinSelection, 0, Imbalances.empty());
+            const { newState: afterGuaranteed, offer: guaranteed } = yield* this.#balanceGuaranteedSection(secretKeys, afterFallible, initialImbalances, coinSelection, Imbalances.empty());
             return {
                 newState: afterGuaranteed,
                 recipe: {
@@ -80,7 +78,7 @@ export class TransactingCapabilityImplementation {
             const offerToBalance = pipe(initialOffersAndCoins, Arr.map((o) => o.outputOffer), ArrayOps.fold((a, b) => a.merge(b)));
             const unprovenTxToBalance = ledger.Transaction.fromParts(networkId, offerToBalance);
             const imbalances = TransactionTrait.unproven.getImbalances(unprovenTxToBalance);
-            const { offer, newState } = yield* this.#balanceGuaranteedSection(secretKeys, state, imbalances, this.getCoinSelection(), selfCoins.length, Imbalances.empty());
+            const { offer, newState } = yield* this.#balanceGuaranteedSection(secretKeys, state, imbalances, this.getCoinSelection(), Imbalances.empty());
             const finalState = CoreWallet.watchCoins(newState, secretKeys, selfCoins);
             const finalTx = unprovenTxToBalance.merge(ledger.Transaction.fromParts(networkId, offer));
             return {
@@ -109,7 +107,7 @@ export class TransactingCapabilityImplementation {
             const outputsParseResult = yield* this.#processDesiredOutputsPossiblyEmpty(state, desiredOutputs);
             const inputsParseResult = Imbalances.fromEntries(Record.toEntries(desiredInputs));
             const networkId = this.networkId;
-            const { offer, newState } = yield* this.#balanceGuaranteedSection(secretKeys, state, TransactionImbalances.empty(), this.getCoinSelection(), outputsParseResult.selfCoins.length, inputsParseResult);
+            const { offer, newState } = yield* this.#balanceGuaranteedSection(secretKeys, state, TransactionImbalances.empty(), this.getCoinSelection(), inputsParseResult);
             const finalState = CoreWallet.watchCoins(newState, secretKeys, outputsParseResult.selfCoins);
             const balancingTx = ledger.Transaction.fromParts(networkId, offer);
             const finalTx = outputsParseResult.unprovenTxToBalance
@@ -211,7 +209,7 @@ export class TransactingCapabilityImplementation {
             },
         });
     }
-    #balanceGuaranteedSection(secretKeys, state, imbalances, coinSelection, knownSelfOutputs, targetImbalances) {
+    #balanceGuaranteedSection(secretKeys, state, imbalances, coinSelection, targetImbalances) {
         return Either.gen(this, function* () {
             const balanceRecipe = yield* Either.try({
                 try: () => getBalanceRecipe({
@@ -242,69 +240,11 @@ export class TransactingCapabilityImplementation {
                     }
                 },
             });
-            if (balanceRecipe.outputs.length + knownSelfOutputs == 0) {
-                return yield* Either.left(new NoSelfOutputsError({}));
-            }
             return yield* pipe(this.#prepareOffer(secretKeys, state, balanceRecipe, 0), Either.fromOption(() => {
                 return new OtherWalletError({
                     message: 'Could not create a valid guaranteed offer',
                 });
             }));
-        }).pipe(EitherOps.flatMapLeft((err) => {
-            if (err instanceof NoSelfOutputsError) {
-                return this.#balanceGuaranteedWithSelfOutput(secretKeys, state, imbalances, coinSelection, targetImbalances);
-            }
-            else {
-                return Either.left(err);
-            }
-        }));
-    }
-    #balanceGuaranteedWithSelfOutput(secretKeys, state, imbalances, coinSelection, targetImbalances) {
-        return Either.gen(this, function* () {
-            const additionalOutputValue = 100000n;
-            const balanceRecipe = yield* Either.try({
-                try: () => {
-                    return getBalanceRecipe({
-                        coins: this.getCoins()
-                            .getAvailableCoins(state)
-                            .map((c) => c.coin),
-                        initialImbalances: Imbalances.merge(imbalances.guaranteed, Imbalances.fromEntry(ledger.shieldedToken().raw, -1n * additionalOutputValue)),
-                        transactionCostModel: ShieldedCostModel,
-                        feeTokenType: '',
-                        coinSelection,
-                        targetImbalances,
-                        createOutput: (coin) => ledger.createShieldedCoinInfo(coin.type, coin.value),
-                        isCoinEqual: (a, b) => a.nonce === b.nonce,
-                    });
-                },
-                catch: (err) => {
-                    if (err instanceof BalancingInsufficientFundsError) {
-                        return new InsufficientFundsError({
-                            message: 'Insufficient funds',
-                            tokenType: err.tokenType,
-                            amount: imbalances.guaranteed.get(err.tokenType) ?? 0n,
-                        });
-                    }
-                    else {
-                        return new OtherWalletError({
-                            message: 'Balancing guaranteed section failed',
-                            cause: err,
-                        });
-                    }
-                },
-            });
-            const additionalCoin = ledger.createShieldedCoinInfo(ledger.shieldedToken().raw, additionalOutputValue);
-            const additionalOffer = pipe(additionalCoin, (coin) => ledger.ZswapOutput.new(coin, 0, this.getKeys().getCoinPublicKey(state).toHexString(), this.getKeys().getEncryptionPublicKey(state).toHexString()), (output) => ledger.ZswapOffer.fromOutput(output, ledger.shieldedToken().raw, additionalOutputValue));
-            return yield* pipe(this.#prepareOffer(secretKeys, state, balanceRecipe, 0), Option.map(({ newState, offer }) => {
-                return {
-                    newState: CoreWallet.watchCoins(newState, secretKeys, [additionalCoin]),
-                    offer: offer.merge(additionalOffer),
-                };
-            }), Either.fromOption(() => {
-                return new OtherWalletError({
-                    message: 'Balancing guaranteed section failed',
-                });
-            }));
         });
     }
     #parseAddress(addr) {

package/dist/v1/Transaction.d.ts

@@ -1,6 +1,6 @@
 import { Imbalances } from '@midnight-ntwrk/wallet-sdk-capabilities';
 import { TransactionImbalances } from './TransactionImbalances.js';
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 export type TransactionTrait<Tx> = {
     getImbalances(tx: Tx): TransactionImbalances;
     id(tx: Tx): string;

package/dist/v1/TransactionHistory.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { CoreWallet } from './CoreWallet.js';
 export type ProgressUpdate = {
     appliedIndex: bigint | undefined;

package/dist/v1/V1Builder.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Either, Types } from 'effect';
 import { NetworkId } from '@midnight-ntwrk/wallet-sdk-abstractions';
 import { Variant, VariantBuilder } from '@midnight-ntwrk/wallet-sdk-runtime/abstractions';

package/dist/v1/V1Builder.js

@@ -10,7 +10,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { Effect, Scope } from 'effect';
 import { WalletSeed } from '@midnight-ntwrk/wallet-sdk-abstractions';
 import { makeDefaultProvingService } from './Proving.js';

package/dist/v1/WalletError.d.ts

@@ -1,4 +1,4 @@
-import * as ledger from '@midnight-ntwrk/ledger-v6';
+import * as ledger from '@midnight-ntwrk/ledger-v7';
 import { LedgerOps } from '@midnight-ntwrk/wallet-sdk-utilities';
 export declare const WalletError: {
     proving(err: Error): WalletError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midnight-ntwrk/wallet-sdk-shielded",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.14",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -28,15 +28,15 @@
     }
   },
   "dependencies": {
-    "@midnight-ntwrk/ledger-v6": "6.1.0-alpha.6",
-    "@midnight-ntwrk/wallet-sdk-abstractions": "1.0.0-beta.9",
-    "@midnight-ntwrk/wallet-sdk-address-format": "3.0.0-beta.9",
-    "@midnight-ntwrk/wallet-sdk-capabilities": "3.0.0-beta.9",
-    "@midnight-ntwrk/wallet-sdk-indexer-client": "1.0.0-beta.14",
-    "@midnight-ntwrk/wallet-sdk-node-client": "1.0.0-beta.10",
-    "@midnight-ntwrk/wallet-sdk-prover-client": "1.0.0-beta.11",
-    "@midnight-ntwrk/wallet-sdk-runtime": "1.0.0-beta.9",
-    "@midnight-ntwrk/wallet-sdk-utilities": "1.0.0-beta.8",
+    "@midnight-ntwrk/ledger-v7": "7.0.0-alpha.1",
+    "@midnight-ntwrk/wallet-sdk-abstractions": "1.0.0-beta.10",
+    "@midnight-ntwrk/wallet-sdk-address-format": "3.0.0-beta.10",
+    "@midnight-ntwrk/wallet-sdk-capabilities": "3.0.0-beta.10",
+    "@midnight-ntwrk/wallet-sdk-indexer-client": "1.0.0-beta.15",
+    "@midnight-ntwrk/wallet-sdk-node-client": "1.0.0-beta.11",
+    "@midnight-ntwrk/wallet-sdk-prover-client": "1.0.0-beta.12",
+    "@midnight-ntwrk/wallet-sdk-runtime": "1.0.0-beta.10",
+    "@midnight-ntwrk/wallet-sdk-utilities": "1.0.0-beta.9",
     "@scure/base": "^1.1.9",
     "effect": "^3.17.3",
     "isomorphic-ws": "^5.0.0",
@@ -67,11 +67,12 @@
     "@polkadot/types": "^16.4.1",
     "eslint": "^9.37.0",
     "fast-check": "^4.2.0",
+    "prettier": "^3.7.0",
     "publint": "~0.3.14",
     "rimraf": "^6.0.1",
-    "testcontainers": "^11.8.1",
+    "testcontainers": "^11.10.0",
     "to-words": "^4.5.1",
     "typescript": "^5.9.3",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.16"
   }
 }