@defuse-protocol/intents-sdk 0.49.0 → 0.51.0

package/dist/index.d.cts

@@ -8,6 +8,8 @@ import { Chain, Chains } from "./src/lib/caip2.cjs";
 import { BatchWithdrawalResult, FeeEstimation, HotBridgeRouteConfig, IntentPublishResult, IntentSettlementStatus, InternalTransferRouteConfig, NearTxInfo, NearWithdrawalRouteConfig, OmniBridgeRouteConfig, ParsedAssetInfo, PoaBridgeRouteConfig, ProcessWithdrawalArgs, RouteConfig, SignAndSendArgs, SignAndSendWithdrawalArgs, SignedIntentsComposition, TxInfo, TxNoInfo, VirtualChainRouteConfig, WithdrawalIdentifier, WithdrawalParams, WithdrawalResult } from "./src/shared-types.cjs";
 import { IntentPayloadBuilder } from "./src/intents/intent-payload-builder.cjs";
 import { IntentsSDK, IntentsSDKConfig } from "./src/sdk.cjs";
+import { Nep413RawPayload } from "./src/intents/intent-signer-impl/intent-signer-nep413.cjs";
+import { Erc191RawPayload } from "./src/intents/intent-signer-impl/intent-signer-viem.cjs";
 import { createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem } from "./src/intents/intent-signer-impl/factories.cjs";
 import { createDefaultRoute, createHotBridgeRoute, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute } from "./src/lib/route-config-factory.cjs";
 import { POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE } from "./src/constants/poa-tokens-routable-through-omni-bridge.cjs";
