@gala-chain/gswap-sdk 2.0.0 → 2.1.0-beta.1

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { ErrorParamsOf, FailureOutcome, GALA_ERROR_CATALOG, GalaChainSigner, GalaChainTokenClassKey, GalaErrorCode, GalaErrorContext, GalaSDKError, HTTPResponse, HttpRequestor, UniqueKeyOptions, WireOptions } from "@gala-chain/gala-core-sdk";
+import { ChainContractPath, ErrorParamsOf, FailureOutcome, GALA_ERROR_CATALOG, GalaChainSigner, GalaChainTokenClassKey, GalaErrorCode, GalaErrorContext, GalaSDKError, HTTPResponse, HttpRequestor, UniqueKeyOptions, WireOptions } from "@gala-chain/gala-core-sdk";
 import BigNumber from "bignumber.js";
 import "decimal.js";
 //#region src/types/confirm_options.d.ts
@@ -368,6 +368,13 @@ export declare const GSWAP_ERROR_CATALOG: {
       readonly serverMessage: 'string';
     };
   };
+  readonly DTO_OPERATION_MISMATCH: {
+    readonly phase: 'post_send';
+    readonly template: 'The signed DTO has no dtoOperation, or one that is not the call it was sent to: {serverMessage}';
+    readonly params: {
+      readonly serverMessage: 'string';
+    };
+  };
   readonly BOUNDS_VIOLATION: {
     readonly phase: 'post_send';
     readonly template: 'The gateway rejected a numeric, tick, symbol or range bound: {serverMessage}';
@@ -1200,7 +1207,7 @@ export declare function toChainDto(message: Record<string, unknown>): Record<str
  * recovers it (the gateway rejects it as REDUNDANT_SIGNER_PUBLIC_KEY). The wrapper carries its own
  * `uniqueKey`, distinct from the DTO's.
  */
-export declare function buildDryRunWrapper(signer: GalaChainSigner, callerPublicKey: string, method: string, dto: Record<string, unknown>, uniqueKeyPrefix?: string): Promise<Record<string, unknown>>;
+export declare function buildDryRunWrapper(signer: GalaChainSigner, callerPublicKey: string, method: string, dto: Record<string, unknown>, uniqueKeyPrefix?: string, contractPath?: ChainContractPath): Promise<Record<string, unknown>>;
 /** The transport and backend a fee quote reads from. */
 export interface DexFeesClient {
   /** Swap backend origin, e.g. `https://dex-backend-prod1.defi.gala.com`. */
@@ -3472,6 +3479,7 @@ export declare const GSWAP_ERROR_PHASE_BY_CODE: {
   readonly SIGNATURE_INVALID: 'post_send';
   readonly SIGNER_MISMATCH: 'post_send';
   readonly DTO_INVALID: 'post_send';
+  readonly DTO_OPERATION_MISMATCH: 'post_send';
   readonly BOUNDS_VIOLATION: 'post_send';
   readonly SYMBOL_CONFLICT: 'post_send';
   readonly RATE_LIMITED: 'post_send';
@@ -4142,8 +4150,8 @@ export declare function isUnprovenAcknowledgement(error: unknown): boolean;
 /**
  * True when the error is a gateway refusal whose `params.serverMessage` an app may relay to the
  * person as the gateway sent it: `GATEWAY_REPORTED_ERROR`, the gateway bounces (`METHOD_NOT_ALLOWED`,
- * `SIGNATURE_INVALID`, `SIGNER_MISMATCH`, `DTO_INVALID`, `BOUNDS_VIOLATION`, `SYMBOL_CONFLICT`,
- * `RATE_LIMITED`, `GATEWAY_REJECTED`) and `CHAIN_DISPATCH_FAILED`. The app shows `serverMessage` when
+ * `SIGNATURE_INVALID`, `SIGNER_MISMATCH`, `DTO_INVALID`, `DTO_OPERATION_MISMATCH`, `BOUNDS_VIOLATION`,
+ * `SYMBOL_CONFLICT`, `RATE_LIMITED`, `GATEWAY_REJECTED`) and `CHAIN_DISPATCH_FAILED`. The app shows `serverMessage` when
  * it is not empty and its own line when it is; the SDK's English `message` is never what to show.
  *
  * It accepts a plain-object view of an SDK error too ({@link FailureView}: an app's wrapper with a
@@ -4167,7 +4175,7 @@ export declare function isUnprovenAcknowledgement(error: unknown): boolean;
 export declare function isRelayableRefusal(error: GSwapSDKError): error is GSwapSDKError<RelayableCode>;
 export declare function isRelayableRefusal(error: unknown): boolean;
 /** The codes {@link isRelayableRefusal} is true for. */
-export type RelayableCode = 'GATEWAY_REPORTED_ERROR' | 'METHOD_NOT_ALLOWED' | 'SIGNATURE_INVALID' | 'SIGNER_MISMATCH' | 'DTO_INVALID' | 'BOUNDS_VIOLATION' | 'SYMBOL_CONFLICT' | 'RATE_LIMITED' | 'CHAIN_DISPATCH_FAILED' | 'GATEWAY_REJECTED';
+export type RelayableCode = 'GATEWAY_REPORTED_ERROR' | 'METHOD_NOT_ALLOWED' | 'SIGNATURE_INVALID' | 'SIGNER_MISMATCH' | 'DTO_INVALID' | 'DTO_OPERATION_MISMATCH' | 'BOUNDS_VIOLATION' | 'SYMBOL_CONFLICT' | 'RATE_LIMITED' | 'CHAIN_DISPATCH_FAILED' | 'GATEWAY_REJECTED';
 /**
  * True when a write got a 2xx answer the SDK refused to interpret, so the answer itself is in
  * `error.body` (or `error.bodyText`) for the app to read: the five unproven acknowledgements

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ErrorParamsOf, FailureOutcome, GALA_ERROR_CATALOG, GalaChainSigner, GalaChainTokenClassKey, GalaErrorCode, GalaErrorContext, GalaSDKError, HTTPResponse, HttpRequestor, UniqueKeyOptions, WireOptions } from "@gala-chain/gala-core-sdk";
+import { ChainContractPath, ErrorParamsOf, FailureOutcome, GALA_ERROR_CATALOG, GalaChainSigner, GalaChainTokenClassKey, GalaErrorCode, GalaErrorContext, GalaSDKError, HTTPResponse, HttpRequestor, UniqueKeyOptions, WireOptions } from "@gala-chain/gala-core-sdk";
 import BigNumber from "bignumber.js";
 import { Decimal } from "decimal.js";
 //#region src/types/confirm_options.d.ts
@@ -368,6 +368,13 @@ export declare const GSWAP_ERROR_CATALOG: {
       readonly serverMessage: 'string';
     };
   };
+  readonly DTO_OPERATION_MISMATCH: {
+    readonly phase: 'post_send';
+    readonly template: 'The signed DTO has no dtoOperation, or one that is not the call it was sent to: {serverMessage}';
+    readonly params: {
+      readonly serverMessage: 'string';
+    };
+  };
   readonly BOUNDS_VIOLATION: {
     readonly phase: 'post_send';
     readonly template: 'The gateway rejected a numeric, tick, symbol or range bound: {serverMessage}';
@@ -1200,7 +1207,7 @@ export declare function toChainDto(message: Record<string, unknown>): Record<str
  * recovers it (the gateway rejects it as REDUNDANT_SIGNER_PUBLIC_KEY). The wrapper carries its own
  * `uniqueKey`, distinct from the DTO's.
  */
-export declare function buildDryRunWrapper(signer: GalaChainSigner, callerPublicKey: string, method: string, dto: Record<string, unknown>, uniqueKeyPrefix?: string): Promise<Record<string, unknown>>;
+export declare function buildDryRunWrapper(signer: GalaChainSigner, callerPublicKey: string, method: string, dto: Record<string, unknown>, uniqueKeyPrefix?: string, contractPath?: ChainContractPath): Promise<Record<string, unknown>>;
 /** The transport and backend a fee quote reads from. */
 export interface DexFeesClient {
   /** Swap backend origin, e.g. `https://dex-backend-prod1.defi.gala.com`. */
@@ -3472,6 +3479,7 @@ export declare const GSWAP_ERROR_PHASE_BY_CODE: {
   readonly SIGNATURE_INVALID: 'post_send';
   readonly SIGNER_MISMATCH: 'post_send';
   readonly DTO_INVALID: 'post_send';
+  readonly DTO_OPERATION_MISMATCH: 'post_send';
   readonly BOUNDS_VIOLATION: 'post_send';
   readonly SYMBOL_CONFLICT: 'post_send';
   readonly RATE_LIMITED: 'post_send';
@@ -4142,8 +4150,8 @@ export declare function isUnprovenAcknowledgement(error: unknown): boolean;
 /**
  * True when the error is a gateway refusal whose `params.serverMessage` an app may relay to the
  * person as the gateway sent it: `GATEWAY_REPORTED_ERROR`, the gateway bounces (`METHOD_NOT_ALLOWED`,
- * `SIGNATURE_INVALID`, `SIGNER_MISMATCH`, `DTO_INVALID`, `BOUNDS_VIOLATION`, `SYMBOL_CONFLICT`,
- * `RATE_LIMITED`, `GATEWAY_REJECTED`) and `CHAIN_DISPATCH_FAILED`. The app shows `serverMessage` when
+ * `SIGNATURE_INVALID`, `SIGNER_MISMATCH`, `DTO_INVALID`, `DTO_OPERATION_MISMATCH`, `BOUNDS_VIOLATION`,
+ * `SYMBOL_CONFLICT`, `RATE_LIMITED`, `GATEWAY_REJECTED`) and `CHAIN_DISPATCH_FAILED`. The app shows `serverMessage` when
  * it is not empty and its own line when it is; the SDK's English `message` is never what to show.
  *
  * It accepts a plain-object view of an SDK error too ({@link FailureView}: an app's wrapper with a
@@ -4167,7 +4175,7 @@ export declare function isUnprovenAcknowledgement(error: unknown): boolean;
 export declare function isRelayableRefusal(error: GSwapSDKError): error is GSwapSDKError<RelayableCode>;
 export declare function isRelayableRefusal(error: unknown): boolean;
 /** The codes {@link isRelayableRefusal} is true for. */
-export type RelayableCode = 'GATEWAY_REPORTED_ERROR' | 'METHOD_NOT_ALLOWED' | 'SIGNATURE_INVALID' | 'SIGNER_MISMATCH' | 'DTO_INVALID' | 'BOUNDS_VIOLATION' | 'SYMBOL_CONFLICT' | 'RATE_LIMITED' | 'CHAIN_DISPATCH_FAILED' | 'GATEWAY_REJECTED';
+export type RelayableCode = 'GATEWAY_REPORTED_ERROR' | 'METHOD_NOT_ALLOWED' | 'SIGNATURE_INVALID' | 'SIGNER_MISMATCH' | 'DTO_INVALID' | 'DTO_OPERATION_MISMATCH' | 'BOUNDS_VIOLATION' | 'SYMBOL_CONFLICT' | 'RATE_LIMITED' | 'CHAIN_DISPATCH_FAILED' | 'GATEWAY_REJECTED';
 /**
  * True when a write got a 2xx answer the SDK refused to interpret, so the answer itself is in
  * `error.body` (or `error.bodyText`) for the app to read: the five unproven acknowledgements

package/dist/index.mjs

@@ -222,6 +222,11 @@ const GSWAP_ERROR_CATALOG = {
 		template: "The gateway rejected the DTO shape: {serverMessage}",
 		params: { serverMessage: "string" }
 	},
+	DTO_OPERATION_MISMATCH: {
+		phase: "post_send",
+		template: "The signed DTO has no dtoOperation, or one that is not the call it was sent to: {serverMessage}",
+		params: { serverMessage: "string" }
+	},
 	BOUNDS_VIOLATION: {
 		phase: "post_send",
 		template: "The gateway rejected a numeric, tick, symbol or range bound: {serverMessage}",
@@ -731,6 +736,7 @@ const GSWAP_ERROR_PHASE_BY_CODE = {
 	SIGNATURE_INVALID: "post_send",
 	SIGNER_MISMATCH: "post_send",
 	DTO_INVALID: "post_send",
+	DTO_OPERATION_MISMATCH: "post_send",
 	BOUNDS_VIOLATION: "post_send",
 	SYMBOL_CONFLICT: "post_send",
 	RATE_LIMITED: "post_send",
@@ -906,6 +912,7 @@ var GSwapSDKError = class GSwapSDKError extends GalaSDKError {
 			case "SIGNATURE_INVALID": return new GSwapSDKError("SIGNATURE_INVALID", params, context);
 			case "SIGNER_MISMATCH": return new GSwapSDKError("SIGNER_MISMATCH", params, context);
 			case "DTO_INVALID": return new GSwapSDKError("DTO_INVALID", params, context);
+			case "DTO_OPERATION_MISMATCH": return new GSwapSDKError("DTO_OPERATION_MISMATCH", params, context);
 			case "BOUNDS_VIOLATION": return new GSwapSDKError("BOUNDS_VIOLATION", params, context);
 			case "SYMBOL_CONFLICT": return new GSwapSDKError("SYMBOL_CONFLICT", params, context);
 			case "RATE_LIMITED": return new GSwapSDKError("RATE_LIMITED", params, context);
@@ -1715,8 +1722,8 @@ function toChainDto(message) {
 * recovers it (the gateway rejects it as REDUNDANT_SIGNER_PUBLIC_KEY). The wrapper carries its own
 * `uniqueKey`, distinct from the DTO's.
 */
-function buildDryRunWrapper(signer, callerPublicKey, method, dto, uniqueKeyPrefix = DRY_RUN_UNIQUE_KEY_PREFIX) {
-	return signPreSend(signer, DRY_RUN_METHOD, {
+function buildDryRunWrapper(signer, callerPublicKey, method, dto, uniqueKeyPrefix = DRY_RUN_UNIQUE_KEY_PREFIX, contractPath = "asset/dexv3-contract") {
+	return signPreSend(signer, contractPath, DRY_RUN_METHOD, {
 		callerPublicKey,
 		method,
 		dto,
@@ -1771,7 +1778,7 @@ var DexFees = class {
 		if (this.signer === void 0) throw GSwapSDKError.noSignerError();
 		const channel = options.channel ?? "asset";
 		const contract = options.contract ?? "dexv3-contract";
-		const wrapper = await buildDryRunWrapper(this.signer, callerPublicKey, method, toChainDto(message));
+		const wrapper = await buildDryRunWrapper(this.signer, callerPublicKey, method, toChainDto(message), void 0, `asset/${contract}`);
 		const url = `${this.baseUrl}/wallet/connect/galachain/api/${encodeURIComponent(channel)}/${encodeURIComponent(contract)}/${encodeURIComponent(method)}/fee`;
 		let status;
 		let ok;
@@ -1809,6 +1816,14 @@ function readQuote(body) {
 	return body;
 }
 
+//#endregion
+//#region src/utils/chain_contract.ts
+/**
+* The contract every v2 write goes to: its route under `/v1/chain/` and (through core's table) the
+* `dtoOperation` each DTO is signed with. One constant for both, so they cannot disagree.
+*/
+const DEX_CONTRACT_PATH = "asset/dex-contract";
+
 //#endregion
 //#region src/utils/shadow_errors.ts
 /**
@@ -2170,7 +2185,7 @@ var ChainGateway = class {
 		return (options === null || options === void 0 ? void 0 : options.walletAddress) === void 0 ? this.walletAddress : userRef(options.walletAddress, "walletAddress");
 	}
 	writeUrl(method) {
-		return `${this.dexBackendBaseUrl}/v1/chain/asset/dex-contract/${method}`;
+		return `${this.dexBackendBaseUrl}/v1/chain/${DEX_CONTRACT_PATH}/${method}`;
 	}
 	/**
 	* POSTs a signed body and reads the answer. Neither a timeout nor a transport failure proves the
@@ -4947,7 +4962,7 @@ var Positions = class {
 	}
 	async submit(method, dto, confirmation) {
 		if (this.signer === void 0) throw GSwapSDKError.noSignerError();
-		const signed = await signPreSend(this.signer, method, dto);
+		const signed = await signPreSend(this.signer, DEX_CONTRACT_PATH, method, dto);
 		const submitOptions = this.walletAddress === void 0 ? {} : { walletAddress: this.walletAddress };
 		const owner = this.walletAddress;
 		const positionConfirmation = await this.buildPositionConfirmation(confirmation, owner);
@@ -5608,7 +5623,7 @@ var Swaps = class {
 	async signRequestTrade(dto) {
 		assertCanonicalV2Dto("RequestTrade", dto);
 		if (this.signer === void 0) throw GSwapSDKError.noSignerError();
-		return signPreSend(this.signer, "RequestTrade", dto);
+		return signPreSend(this.signer, DEX_CONTRACT_PATH, "RequestTrade", dto);
 	}
 	/** The pool's two symbols in contract order: the quote's own when pinned, else string order. */
 	orientPool(tokenInSymbol, tokenOutSymbol, pool) {
@@ -5869,6 +5884,7 @@ const BY_CODE = {
 	SIGNATURE_INVALID: NOT_QUEUED,
 	SIGNER_MISMATCH: NOT_QUEUED,
 	DTO_INVALID: NOT_QUEUED,
+	DTO_OPERATION_MISMATCH: NOT_QUEUED,
 	BOUNDS_VIOLATION: NOT_QUEUED,
 	SYMBOL_CONFLICT: NOT_QUEUED,
 	RATE_LIMITED: NOT_QUEUED,
@@ -6537,6 +6553,7 @@ const RELAYABLE_REFUSAL_CODES = [
 	"SIGNATURE_INVALID",
 	"SIGNER_MISMATCH",
 	"DTO_INVALID",
+	"DTO_OPERATION_MISMATCH",
 	"BOUNDS_VIOLATION",
 	"SYMBOL_CONFLICT",
 	"RATE_LIMITED",