@unionlabs/payments 0.2.1 → 0.3.1

package/src/internal/publicClient.ts

@@ -35,7 +35,6 @@ export function make({
       {},
       {
         [TypeId as Client.TypeId]: TypeId as Client.TypeId,
-        safe: undefined as any,
         getLatestHeight,
         getLatestBlockNumber,
         readBalance,
@@ -50,8 +49,6 @@ export function make({
       },
     );
 
-    (client as any).safe = client;
-
     return client;
   });
 }

package/src/promises/Payment.ts

@@ -1,11 +1,9 @@
 import { Effect, Layer, Struct } from "effect";
 import { constant, flow, pipe } from "effect/Function";
-import * as attestor from "../Attestor.js";
 import * as payment from "../Payment.js";
 import * as prover from "../Prover.js";
 import * as publicClient from "../PublicClient.js";
 import * as walletClient from "../WalletClient.js";
-import type * as Attestor from "./Attestor.js";
 import type * as Prover from "./Prover.js";
 import type * as PublicClient from "./PublicClient.js";
 import type * as WalletClient from "./WalletClient.js";
@@ -32,38 +30,49 @@ export const prepareDeposit = (
 
 export const prepareRedemption = (
   options: {
-    sourceWalletClient: WalletClient.WalletClient;
     destinationWalletClient: WalletClient.WalletClient;
+  } & Parameters<typeof payment.prepareRedemption>[0],
+) =>
+  pipe(
+    payment.prepareRedemption(
+      pipe(options, Struct.omit("destinationWalletClient")),
+    ),
+    Effect.provide([
+      Layer.succeed(
+        walletClient.DestinationWalletClient,
+        options.destinationWalletClient.client,
+      ),
+    ]),
+    Effect.runPromise,
+  );
+
+export const getNullifier = flow(payment.getNullifier, Effect.runPromise);
+
+export const getDepositAddress = flow(
+  payment.getDepositAddress,
+  Effect.runPromise,
+);
+
+export const generateProof = (
+  options: {
     destinationPublicClient: PublicClient.PublicClient;
     sourcePublicClient: PublicClient.PublicClient;
     publicClient: PublicClient.PublicClient;
-    attestor: Attestor.Attestor;
     prover: Prover.Prover;
-  } & Parameters<typeof payment.prepareRedemption>[0],
+  } & Parameters<typeof payment.generateProof>[0],
 ) =>
   pipe(
-    payment.prepareRedemption(
+    payment.generateProof(
       pipe(
         options,
-        Struct.omit("sourceWalletClient"),
         Struct.omit("publicClient"),
-        Struct.omit("destinationWalletClient"),
         Struct.omit("destinationPublicClient"),
         Struct.omit("sourcePublicClient"),
-        Struct.omit("attestor"),
         Struct.omit("prover"),
       ),
     ),
     Effect.provide([
-      Layer.succeed(
-        walletClient.SourceWalletClient,
-        options.sourceWalletClient.client,
-      ),
       Layer.succeed(publicClient.PublicClient, options.publicClient.client),
-      Layer.succeed(
-        walletClient.DestinationWalletClient,
-        options.destinationWalletClient.client,
-      ),
       Layer.succeed(
         publicClient.DestinationPublicClient,
         options.destinationPublicClient.client,
@@ -72,15 +81,7 @@ export const prepareRedemption = (
         publicClient.SourcePublicClient,
         options.sourcePublicClient.client,
       ),
-      Layer.succeed(attestor.Attestor, options.attestor.attestor),
       Layer.succeed(prover.Prover, options.prover.prover),
     ]),
     Effect.runPromise,
   );
-
-export const getNullifier = flow(payment.getNullifier, Effect.runPromise);
-
-export const getDepositAddress = flow(
-  payment.getDepositAddress,
-  Effect.runPromise,
-);

package/src/promises/PublicClient.ts

@@ -1,10 +1,9 @@
 import { Effect } from "effect";
-import { flow } from "effect/Function";
+import { constant, flow, pipe } from "effect/Function";
 import * as client from "../PublicClient.js";
 
 export class PublicClient {
   readonly [client.TypeId] = client.TypeId;
-  readonly safe = this;
   client: client.PublicClient;
 
   constructor(client: client.PublicClient) {
@@ -18,7 +17,7 @@ export class PublicClient {
     return flow(this.client.getLatestHeight, Effect.runPromise);
   }
   get getLatestBlockNumber() {
-    return flow(this.client.getLatestBlockNumber, Effect.runPromise);
+    return constant(pipe(this.client.getLatestBlockNumber, Effect.runPromise));
   }
   get readBalance() {
     return flow(this.client.readBalance, Effect.runPromise);

package/src/promises/WalletClient.ts

@@ -4,7 +4,6 @@ import * as walletClient from "../WalletClient.js";
 
 export class WalletClient {
   readonly [walletClient.TypeId] = walletClient.TypeId;
-  readonly safe = this;
   client: walletClient.WalletClient;
 
   constructor(client: walletClient.WalletClient) {

package/src/rpc.ts

@@ -244,12 +244,10 @@ const IBC_HANDLER_ABI = [
   },
 ] as const;
 
-// @ts-expect-error
-const MULTICALL3_ADDRESS =
+export const MULTICALL3_ADDRESS =
   "0xcA11bde05977b3631167028862bE2a173976CA11" as Address;
 
-// @ts-expect-error
-const MULTICALL3_ABI = [
+export const MULTICALL3_ABI = [
   {
     inputs: [
       {

package/src/tsdoc-metadata.json

@@ -1,11 +0,0 @@
-// This file is read by tools that parse documentation comments conforming to the TSDoc standard.
-// It should be published with your NPM package.  It should not be tracked by Git.
-{
-  "tsdocVersion": "0.12",
-  "toolPackages": [
-    {
-      "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.55.1"
-    }
-  ]
-}