@funkit/fun-relay 0.1.6 → 0.1.8

package/dist/src/quote.d.ts

@@ -1,39 +1,43 @@
 import type { Execute, GetQuoteParameters } from '@reservoir0x/relay-sdk';
-import { type Address } from 'viem';
+import type { RelayAddress, RelayChainId, RelayVmType, RelayWallet } from './execution';
 import type { ApiFunkitCheckoutActionParams, CheckoutQuoteResponse, Logger } from './types';
 type RelayQuoteOptions = GetQuoteParameters['options'] & {};
-export type GetRelayQuoteParams = {
+export type RelayQuoteResult<VmType extends RelayVmType> = Execute & {
+    __vm: VmType;
+};
+export type GetRelayQuoteParams<SourceVmType extends RelayVmType = RelayVmType, TargetVmType extends RelayVmType = RelayVmType> = {
     actionParams?: ApiFunkitCheckoutActionParams[];
-    fromChainId: string;
-    fromTokenAddress: Address;
+    clientId: string;
+    fromChainId: RelayChainId<SourceVmType>;
+    fromTokenAddress: RelayAddress<SourceVmType>;
     logger: Logger;
     /**
      * {@link getRelayQuote} already sets {@link RelayQuoteOptions.appFees|appFees} and {@link RelayQuoteOptions.referrer|referrer}.
      * Only include them if you wish to override.
      */
     options?: RelayQuoteOptions;
-    recipientAddress: Address | undefined;
-    toChainId: string;
-    toTokenAddress: Address;
-    tradeType: 'EXACT_INPUT' | 'EXACT_OUTPUT';
-    userAddress: Address | undefined;
-    clientId: string;
+    recipientAddress: RelayAddress<TargetVmType> | undefined;
+    toChainId: RelayChainId<TargetVmType>;
+    toTokenAddress: RelayAddress<TargetVmType>;
+    tradeType: 'EXACT_INPUT' | 'EXACT_OUTPUT' | 'EXPECTED_OUTPUT';
+    userAddress: RelayAddress<SourceVmType> | undefined;
+    walletClient?: RelayWallet<SourceVmType>;
 } & ({
     fromTokenAmountBaseUnit: bigint | string;
     tradeType: 'EXACT_INPUT';
 } | {
     toTokenAmountBaseUnit: bigint | string;
-    tradeType: 'EXACT_OUTPUT';
+    tradeType: 'EXACT_OUTPUT' | 'EXPECTED_OUTPUT';
 });
-export type RelayQuote = CheckoutQuoteResponse & {
+export type RelayQuote<VmType extends RelayVmType = RelayVmType> = CheckoutQuoteResponse & {
     /** Required for EXACT_INPUT checkouts */
     finalToAmountBaseUnit: string;
     metadata: {
         fromAmountBaseUnit: string;
-        relayQuote: Execute;
+        relayQuote: RelayQuoteResult<VmType>;
         toAmountBaseUnit: string;
     };
 };
-export declare function getRelayQuote({ logger, ...params }: GetRelayQuoteParams): Promise<RelayQuote>;
+export declare function getRelayQuote<SourceVmType extends RelayVmType, TargetVmType extends RelayVmType = RelayVmType>({ logger, walletClient, ...params }: GetRelayQuoteParams<SourceVmType, TargetVmType>): Promise<RelayQuote<SourceVmType>>;
 export {};
 //# sourceMappingURL=quote.d.ts.map

package/dist/src/quote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quote.d.ts","sourceRoot":"","sources":["../../src/quote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,EAAE,KAAK,OAAO,EAAsB,MAAM,MAAM,CAAA;AAQvD,OAAO,KAAK,EACV,6BAA6B,EAC7B,qBAAqB,EACrB,MAAM,EACP,MAAM,SAAS,CAAA;AAGhB,KAAK,iBAAiB,GAAG,kBAAkB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAA;AAE3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,CAAC,EAAE,6BAA6B,EAAE,CAAA;IAC9C,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,OAAO,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,OAAO,CAAA;IACvB,SAAS,EAAE,aAAa,GAAG,cAAc,CAAA;IACzC,WAAW,EAAE,OAAO,GAAG,SAAS,CAAA;IAChC,QAAQ,EAAE,MAAM,CAAA;CACjB,GAAG,CACA;IACE,uBAAuB,EAAE,MAAM,GAAG,MAAM,CAAA;IACxC,SAAS,EAAE,aAAa,CAAA;CACzB,GACD;IACE,qBAAqB,EAAE,MAAM,GAAG,MAAM,CAAA;IACtC,SAAS,EAAE,cAAc,CAAA;CAC1B,CACJ,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,qBAAqB,GAAG;IAC/C,yCAAyC;IACzC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,QAAQ,EAAE;QACR,kBAAkB,EAAE,MAAM,CAAA;QAC1B,UAAU,EAAE,OAAO,CAAA;QACnB,gBAAgB,EAAE,MAAM,CAAA;KACzB,CAAA;CACF,CAAA;AAED,wBAAsB,aAAa,CAAC,EAClC,MAAM,EACN,GAAG,MAAM,EACV,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CA8K3C"}
+{"version":3,"file":"quote.d.ts","sourceRoot":"","sources":["../../src/quote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AASzE,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,WAAW,EACZ,MAAM,aAAa,CAAA;AAGpB,OAAO,KAAK,EACV,6BAA6B,EAC7B,qBAAqB,EACrB,MAAM,EACP,MAAM,SAAS,CAAA;AAGhB,KAAK,iBAAiB,GAAG,kBAAkB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAA;AAE3D,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,WAAW,IAAI,OAAO,GAAG;IACnE,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,mBAAmB,CAC7B,YAAY,SAAS,WAAW,GAAG,WAAW,EAC9C,YAAY,SAAS,WAAW,GAAG,WAAW,IAC5C;IACF,YAAY,CAAC,EAAE,6BAA6B,EAAE,CAAA;IAC9C,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC,CAAA;IACvC,gBAAgB,EAAE,YAAY,CAAC,YAAY,CAAC,CAAA;IAC5C,MAAM,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,gBAAgB,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACxD,SAAS,EAAE,YAAY,CAAC,YAAY,CAAC,CAAA;IACrC,cAAc,EAAE,YAAY,CAAC,YAAY,CAAC,CAAA;IAC1C,SAAS,EAAE,aAAa,GAAG,cAAc,GAAG,iBAAiB,CAAA;IAC7D,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACnD,YAAY,CAAC,EAAE,WAAW,CAAC,YAAY,CAAC,CAAA;CACzC,GAAG,CACA;IACE,uBAAuB,EAAE,MAAM,GAAG,MAAM,CAAA;IACxC,SAAS,EAAE,aAAa,CAAA;CACzB,GACD;IACE,qBAAqB,EAAE,MAAM,GAAG,MAAM,CAAA;IACtC,SAAS,EAAE,cAAc,GAAG,iBAAiB,CAAA;CAC9C,CACJ,CAAA;AAED,MAAM,MAAM,UAAU,CAAC,MAAM,SAAS,WAAW,GAAG,WAAW,IAC7D,qBAAqB,GAAG;IACtB,yCAAyC;IACzC,qBAAqB,EAAE,MAAM,CAAA;IAC7B,QAAQ,EAAE;QACR,kBAAkB,EAAE,MAAM,CAAA;QAC1B,UAAU,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;QACpC,gBAAgB,EAAE,MAAM,CAAA;KACzB,CAAA;CACF,CAAA;AAyCH,wBAAsB,aAAa,CACjC,YAAY,SAAS,WAAW,EAChC,YAAY,SAAS,WAAW,GAAG,WAAW,EAC9C,EACA,MAAM,EACN,YAAY,EACZ,GAAG,MAAM,EACV,EAAE,mBAAmB,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,OAAO,CAC1D,UAAU,CAAC,YAAY,CAAC,CACzB,CAwKA"}

package/dist/src/solana.d.ts

@@ -0,0 +1,11 @@
+import type { AdaptedWallet } from '@reservoir0x/relay-sdk';
+import { type Connection, type VersionedTransaction } from '@solana/web3.js';
+type Base58 = '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'J' | 'K' | 'L' | 'M' | 'N' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z';
+export type SolanaAddress = `${Base58}${string}`;
+export type SolanaTxHash = `${Base58}${string}`;
+export type SolanaWallet = AdaptedWallet & {
+    address(): Promise<SolanaAddress>;
+};
+export declare function getSolanaWallet(walletAddress: SolanaAddress, connection: Connection, signTransaction: (transaction: VersionedTransaction) => Promise<VersionedTransaction>): SolanaWallet;
+export {};
+//# sourceMappingURL=solana.d.ts.map

package/dist/src/solana.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/solana.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE3D,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,oBAAoB,EAC1B,MAAM,iBAAiB,CAAA;AAGxB,KAAK,MAAM,GACP,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,CAAA;AAEP,MAAM,MAAM,aAAa,GAAG,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAEhD,MAAM,MAAM,YAAY,GAAG,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAE/C,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG;IACzC,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC,CAAA;CAClC,CAAA;AAED,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,CACf,WAAW,EAAE,oBAAoB,KAC9B,OAAO,CAAC,oBAAoB,CAAC,GACjC,YAAY,CA2Bd"}

package/dist/src/utils.d.ts

@@ -1,9 +1,9 @@
-import type { Address } from 'viem';
+import type { RelayAddress, RelayVmType } from './execution';
 import { CheckoutRefundState, CheckoutState, type RelayExecutionInfo } from './types';
 /**
  * Converts a token address within Funkit the corresponding Relay token address.
  */
-export declare function convertFunToRelayTokenAddress(address: Address): Address;
+export declare function convertFunToRelayTokenAddress<T extends RelayVmType>(address: RelayAddress<T>): RelayAddress<T>;
 export declare function getRelayExecutionRefundState(info: RelayExecutionInfo): CheckoutRefundState | undefined;
 export declare function getRelayExecutionState(info: RelayExecutionInfo): CheckoutState;
 /**

package/dist/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAMnC,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,KAAK,kBAAkB,EACxB,MAAM,SAAS,CAAA;AAEhB;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAMvE;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,kBAAkB,GACvB,mBAAmB,GAAG,SAAS,CAOjC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,kBAAkB,GACvB,aAAa,CAUf;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAET"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,KAAK,kBAAkB,EACxB,MAAM,SAAS,CAAA;AAEhB;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,WAAW,EACjE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,YAAY,CAAC,CAAC,CAAC,CAMjB;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,kBAAkB,GACvB,mBAAmB,GAAG,SAAS,CAOjC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,kBAAkB,GACvB,aAAa,CAUf;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAET"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funkit/fun-relay",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "files": [
     "dist/src",
     "dist/index.d.ts",
@@ -27,12 +27,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@reservoir0x/relay-sdk": "^2.0.3"
+    "@reservoir0x/relay-sdk": "^2.1.3",
+    "@reservoir0x/relay-svm-wallet-adapter": "^8.0.3"
   },
   "devDependencies": {
+    "@solana/web3.js": "^1.98.2",
     "viem": "^2.29.4"
   },
   "peerDependencies": {
+    "@solana/web3.js": ">=1.98.0",
     "viem": ">=2.23.1"
   },
   "keywords": [