@riftresearch/sdk 0.2.0 → 0.2.2

package/README.md

@@ -68,7 +68,7 @@ const swap = await executeSwap()
 console.log(`Swap ID: ${swap.swapId}`) // API order ID
 
 // Check status
-const status = await sdk.getSwapStatus(swap.swapId)
+const status = await sdk.getOrderStatus(swap.swapId)
 console.log(`Status: ${status.status}`)
 ```
 

package/dist/index.d.ts

@@ -1,3 +1,9 @@
+/**
+* Core domain types for Rift Swap Router.
+* Shared between SDK and server packages.
+*/
+type Address = string;
+type TxHash = string;
 type U256 = string;
 type BitcoinChain = {
 	kind: "BITCOIN";
@@ -124,6 +130,10 @@ type QuoteResponse = ExactInputQuoteResponse | ExactOutputQuoteResponse;
 type OrderStatus = "waiting_for_deposit" | "deposit_confirming" | "initiating_transfer" | "confirming_transfer" | "swap_complete" | "refunding_user" | "failed";
 interface OrderStatusResponse {
 	status: OrderStatus;
+	destinationAddress: Address;
+	payoutTransaction?: TxHash;
+	depositTransaction?: TxHash;
+	quote: QuoteResponse;
 }
 /**
 * Execution actions - the mechanism by which a step is executed.
@@ -359,9 +369,9 @@ interface ExactOutputQuoteResult extends QuoteResultBase {
 type QuoteResult = ExactInputQuoteResult | ExactOutputQuoteResult;
 interface GetQuoteResult {
 	quote: QuoteResult;
-	executeSwap: () => Promise<SwapResult>;
+	executeSwap: () => Promise<OrderResult>;
 }
-interface SwapResult {
+interface OrderResult {
 	swapId: string;
 	status: SwapStatus2;
 	rift: RiftOrder;
@@ -440,12 +450,12 @@ declare class RiftSdk {
 	*/
 	private executeBtcTransferStep;
 	private buildQuoteResult;
-	private buildSwapResult;
+	private buildOrderResult;
 	private getAddress;
 	private getRefundAddress;
 	/**
-	* Get the current status of a swap by its ID.
+	* Get the current status of an order by its ID.
 	*/
-	getSwapStatus(swapId: string): Promise<SwapResult>;
+	getOrderStatus(orderId: string): Promise<OrderStatusResponse>;
 }
-export { getSupportedModes, detectRoute, createClient, TradeParameters, TokenIdentifier, SwapStatus2 as SwapStatus, SwapRoute, SwapResult, SupportedModes, SendBitcoinFn, RiftSdkOptions, RiftSdk, RiftOrder, RiftClient, QuoteResult, OrderResponse, NativeToken, GetQuoteResult, ExecutionStep, ExecutionAction, EvmChain, EvmCallStep, EvmCallKind, Erc20Token, Currency, Chain, CBBTC_ETHEREUM, CBBTC_BASE, BtcTransferStep, BtcTransferKind, BitcoinChain, BTC, App };
+export { getSupportedModes, detectRoute, createClient, TradeParameters, TokenIdentifier, SwapStatus2 as SwapStatus, SwapRoute, SupportedModes, SendBitcoinFn, RiftSdkOptions, RiftSdk, RiftOrder, RiftClient, QuoteResult, OrderResult, OrderResponse, NativeToken, GetQuoteResult, ExecutionStep, ExecutionAction, EvmChain, EvmCallStep, EvmCallKind, Erc20Token, Currency, Chain, CBBTC_ETHEREUM, CBBTC_BASE, BtcTransferStep, BtcTransferKind, BitcoinChain, BTC, App };

package/dist/index.js

@@ -1,6 +1,35 @@
+// ../common/src/constants.ts
+var CBBTC_ADDRESS = "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf";
+var CBBTC_ADDRESS_LOWER = CBBTC_ADDRESS.toLowerCase();
+var BTC_CHAIN = {
+  kind: "BITCOIN"
+};
+var ETH_CHAIN = {
+  kind: "EVM",
+  chainId: 1
+};
+var BASE_CHAIN = {
+  kind: "EVM",
+  chainId: 8453
+};
+var CBBTC_TOKEN = {
+  kind: "TOKEN",
+  address: CBBTC_ADDRESS,
+  decimals: 8
+};
+var BTC = {
+  chain: BTC_CHAIN,
+  token: { kind: "NATIVE", decimals: 8 }
+};
+var CBBTC_ETHEREUM = {
+  chain: ETH_CHAIN,
+  token: CBBTC_TOKEN
+};
+var CBBTC_BASE = {
+  chain: BASE_CHAIN,
+  token: CBBTC_TOKEN
+};
 // src/apiClient.ts
-import { BTC, CBBTC_BASE, CBBTC_ETHEREUM } from "@riftresearch/common";
-
 class SwapRouterApiError extends Error {
   status;
   body;
@@ -67,20 +96,20 @@ function createClient(baseUrl) {
 }
 // src/router.ts
 import { match, P } from "ts-pattern";
-var CBBTC_ADDRESS = "0xcbb7c0000ab88b473b1f5afd9ef808440eed33bf";
+var CBBTC_ADDRESS2 = "0xcbb7c0000ab88b473b1f5afd9ef808440eed33bf";
 var isBitcoin = (currency) => currency.chain.kind === "BITCOIN";
-var isCbBtc = (currency) => currency.chain.kind === "EVM" && currency.token.kind === "TOKEN" && currency.token.address.toLowerCase() === CBBTC_ADDRESS;
-var isEvmToken = (currency) => currency.chain.kind === "EVM";
-var isSameEvmChain = (a, b) => a.chain.kind === "EVM" && b.chain.kind === "EVM" && a.chain.chainId === b.chain.chainId;
+var isCbBtc = (currency) => currency.chain.kind === "EVM" && currency.token.kind === "TOKEN" && currency.token.address.toLowerCase() === CBBTC_ADDRESS2;
+var isEvmToken2 = (currency) => currency.chain.kind === "EVM";
+var isSameEvmChain2 = (a, b) => a.chain.kind === "EVM" && b.chain.kind === "EVM" && a.chain.chainId === b.chain.chainId;
 function detectRoute(from, to) {
   return match({ from, to }).with({ from: P.when(isCbBtc), to: P.when(isBitcoin) }, () => ({
     type: "direct_rift",
     direction: "to_btc"
-  })).with({ from: P.when(isBitcoin), to: P.when(isEvmToken) }, () => ({
+  })).with({ from: P.when(isBitcoin), to: P.when(isEvmToken2) }, () => ({
     type: "direct_rift",
     direction: "from_btc"
   })).with({
-    from: P.when((c) => isEvmToken(c) && !isCbBtc(c)),
+    from: P.when((c) => isEvmToken2(c) && !isCbBtc(c)),
     to: P.when(isBitcoin)
   }, ({ from: from2 }) => {
     if (from2.chain.kind !== "EVM") {
@@ -91,8 +120,8 @@ function detectRoute(from, to) {
       evmChainId: from2.chain.chainId
     };
   }).with({
-    from: P.when(isEvmToken),
-    to: P.when((c) => isEvmToken(c) && isSameEvmChain(from, to))
+    from: P.when(isEvmToken2),
+    to: P.when((c) => isEvmToken2(c) && isSameEvmChain2(from, to))
   }, ({ from: from2 }) => {
     if (from2.chain.kind !== "EVM") {
       throw new Error("Expected EVM chain");
@@ -168,7 +197,7 @@ class RiftSdk {
           }
         }
         const swap = await this.riftClient.getOrder(orderResponse.swapId);
-        return this.buildSwapResult(swap, {
+        return this.buildOrderResult(swap, {
           chained: isChained,
           riftOrderId: orderResponse.swapId
         });
@@ -237,10 +266,10 @@ class RiftSdk {
       };
     }
   }
-  buildSwapResult(swap, options) {
+  buildOrderResult(swap, options) {
     const riftOrderId = options?.riftOrderId;
     if (!riftOrderId) {
-      throw new Error("Missing rift order id for swap result.");
+      throw new Error("Missing rift order id for order result.");
     }
     return {
       swapId: riftOrderId,
@@ -261,13 +290,8 @@ class RiftSdk {
     }
     return this.getAddress();
   }
-  async getSwapStatus(swapId) {
-    const rift = await this.riftClient.getOrder(swapId);
-    return {
-      swapId,
-      status: rift.status,
-      rift
-    };
+  async getOrderStatus(orderId) {
+    return this.riftClient.getOrder(orderId);
   }
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@riftresearch/sdk",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"description": "SDK for swapping between bitcoin and evm chains",
 	"license": "MIT",
 	"files": [
@@ -12,9 +12,12 @@
 		"test": "bun test",
 		"test:coverage": "bun test --coverage",
 		"test:watch": "bun test --watch",
-		"type-check": "tsc --noEmit"
+		"type-check": "tsc --noEmit",
+		"verify:publish": "node ../../scripts/verify-publish.mjs package.json",
+		"prepublishOnly": "bun run build && node ../../scripts/verify-publish.mjs package.json"
 	},
 	"devDependencies": {
+		"@riftresearch/common": "workspace:*",
 		"@riftresearch/server": "workspace:*",
 		"@types/bun": "^1.3.6",
 		"bunup": "^0.16.20",
@@ -44,7 +47,6 @@
 	"types": "./dist/index.d.ts",
 	"dependencies": {
 		"@elysiajs/eden": "^1.4.5",
-		"@riftresearch/common": "workspace:*",
 		"@scure/base": "^2.0.0",
 		"@scure/btc-signer": "^2.0.1",
 		"ts-pattern": "^5.9.0"