@@ -19,4 +21,4 @@ import { InsufficientUtxoForOmniBridgeWithdrawalError, InsufficientUtxoForOmniBr
 import { computeIntentHash } from "./src/intents/intent-hash.cjs";
 import { validateAddress } from "./src/lib/validateAddress.cjs";
 import { AssertionError, AssertionErrorType, BaseError, BaseErrorType, EnvConfig, HttpRequestError, HttpRequestErrorType, ILogger, IntentSettlementError, IntentSettlementErrorType, NearIntentsEnv, PoaWithdrawalInvariantError, PoaWithdrawalInvariantErrorType, PoaWithdrawalNotFoundError, PoaWithdrawalNotFoundErrorType, PoaWithdrawalPendingError, PoaWithdrawalPendingErrorType, QuoteError, QuoteErrorType, RelayPublishError, RelayPublishErrorType, RetryOptions, RpcEndpoint, RpcEndpointConfig, RpcRequestError, RpcRequestErrorType, TimeoutError, TimeoutErrorType } from "@defuse-protocol/internal-utils";
-export { AssertionError, type AssertionErrorType, BaseError, type BaseErrorType, type BatchWithdrawalResult, BridgeNameEnum, type BridgeNameEnumValues, type Chain, Chains, DestinationExplicitNearAccountDoesntExistError, type DestinationExplicitNearAccountDoesntExistErrorType, type EnvConfig, type FeeEstimation, FeeExceedsAmountError, type FeeExceedsAmountErrorType, type HotBridgeRouteConfig, HotWithdrawalApiFeeRequestTimeoutError, type HotWithdrawalApiFeeRequestTimeoutErrorType, HotWithdrawalNotFoundError, type HotWithdrawalNotFoundErrorType, HttpRequestError, type HttpRequestErrorType, type IIntentSigner, type ILogger, InsufficientUtxoForOmniBridgeWithdrawalError, type InsufficientUtxoForOmniBridgeWithdrawalErrorType, type IntentPayload, IntentPayloadBuilder, type IntentPayloadFactory, type IntentPrimitive, type IntentPublishResult, type IntentRelayParamsFactory, IntentSettlementError, type IntentSettlementErrorType, type IntentSettlementStatus, IntentsNearOmniAvailableBalanceTooLowError, type IntentsNearOmniAvailableBalanceTooLowErrorType, IntentsSDK, type IntentsSDKConfig, type InternalTransferRouteConfig, InvalidFeeValueError, type InvalidFeeValueErrorType, MinWithdrawalAmountError, type MinWithdrawalAmountErrorType, type MultiPayload, type NearIntentsEnv, type NearTxInfo, type NearWithdrawalRouteConfig, type OmniBridgeRouteConfig, OmniWithdrawalApiFeeRequestTimeoutError, type OmniWithdrawalApiFeeRequestTimeoutErrorType, type OnBeforePublishIntentHook, POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE, type ParsedAssetInfo, type PoaBridgeRouteConfig, PoaWithdrawalInvariantError, type PoaWithdrawalInvariantErrorType, PoaWithdrawalNotFoundError, type PoaWithdrawalNotFoundErrorType, PoaWithdrawalPendingError, type PoaWithdrawalPendingErrorType, type ProcessWithdrawalArgs, QuoteError, type QuoteErrorType, RelayPublishError, type RelayPublishErrorType, type RetryOptions, type RouteConfig, RouteEnum, type RouteEnumValues, type RpcEndpoint, type RpcEndpointConfig, RpcRequestError, type RpcRequestErrorType, type SignAndSendArgs, type SignAndSendWithdrawalArgs, type SignedIntentsComposition, TimeoutError, type TimeoutErrorType, TokenNotFoundInDestinationChainError, type TokenNotFoundInDestinationChainErrorType, TrustlineNotFoundError, type TrustlineNotFoundErrorType, type TxInfo, type TxNoInfo, UnsupportedAssetIdError, type UnsupportedAssetIdErrorType, UnsupportedDestinationMemoError, type UnsupportedDestinationMemoErrorType, VersionedNonceBuilder, type VirtualChainRouteConfig, WithdrawalFailedError, type WithdrawalFailedErrorType, type WithdrawalIdentifier, type WithdrawalParams, type WithdrawalResult, WithdrawalWatchError, type WithdrawalWatchErrorType, computeIntentHash, createDefaultRoute, createHotBridgeRoute, createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute, validateAddress as validateAddressFormat };
+export { AssertionError, type AssertionErrorType, BaseError, type BaseErrorType, type BatchWithdrawalResult, BridgeNameEnum, type BridgeNameEnumValues, type Chain, Chains, DestinationExplicitNearAccountDoesntExistError, type DestinationExplicitNearAccountDoesntExistErrorType, type EnvConfig, type Erc191RawPayload, type FeeEstimation, FeeExceedsAmountError, type FeeExceedsAmountErrorType, type HotBridgeRouteConfig, HotWithdrawalApiFeeRequestTimeoutError, type HotWithdrawalApiFeeRequestTimeoutErrorType, HotWithdrawalNotFoundError, type HotWithdrawalNotFoundErrorType, HttpRequestError, type HttpRequestErrorType, type IIntentSigner, type ILogger, InsufficientUtxoForOmniBridgeWithdrawalError, type InsufficientUtxoForOmniBridgeWithdrawalErrorType, type IntentPayload, IntentPayloadBuilder, type IntentPayloadFactory, type IntentPrimitive, type IntentPublishResult, type IntentRelayParamsFactory, IntentSettlementError, type IntentSettlementErrorType, type IntentSettlementStatus, IntentsNearOmniAvailableBalanceTooLowError, type IntentsNearOmniAvailableBalanceTooLowErrorType, IntentsSDK, type IntentsSDKConfig, type InternalTransferRouteConfig, InvalidFeeValueError, type InvalidFeeValueErrorType, MinWithdrawalAmountError, type MinWithdrawalAmountErrorType, type MultiPayload, type NearIntentsEnv, type NearTxInfo, type NearWithdrawalRouteConfig, type Nep413RawPayload, type OmniBridgeRouteConfig, OmniWithdrawalApiFeeRequestTimeoutError, type OmniWithdrawalApiFeeRequestTimeoutErrorType, type OnBeforePublishIntentHook, POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE, type ParsedAssetInfo, type PoaBridgeRouteConfig, PoaWithdrawalInvariantError, type PoaWithdrawalInvariantErrorType, PoaWithdrawalNotFoundError, type PoaWithdrawalNotFoundErrorType, PoaWithdrawalPendingError, type PoaWithdrawalPendingErrorType, type ProcessWithdrawalArgs, QuoteError, type QuoteErrorType, RelayPublishError, type RelayPublishErrorType, type RetryOptions, type RouteConfig, RouteEnum, type RouteEnumValues, type RpcEndpoint, type RpcEndpointConfig, RpcRequestError, type RpcRequestErrorType, type SignAndSendArgs, type SignAndSendWithdrawalArgs, type SignedIntentsComposition, TimeoutError, type TimeoutErrorType, TokenNotFoundInDestinationChainError, type TokenNotFoundInDestinationChainErrorType, TrustlineNotFoundError, type TrustlineNotFoundErrorType, type TxInfo, type TxNoInfo, UnsupportedAssetIdError, type UnsupportedAssetIdErrorType, UnsupportedDestinationMemoError, type UnsupportedDestinationMemoErrorType, VersionedNonceBuilder, type VirtualChainRouteConfig, WithdrawalFailedError, type WithdrawalFailedErrorType, type WithdrawalIdentifier, type WithdrawalParams, type WithdrawalResult, WithdrawalWatchError, type WithdrawalWatchErrorType, computeIntentHash, createDefaultRoute, createHotBridgeRoute, createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute, validateAddress as validateAddressFormat };

package/dist/index.d.ts

@@ -8,6 +8,8 @@ import { Chain, Chains } from "./src/lib/caip2.js";
 import { BatchWithdrawalResult, FeeEstimation, HotBridgeRouteConfig, IntentPublishResult, IntentSettlementStatus, InternalTransferRouteConfig, NearTxInfo, NearWithdrawalRouteConfig, OmniBridgeRouteConfig, ParsedAssetInfo, PoaBridgeRouteConfig, ProcessWithdrawalArgs, RouteConfig, SignAndSendArgs, SignAndSendWithdrawalArgs, SignedIntentsComposition, TxInfo, TxNoInfo, VirtualChainRouteConfig, WithdrawalIdentifier, WithdrawalParams, WithdrawalResult } from "./src/shared-types.js";
 import { IntentPayloadBuilder } from "./src/intents/intent-payload-builder.js";
 import { IntentsSDK, IntentsSDKConfig } from "./src/sdk.js";
+import { Nep413RawPayload } from "./src/intents/intent-signer-impl/intent-signer-nep413.js";
+import { Erc191RawPayload } from "./src/intents/intent-signer-impl/intent-signer-viem.js";
 import { createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem } from "./src/intents/intent-signer-impl/factories.js";
 import { createDefaultRoute, createHotBridgeRoute, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute } from "./src/lib/route-config-factory.js";
 import { POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE } from "./src/constants/poa-tokens-routable-through-omni-bridge.js";
@@ -19,4 +21,4 @@ import { InsufficientUtxoForOmniBridgeWithdrawalError, InsufficientUtxoForOmniBr
 import { computeIntentHash } from "./src/intents/intent-hash.js";
 import { validateAddress } from "./src/lib/validateAddress.js";
 import { AssertionError, AssertionErrorType, BaseError, BaseErrorType, EnvConfig, HttpRequestError, HttpRequestErrorType, ILogger, IntentSettlementError, IntentSettlementErrorType, NearIntentsEnv, PoaWithdrawalInvariantError, PoaWithdrawalInvariantErrorType, PoaWithdrawalNotFoundError, PoaWithdrawalNotFoundErrorType, PoaWithdrawalPendingError, PoaWithdrawalPendingErrorType, QuoteError, QuoteErrorType, RelayPublishError, RelayPublishErrorType, RetryOptions, RpcEndpoint, RpcEndpointConfig, RpcRequestError, RpcRequestErrorType, TimeoutError, TimeoutErrorType } from "@defuse-protocol/internal-utils";
-export { AssertionError, type AssertionErrorType, BaseError, type BaseErrorType, type BatchWithdrawalResult, BridgeNameEnum, type BridgeNameEnumValues, type Chain, Chains, DestinationExplicitNearAccountDoesntExistError, type DestinationExplicitNearAccountDoesntExistErrorType, type EnvConfig, type FeeEstimation, FeeExceedsAmountError, type FeeExceedsAmountErrorType, type HotBridgeRouteConfig, HotWithdrawalApiFeeRequestTimeoutError, type HotWithdrawalApiFeeRequestTimeoutErrorType, HotWithdrawalNotFoundError, type HotWithdrawalNotFoundErrorType, HttpRequestError, type HttpRequestErrorType, type IIntentSigner, type ILogger, InsufficientUtxoForOmniBridgeWithdrawalError, type InsufficientUtxoForOmniBridgeWithdrawalErrorType, type IntentPayload, IntentPayloadBuilder, type IntentPayloadFactory, type IntentPrimitive, type IntentPublishResult, type IntentRelayParamsFactory, IntentSettlementError, type IntentSettlementErrorType, type IntentSettlementStatus, IntentsNearOmniAvailableBalanceTooLowError, type IntentsNearOmniAvailableBalanceTooLowErrorType, IntentsSDK, type IntentsSDKConfig, type InternalTransferRouteConfig, InvalidFeeValueError, type InvalidFeeValueErrorType, MinWithdrawalAmountError, type MinWithdrawalAmountErrorType, type MultiPayload, type NearIntentsEnv, type NearTxInfo, type NearWithdrawalRouteConfig, type OmniBridgeRouteConfig, OmniWithdrawalApiFeeRequestTimeoutError, type OmniWithdrawalApiFeeRequestTimeoutErrorType, type OnBeforePublishIntentHook, POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE, type ParsedAssetInfo, type PoaBridgeRouteConfig, PoaWithdrawalInvariantError, type PoaWithdrawalInvariantErrorType, PoaWithdrawalNotFoundError, type PoaWithdrawalNotFoundErrorType, PoaWithdrawalPendingError, type PoaWithdrawalPendingErrorType, type ProcessWithdrawalArgs, QuoteError, type QuoteErrorType, RelayPublishError, type RelayPublishErrorType, type RetryOptions, type RouteConfig, RouteEnum, type RouteEnumValues, type RpcEndpoint, type RpcEndpointConfig, RpcRequestError, type RpcRequestErrorType, type SignAndSendArgs, type SignAndSendWithdrawalArgs, type SignedIntentsComposition, TimeoutError, type TimeoutErrorType, TokenNotFoundInDestinationChainError, type TokenNotFoundInDestinationChainErrorType, TrustlineNotFoundError, type TrustlineNotFoundErrorType, type TxInfo, type TxNoInfo, UnsupportedAssetIdError, type UnsupportedAssetIdErrorType, UnsupportedDestinationMemoError, type UnsupportedDestinationMemoErrorType, VersionedNonceBuilder, type VirtualChainRouteConfig, WithdrawalFailedError, type WithdrawalFailedErrorType, type WithdrawalIdentifier, type WithdrawalParams, type WithdrawalResult, WithdrawalWatchError, type WithdrawalWatchErrorType, computeIntentHash, createDefaultRoute, createHotBridgeRoute, createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute, validateAddress as validateAddressFormat };
+export { AssertionError, type AssertionErrorType, BaseError, type BaseErrorType, type BatchWithdrawalResult, BridgeNameEnum, type BridgeNameEnumValues, type Chain, Chains, DestinationExplicitNearAccountDoesntExistError, type DestinationExplicitNearAccountDoesntExistErrorType, type EnvConfig, type Erc191RawPayload, type FeeEstimation, FeeExceedsAmountError, type FeeExceedsAmountErrorType, type HotBridgeRouteConfig, HotWithdrawalApiFeeRequestTimeoutError, type HotWithdrawalApiFeeRequestTimeoutErrorType, HotWithdrawalNotFoundError, type HotWithdrawalNotFoundErrorType, HttpRequestError, type HttpRequestErrorType, type IIntentSigner, type ILogger, InsufficientUtxoForOmniBridgeWithdrawalError, type InsufficientUtxoForOmniBridgeWithdrawalErrorType, type IntentPayload, IntentPayloadBuilder, type IntentPayloadFactory, type IntentPrimitive, type IntentPublishResult, type IntentRelayParamsFactory, IntentSettlementError, type IntentSettlementErrorType, type IntentSettlementStatus, IntentsNearOmniAvailableBalanceTooLowError, type IntentsNearOmniAvailableBalanceTooLowErrorType, IntentsSDK, type IntentsSDKConfig, type InternalTransferRouteConfig, InvalidFeeValueError, type InvalidFeeValueErrorType, MinWithdrawalAmountError, type MinWithdrawalAmountErrorType, type MultiPayload, type NearIntentsEnv, type NearTxInfo, type NearWithdrawalRouteConfig, type Nep413RawPayload, type OmniBridgeRouteConfig, OmniWithdrawalApiFeeRequestTimeoutError, type OmniWithdrawalApiFeeRequestTimeoutErrorType, type OnBeforePublishIntentHook, POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE, type ParsedAssetInfo, type PoaBridgeRouteConfig, PoaWithdrawalInvariantError, type PoaWithdrawalInvariantErrorType, PoaWithdrawalNotFoundError, type PoaWithdrawalNotFoundErrorType, PoaWithdrawalPendingError, type PoaWithdrawalPendingErrorType, type ProcessWithdrawalArgs, QuoteError, type QuoteErrorType, RelayPublishError, type RelayPublishErrorType, type RetryOptions, type RouteConfig, RouteEnum, type RouteEnumValues, type RpcEndpoint, type RpcEndpointConfig, RpcRequestError, type RpcRequestErrorType, type SignAndSendArgs, type SignAndSendWithdrawalArgs, type SignedIntentsComposition, TimeoutError, type TimeoutErrorType, TokenNotFoundInDestinationChainError, type TokenNotFoundInDestinationChainErrorType, TrustlineNotFoundError, type TrustlineNotFoundErrorType, type TxInfo, type TxNoInfo, UnsupportedAssetIdError, type UnsupportedAssetIdErrorType, UnsupportedDestinationMemoError, type UnsupportedDestinationMemoErrorType, VersionedNonceBuilder, type VirtualChainRouteConfig, WithdrawalFailedError, type WithdrawalFailedErrorType, type WithdrawalIdentifier, type WithdrawalParams, type WithdrawalResult, WithdrawalWatchError, type WithdrawalWatchErrorType, computeIntentHash, createDefaultRoute, createHotBridgeRoute, createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute, validateAddress as validateAddressFormat };

package/dist/src/bridges/omni-bridge/omni-bridge-utils.cjs

@@ -5,13 +5,14 @@ const require_poa_tokens_routable_through_omni_bridge = require('../../constants
 let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
 let valibot = require("valibot");
 valibot = require_rolldown_runtime.__toESM(valibot);
-let omni_bridge_sdk = require("omni-bridge-sdk");
+let _omni_bridge_core = require("@omni-bridge/core");
+let _omni_bridge_near = require("@omni-bridge/near");
 
 //#region src/bridges/omni-bridge/omni-bridge-utils.ts
 function createWithdrawIntentsPrimitive(params) {
 	const { contractId: tokenAccountId, standard } = _defuse_protocol_internal_utils.utils.parseDefuseAssetId(params.assetId);
 	(0, _defuse_protocol_internal_utils.assert)(standard === "nep141", "Only NEP-141 is supported");
-	const recipient = (0, omni_bridge_sdk.omniAddress)(params.omniChainKind, params.destinationAddress);
+	const recipient = (0, _omni_bridge_core.omniAddress)(params.omniChainKind, params.destinationAddress);
 	let msg = "";
 	const ftWithdrawPayload = {
 		recipient,
@@ -25,7 +26,7 @@ function createWithdrawIntentsPrimitive(params) {
 	}
 	const intents = [];
 	if (params.nativeFee > 0n) intents.push({
-		deposit_for_account_id: (0, omni_bridge_sdk.calculateStorageAccountId)({
+		deposit_for_account_id: (0, _omni_bridge_near.calculateStorageAccountId)({
 			token: `near:${tokenAccountId}`,
 			amount: params.amount,
 			recipient,
@@ -56,12 +57,12 @@ function createWithdrawIntentsPrimitive(params) {
 * This serves as a single source of truth for bidirectional chain conversions.
 */
 const CHAIN_MAPPINGS = [
-	[require_caip2.Chains.Ethereum, omni_bridge_sdk.ChainKind.Eth],
-	[require_caip2.Chains.Base, omni_bridge_sdk.ChainKind.Base],
-	[require_caip2.Chains.Arbitrum, omni_bridge_sdk.ChainKind.Arb],
-	[require_caip2.Chains.Solana, omni_bridge_sdk.ChainKind.Sol],
-	[require_caip2.Chains.BNB, omni_bridge_sdk.ChainKind.Bnb],
-	[require_caip2.Chains.Bitcoin, omni_bridge_sdk.ChainKind.Btc]
+	[require_caip2.Chains.Ethereum, _omni_bridge_core.ChainKind.Eth],
+	[require_caip2.Chains.Base, _omni_bridge_core.ChainKind.Base],
+	[require_caip2.Chains.Arbitrum, _omni_bridge_core.ChainKind.Arb],
+	[require_caip2.Chains.Solana, _omni_bridge_core.ChainKind.Sol],
+	[require_caip2.Chains.BNB, _omni_bridge_core.ChainKind.Bnb],
+	[require_caip2.Chains.Bitcoin, _omni_bridge_core.ChainKind.Btc]
 ];
 function caip2ToChainKind(network) {
 	return CHAIN_MAPPINGS.find(([chain]) => chain === network)?.[1] ?? null;
@@ -69,7 +70,7 @@ function caip2ToChainKind(network) {
 function chainKindToCaip2(network) {
 	return CHAIN_MAPPINGS.find(([_, kind]) => kind === network)?.[0] ?? null;
 }
-const UTXO_CHAINS = [omni_bridge_sdk.ChainKind.Btc];
+const UTXO_CHAINS = [_omni_bridge_core.ChainKind.Btc];
 function isUtxoChain(network) {
 	return UTXO_CHAINS.includes(network);
 }
@@ -78,7 +79,7 @@ function poaContractIdToChainKind(contractId) {
 }
 function validateOmniToken(nearAddress) {
 	if (nearAddress.endsWith(".testnet")) return false;
-	return (0, omni_bridge_sdk.isBridgeToken)(nearAddress);
+	return (0, _omni_bridge_core.isBridgeToken)(nearAddress);
 }
 async function getAccountOmniStorageBalance(nearProvider, accountId) {
 	return _defuse_protocol_internal_utils.utils.queryContract({
@@ -111,7 +112,7 @@ async function getBridgedToken(nearProvider, tokenAddress, destinationChain) {
 		contractId: require_omni_bridge_constants.OMNI_BRIDGE_CONTRACT,
 		methodName: "get_bridged_token",
 		args: {
-			chain: omni_bridge_sdk.ChainKind[destinationChain].toString(),
+			chain: _omni_bridge_core.ChainKind[destinationChain].toString(),
 			address: tokenAddress
 		},
 		finality: "optimistic",
@@ -126,7 +127,7 @@ async function getBridgedToken(nearProvider, tokenAddress, destinationChain) {
 * @returns Promise resolving to the token's decimal information
 */
 async function getTokenDecimals(nearProvider, tokenAddress) {
-	if ((0, omni_bridge_sdk.getChain)(tokenAddress) === omni_bridge_sdk.ChainKind.Near) throw new Error("Token decimals cannot be queried using NEAR addresses. Use the token's foreign chain representation (e.g., eth:0x...) to query decimals.");
+	if ((0, _omni_bridge_core.getChain)(tokenAddress) === _omni_bridge_core.ChainKind.Near) throw new Error("Token decimals cannot be queried using NEAR addresses. Use the token's foreign chain representation (e.g., eth:0x...) to query decimals.");
 	return _defuse_protocol_internal_utils.utils.queryContract({
 		contractId: require_omni_bridge_constants.OMNI_BRIDGE_CONTRACT,
 		methodName: "get_token_decimals",

package/dist/src/bridges/omni-bridge/omni-bridge-utils.js

@@ -3,7 +3,8 @@ import { MIN_GAS_AMOUNT, OMNI_BRIDGE_CONTRACT } from "./omni-bridge-constants.js
 import { POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE } from "../../constants/poa-tokens-routable-through-omni-bridge.js";
 import { assert, utils } from "@defuse-protocol/internal-utils";
 import * as v from "valibot";
-import { ChainKind, calculateStorageAccountId, getChain, isBridgeToken, omniAddress } from "omni-bridge-sdk";
+import { ChainKind, getChain, isBridgeToken, omniAddress } from "@omni-bridge/core";
+import { calculateStorageAccountId } from "@omni-bridge/near";
 
 //#region src/bridges/omni-bridge/omni-bridge-utils.ts
 function createWithdrawIntentsPrimitive(params) {

package/dist/src/bridges/omni-bridge/omni-bridge.cjs

@@ -13,7 +13,7 @@ let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils")
 let lru_cache = require("lru-cache");
 let _isaacs_ttlcache = require("@isaacs/ttlcache");
 _isaacs_ttlcache = require_rolldown_runtime.__toESM(_isaacs_ttlcache);
-let omni_bridge_sdk = require("omni-bridge-sdk");
+let _omni_bridge_core = require("@omni-bridge/core");
 
 //#region src/bridges/omni-bridge/omni-bridge.ts
 var OmniBridge = class {
@@ -27,7 +27,7 @@ var OmniBridge = class {
 		this.tokenDecimalsCache = new _isaacs_ttlcache.default({ ttl: 36e5 });
 		this.envConfig = envConfig;
 		this.nearProvider = nearProvider;
-		this.omniBridgeAPI = new omni_bridge_sdk.OmniBridgeAPI();
+		this.omniBridgeAPI = new _omni_bridge_core.BridgeAPI("mainnet");
 		this.solverRelayApiKey = solverRelayApiKey;
 		this.routeMigratedPoaTokensThroughOmniBridge = routeMigratedPoaTokensThroughOmniBridge ?? false;
 	}
@@ -53,7 +53,7 @@ var OmniBridge = class {
 			if (omniChainKind === null) throw new require_errors.UnsupportedAssetIdError(params.assetId, `Chain ${params.routeConfig.chain} is not supported in Omni Bridge.`);
 			caip2Chain = params.routeConfig.chain;
 		} else {
-			omniChainKind = poaTokenRoutedThroughOmniBridge ? require_omni_bridge_utils.poaContractIdToChainKind(parsed.contractId) : (0, omni_bridge_sdk.parseOriginChain)(parsed.contractId);
+			omniChainKind = poaTokenRoutedThroughOmniBridge ? require_omni_bridge_utils.poaContractIdToChainKind(parsed.contractId) : (0, _omni_bridge_core.parseOriginChain)(parsed.contractId);
 			if (omniChainKind === null) throw new require_errors.UnsupportedAssetIdError(params.assetId, `Withdrawal of ${parsed.contractId} to its origin chain is not supported in Omni Bridge.`);
 			caip2Chain = require_omni_bridge_utils.chainKindToCaip2(omniChainKind);
 			if (caip2Chain === null) throw new require_errors.UnsupportedAssetIdError(params.assetId, `Withdrawal of ${parsed.contractId} to its origin chain is not supported in Omni Bridge.`);
@@ -67,7 +67,7 @@ var OmniBridge = class {
 	parseAssetId(assetId) {
 		const parsed = require_parse_defuse_asset_id.parseDefuseAssetId(assetId);
 		if (parsed.standard !== "nep141") return null;
-		const omniChainKind = this.isPoaTokenRoutedThroughOmniBridge(parsed.contractId) ? require_omni_bridge_utils.poaContractIdToChainKind(parsed.contractId) : (0, omni_bridge_sdk.parseOriginChain)(parsed.contractId);
+		const omniChainKind = this.isPoaTokenRoutedThroughOmniBridge(parsed.contractId) ? require_omni_bridge_utils.poaContractIdToChainKind(parsed.contractId) : (0, _omni_bridge_core.parseOriginChain)(parsed.contractId);
 		if (omniChainKind === null) return null;
 		const blockchain = require_omni_bridge_utils.chainKindToCaip2(omniChainKind);
 		if (blockchain === null) return null;
@@ -86,7 +86,7 @@ var OmniBridge = class {
 			omniChainKind = require_omni_bridge_utils.caip2ToChainKind(routeConfig.chain);
 			blockchain = routeConfig.chain;
 		} else {
-			omniChainKind = this.isPoaTokenRoutedThroughOmniBridge(parsed.contractId) ? require_omni_bridge_utils.poaContractIdToChainKind(parsed.contractId) : (0, omni_bridge_sdk.parseOriginChain)(parsed.contractId);
+			omniChainKind = this.isPoaTokenRoutedThroughOmniBridge(parsed.contractId) ? require_omni_bridge_utils.poaContractIdToChainKind(parsed.contractId) : (0, _omni_bridge_core.parseOriginChain)(parsed.contractId);
 			if (omniChainKind === null) return null;
 			blockchain = require_omni_bridge_utils.chainKindToCaip2(omniChainKind);
 		}
@@ -159,7 +159,7 @@ var OmniBridge = class {
 		const decimals = await this.getCachedTokenDecimals(destTokenAddress);
 		(0, _defuse_protocol_internal_utils.assert)(decimals !== null, `Failed to retrieve token decimals for address ${destTokenAddress} via OmniBridge contract. 
   Ensure the token is supported and the address is correct.`);
-		if ((0, omni_bridge_sdk.verifyTransferAmount)(args.amount, 0n, decimals.origin_decimals, decimals.decimals) === false) throw new require_errors.MinWithdrawalAmountError((0, omni_bridge_sdk.getMinimumTransferableAmount)(decimals.origin_decimals, decimals.decimals), args.amount, args.assetId);
+		if ((0, _omni_bridge_core.verifyTransferAmount)(args.amount, 0n, decimals.origin_decimals, decimals.decimals) === false) throw new require_errors.MinWithdrawalAmountError((0, _omni_bridge_core.getMinimumTransferableAmount)(decimals.origin_decimals, decimals.decimals), args.amount, args.assetId);
 		const storageBalance = await require_omni_bridge_utils.getAccountOmniStorageBalance(this.nearProvider, this.envConfig.contractID);
 		const intentsNearStorageBalance = storageBalance === null ? 0n : BigInt(storageBalance.available);
 		if (intentsNearStorageBalance <= require_omni_bridge_constants.MIN_ALLOWED_STORAGE_BALANCE_FOR_INTENTS_NEAR) throw new require_error.IntentsNearOmniAvailableBalanceTooLowError(intentsNearStorageBalance.toString());
@@ -169,7 +169,7 @@ var OmniBridge = class {
 			(0, _defuse_protocol_internal_utils.assert)(require_estimate_fee.getUnderlyingFee(args.feeEstimation, require_route_enum.RouteEnum.OmniBridge, "relayerFee") > 0n, `Invalid Omni Bridge relayer fee for non UTXO chain withdrawal: expected > 0, got ${relayerFee}`);
 		}
 		if (utxoChainWithdrawal) {
-			const fee = await (0, _defuse_protocol_internal_utils.withTimeout)(() => this.omniBridgeAPI.getFee((0, omni_bridge_sdk.omniAddress)(omni_bridge_sdk.ChainKind.Near, this.envConfig.contractID), (0, omni_bridge_sdk.omniAddress)(omniChainKind, args.destinationAddress), (0, omni_bridge_sdk.omniAddress)(omni_bridge_sdk.ChainKind.Near, assetInfo.contractId), args.amount), {
+			const fee = await (0, _defuse_protocol_internal_utils.withTimeout)(() => this.omniBridgeAPI.getFee((0, _omni_bridge_core.omniAddress)(_omni_bridge_core.ChainKind.Near, this.envConfig.contractID), (0, _omni_bridge_core.omniAddress)(omniChainKind, args.destinationAddress), (0, _omni_bridge_core.omniAddress)(_omni_bridge_core.ChainKind.Near, assetInfo.contractId), args.amount), {
 				timeout: typeof window !== "undefined" ? 1e4 : 3e3,
 				errorInstance: new require_error.OmniWithdrawalApiFeeRequestTimeoutError()
 			});
@@ -189,7 +189,7 @@ var OmniBridge = class {
 		(0, _defuse_protocol_internal_utils.assert)(assetInfo !== null, `Asset ${args.withdrawalParams.assetId} is not supported by Omni Bridge`);
 		const omniChainKind = require_omni_bridge_utils.caip2ToChainKind(assetInfo.blockchain);
 		(0, _defuse_protocol_internal_utils.assert)(omniChainKind !== null, `Chain ${assetInfo.blockchain} is not supported by Omni Bridge`);
-		const fee = await (0, _defuse_protocol_internal_utils.withTimeout)(() => this.omniBridgeAPI.getFee((0, omni_bridge_sdk.omniAddress)(omni_bridge_sdk.ChainKind.Near, this.envConfig.contractID), (0, omni_bridge_sdk.omniAddress)(omniChainKind, args.withdrawalParams.destinationAddress), (0, omni_bridge_sdk.omniAddress)(omni_bridge_sdk.ChainKind.Near, assetInfo.contractId), args.withdrawalParams.amount), {
+		const fee = await (0, _defuse_protocol_internal_utils.withTimeout)(() => this.omniBridgeAPI.getFee((0, _omni_bridge_core.omniAddress)(_omni_bridge_core.ChainKind.Near, this.envConfig.contractID), (0, _omni_bridge_core.omniAddress)(omniChainKind, args.withdrawalParams.destinationAddress), (0, _omni_bridge_core.omniAddress)(_omni_bridge_core.ChainKind.Near, assetInfo.contractId), args.withdrawalParams.amount), {
 			timeout: typeof window !== "undefined" ? 1e4 : 3e3,
 			errorInstance: new require_error.OmniWithdrawalApiFeeRequestTimeoutError()
 		});
@@ -250,11 +250,11 @@ var OmniBridge = class {
 	async describeWithdrawal(args) {
 		const transfer = (await this.omniBridgeAPI.getTransfer({ transactionHash: args.tx.hash }))[args.index];
 		if (transfer == null || transfer.transfer_message == null) return { status: "pending" };
-		const destinationChain = (0, omni_bridge_sdk.getChain)(transfer.transfer_message.recipient);
+		const destinationChain = (0, _omni_bridge_core.getChain)(transfer.transfer_message.recipient);
 		let txHash = null;
-		if ((0, omni_bridge_sdk.isEvmChain)(destinationChain)) txHash = transfer.finalised?.EVMLog?.transaction_hash;
-		else if (destinationChain === omni_bridge_sdk.ChainKind.Sol) txHash = transfer.finalised?.Solana?.signature;
-		else if (destinationChain === omni_bridge_sdk.ChainKind.Btc) txHash = typeof window !== "undefined" ? transfer.utxo_transfer?.btc_pending_id : transfer.finalised?.UtxoLog?.transaction_hash;
+		if ((0, _omni_bridge_core.isEvmChain)(destinationChain)) txHash = transfer.finalised?.EVMLog?.transaction_hash;
+		else if (destinationChain === _omni_bridge_core.ChainKind.Sol) txHash = transfer.finalised?.Solana?.signature;
+		else if (destinationChain === _omni_bridge_core.ChainKind.Btc) txHash = typeof window !== "undefined" ? transfer.utxo_transfer?.btc_pending_id : transfer.finalised?.UtxoLog?.transaction_hash;
 		else return {
 			status: "completed",
 			txHash: null
@@ -289,7 +289,7 @@ var OmniBridge = class {
 		const key = `${omniChainKind}:${contractId}`;
 		const cached = this.destinationChainAddressCache.get(key);
 		if (cached !== void 0) return cached;
-		const tokenOnDestinationNetwork = await require_omni_bridge_utils.getBridgedToken(this.nearProvider, (0, omni_bridge_sdk.omniAddress)(omni_bridge_sdk.ChainKind.Near, contractId), omniChainKind);
+		const tokenOnDestinationNetwork = await require_omni_bridge_utils.getBridgedToken(this.nearProvider, (0, _omni_bridge_core.omniAddress)(_omni_bridge_core.ChainKind.Near, contractId), omniChainKind);
 		if (tokenOnDestinationNetwork !== null) this.destinationChainAddressCache.set(key, tokenOnDestinationNetwork);
 		return tokenOnDestinationNetwork;
 	}

package/dist/src/bridges/omni-bridge/omni-bridge.js

@@ -11,7 +11,7 @@ import { caip2ToChainKind, chainKindToCaip2, createWithdrawIntentsPrimitive, get
 import { assert, getNearNep141MinStorageBalance, getNearNep141StorageBalance, withTimeout } from "@defuse-protocol/internal-utils";
 import { LRUCache } from "lru-cache";
 import TTLCache from "@isaacs/ttlcache";
-import { ChainKind, OmniBridgeAPI, getChain, getMinimumTransferableAmount, isEvmChain, omniAddress, parseOriginChain, verifyTransferAmount } from "omni-bridge-sdk";
+import { BridgeAPI, ChainKind, getChain, getMinimumTransferableAmount, isEvmChain, omniAddress, parseOriginChain, verifyTransferAmount } from "@omni-bridge/core";
 
 //#region src/bridges/omni-bridge/omni-bridge.ts
 var OmniBridge = class {
@@ -25,7 +25,7 @@ var OmniBridge = class {
 		this.tokenDecimalsCache = new TTLCache({ ttl: 36e5 });
 		this.envConfig = envConfig;
 		this.nearProvider = nearProvider;
-		this.omniBridgeAPI = new OmniBridgeAPI();
+		this.omniBridgeAPI = new BridgeAPI("mainnet");
 		this.solverRelayApiKey = solverRelayApiKey;
 		this.routeMigratedPoaTokensThroughOmniBridge = routeMigratedPoaTokensThroughOmniBridge ?? false;
 	}

package/dist/src/constants/poa-tokens-routable-through-omni-bridge.cjs

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
-let omni_bridge_sdk = require("omni-bridge-sdk");
+let _omni_bridge_core = require("@omni-bridge/core");
 
 //#region src/constants/poa-tokens-routable-through-omni-bridge.ts
 /**
@@ -8,9 +8,9 @@ let omni_bridge_sdk = require("omni-bridge-sdk");
 * feature flag to enable Omni Bridge routing for these tokens.
 */
 const POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE = {
-	"sol-57d087fd8c460f612f8701f5499ad8b2eec5ab68.omft.near": omni_bridge_sdk.ChainKind.Sol,
-	"sol-c58e6539c2f2e097c251f8edf11f9c03e581f8d4.omft.near": omni_bridge_sdk.ChainKind.Sol,
-	"sol-b9c68f94ec8fd160137af8cdfe5e61cd68e2afba.omft.near": omni_bridge_sdk.ChainKind.Sol
+	"sol-57d087fd8c460f612f8701f5499ad8b2eec5ab68.omft.near": _omni_bridge_core.ChainKind.Sol,
+	"sol-c58e6539c2f2e097c251f8edf11f9c03e581f8d4.omft.near": _omni_bridge_core.ChainKind.Sol,
+	"sol-b9c68f94ec8fd160137af8cdfe5e61cd68e2afba.omft.near": _omni_bridge_core.ChainKind.Sol
 };
 
 //#endregion

package/dist/src/constants/poa-tokens-routable-through-omni-bridge.d.cts

@@ -1,4 +1,4 @@
-import { ChainKind } from "omni-bridge-sdk";
+import { ChainKind } from "@omni-bridge/core";
 
 //#region src/constants/poa-tokens-routable-through-omni-bridge.d.ts
 

package/dist/src/constants/poa-tokens-routable-through-omni-bridge.d.ts

@@ -1,4 +1,4 @@
-import { ChainKind } from "omni-bridge-sdk";
+import { ChainKind } from "@omni-bridge/core";
 
 //#region src/constants/poa-tokens-routable-through-omni-bridge.d.ts
 

package/dist/src/constants/poa-tokens-routable-through-omni-bridge.js

@@ -1,4 +1,4 @@
-import { ChainKind } from "omni-bridge-sdk";
+import { ChainKind } from "@omni-bridge/core";
 
 //#region src/constants/poa-tokens-routable-through-omni-bridge.ts
 /**

package/dist/src/intents/intent-signer-impl/factories.d.cts

@@ -1,11 +1,10 @@
-import { IIntentSigner } from "../interfaces/intent-signer.cjs";
-import { IntentSignerNEP413Config } from "./intent-signer-nep413.cjs";
-import { IntentSignerNearKeypairConfig } from "./intent-signer-near-keypair.cjs";
-import { IntentSignerViemConfig } from "./intent-signer-viem.cjs";
+import { IntentSignerNEP413, IntentSignerNEP413Config } from "./intent-signer-nep413.cjs";
+import { IntentSignerNearKeypair, IntentSignerNearKeypairConfig } from "./intent-signer-near-keypair.cjs";
+import { IntentSignerViem, IntentSignerViemConfig } from "./intent-signer-viem.cjs";
 
 //#region src/intents/intent-signer-impl/factories.d.ts
-declare function createIntentSignerNEP413(config: IntentSignerNEP413Config): IIntentSigner;
-declare function createIntentSignerNearKeyPair(config: IntentSignerNearKeypairConfig): IIntentSigner;
-declare function createIntentSignerViem(config: IntentSignerViemConfig): IIntentSigner;
+declare function createIntentSignerNEP413(config: IntentSignerNEP413Config): IntentSignerNEP413;
+declare function createIntentSignerNearKeyPair(config: IntentSignerNearKeypairConfig): IntentSignerNearKeypair;
+declare function createIntentSignerViem(config: IntentSignerViemConfig): IntentSignerViem;
 //#endregion
 export { createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem };

package/dist/src/intents/intent-signer-impl/factories.d.ts

@@ -1,11 +1,10 @@
-import { IIntentSigner } from "../interfaces/intent-signer.js";
-import { IntentSignerNEP413Config } from "./intent-signer-nep413.js";
-import { IntentSignerNearKeypairConfig } from "./intent-signer-near-keypair.js";
-import { IntentSignerViemConfig } from "./intent-signer-viem.js";
+import { IntentSignerNEP413, IntentSignerNEP413Config } from "./intent-signer-nep413.js";
+import { IntentSignerNearKeypair, IntentSignerNearKeypairConfig } from "./intent-signer-near-keypair.js";
+import { IntentSignerViem, IntentSignerViemConfig } from "./intent-signer-viem.js";
 
 //#region src/intents/intent-signer-impl/factories.d.ts
-declare function createIntentSignerNEP413(config: IntentSignerNEP413Config): IIntentSigner;
-declare function createIntentSignerNearKeyPair(config: IntentSignerNearKeypairConfig): IIntentSigner;
-declare function createIntentSignerViem(config: IntentSignerViemConfig): IIntentSigner;
+declare function createIntentSignerNEP413(config: IntentSignerNEP413Config): IntentSignerNEP413;
+declare function createIntentSignerNearKeyPair(config: IntentSignerNearKeypairConfig): IntentSignerNearKeypair;
+declare function createIntentSignerViem(config: IntentSignerViemConfig): IntentSignerViem;
 //#endregion
 export { createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem };

package/dist/src/intents/intent-signer-impl/intent-signer-near-keypair.d.cts

@@ -1,3 +1,5 @@
+import { IIntentSigner } from "../interfaces/intent-signer.cjs";
+import { IntentSignerNEP413 } from "./intent-signer-nep413.cjs";
 import * as near_api_js0 from "near-api-js";
 
 //#region src/intents/intent-signer-impl/intent-signer-near-keypair.d.ts
@@ -11,5 +13,11 @@ interface IntentSignerNearKeypairConfig {
    */
   accountId: string;
 }
+declare class IntentSignerNearKeypair extends IntentSignerNEP413 implements IIntentSigner {
+  constructor({
+    signer,
+    accountId
+  }: IntentSignerNearKeypairConfig);
+}
 //#endregion
-export { IntentSignerNearKeypairConfig };
+export { IntentSignerNearKeypair, IntentSignerNearKeypairConfig };

package/dist/src/intents/intent-signer-impl/intent-signer-near-keypair.d.ts

@@ -1,4 +1,5 @@
-import "./intent-signer-nep413.js";
+import { IIntentSigner } from "../interfaces/intent-signer.js";
+import { IntentSignerNEP413 } from "./intent-signer-nep413.js";
 import * as near_api_js0 from "near-api-js";
 
 //#region src/intents/intent-signer-impl/intent-signer-near-keypair.d.ts
@@ -12,5 +13,11 @@ interface IntentSignerNearKeypairConfig {
    */
   accountId: string;
 }
+declare class IntentSignerNearKeypair extends IntentSignerNEP413 implements IIntentSigner {
+  constructor({
+    signer,
+    accountId
+  }: IntentSignerNearKeypairConfig);
+}
 //#endregion
-export { IntentSignerNearKeypairConfig };
+export { IntentSignerNearKeypair, IntentSignerNearKeypairConfig };

package/dist/src/intents/intent-signer-impl/intent-signer-nep413.cjs

@@ -5,32 +5,39 @@ let _scure_base = require("@scure/base");
 //#region src/intents/intent-signer-impl/intent-signer-nep413.ts
 var IntentSignerNEP413 = class {
 	constructor({ signMessage, accountId }) {
-		this.signMessage = signMessage;
+		this.standard = "nep413";
+		this.signMessageFn = signMessage;
 		this.accountId = accountId;
 	}
-	async signIntent(intent) {
+	async signRaw(input) {
 		const nep413Payload = {
-			recipient: intent.verifying_contract,
-			nonce: Array.from(_scure_base.base64.decode(intent.nonce)),
-			message: JSON.stringify({
-				deadline: intent.deadline,
-				intents: intent.intents,
-				signer_id: intent.signer_id ?? this.accountId
-			})
+			message: input.payload.message,
+			nonce: Array.from(_scure_base.base64.decode(input.payload.nonce)),
+			recipient: input.payload.recipient,
+			callback_url: input.payload.callbackUrl
 		};
 		const nep413Hash = await require_nep413.hashNEP413Message(nep413Payload);
-		const { publicKey, signature } = await this.signMessage(nep413Payload, nep413Hash);
+		const { publicKey, signature } = await this.signMessageFn(nep413Payload, nep413Hash);
 		const signatureFormatted = signature.startsWith("ed25519:") ? signature : `ed25519:${_scure_base.base58.encode(_scure_base.base64.decode(signature))}`;
 		return {
 			standard: "nep413",
-			payload: {
-				...nep413Payload,
-				nonce: intent.nonce
-			},
+			payload: input.payload,
 			public_key: publicKey,
 			signature: signatureFormatted
 		};
 	}
+	/** Builds payload from IntentPayload and signs it via signRaw() */
+	async signIntent(intent) {
+		return this.signRaw({ payload: {
+			message: JSON.stringify({
+				deadline: intent.deadline,
+				intents: intent.intents,
+				signer_id: intent.signer_id ?? this.accountId
+			}),
+			nonce: intent.nonce,
+			recipient: intent.verifying_contract
+		} });
+	}
 };
 
 //#endregion

package/dist/src/intents/intent-signer-impl/intent-signer-nep413.d.cts

@@ -1,6 +1,10 @@
+import { IntentPayload } from "../shared-types.cjs";
+import { IIntentSigner } from "../interfaces/intent-signer.cjs";
 import { NEP413Payload } from "../../lib/nep413.cjs";
+import { MultiPayloadNep413 } from "@defuse-protocol/contract-types";
 
 //#region src/intents/intent-signer-impl/intent-signer-nep413.d.ts
+type Nep413RawPayload = Pick<MultiPayloadNep413, "payload">;
 type MaybePromise<T> = T | Promise<T>;
 type SignMessageNEP413 = (nep413Payload: NEP413Payload, nep413Hash: Uint8Array) => MaybePromise<{
   publicKey: string;
@@ -10,5 +14,17 @@ interface IntentSignerNEP413Config {
   signMessage: SignMessageNEP413;
   accountId: string;
 }
+declare class IntentSignerNEP413 implements IIntentSigner {
+  readonly standard: "nep413";
+  private signMessageFn;
+  protected accountId: string;
+  constructor({
+    signMessage,
+    accountId
+  }: IntentSignerNEP413Config);
+  signRaw(input: Nep413RawPayload): Promise<MultiPayloadNep413>;
+  /** Builds payload from IntentPayload and signs it via signRaw() */
+  signIntent(intent: IntentPayload): Promise<MultiPayloadNep413>;
+}
 //#endregion
-export { IntentSignerNEP413Config };
+export { IntentSignerNEP413, IntentSignerNEP413Config, Nep413RawPayload };

package/dist/src/intents/intent-signer-impl/intent-signer-nep413.d.ts

@@ -1,6 +1,10 @@
+import { IntentPayload } from "../shared-types.js";
+import { IIntentSigner } from "../interfaces/intent-signer.js";
 import { NEP413Payload } from "../../lib/nep413.js";
+import { MultiPayloadNep413 } from "@defuse-protocol/contract-types";
 
 //#region src/intents/intent-signer-impl/intent-signer-nep413.d.ts
+type Nep413RawPayload = Pick<MultiPayloadNep413, "payload">;
 type MaybePromise<T> = T | Promise<T>;
 type SignMessageNEP413 = (nep413Payload: NEP413Payload, nep413Hash: Uint8Array) => MaybePromise<{
   publicKey: string;
@@ -10,5 +14,17 @@ interface IntentSignerNEP413Config {
   signMessage: SignMessageNEP413;
   accountId: string;
 }
+declare class IntentSignerNEP413 implements IIntentSigner {
+  readonly standard: "nep413";
+  private signMessageFn;
+  protected accountId: string;
+  constructor({
+    signMessage,
+    accountId
+  }: IntentSignerNEP413Config);
+  signRaw(input: Nep413RawPayload): Promise<MultiPayloadNep413>;
+  /** Builds payload from IntentPayload and signs it via signRaw() */
+  signIntent(intent: IntentPayload): Promise<MultiPayloadNep413>;
+}
 //#endregion
-export { IntentSignerNEP413Config };
+export { IntentSignerNEP413, IntentSignerNEP413Config, Nep413RawPayload };

package/dist/src/intents/intent-signer-impl/intent-signer-nep413.js

@@ -4,32 +4,39 @@ import { base58, base64 } from "@scure/base";
 //#region src/intents/intent-signer-impl/intent-signer-nep413.ts
 var IntentSignerNEP413 = class {
 	constructor({ signMessage, accountId }) {
-		this.signMessage = signMessage;
+		this.standard = "nep413";
+		this.signMessageFn = signMessage;
 		this.accountId = accountId;
 	}
-	async signIntent(intent) {
+	async signRaw(input) {
 		const nep413Payload = {
-			recipient: intent.verifying_contract,
-			nonce: Array.from(base64.decode(intent.nonce)),
-			message: JSON.stringify({
-				deadline: intent.deadline,
-				intents: intent.intents,
-				signer_id: intent.signer_id ?? this.accountId
-			})
+			message: input.payload.message,
+			nonce: Array.from(base64.decode(input.payload.nonce)),
+			recipient: input.payload.recipient,
+			callback_url: input.payload.callbackUrl
 		};
 		const nep413Hash = await hashNEP413Message(nep413Payload);
-		const { publicKey, signature } = await this.signMessage(nep413Payload, nep413Hash);
+		const { publicKey, signature } = await this.signMessageFn(nep413Payload, nep413Hash);
 		const signatureFormatted = signature.startsWith("ed25519:") ? signature : `ed25519:${base58.encode(base64.decode(signature))}`;
 		return {
 			standard: "nep413",
-			payload: {
-				...nep413Payload,
-				nonce: intent.nonce
-			},
+			payload: input.payload,
 			public_key: publicKey,
 			signature: signatureFormatted
 		};
 	}
+	/** Builds payload from IntentPayload and signs it via signRaw() */
+	async signIntent(intent) {
+		return this.signRaw({ payload: {
+			message: JSON.stringify({
+				deadline: intent.deadline,
+				intents: intent.intents,
+				signer_id: intent.signer_id ?? this.accountId
+			}),
+			nonce: intent.nonce,
+			recipient: intent.verifying_contract
+		} });
+	}
 };
 
 //#endregion

package/dist/src/intents/intent-signer-impl/intent-signer-viem.cjs

@@ -5,9 +5,20 @@ let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils")
 var IntentSignerViem = class {
 	constructor(config) {
 		this.config = config;
+		this.standard = "erc191";
 	}
+	async signRaw(input) {
+		const signature = await this.config.signer.signMessage?.({ message: input.payload });
+		if (signature == null) throw new Error("No signature is returned");
+		return {
+			standard: "erc191",
+			payload: input.payload,
+			signature: _defuse_protocol_internal_utils.utils.transformERC191Signature(signature)
+		};
+	}
+	/** Builds payload from IntentPayload and signs it via signRaw() */
 	async signIntent(intent) {
-		const payload = JSON.stringify({
+		return this.signRaw({ payload: JSON.stringify({
 			signer_id: intent.signer_id ?? this.config.accountId ?? _defuse_protocol_internal_utils.utils.authHandleToIntentsUserId({
 				identifier: this.config.signer.address,
 				method: "evm"
@@ -16,14 +27,7 @@ var IntentSignerViem = class {
 			deadline: intent.deadline,
 			nonce: intent.nonce,
 			intents: intent.intents
-		});
-		const signature = await this.config.signer.signMessage?.({ message: payload });
-		if (signature == null) throw new Error("No signature is returned");
-		return {
-			standard: "erc191",
-			payload,
-			signature: _defuse_protocol_internal_utils.utils.transformERC191Signature(signature)
-		};
+		}) });
 	}
 };
 

package/dist/src/intents/intent-signer-impl/intent-signer-viem.d.cts

@@ -1,6 +1,10 @@
+import { IntentPayload } from "../shared-types.cjs";
+import { IIntentSigner } from "../interfaces/intent-signer.cjs";
+import { MultiPayloadErc191 } from "@defuse-protocol/contract-types";
 import { Account } from "viem";
 
 //#region src/intents/intent-signer-impl/intent-signer-viem.d.ts
+type Erc191RawPayload = Pick<MultiPayloadErc191, "payload">;
 type IntentSignerViemConfig = {
   /**
    * Instance of viem's Account type
@@ -13,5 +17,13 @@ type IntentSignerViemConfig = {
    */
   accountId?: string;
 };
+declare class IntentSignerViem implements IIntentSigner {
+  private config;
+  readonly standard: "erc191";
+  constructor(config: IntentSignerViemConfig);
+  signRaw(input: Erc191RawPayload): Promise<MultiPayloadErc191>;
+  /** Builds payload from IntentPayload and signs it via signRaw() */
+  signIntent(intent: IntentPayload): Promise<MultiPayloadErc191>;
+}
 //#endregion
-export { IntentSignerViemConfig };
+export { Erc191RawPayload, IntentSignerViem, IntentSignerViemConfig };

package/dist/src/intents/intent-signer-impl/intent-signer-viem.d.ts

@@ -1,6 +1,10 @@
+import { IntentPayload } from "../shared-types.js";
+import { IIntentSigner } from "../interfaces/intent-signer.js";
 import { Account } from "viem";
+import { MultiPayloadErc191 } from "@defuse-protocol/contract-types";
 
 //#region src/intents/intent-signer-impl/intent-signer-viem.d.ts
+type Erc191RawPayload = Pick<MultiPayloadErc191, "payload">;
 type IntentSignerViemConfig = {
   /**
    * Instance of viem's Account type
@@ -13,5 +17,13 @@ type IntentSignerViemConfig = {
    */
   accountId?: string;
 };
+declare class IntentSignerViem implements IIntentSigner {
+  private config;
+  readonly standard: "erc191";
+  constructor(config: IntentSignerViemConfig);
+  signRaw(input: Erc191RawPayload): Promise<MultiPayloadErc191>;
+  /** Builds payload from IntentPayload and signs it via signRaw() */
+  signIntent(intent: IntentPayload): Promise<MultiPayloadErc191>;
+}
 //#endregion
-export { IntentSignerViemConfig };
+export { Erc191RawPayload, IntentSignerViem, IntentSignerViemConfig };

package/dist/src/intents/intent-signer-impl/intent-signer-viem.js

@@ -4,9 +4,20 @@ import { utils } from "@defuse-protocol/internal-utils";
 var IntentSignerViem = class {
 	constructor(config) {
 		this.config = config;
+		this.standard = "erc191";
 	}
+	async signRaw(input) {
+		const signature = await this.config.signer.signMessage?.({ message: input.payload });
+		if (signature == null) throw new Error("No signature is returned");
+		return {
+			standard: "erc191",
+			payload: input.payload,
+			signature: utils.transformERC191Signature(signature)
+		};
+	}
+	/** Builds payload from IntentPayload and signs it via signRaw() */
 	async signIntent(intent) {
-		const payload = JSON.stringify({
+		return this.signRaw({ payload: JSON.stringify({
 			signer_id: intent.signer_id ?? this.config.accountId ?? utils.authHandleToIntentsUserId({
 				identifier: this.config.signer.address,
 				method: "evm"
@@ -15,14 +26,7 @@ var IntentSignerViem = class {
 			deadline: intent.deadline,
 			nonce: intent.nonce,
 			intents: intent.intents
-		});
-		const signature = await this.config.signer.signMessage?.({ message: payload });
-		if (signature == null) throw new Error("No signature is returned");
-		return {
-			standard: "erc191",
-			payload,
-			signature: utils.transformERC191Signature(signature)
-		};
+		}) });
 	}
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defuse-protocol/intents-sdk",
-  "version": "0.49.0",
+  "version": "0.51.0",
   "private": false,
   "type": "module",
   "repository": {
@@ -34,16 +34,14 @@
     "@hot-labs/omni-sdk": "2.24.7",
     "@isaacs/ttlcache": "^1.0.0",
     "@lifeomic/attempt": "^3.0.0",
-    "@near-js/accounts": "^2.0.1",
-    "@near-js/client": "^2.0.1",
-    "@near-js/keystores": "^2.0.1",
+    "@omni-bridge/core": "0.2.3",
+    "@omni-bridge/near": "0.2.3",
     "@noble/hashes": "^1.7.1",
     "@scure/base": "^1.0.0",
     "@solana/web3.js": "^1.0.0",
     "borsher": "^4.0.0",
     "lru-cache": "^11",
     "near-api-js": "^4.0.0 || ^5.0.0",
-    "omni-bridge-sdk": "0.23.1",
     "ripple-address-codec": "^5.0.0",
     "valibot": "^1.0.0",
     "viem": "^2.0.0",