@prb/effect-solana 1.0.0-beta.0 → 1.0.0-beta.2

package/README.md

@@ -1,8 +1,12 @@
 # @prb/effect-solana
 
-Effect-TS integration for the Solana blockchain ecosystem.
+[![npm version](https://img.shields.io/npm/v/@prb/effect-solana.svg)](https://www.npmjs.com/package/@prb/effect-solana)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-## Installation
+Effect-TS integration for the Solana blockchain ecosystem. Type-safe, composable abstractions built on
+[@solana/kit](https://github.com/solana-labs/solana-web3.js) v2.
+
+## 📦 Installation
 
 ```bash
 npm install @prb/effect-solana effect @solana/kit
@@ -12,34 +16,46 @@ pnpm add @prb/effect-solana effect @solana/kit
 bun add @prb/effect-solana effect @solana/kit
 ```
 
-## Quick Start
+### Peer Dependencies
+
+Required:
+
+- `effect` ^3.x
+- `@solana/kit` ^2.2.0
+- `@solana-program/system` ^0.8.0
+- `@solana-program/token` ^0.8.0
+- `@solana-program/compute-budget` ^0.8.0
+
+Optional:
+
+- `@coral-xyz/anchor` ^0.31.1 (for Anchor IDL support)
+- `@solana/web3.js` ^1.95.0 (for legacy interop)
+- `react`, `react-dom` (for React hooks)
+
+## 🚀 Quick Start
 
 ```typescript
 import { Effect, Layer } from "effect";
-import { BalanceService, BalanceServiceLive, RpcService, RpcServiceLive } from "@prb/effect-solana";
+import { BalanceService, makeSolanaLayer } from "@prb/effect-solana";
 import type { Address } from "@solana/kit";
 
-// Create a custom RPC layer
-const MyRpcLayer = Layer.succeed(RpcService, {
-  getRpc: () => Effect.succeed(/* your RPC client */),
-  getRpcUrl: () => Effect.succeed("https://api.devnet.solana.com"),
-});
-
-// Compose with BalanceService
-const MainLayer = BalanceServiceLive.pipe(Layer.provide(MyRpcLayer));
+// Create a complete Solana layer
+const SolanaLayer = makeSolanaLayer(
+  { cluster: "devnet" },
+  () => walletAdapter, // your wallet adapter
+);
 
 // Read SOL balance
 const program = Effect.gen(function* () {
   const balance = yield* BalanceService;
   const address = "YOUR_ADDRESS" as Address;
-  const sol = yield* balance.getSolBalance(address);
-  console.log(`Balance: ${sol} lamports`);
+  return yield* balance.getSolBalance(address);
 });
 
-Effect.runPromise(Effect.provide(program, MainLayer));
+Effect.runPromise(Effect.provide(program, SolanaLayer));
 ```
 
-## Services
+## 🔧 Services
 
 ### RpcService
 
@@ -98,10 +114,10 @@ const program = Effect.gen(function* () {
 
 ### TokenService
 
-SPL token operations.
+SPL token operations (supports both Token and Token-2022 programs).
 
 ```typescript
-import { TokenService } from "@prb/effect-solana";
+import { TokenService, TOKEN_2022_PROGRAM_ADDRESS } from "@prb/effect-solana";
 
 const program = Effect.gen(function* () {
   const token = yield* TokenService;
@@ -109,7 +125,7 @@ const program = Effect.gen(function* () {
   // Get associated token address
   const ata = yield* token.getAssociatedTokenAddress({ owner, mint });
 
-  // Token-2022: pass tokenProgram to work with Token-2022 mints
+  // Token-2022 support
   const ata2022 = yield* token.getAssociatedTokenAddress({
     owner,
     mint,
@@ -117,17 +133,15 @@ const program = Effect.gen(function* () {
   });
 
   // Get or create ATA
-  const { address, instruction } = yield* token.getOrCreateATA({ owner, mint, payer });
+  const { address, instruction } = yield* token.getOrCreateATA({
+    owner,
+    mint,
+    payer,
+  });
 
   // Get token balance
   const balance = yield* token.getTokenBalance(ata);
 
-  // Get mint account
-  const mint = yield* token.getMint(params.mint);
-
-  // Get token account
-  const account = yield* token.getTokenAccount(ata);
-
   // Build transfer instruction
   const transfer = yield* token.getTransferInstruction({
     source: ata,
@@ -135,17 +149,6 @@ const program = Effect.gen(function* () {
     authority: owner,
     amount: 1_000_000n,
   });
-
-  const transfer2022 = yield* token.getTransferInstruction({
-    source: ata2022,
-    destination: recipientAta2022,
-    authority: owner,
-    amount: 1_000_000n,
-    tokenProgram: TOKEN_2022_PROGRAM_ADDRESS,
-  });
-
-  // Check if token account exists
-  const exists = yield* token.tokenAccountExists(ata);
 });
 ```
 
@@ -159,36 +162,52 @@ import { TransactionService } from "@prb/effect-solana";
 const program = Effect.gen(function* () {
   const tx = yield* TransactionService;
 
-  // Build transaction
+  // Build transaction with compute budget
   const message = yield* tx.build(instructions, {
     computeBudget: { unitLimit: 600_000, microLamports: 10_000 },
   });
 
-  // Sign transaction
+  // Sign, send, and confirm
   const signed = yield* tx.sign(message);
-
-  // Send transaction
   const signature = yield* tx.send(signed);
-
-  // Confirm transaction
   const receipt = yield* tx.confirm(signature, {
     commitment: "confirmed",
     timeout: 60_000,
   });
 
-  // Or do all at once
+  // Or all at once
   const receipt2 = yield* tx.sendAndConfirm(instructions, {
     commitment: "confirmed",
   });
 
-  // Batch send and confirm
-  const receipts = yield* tx.sendAndConfirmBatch(
-    [{ instructions }, { instructions: [instruction2], computeBudget: { unitLimit: 300_000 } }],
-    { concurrency: 2, confirm: { commitment: "confirmed" } },
-  );
+  // Batch transactions
+  const receipts = yield* tx.sendAndConfirmBatch([{ instructions }, { instructions: [instruction2] }], {
+    concurrency: 2,
+    confirm: { commitment: "confirmed" },
+  });
+});
+```
+
+### ProgramWriter
 
-  // Simulate before sending
-  yield* tx.simulate(message);
+Build instructions from Anchor IDLs.
+
+```typescript
+import { ProgramWriter } from "@prb/effect-solana";
+import type { Idl } from "@prb/effect-solana";
+
+const program = Effect.gen(function* () {
+  const writer = yield* ProgramWriter;
+
+  const instruction = yield* writer.build(
+    idl,
+    {
+      method: "withdraw",
+      args: [amount],
+      accounts: { signer, streamRecipient /* ... */ },
+    },
+    programId,
+  );
 });
 ```
 
@@ -205,18 +224,32 @@ const program = Effect.gen(function* () {
 });
 ```
 
-## Layer Composition
+## 🧩 Layer Composition
 
-Compose services to build your application layer:
+### Using Presets
+
+```typescript
+import { makeSolanaLayer, makeRpcLayer, makeSignerLayer } from "@prb/effect-solana";
+
+// Complete layer with all services
+const AppLayer = makeSolanaLayer({ cluster: "devnet" }, () => walletAdapter);
+
+// Or compose manually
+const rpcLayer = makeRpcLayer({ cluster: "devnet", rpcUrl: "https://my-rpc.com" });
+const signerLayer = makeSignerLayer(() => walletAdapter);
+```
+
+### Manual Composition
 
 ```typescript
 import { Layer } from "effect";
 import {
   BalanceServiceLive,
-  RpcServiceLive,
-  SignerServiceLive,
+  RpcService,
+  SignerService,
   TokenServiceLive,
   TransactionServiceLive,
+  ProgramWriterLive,
 } from "@prb/effect-solana";
 
 // Create custom implementations
@@ -231,107 +264,20 @@ const MySignerLayer = Layer.succeed(SignerService, {
 });
 
 // Compose layers
-const AppLayer = Layer.mergeAll(BalanceServiceLive, TokenServiceLive, TransactionServiceLive).pipe(
+const AppLayer = Layer.mergeAll(BalanceServiceLive, TokenServiceLive, TransactionServiceLive, ProgramWriterLive).pipe(
   Layer.provide(Layer.merge(MyRpcLayer, MySignerLayer)),
 );
 ```
 
-## Constants
-
-The library exports common Solana constants:
-
-```typescript
-import {
-  LAMPORTS_PER_SOL,
-  ClusterEndpoints,
-  SYSTEM_PROGRAM_ADDRESS,
-  TOKEN_PROGRAM_ADDRESS,
-  TOKEN_2022_PROGRAM_ADDRESS,
-  ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
-  COMPUTE_BUDGET_PROGRAM_ADDRESS,
-  MEMO_PROGRAM_ADDRESS,
-} from "@prb/effect-solana";
-
-// Use cluster endpoints
-const devnetUrl = ClusterEndpoints.devnet;
-const mainnetUrl = ClusterEndpoints["mainnet-beta"];
-```
-
-## Types
-
-Re-exported Solana types and custom definitions:
-
-```typescript
-import type {
-  Address,
-  Commitment,
-  Lamports,
-  Signature,
-  TransactionError,
-  Cluster,
-  ClusterConfig,
-  Microlamports,
-} from "@prb/effect-solana";
-```
-
-## Error Handling
-
-All errors are tagged for discriminated union handling:
-
-```typescript
-import { Effect } from "effect";
-import { WalletNotConnectedError, TransactionFailedError, TransactionTimeoutError, RpcError } from "@prb/effect-solana";
-
-const handled = program.pipe(
-  Effect.catchTag("WalletNotConnectedError", (e) => Effect.succeed("Please connect wallet")),
-  Effect.catchTag("TransactionFailedError", (e) => Effect.succeed(`TX failed: ${e.message}`)),
-  Effect.catchTag("TransactionTimeoutError", (e) => Effect.succeed(`TX timed out: ${e.signature}`)),
-  Effect.catchTag("RpcError", (e) => Effect.succeed(`RPC error at ${e.url}: ${e.message}`)),
-);
-```
-
-## Telemetry
-
-The library includes built-in OpenTelemetry spans for observability:
-
-```typescript
-import { SpanNames } from "@prb/effect-solana";
-
-// Balance operations
-SpanNames.BALANCE_GET_SOL;
-SpanNames.BALANCE_WATCH_SOL;
-
-// Transaction operations
-SpanNames.TX_BUILD;
-SpanNames.TX_SIGN;
-SpanNames.TX_SEND;
-SpanNames.TX_CONFIRM;
-SpanNames.TX_SEND_AND_CONFIRM;
-SpanNames.TX_SIMULATE;
-
-// Token operations
-SpanNames.TOKEN_GET_ATA;
-SpanNames.TOKEN_CREATE_ATA;
-SpanNames.TOKEN_GET_ACCOUNT;
-
-// PDA operations
-SpanNames.PDA_DERIVE;
-
-// And more...
-```
-
-## React Integration
-
-The library provides React hooks for integrating Solana operations into React applications:
+## ⚛️ React Integration
 
 ```typescript
 import { EffectSolanaProvider, useEffectMemo } from "@prb/effect-solana";
 import { BalanceService } from "@prb/effect-solana";
-import type { Address } from "@solana/kit";
 
 function App() {
   return (
-    <EffectSolanaProvider layer={MainLayer}>
+    <EffectSolanaProvider layer={AppLayer}>
       <Balance address={yourAddress} />
     </EffectSolanaProvider>
   );
@@ -344,7 +290,7 @@ function Balance({ address }: { address: Address }) {
         const balance = yield* BalanceService;
         return yield* balance.getSolBalance(address);
       }),
-    [address],
+    [address]
   );
 
   if (result.status === "loading") return <div>Loading...</div>;
@@ -353,54 +299,88 @@ function Balance({ address }: { address: Address }) {
 }
 ```
 
-Available React hooks:
+### Available Hooks
 
 - `useEffectMemo` - Run an Effect with memoization
 - `useEffectOnce` - Run an Effect once on mount
 - `useStream` - Subscribe to an Effect Stream
 - `useForkEffect` - Fork an Effect as a background fiber
-- `EffectSolanaProvider` - Context provider for Effect runtime
 - `useEffectSolanaRuntime` - Access the Effect runtime
 
-## Examples
+## 🚨 Error Handling
 
-### Send SOL Transfer
+All errors are tagged for discriminated union handling:
 
 ```typescript
 import { Effect } from "effect";
-import { TransactionService } from "@prb/effect-solana";
-import { getTransferSolInstruction } from "@solana-program/system";
+import {
+  WalletNotConnectedError,
+  TransactionFailedError,
+  TransactionTimeoutError,
+  RpcError,
+  catchUserRejection,
+} from "@prb/effect-solana";
 
-const sendSol = (params: { from: Address; to: Address; amount: Lamports }) =>
-  Effect.gen(function* () {
-    const tx = yield* TransactionService;
+const handled = program.pipe(
+  Effect.catchTag("WalletNotConnectedError", () => Effect.succeed("Please connect wallet")),
+  Effect.catchTag("TransactionFailedError", (e) => Effect.succeed(`TX failed: ${e.message}`)),
+  Effect.catchTag("TransactionTimeoutError", (e) => Effect.succeed(`TX timed out: ${e.signature}`)),
+  Effect.catchTag("RpcError", (e) => Effect.succeed(`RPC error: ${e.message}`)),
+);
 
-    const instruction = getTransferSolInstruction({
-      source: params.from,
-      destination: params.to,
-      amount: params.amount,
-    });
+// Convenience operator for user rejections
+const result = sendTransaction(tx).pipe(catchUserRejection(null));
+```
 
-    const receipt = yield* tx.sendAndConfirm([instruction]);
-    return receipt.signature;
-  });
+### Error Types
+
+| Error                      | Description                        |
+| -------------------------- | ---------------------------------- |
+| `RpcError`                 | RPC communication failure          |
+| `WalletNotConnectedError`  | Wallet not connected               |
+| `SignatureError`           | Transaction signing failed         |
+| `UserRejectedError`        | User rejected the transaction      |
+| `TransactionSendError`     | Failed to send transaction         |
+| `TransactionFailedError`   | Transaction execution failed       |
+| `TransactionTimeoutError`  | Transaction confirmation timed out |
+| `BlockhashExpiredError`    | Blockhash expired before confirm   |
+| `SimulationFailedError`    | Transaction simulation failed      |
+| `AccountNotFoundError`     | Account does not exist             |
+| `InsufficientBalanceError` | Insufficient SOL balance           |
+
+## 📊 Telemetry
+
+Built-in OpenTelemetry spans for observability:
+
+```typescript
+import { SpanNames } from "@prb/effect-solana";
+
+// Examples: SpanNames.TX_SEND, SpanNames.BALANCE_GET_SOL, SpanNames.TOKEN_GET_ATA
 ```
 
-### Watch Balance Changes
+## 📚 Constants
 
 ```typescript
-import { Effect, Stream } from "effect";
-import { BalanceService } from "@prb/effect-solana";
+import {
+  LAMPORTS_PER_SOL,
+  ClusterEndpoints,
+  SYSTEM_PROGRAM_ADDRESS,
+  TOKEN_PROGRAM_ADDRESS,
+  TOKEN_2022_PROGRAM_ADDRESS,
+  ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
+  COMPUTE_BUDGET_PROGRAM_ADDRESS,
+  MEMO_PROGRAM_ADDRESS,
+} from "@prb/effect-solana";
+```
 
-const watchBalance = (address: Address) =>
-  Effect.gen(function* () {
-    const balance = yield* BalanceService;
-    const stream = yield* balance.watchBalance({ address });
+## 🔗 Legacy Interop
 
-    yield* Stream.runForEach(stream, (lamports) => Effect.sync(() => console.log(`Balance: ${lamports}`)));
-  });
+Bridge utilities for `@solana/web3.js` v1 compatibility:
+
+```typescript
+import { LegacySigner, transactionBridge } from "@prb/effect-solana/web3.js";
 ```
 
-## License
+## 📄 License
 
-MIT
+This project is licensed under the MIT License - see the [LICENSE](../LICENSE) file for details.

package/dist/core/errors/predicates.d.ts

@@ -1,5 +1,3 @@
-import { Effect } from "effect";
-import type { UserRejectedError } from "./wallet.js";
 export type TaggedErrorShape = {
     readonly _tag: string;
     readonly message: string;
@@ -9,13 +7,4 @@ export declare const hasTaggedErrorShape: (error: unknown) => error is TaggedErr
 export declare const isTaggedError: <T extends {
     readonly _tag: string;
 }>(tag: T["_tag"]) => (error: unknown) => error is T;
-export declare const isUserRejectedError: (error: unknown) => error is UserRejectedError;
-export declare const catchUserRejection: {
-    <A2>(fallback: A2): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A | A2, Exclude<E, UserRejectedError>, R>;
-    <A, E, R, A2>(effect: Effect.Effect<A, E, R>, fallback: A2): Effect.Effect<A | A2, Exclude<E, UserRejectedError>, R>;
-};
-export declare const catchUserRejectionWith: {
-    <A2, E2, R2>(fallback: Effect.Effect<A2, E2, R2>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A | A2, Exclude<E, UserRejectedError> | E2, R | R2>;
-    <A, E, R, A2, E2, R2>(effect: Effect.Effect<A, E, R>, fallback: Effect.Effect<A2, E2, R2>): Effect.Effect<A | A2, Exclude<E, UserRejectedError> | E2, R | R2>;
-};
 //# sourceMappingURL=predicates.d.ts.map

package/dist/core/errors/predicates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"predicates.d.ts","sourceRoot":"","sources":["../../../src/core/errors/predicates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAMF,eAAO,MAAM,mBAAmB,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,gBACoC,CAAC;AAMnG,eAAO,MAAM,aAAa,GACvB,CAAC,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,MACnD,OAAO,OAAO,KAAG,KAAK,IAAI,CACuB,CAAC;AAMrD,eAAO,MAAM,mBAAmB,UAPtB,OAAO,KAAG,KAAK,qBAO+D,CAAC;AAgBzF,eAAO,MAAM,kBAAkB,EAAE;IAC/B,CAAC,EAAE,EACD,QAAQ,EAAE,EAAE,GACX,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,QAAQ,EAAE,EAAE,GACX,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;CAY5D,CAAC;AAcF,eAAO,MAAM,sBAAsB,EAAE;IACnC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EACT,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAClC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAClC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;CAYtE,CAAC"}
+{"version":3,"file":"predicates.d.ts","sourceRoot":"","sources":["../../../src/core/errors/predicates.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAMF,eAAO,MAAM,mBAAmB,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,gBACoC,CAAC;AAMnG,eAAO,MAAM,aAAa,GACvB,CAAC,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,MACnD,OAAO,OAAO,KAAG,KAAK,IAAI,CACuB,CAAC"}

package/dist/core/errors/predicates.js

@@ -1,8 +1,3 @@
-import { Effect } from "effect";
-import { dual } from "effect/Function";
 export const hasTaggedErrorShape = (error) => error !== null && typeof error === "object" && "_tag" in error && typeof error._tag === "string";
 export const isTaggedError = (tag) => (error) => hasTaggedErrorShape(error) && error._tag === tag;
-export const isUserRejectedError = isTaggedError("UserRejectedError");
-export const catchUserRejection = dual(2, (effect, fallback) => Effect.catchIf(effect, isUserRejectedError, () => Effect.succeed(fallback)));
-export const catchUserRejectionWith = dual(2, (effect, fallback) => Effect.catchIf(effect, isUserRejectedError, () => fallback));
 //# sourceMappingURL=predicates.js.map

package/dist/core/errors/predicates.js.map

@@ -1 +1 @@
-{"version":3,"file":"predicates.js","sourceRoot":"","sources":["../../../src/core/errors/predicates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAevC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAA6B,EAAE,CAC/E,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AAMnG,MAAM,CAAC,MAAM,aAAa,GACxB,CAAsC,GAAc,EAAE,EAAE,CACxD,CAAC,KAAc,EAAc,EAAE,CAC7B,mBAAmB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC;AAMrD,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,CAAoB,mBAAmB,CAAC,CAAC;AAgBzF,MAAM,CAAC,MAAM,kBAAkB,GAU3B,IAAI,CACN,CAAC,EACD,CACE,MAA8B,EAC9B,QAAY,EAC6C,EAAE,CAC3D,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAIzE,CACJ,CAAC;AAcF,MAAM,CAAC,MAAM,sBAAsB,GAU/B,IAAI,CACN,CAAC,EACD,CACE,MAA8B,EAC9B,QAAmC,EACgC,EAAE,CACrE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAIzD,CACJ,CAAC"}
+{"version":3,"file":"predicates.js","sourceRoot":"","sources":["../../../src/core/errors/predicates.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAA6B,EAAE,CAC/E,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AAMnG,MAAM,CAAC,MAAM,aAAa,GACxB,CAAsC,GAAc,EAAE,EAAE,CACxD,CAAC,KAAc,EAAc,EAAE,CAC7B,mBAAmB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC"}

package/dist/core/errors/transaction.d.ts

@@ -1,4 +1,11 @@
-import { Schema } from "effect";
+import { Effect, Schema } from "effect";
+declare const UserRejectedError_base: Schema.TaggedErrorClass<UserRejectedError, "UserRejectedError", {
+    readonly _tag: Schema.tag<"UserRejectedError">;
+} & {
+    message: typeof Schema.String;
+}>;
+export declare class UserRejectedError extends UserRejectedError_base {
+}
 declare const TransactionSendError_base: Schema.TaggedErrorClass<TransactionSendError, "TransactionSendError", {
     readonly _tag: Schema.tag<"TransactionSendError">;
 } & {
@@ -11,6 +18,7 @@ export declare class TransactionSendError extends TransactionSendError_base {
 declare const TransactionFailedError_base: Schema.TaggedErrorClass<TransactionFailedError, "TransactionFailedError", {
     readonly _tag: Schema.tag<"TransactionFailedError">;
 } & {
+    cause: Schema.optional<typeof Schema.Unknown>;
     logs: Schema.optional<Schema.Array$<typeof Schema.String>>;
     message: typeof Schema.String;
     signature: typeof Schema.String;
@@ -42,5 +50,16 @@ declare const SimulationFailedError_base: Schema.TaggedErrorClass<SimulationFail
 }>;
 export declare class SimulationFailedError extends SimulationFailedError_base {
 }
+export declare const isTaggedUserRejectedError: (error: unknown) => error is UserRejectedError;
+export declare const isUserRejectedError: (error: unknown) => error is UserRejectedError;
+export declare function isLikelyUserRejectedError(error: unknown): boolean;
+export declare const catchUserRejection: {
+    <A2>(fallback: A2): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A | A2, Exclude<E, UserRejectedError>, R>;
+    <A, E, R, A2>(effect: Effect.Effect<A, E, R>, fallback: A2): Effect.Effect<A | A2, Exclude<E, UserRejectedError>, R>;
+};
+export declare const catchUserRejectionWith: {
+    <A2, E2, R2>(fallback: Effect.Effect<A2, E2, R2>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A | A2, Exclude<E, UserRejectedError> | E2, R | R2>;
+    <A, E, R, A2, E2, R2>(effect: Effect.Effect<A, E, R>, fallback: Effect.Effect<A2, E2, R2>): Effect.Effect<A | A2, Exclude<E, UserRejectedError> | E2, R | R2>;
+};
 export {};
 //# sourceMappingURL=transaction.d.ts.map

package/dist/core/errors/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../src/core/errors/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;;;;;AAEhC,qBAAa,oBAAqB,SAAQ,yBAOzC;CAAG;;;;;;;;AAEJ,qBAAa,sBAAuB,SAAQ,2BAO3C;CAAG;;;;;;;AAEJ,qBAAa,uBAAwB,SAAQ,4BAM5C;CAAG;;;;;;;AAEJ,qBAAa,qBAAsB,SAAQ,0BAM1C;CAAG;;;;;;;;AAEJ,qBAAa,qBAAsB,SAAQ,0BAO1C;CAAG"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../src/core/errors/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;;;AASxC,qBAAa,iBAAkB,SAAQ,sBAKtC;CAAG;;;;;;;;AAEJ,qBAAa,oBAAqB,SAAQ,yBAOzC;CAAG;;;;;;;;;AAEJ,qBAAa,sBAAuB,SAAQ,2BAQ3C;CAAG;;;;;;;AAEJ,qBAAa,uBAAwB,SAAQ,4BAM5C;CAAG;;;;;;;AAEJ,qBAAa,qBAAsB,SAAQ,0BAM1C;CAAG;;;;;;;;AAEJ,qBAAa,qBAAsB,SAAQ,0BAO1C;CAAG;AASJ,eAAO,MAAM,yBAAyB,gDAAwD,CAAC;AAM/F,eAAO,MAAM,mBAAmB,gDAA4B,CAAC;AAiE7D,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAqBjE;AAoBD,eAAO,MAAM,kBAAkB,EAAE;IAC/B,CAAC,EAAE,EACD,QAAQ,EAAE,EAAE,GACX,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,QAAQ,EAAE,EAAE,GACX,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;CAY5D,CAAC;AAcF,eAAO,MAAM,sBAAsB,EAAE;IACnC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EACT,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAClC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAClC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;CAYtE,CAAC"}

package/dist/core/errors/transaction.js

@@ -1,4 +1,10 @@
-import { Schema } from "effect";
+import { Effect, Schema } from "effect";
+import { dual } from "effect/Function";
+import { hasTaggedErrorShape, isTaggedError } from "./predicates.js";
+export class UserRejectedError extends Schema.TaggedError()("UserRejectedError", {
+    message: Schema.String,
+}) {
+}
 export class TransactionSendError extends Schema.TaggedError()("TransactionSendError", {
     cause: Schema.optional(Schema.Unknown),
     message: Schema.String,
@@ -6,6 +12,7 @@ export class TransactionSendError extends Schema.TaggedError()("TransactionSendE
 }) {
 }
 export class TransactionFailedError extends Schema.TaggedError()("TransactionFailedError", {
+    cause: Schema.optional(Schema.Unknown),
     logs: Schema.optional(Schema.Array(Schema.String)),
     message: Schema.String,
     signature: Schema.String,
@@ -27,4 +34,56 @@ export class SimulationFailedError extends Schema.TaggedError()("SimulationFaile
     message: Schema.String,
 }) {
 }
+export const isTaggedUserRejectedError = isTaggedError("UserRejectedError");
+export const isUserRejectedError = isTaggedUserRejectedError;
+const USER_REJECTION_CODE = 4001;
+const USER_REJECTION_MESSAGES = ["user rejected", "rejected the request"];
+function isRejectionCode(code) {
+    return code === USER_REJECTION_CODE || code === `${USER_REJECTION_CODE}`;
+}
+function hasRejectionMessage(message) {
+    const lower = message.toLowerCase();
+    return USER_REJECTION_MESSAGES.some((m) => lower.includes(m));
+}
+function checkCause(cause, depth) {
+    if (!cause || depth > 3) {
+        return false;
+    }
+    if (typeof cause === "object" && "code" in cause && isRejectionCode(cause.code)) {
+        return true;
+    }
+    if (typeof cause === "string") {
+        return hasRejectionMessage(cause);
+    }
+    if (cause instanceof Error) {
+        if (isRejectionCode(cause.code)) {
+            return true;
+        }
+        if (hasRejectionMessage(cause.message)) {
+            return true;
+        }
+        return checkCause(cause.cause, depth + 1);
+    }
+    if (typeof cause === "object" && "message" in cause && typeof cause.message === "string") {
+        return hasRejectionMessage(cause.message);
+    }
+    return false;
+}
+export function isLikelyUserRejectedError(error) {
+    if (!error || typeof error !== "object") {
+        return false;
+    }
+    if (isUserRejectedError(error)) {
+        return true;
+    }
+    if (hasTaggedErrorShape(error) && error._tag === "WalletNotConnectedError") {
+        return true;
+    }
+    if (hasTaggedErrorShape(error) && error._tag === "SignatureError") {
+        return checkCause(error.cause, 0);
+    }
+    return false;
+}
+export const catchUserRejection = dual(2, (effect, fallback) => Effect.catchIf(effect, isUserRejectedError, () => Effect.succeed(fallback)));
+export const catchUserRejectionWith = dual(2, (effect, fallback) => Effect.catchIf(effect, isUserRejectedError, () => fallback));
 //# sourceMappingURL=transaction.js.map

package/dist/core/errors/transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/core/errors/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,OAAO,oBAAqB,SAAQ,MAAM,CAAC,WAAW,EAAwB,CAClF,sBAAsB,EACtB;IACE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;CAC1C,CACF;CAAG;AAEJ,MAAM,OAAO,sBAAuB,SAAQ,MAAM,CAAC,WAAW,EAA0B,CACtF,wBAAwB,EACxB;IACE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CACF;CAAG;AAEJ,MAAM,OAAO,uBAAwB,SAAQ,MAAM,CAAC,WAAW,EAA2B,CACxF,yBAAyB,EACzB;IACE,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CACF;CAAG;AAEJ,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,WAAW,EAAyB,CACpF,uBAAuB,EACvB;IACE,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CACF;CAAG;AAEJ,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,WAAW,EAAyB,CACpF,uBAAuB,EACvB;IACE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CACF;CAAG"}
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/core/errors/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMrE,MAAM,OAAO,iBAAkB,SAAQ,MAAM,CAAC,WAAW,EAAqB,CAC5E,mBAAmB,EACnB;IACE,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CACF;CAAG;AAEJ,MAAM,OAAO,oBAAqB,SAAQ,MAAM,CAAC,WAAW,EAAwB,CAClF,sBAAsB,EACtB;IACE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;CAC1C,CACF;CAAG;AAEJ,MAAM,OAAO,sBAAuB,SAAQ,MAAM,CAAC,WAAW,EAA0B,CACtF,wBAAwB,EACxB;IACE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CACF;CAAG;AAEJ,MAAM,OAAO,uBAAwB,SAAQ,MAAM,CAAC,WAAW,EAA2B,CACxF,yBAAyB,EACzB;IACE,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CACF;CAAG;AAEJ,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,WAAW,EAAyB,CACpF,uBAAuB,EACvB;IACE,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CACF;CAAG;AAEJ,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,WAAW,EAAyB,CACpF,uBAAuB,EACvB;IACE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CACF;CAAG;AASJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,aAAa,CAAoB,mBAAmB,CAAC,CAAC;AAM/F,MAAM,CAAC,MAAM,mBAAmB,GAAG,yBAAyB,CAAC;AAM7D,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAKjC,MAAM,uBAAuB,GAAG,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;AAE1E,SAAS,eAAe,CAAC,IAAa;IACpC,OAAO,IAAI,KAAK,mBAAmB,IAAI,IAAI,KAAK,GAAG,mBAAmB,EAAE,CAAC;AAC3E,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAe;IAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACpC,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,UAAU,CAAC,KAAc,EAAE,KAAa;IAC/C,IAAI,CAAC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IAGD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAChF,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,IAAI,eAAe,CAAE,KAA4B,CAAC,IAAI,CAAC,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,UAAU,CAAE,KAA6B,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,SAAS,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzF,OAAO,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAaD,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IAGD,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,IAAI,mBAAmB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,yBAAyB,EAAE,CAAC;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,IAAI,mBAAmB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QAClE,OAAO,UAAU,CAAE,KAA6B,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAoBD,MAAM,CAAC,MAAM,kBAAkB,GAU3B,IAAI,CACN,CAAC,EACD,CACE,MAA8B,EAC9B,QAAY,EAC6C,EAAE,CAC3D,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAIzE,CACJ,CAAC;AAcF,MAAM,CAAC,MAAM,sBAAsB,GAU/B,IAAI,CACN,CAAC,EACD,CACE,MAA8B,EAC9B,QAAmC,EACgC,EAAE,CACrE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAIzD,CACJ,CAAC"}

package/dist/core/errors/wallet.d.ts

@@ -14,12 +14,5 @@ declare const SignatureError_base: Schema.TaggedErrorClass<SignatureError, "Sign
 }>;
 export declare class SignatureError extends SignatureError_base {
 }
-declare const UserRejectedError_base: Schema.TaggedErrorClass<UserRejectedError, "UserRejectedError", {
-    readonly _tag: Schema.tag<"UserRejectedError">;
-} & {
-    message: typeof Schema.String;
-}>;
-export declare class UserRejectedError extends UserRejectedError_base {
-}
 export {};
 //# sourceMappingURL=wallet.d.ts.map