@defuse-protocol/intents-sdk 0.78.1 → 0.80.0

package/README.md

@@ -279,6 +279,9 @@ The SDK automatically detects and supports multiple route types based on asset i
 - **Supported Assets**: Fungible tokens (NEP-141) supported by omni bridge relayer.
 - **Use Case**: multi-chain transfers for supported list of chains
 - **Route Type**: `omni_bridge`
+- **Note**: Some tokens originally issued via the PoA Bridge (`.omft.near`) have since migrated to the Omni Bridge.
+  The SDK tracks these in `POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE` and automatically routes them through Omni Bridge
+  instead of PoA Bridge.
 
 ##### Internal Transfer Route
 
@@ -363,51 +366,6 @@ const sdk = new IntentsSDK({
 });
 ```
 
-### Feature Flags
-
-Configure optional SDK features through the `features` configuration:
-
-#### Migrated PoA Token Routing
-
-Will route migrated PoA tokens (ending with `*.omft.near`) through Omni Bridge instead of the legacy PoA Bridge, unless explicitly set to route them through PoA bridge with routeConfig. Enable this when working with POA tokens that have been migrated to the Omni infrastructure:
-
-```typescript
-const sdk = new IntentsSDK({
-    referral: 'your-referral-code',
-    features: {
-        routeMigratedPoaTokensThroughOmniBridge: true
-    }
-});
-
-// With this flag enabled, tokens like 'nep141:sol-c58e6539c2f2e097c251f8edf11f9c03e581f8d4.omft.near' will route through Omni Bridge
-const result = await sdk.processWithdrawal({
-    withdrawalParams: {
-        assetId: 'nep141:sol-c58e6539c2f2e097c251f8edf11f9c03e581f8d4.omft.near', // Migrated PoA token
-        amount: 1000000n,
-        destinationAddress: '39hqXivfCPUSqmXAaX3eo4JcA5bGFXhhs26dmg585DGb',
-        feeInclusive: false
-    }
-});
-```
-
-**When to enable:**
-- Working with PoA tokens that have been migrated to Omni Bridge
-- Explicitly want to route `*.omft.near` tokens through the Omni Bridge
-- Default behavior (when disabled) routes these tokens through the PoA Bridge
-
-**Allowlisted Tokens:**
-
-Not all PoA tokens can be routed through Omni Bridge. The SDK exports `POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE` constant containing the tokens that support this routing:
-
-```typescript
-import { POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE } from '@defuse-protocol/intents-sdk';
-
-console.log(POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE);
-// { 'sol-...omft.near': ChainKind.Sol, ... }
-```
-
-The keys are token contract IDs and values are their `ChainKind`. Only tokens in this map will be routed through Omni Bridge when the feature flag is enabled. Other `*.omft.near` tokens will continue using the PoA Bridge.
-
 ### Other Intent Signers
 
 The SDK supports multiple intent signing methods using factory functions:

package/dist/index.cjs

@@ -7,7 +7,7 @@ const require_bridge_name_enum = require('./src/constants/bridge-name-enum.cjs')
 const require_error = require('./src/bridges/direct-bridge/error.cjs');
 const require_error$1 = require('./src/bridges/hot-bridge/error.cjs');
 const require_error$2 = require('./src/bridges/omni-bridge/error.cjs');
-const require_poa_tokens_routable_through_omni_bridge = require('./src/constants/poa-tokens-routable-through-omni-bridge.cjs');
+const require_poa_tokens_migrated_to_omni_bridge = require('./src/constants/poa-tokens-migrated-to-omni-bridge.cjs');
 const require_errors$1 = require('./src/bridges/poa-bridge/errors.cjs');
 const require_intent_hash = require('./src/intents/intent-hash.cjs');
 const require_expirable_nonce = require('./src/intents/expirable-nonce.cjs');
@@ -32,6 +32,7 @@ Object.defineProperty(exports, 'BaseError', {
 });
 exports.BridgeNameEnum = require_bridge_name_enum.BridgeNameEnum;
 exports.Chains = require_caip2.Chains;
+exports.DestinationAddressMatchesTokenAddressError = require_errors.DestinationAddressMatchesTokenAddressError;
 exports.DestinationExplicitNearAccountDoesntExistError = require_error.DestinationExplicitNearAccountDoesntExistError;
 exports.FeeExceedsAmountError = require_errors.FeeExceedsAmountError;
 exports.HotWithdrawalApiFeeRequestTimeoutError = require_error$1.HotWithdrawalApiFeeRequestTimeoutError;
@@ -55,7 +56,7 @@ exports.IntentsSDK = require_sdk.IntentsSDK;
 exports.InvalidFeeValueError = require_error$2.InvalidFeeValueError;
 exports.MinWithdrawalAmountError = require_errors.MinWithdrawalAmountError;
 exports.OmniWithdrawalApiFeeRequestTimeoutError = require_error$2.OmniWithdrawalApiFeeRequestTimeoutError;
-exports.POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE = require_poa_tokens_routable_through_omni_bridge.POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE;
+exports.POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE = require_poa_tokens_migrated_to_omni_bridge.POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE;
 Object.defineProperty(exports, 'PoaWithdrawalInvariantError', {
   enumerable: true,
   get: function () {

package/dist/index.d.cts

@@ -12,9 +12,9 @@ import { Nep413RawPayload } from "./src/intents/intent-signer-impl/intent-signer
 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";
+import { POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE } from "./src/constants/poa-tokens-migrated-to-omni-bridge.cjs";
 import { WithdrawalFailedError, WithdrawalFailedErrorType, WithdrawalWatchError, WithdrawalWatchErrorType } from "./src/core/withdrawal-watcher.cjs";
-import { FeeExceedsAmountError, FeeExceedsAmountErrorType, MinWithdrawalAmountError, MinWithdrawalAmountErrorType, TrustlineNotFoundError, TrustlineNotFoundErrorType, UnsupportedAssetIdError, UnsupportedAssetIdErrorType, UnsupportedDestinationMemoError, UnsupportedDestinationMemoErrorType } from "./src/classes/errors.cjs";
+import { DestinationAddressMatchesTokenAddressError, DestinationAddressMatchesTokenAddressErrorType, FeeExceedsAmountError, FeeExceedsAmountErrorType, MinWithdrawalAmountError, MinWithdrawalAmountErrorType, TrustlineNotFoundError, TrustlineNotFoundErrorType, UnsupportedAssetIdError, UnsupportedAssetIdErrorType, UnsupportedDestinationMemoError, UnsupportedDestinationMemoErrorType } from "./src/classes/errors.cjs";
 import { DestinationExplicitNearAccountDoesntExistError, DestinationExplicitNearAccountDoesntExistErrorType } from "./src/bridges/direct-bridge/error.cjs";
 import { HotWithdrawalApiFeeRequestTimeoutError, HotWithdrawalApiFeeRequestTimeoutErrorType, HotWithdrawalNotFoundError, HotWithdrawalNotFoundErrorType } from "./src/bridges/hot-bridge/error.cjs";
 import { InsufficientUtxoForOmniBridgeWithdrawalError, InsufficientUtxoForOmniBridgeWithdrawalErrorType, IntentsNearOmniAvailableBalanceTooLowError, IntentsNearOmniAvailableBalanceTooLowErrorType, InvalidFeeValueError, InvalidFeeValueErrorType, OmniWithdrawalApiFeeRequestTimeoutError, OmniWithdrawalApiFeeRequestTimeoutErrorType, TokenNotFoundInDestinationChainError, TokenNotFoundInDestinationChainErrorType } from "./src/bridges/omni-bridge/error.cjs";
@@ -22,4 +22,4 @@ import { XrplDepositAuthEnabledError, XrplDepositAuthEnabledErrorType, XrplDesti
 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, RelayPublishRejectedError, RelayPublishRejectedErrorType, RelayPublishResultUnknownError, RelayPublishResultUnknownErrorType, 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 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, type QuoteOptions, RelayPublishError, type RelayPublishErrorType, RelayPublishRejectedError, type RelayPublishRejectedErrorType, RelayPublishResultUnknownError, type RelayPublishResultUnknownErrorType, 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, XrplDepositAuthEnabledError, type XrplDepositAuthEnabledErrorType, XrplDestinationTagRequiredError, type XrplDestinationTagRequiredErrorType, 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, DestinationAddressMatchesTokenAddressError, type DestinationAddressMatchesTokenAddressErrorType, 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_MIGRATED_TO_OMNI_BRIDGE, type ParsedAssetInfo, type PoaBridgeRouteConfig, PoaWithdrawalInvariantError, type PoaWithdrawalInvariantErrorType, PoaWithdrawalNotFoundError, type PoaWithdrawalNotFoundErrorType, PoaWithdrawalPendingError, type PoaWithdrawalPendingErrorType, type ProcessWithdrawalArgs, QuoteError, type QuoteErrorType, type QuoteOptions, RelayPublishError, type RelayPublishErrorType, RelayPublishRejectedError, type RelayPublishRejectedErrorType, RelayPublishResultUnknownError, type RelayPublishResultUnknownErrorType, 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, XrplDepositAuthEnabledError, type XrplDepositAuthEnabledErrorType, XrplDestinationTagRequiredError, type XrplDestinationTagRequiredErrorType, computeIntentHash, createDefaultRoute, createHotBridgeRoute, createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute, validateAddress as validateAddressFormat };

package/dist/index.d.ts

@@ -12,9 +12,9 @@ import { Nep413RawPayload } from "./src/intents/intent-signer-impl/intent-signer
 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";
+import { POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE } from "./src/constants/poa-tokens-migrated-to-omni-bridge.js";
 import { WithdrawalFailedError, WithdrawalFailedErrorType, WithdrawalWatchError, WithdrawalWatchErrorType } from "./src/core/withdrawal-watcher.js";
-import { FeeExceedsAmountError, FeeExceedsAmountErrorType, MinWithdrawalAmountError, MinWithdrawalAmountErrorType, TrustlineNotFoundError, TrustlineNotFoundErrorType, UnsupportedAssetIdError, UnsupportedAssetIdErrorType, UnsupportedDestinationMemoError, UnsupportedDestinationMemoErrorType } from "./src/classes/errors.js";
+import { DestinationAddressMatchesTokenAddressError, DestinationAddressMatchesTokenAddressErrorType, FeeExceedsAmountError, FeeExceedsAmountErrorType, MinWithdrawalAmountError, MinWithdrawalAmountErrorType, TrustlineNotFoundError, TrustlineNotFoundErrorType, UnsupportedAssetIdError, UnsupportedAssetIdErrorType, UnsupportedDestinationMemoError, UnsupportedDestinationMemoErrorType } from "./src/classes/errors.js";
 import { DestinationExplicitNearAccountDoesntExistError, DestinationExplicitNearAccountDoesntExistErrorType } from "./src/bridges/direct-bridge/error.js";
 import { HotWithdrawalApiFeeRequestTimeoutError, HotWithdrawalApiFeeRequestTimeoutErrorType, HotWithdrawalNotFoundError, HotWithdrawalNotFoundErrorType } from "./src/bridges/hot-bridge/error.js";
 import { InsufficientUtxoForOmniBridgeWithdrawalError, InsufficientUtxoForOmniBridgeWithdrawalErrorType, IntentsNearOmniAvailableBalanceTooLowError, IntentsNearOmniAvailableBalanceTooLowErrorType, InvalidFeeValueError, InvalidFeeValueErrorType, OmniWithdrawalApiFeeRequestTimeoutError, OmniWithdrawalApiFeeRequestTimeoutErrorType, TokenNotFoundInDestinationChainError, TokenNotFoundInDestinationChainErrorType } from "./src/bridges/omni-bridge/error.js";
@@ -22,4 +22,4 @@ import { XrplDepositAuthEnabledError, XrplDepositAuthEnabledErrorType, XrplDesti
 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, RelayPublishRejectedError, RelayPublishRejectedErrorType, RelayPublishResultUnknownError, RelayPublishResultUnknownErrorType, 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 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, type QuoteOptions, RelayPublishError, type RelayPublishErrorType, RelayPublishRejectedError, type RelayPublishRejectedErrorType, RelayPublishResultUnknownError, type RelayPublishResultUnknownErrorType, 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, XrplDepositAuthEnabledError, type XrplDepositAuthEnabledErrorType, XrplDestinationTagRequiredError, type XrplDestinationTagRequiredErrorType, 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, DestinationAddressMatchesTokenAddressError, type DestinationAddressMatchesTokenAddressErrorType, 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_MIGRATED_TO_OMNI_BRIDGE, type ParsedAssetInfo, type PoaBridgeRouteConfig, PoaWithdrawalInvariantError, type PoaWithdrawalInvariantErrorType, PoaWithdrawalNotFoundError, type PoaWithdrawalNotFoundErrorType, PoaWithdrawalPendingError, type PoaWithdrawalPendingErrorType, type ProcessWithdrawalArgs, QuoteError, type QuoteErrorType, type QuoteOptions, RelayPublishError, type RelayPublishErrorType, RelayPublishRejectedError, type RelayPublishRejectedErrorType, RelayPublishResultUnknownError, type RelayPublishResultUnknownErrorType, 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, XrplDepositAuthEnabledError, type XrplDepositAuthEnabledErrorType, XrplDestinationTagRequiredError, type XrplDestinationTagRequiredErrorType, computeIntentHash, createDefaultRoute, createHotBridgeRoute, createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute, validateAddress as validateAddressFormat };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { FeeExceedsAmountError, MinWithdrawalAmountError, TrustlineNotFoundError, UnsupportedAssetIdError, UnsupportedDestinationMemoError } from "./src/classes/errors.js";
+import { DestinationAddressMatchesTokenAddressError, FeeExceedsAmountError, MinWithdrawalAmountError, TrustlineNotFoundError, UnsupportedAssetIdError, UnsupportedDestinationMemoError } from "./src/classes/errors.js";
 import { RouteEnum } from "./src/constants/route-enum.js";
 import { Chains } from "./src/lib/caip2.js";
 import { validateAddress } from "./src/lib/validateAddress.js";
@@ -6,7 +6,7 @@ import { BridgeNameEnum } from "./src/constants/bridge-name-enum.js";
 import { DestinationExplicitNearAccountDoesntExistError } from "./src/bridges/direct-bridge/error.js";
 import { HotWithdrawalApiFeeRequestTimeoutError, HotWithdrawalNotFoundError } from "./src/bridges/hot-bridge/error.js";
 import { InsufficientUtxoForOmniBridgeWithdrawalError, IntentsNearOmniAvailableBalanceTooLowError, InvalidFeeValueError, OmniWithdrawalApiFeeRequestTimeoutError, TokenNotFoundInDestinationChainError } from "./src/bridges/omni-bridge/error.js";
-import { POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE } from "./src/constants/poa-tokens-routable-through-omni-bridge.js";
+import { POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE } from "./src/constants/poa-tokens-migrated-to-omni-bridge.js";
 import { XrplDepositAuthEnabledError, XrplDestinationTagRequiredError } from "./src/bridges/poa-bridge/errors.js";
 import { computeIntentHash } from "./src/intents/intent-hash.js";
 import { VersionedNonceBuilder } from "./src/intents/expirable-nonce.js";
@@ -17,4 +17,4 @@ import { createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSi
 import { createDefaultRoute, createHotBridgeRoute, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute } from "./src/lib/route-config-factory.js";
 import { AssertionError, BaseError, HttpRequestError, IntentSettlementError, PoaWithdrawalInvariantError, PoaWithdrawalNotFoundError, PoaWithdrawalPendingError, QuoteError, RelayPublishError, RelayPublishRejectedError, RelayPublishResultUnknownError, RpcRequestError, TimeoutError } from "@defuse-protocol/internal-utils";
 
-export { AssertionError, BaseError, BridgeNameEnum, Chains, DestinationExplicitNearAccountDoesntExistError, FeeExceedsAmountError, HotWithdrawalApiFeeRequestTimeoutError, HotWithdrawalNotFoundError, HttpRequestError, InsufficientUtxoForOmniBridgeWithdrawalError, IntentPayloadBuilder, IntentSettlementError, IntentsNearOmniAvailableBalanceTooLowError, IntentsSDK, InvalidFeeValueError, MinWithdrawalAmountError, OmniWithdrawalApiFeeRequestTimeoutError, POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE, PoaWithdrawalInvariantError, PoaWithdrawalNotFoundError, PoaWithdrawalPendingError, QuoteError, RelayPublishError, RelayPublishRejectedError, RelayPublishResultUnknownError, RouteEnum, RpcRequestError, TimeoutError, TokenNotFoundInDestinationChainError, TrustlineNotFoundError, UnsupportedAssetIdError, UnsupportedDestinationMemoError, VersionedNonceBuilder, WithdrawalFailedError, WithdrawalWatchError, XrplDepositAuthEnabledError, XrplDestinationTagRequiredError, computeIntentHash, createDefaultRoute, createHotBridgeRoute, createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute, validateAddress as validateAddressFormat };
+export { AssertionError, BaseError, BridgeNameEnum, Chains, DestinationAddressMatchesTokenAddressError, DestinationExplicitNearAccountDoesntExistError, FeeExceedsAmountError, HotWithdrawalApiFeeRequestTimeoutError, HotWithdrawalNotFoundError, HttpRequestError, InsufficientUtxoForOmniBridgeWithdrawalError, IntentPayloadBuilder, IntentSettlementError, IntentsNearOmniAvailableBalanceTooLowError, IntentsSDK, InvalidFeeValueError, MinWithdrawalAmountError, OmniWithdrawalApiFeeRequestTimeoutError, POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE, PoaWithdrawalInvariantError, PoaWithdrawalNotFoundError, PoaWithdrawalPendingError, QuoteError, RelayPublishError, RelayPublishRejectedError, RelayPublishResultUnknownError, RouteEnum, RpcRequestError, TimeoutError, TokenNotFoundInDestinationChainError, TrustlineNotFoundError, UnsupportedAssetIdError, UnsupportedDestinationMemoError, VersionedNonceBuilder, WithdrawalFailedError, WithdrawalWatchError, XrplDepositAuthEnabledError, XrplDestinationTagRequiredError, computeIntentHash, createDefaultRoute, createHotBridgeRoute, createIntentSignerNEP413, createIntentSignerNearKeyPair, createIntentSignerViem, createInternalTransferRoute, createNearWithdrawalRoute, createOmniBridgeRoute, createPoaBridgeRoute, createVirtualChainRoute, validateAddress as validateAddressFormat };

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

@@ -8,6 +8,7 @@ const require_validateAddress = require('../../lib/validateAddress.cjs');
 const require_bridge_name_enum = require('../../constants/bridge-name-enum.cjs');
 const require_direct_bridge_constants = require('./direct-bridge-constants.cjs');
 const require_direct_bridge_utils = require('./direct-bridge-utils.cjs');
+const require_compareAddresses = require('../../lib/compareAddresses.cjs');
 const require_error = require('./error.cjs');
 let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
 let lru_cache = require("lru-cache");
@@ -73,6 +74,8 @@ var DirectBridge = class {
 	*/
 	async validateWithdrawal(args) {
 		if (require_validateAddress.validateAddress(args.destinationAddress, require_caip2.Chains.Near) === false) throw new require_errors.InvalidDestinationAddressForWithdrawalError(args.destinationAddress, require_caip2.Chains.Near);
+		const { contractId: tokenAccountId } = _defuse_protocol_internal_utils.utils.parseDefuseAssetId(args.assetId);
+		if (require_compareAddresses.compareAddresses(tokenAccountId, args.destinationAddress, require_caip2.Chains.Near)) throw new require_errors.DestinationAddressMatchesTokenAddressError(tokenAccountId, args.assetId);
 		if (_defuse_protocol_internal_utils.utils.isImplicitAccount(args.destinationAddress) === false && await this.getCachedAccountExistenceCheck(args.destinationAddress) === false) throw new require_error.DestinationExplicitNearAccountDoesntExistError(args.destinationAddress);
 	}
 	async estimateWithdrawalFee(args) {

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

@@ -1,4 +1,4 @@
-import { InvalidDestinationAddressForWithdrawalError, UnsupportedAssetIdError } from "../../classes/errors.js";
+import { DestinationAddressMatchesTokenAddressError, InvalidDestinationAddressForWithdrawalError, UnsupportedAssetIdError } from "../../classes/errors.js";
 import { RouteEnum } from "../../constants/route-enum.js";
 import { Chains } from "../../lib/caip2.js";
 import { getFeeQuote, getUnderlyingFee } from "../../lib/estimate-fee.js";
@@ -7,6 +7,7 @@ import { validateAddress } from "../../lib/validateAddress.js";
 import { BridgeNameEnum } from "../../constants/bridge-name-enum.js";
 import { NEAR_NATIVE_ASSET_ID } from "./direct-bridge-constants.js";
 import { accountExistsInNEAR, createWithdrawIntentPrimitive, withdrawalParamsInvariant } from "./direct-bridge-utils.js";
+import { compareAddresses } from "../../lib/compareAddresses.js";
 import { DestinationExplicitNearAccountDoesntExistError } from "./error.js";
 import { assert, getNearNep141MinStorageBalance, getNearNep141StorageBalance, utils } from "@defuse-protocol/internal-utils";
 import { LRUCache } from "lru-cache";
@@ -72,6 +73,8 @@ var DirectBridge = class {
 	*/
 	async validateWithdrawal(args) {
 		if (validateAddress(args.destinationAddress, Chains.Near) === false) throw new InvalidDestinationAddressForWithdrawalError(args.destinationAddress, Chains.Near);
+		const { contractId: tokenAccountId } = utils.parseDefuseAssetId(args.assetId);
+		if (compareAddresses(tokenAccountId, args.destinationAddress, Chains.Near)) throw new DestinationAddressMatchesTokenAddressError(tokenAccountId, args.assetId);
 		if (utils.isImplicitAccount(args.destinationAddress) === false && await this.getCachedAccountExistenceCheck(args.destinationAddress) === false) throw new DestinationExplicitNearAccountDoesntExistError(args.destinationAddress);
 	}
 	async estimateWithdrawalFee(args) {

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

@@ -6,6 +6,7 @@ const require_estimate_fee = require('../../lib/estimate-fee.cjs');
 const require_parse_defuse_asset_id = require('../../lib/parse-defuse-asset-id.cjs');
 const require_validateAddress = require('../../lib/validateAddress.cjs');
 const require_bridge_name_enum = require('../../constants/bridge-name-enum.cjs');
+const require_compareAddresses = require('../../lib/compareAddresses.cjs');
 const require_error = require('./error.cjs');
 const require_hot_bridge_constants = require('./hot-bridge-constants.cjs');
 const require_hot_bridge_utils = require('./hot-bridge-utils.cjs');
@@ -122,8 +123,10 @@ var HotBridge = class HotBridge {
 		(0, _defuse_protocol_internal_utils.assert)(assetInfo != null, "Asset is not supported");
 		require_hot_bridge_utils.hotBlockchainInvariant(assetInfo.blockchain);
 		if (require_validateAddress.validateAddress(args.destinationAddress, assetInfo.blockchain) === false) throw new require_errors.InvalidDestinationAddressForWithdrawalError(args.destinationAddress, assetInfo.blockchain);
+		const nativeAsset = "native" in assetInfo;
+		const token = nativeAsset ? "native" : assetInfo.address;
+		if (!nativeAsset && require_compareAddresses.compareAddresses(token, args.destinationAddress, assetInfo.blockchain)) throw new require_errors.DestinationAddressMatchesTokenAddressError(token, args.assetId);
 		if (assetInfo.blockchain === require_caip2.Chains.Stellar) {
-			const token = "native" in assetInfo ? "native" : assetInfo.address;
 			if (!await this.hotSdk.stellar.isTrustlineExists(args.destinationAddress, token)) throw new require_errors.TrustlineNotFoundError(args.destinationAddress, args.assetId, assetInfo.blockchain, token);
 		}
 	}

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

@@ -1,10 +1,11 @@
-import { InvalidDestinationAddressForWithdrawalError, TrustlineNotFoundError, UnsupportedAssetIdError, UnsupportedDestinationMemoError } from "../../classes/errors.js";
+import { DestinationAddressMatchesTokenAddressError, InvalidDestinationAddressForWithdrawalError, TrustlineNotFoundError, UnsupportedAssetIdError, UnsupportedDestinationMemoError } from "../../classes/errors.js";
 import { RouteEnum } from "../../constants/route-enum.js";
 import { Chains } from "../../lib/caip2.js";
 import { getFeeQuote, getUnderlyingFee } from "../../lib/estimate-fee.js";
 import { parseDefuseAssetId } from "../../lib/parse-defuse-asset-id.js";
 import { validateAddress } from "../../lib/validateAddress.js";
 import { BridgeNameEnum } from "../../constants/bridge-name-enum.js";
+import { compareAddresses } from "../../lib/compareAddresses.js";
 import { HotWithdrawalApiFeeRequestTimeoutError, HotWithdrawalNotFoundError } from "./error.js";
 import { HotWithdrawStatus, MIN_GAS_AMOUNT } from "./hot-bridge-constants.js";
 import { formatTxHash, getFeeAssetIdForChain, hotBlockchainInvariant, hotNetworkIdToCAIP2, toHotNetworkId } from "./hot-bridge-utils.js";
@@ -120,8 +121,10 @@ var HotBridge$1 = class HotBridge$1 {
 		assert(assetInfo != null, "Asset is not supported");
 		hotBlockchainInvariant(assetInfo.blockchain);
 		if (validateAddress(args.destinationAddress, assetInfo.blockchain) === false) throw new InvalidDestinationAddressForWithdrawalError(args.destinationAddress, assetInfo.blockchain);
+		const nativeAsset = "native" in assetInfo;
+		const token = nativeAsset ? "native" : assetInfo.address;
+		if (!nativeAsset && compareAddresses(token, args.destinationAddress, assetInfo.blockchain)) throw new DestinationAddressMatchesTokenAddressError(token, args.assetId);
 		if (assetInfo.blockchain === Chains.Stellar) {
-			const token = "native" in assetInfo ? "native" : assetInfo.address;
 			if (!await this.hotSdk.stellar.isTrustlineExists(args.destinationAddress, token)) throw new TrustlineNotFoundError(args.destinationAddress, args.assetId, assetInfo.blockchain, token);
 		}
 	}

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

@@ -3,6 +3,8 @@
 const NEAR_NATIVE_ASSET_ID = "nep141:wrap.near";
 const OMNI_BRIDGE_CONTRACT = "omni.bridge.near";
 const MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR = 500000000000000000000000n;
+const SOL_OMNI_CONTRACT_ID = "sol.omft.near";
+const MIN_AMOUNT_SOL_OMNI_WITHDRAWAL = 890880n;
 const MIN_GAS_AMOUNT = "37400000000000";
 const INTENTS_STORAGE_BALANCE_CACHE_KEY = "INTENTS_STORAGE_BALANCE";
 const FEE_SUBSIDIZED_TOKENS = ["nep141:lsd-usdt.rhealab.near"];
@@ -10,7 +12,9 @@ const FEE_SUBSIDIZED_TOKENS = ["nep141:lsd-usdt.rhealab.near"];
 //#endregion
 exports.FEE_SUBSIDIZED_TOKENS = FEE_SUBSIDIZED_TOKENS;
 exports.INTENTS_STORAGE_BALANCE_CACHE_KEY = INTENTS_STORAGE_BALANCE_CACHE_KEY;
+exports.MIN_AMOUNT_SOL_OMNI_WITHDRAWAL = MIN_AMOUNT_SOL_OMNI_WITHDRAWAL;
 exports.MIN_GAS_AMOUNT = MIN_GAS_AMOUNT;
 exports.MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR = MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR;
 exports.NEAR_NATIVE_ASSET_ID = NEAR_NATIVE_ASSET_ID;
-exports.OMNI_BRIDGE_CONTRACT = OMNI_BRIDGE_CONTRACT;
+exports.OMNI_BRIDGE_CONTRACT = OMNI_BRIDGE_CONTRACT;
+exports.SOL_OMNI_CONTRACT_ID = SOL_OMNI_CONTRACT_ID;

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

@@ -2,9 +2,11 @@
 const NEAR_NATIVE_ASSET_ID = "nep141:wrap.near";
 const OMNI_BRIDGE_CONTRACT = "omni.bridge.near";
 const MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR = 500000000000000000000000n;
+const SOL_OMNI_CONTRACT_ID = "sol.omft.near";
+const MIN_AMOUNT_SOL_OMNI_WITHDRAWAL = 890880n;
 const MIN_GAS_AMOUNT = "37400000000000";
 const INTENTS_STORAGE_BALANCE_CACHE_KEY = "INTENTS_STORAGE_BALANCE";
 const FEE_SUBSIDIZED_TOKENS = ["nep141:lsd-usdt.rhealab.near"];
 
 //#endregion
-export { FEE_SUBSIDIZED_TOKENS, INTENTS_STORAGE_BALANCE_CACHE_KEY, MIN_GAS_AMOUNT, MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR, NEAR_NATIVE_ASSET_ID, OMNI_BRIDGE_CONTRACT };
+export { FEE_SUBSIDIZED_TOKENS, INTENTS_STORAGE_BALANCE_CACHE_KEY, MIN_AMOUNT_SOL_OMNI_WITHDRAWAL, MIN_GAS_AMOUNT, MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR, NEAR_NATIVE_ASSET_ID, OMNI_BRIDGE_CONTRACT, SOL_OMNI_CONTRACT_ID };

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

@@ -1,7 +1,7 @@
 const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
 const require_caip2 = require('../../lib/caip2.cjs');
 const require_omni_bridge_constants = require('./omni-bridge-constants.cjs');
-const require_poa_tokens_routable_through_omni_bridge = require('../../constants/poa-tokens-routable-through-omni-bridge.cjs');
+const require_poa_tokens_migrated_to_omni_bridge = require('../../constants/poa-tokens-migrated-to-omni-bridge.cjs');
 let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
 let valibot = require("valibot");
 valibot = require_rolldown_runtime.__toESM(valibot);
@@ -82,7 +82,7 @@ function isUtxoChain(network) {
 	return UTXO_CHAINS.includes(network);
 }
 function poaContractIdToChainKind(contractId) {
-	return require_poa_tokens_routable_through_omni_bridge.POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE[contractId] ?? null;
+	return require_poa_tokens_migrated_to_omni_bridge.POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE[contractId] ?? null;
 }
 function validateOmniToken(nearAddress) {
 	if (nearAddress.endsWith(".testnet")) return false;

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

@@ -1,6 +1,6 @@
 import { Chains } from "../../lib/caip2.js";
 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 { POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE } from "../../constants/poa-tokens-migrated-to-omni-bridge.js";
 import { assert, utils } from "@defuse-protocol/internal-utils";
 import * as v from "valibot";
 import { ChainKind, getChain, isBridgeToken, omniAddress } from "@omni-bridge/core";
@@ -80,7 +80,7 @@ function isUtxoChain(network) {
 	return UTXO_CHAINS.includes(network);
 }
 function poaContractIdToChainKind(contractId) {
-	return POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE[contractId] ?? null;
+	return POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE[contractId] ?? null;
 }
 function validateOmniToken(nearAddress) {
 	if (nearAddress.endsWith(".testnet")) return false;

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

@@ -6,9 +6,10 @@ const require_estimate_fee = require('../../lib/estimate-fee.cjs');
 const require_parse_defuse_asset_id = require('../../lib/parse-defuse-asset-id.cjs');
 const require_validateAddress = require('../../lib/validateAddress.cjs');
 const require_bridge_name_enum = require('../../constants/bridge-name-enum.cjs');
+const require_compareAddresses = require('../../lib/compareAddresses.cjs');
 const require_error = require('./error.cjs');
 const require_omni_bridge_constants = require('./omni-bridge-constants.cjs');
-const require_poa_tokens_routable_through_omni_bridge = require('../../constants/poa-tokens-routable-through-omni-bridge.cjs');
+const require_poa_tokens_migrated_to_omni_bridge = require('../../constants/poa-tokens-migrated-to-omni-bridge.cjs');
 const require_omni_bridge_utils = require('./omni-bridge-utils.cjs');
 let _defuse_protocol_internal_utils = require("@defuse-protocol/internal-utils");
 let lru_cache = require("lru-cache");
@@ -18,7 +19,7 @@ let _omni_bridge_core = require("@omni-bridge/core");
 
 //#region src/bridges/omni-bridge/omni-bridge.ts
 var OmniBridge = class {
-	constructor({ envConfig, nearProvider, solverRelayApiKey, routeMigratedPoaTokensThroughOmniBridge, bridgeConfig }) {
+	constructor({ envConfig, nearProvider, solverRelayApiKey, bridgeConfig }) {
 		this.route = require_route_enum.RouteEnum.OmniBridge;
 		this.intentsStorageBalanceCache = new _isaacs_ttlcache.default({
 			max: 1,
@@ -34,7 +35,6 @@ var OmniBridge = class {
 		this.nearProvider = nearProvider;
 		this.omniBridgeAPI = new _omni_bridge_core.BridgeAPI("mainnet");
 		this.solverRelayApiKey = solverRelayApiKey;
-		this.routeMigratedPoaTokensThroughOmniBridge = routeMigratedPoaTokensThroughOmniBridge ?? false;
 		this.bridgeConfig = { prefundedNativeFeeTokens: bridgeConfig?.prefundedNativeFeeTokens ?? [] };
 	}
 	is(routeConfig) {
@@ -48,7 +48,7 @@ var OmniBridge = class {
 		const nonValidStandard = parsed.standard !== "nep141";
 		if (nonValidStandard && (omniBridgeSetWithNoChain || targetChainSpecified)) throw new require_errors.UnsupportedAssetIdError(params.assetId, `Only NEP-141 tokens are supported by Omni Bridge.`);
 		if (nonValidStandard) return false;
-		const poaTokenRoutedThroughOmniBridge = this.isPoaTokenRoutedThroughOmniBridge(parsed.contractId);
+		const poaTokenRoutedThroughOmniBridge = this.isPoaTokenMigratedToOmniBridge(parsed.contractId);
 		const nonValidToken = !poaTokenRoutedThroughOmniBridge && require_omni_bridge_utils.validateOmniToken(parsed.contractId) === false;
 		if (nonValidToken && omniBridgeSetWithNoChain) throw new require_errors.UnsupportedAssetIdError(params.assetId, `Non valid omni contract id ${parsed.contractId}`);
 		if (!targetChainSpecified && nonValidToken) return false;
@@ -73,7 +73,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_core.parseOriginChain)(parsed.contractId);
+		const omniChainKind = this.isPoaTokenMigratedToOmniBridge(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;
@@ -92,7 +92,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_core.parseOriginChain)(parsed.contractId);
+			omniChainKind = this.isPoaTokenMigratedToOmniBridge(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);
 		}
@@ -164,10 +164,12 @@ var OmniBridge = class {
 		if (require_validateAddress.validateAddress(args.destinationAddress, assetInfo.blockchain) === false) throw new require_errors.InvalidDestinationAddressForWithdrawalError(args.destinationAddress, assetInfo.blockchain);
 		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 destTokenAddress = await this.getCachedDestinationTokenAddress(assetInfo.contractId, omniChainKind);
-		if (destTokenAddress === null) throw new require_error.TokenNotFoundInDestinationChainError(args.assetId, assetInfo.blockchain);
-		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. 
+		const destTokenOmniAddress = await this.getCachedDestinationTokenAddress(assetInfo.contractId, omniChainKind);
+		if (destTokenOmniAddress === null) throw new require_error.TokenNotFoundInDestinationChainError(args.assetId, assetInfo.blockchain);
+		const destTokenAddress = (0, _omni_bridge_core.getAddress)(destTokenOmniAddress);
+		if (require_compareAddresses.compareAddresses(destTokenAddress, args.destinationAddress, assetInfo.blockchain)) throw new require_errors.DestinationAddressMatchesTokenAddressError(destTokenAddress, args.assetId);
+		const decimals = await this.getCachedTokenDecimals(destTokenOmniAddress);
+		(0, _defuse_protocol_internal_utils.assert)(decimals !== null, `Failed to retrieve token decimals for address ${destTokenOmniAddress} via OmniBridge contract. 
   Ensure the token is supported and the address is correct.`);
 		if (!args.skipMinAmountValidation) {
 			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);
@@ -195,7 +197,7 @@ var OmniBridge = class {
 				const actualAmountWithFee = args.amount + utxoMaxGasFee + utxoProtocolFee;
 				if (actualAmountWithFee < minAmount) throw new require_errors.MinWithdrawalAmountError(minAmount, actualAmountWithFee, args.assetId);
 			}
-		}
+		} else if (!args.skipMinAmountValidation && omniChainKind === _omni_bridge_core.ChainKind.Sol && assetInfo.contractId === require_omni_bridge_constants.SOL_OMNI_CONTRACT_ID && args.amount < require_omni_bridge_constants.MIN_AMOUNT_SOL_OMNI_WITHDRAWAL) throw new require_errors.MinWithdrawalAmountError(require_omni_bridge_constants.MIN_AMOUNT_SOL_OMNI_WITHDRAWAL, args.amount, args.assetId);
 	}
 	async estimateWithdrawalFee(args) {
 		const assetInfo = this.makeAssetInfo(args.withdrawalParams.assetId, args.withdrawalParams.routeConfig);
@@ -328,11 +330,10 @@ var OmniBridge = class {
 		return intentsStorageBalance;
 	}
 	/**
-	* Checks if passed token contract id is an allowlisted PoA token that should be routed via OmniBridge.
-	* Always return false when feature flag routeMigratedPoaTokensThroughOmniBridge = false.
+	* Checks if passed token contract id is a Omni migrated PoA token.
 	*/
-	isPoaTokenRoutedThroughOmniBridge(nearAddress) {
-		return this.routeMigratedPoaTokensThroughOmniBridge ? require_poa_tokens_routable_through_omni_bridge.POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE[nearAddress] !== void 0 : false;
+	isPoaTokenMigratedToOmniBridge(nearAddress) {
+		return require_poa_tokens_migrated_to_omni_bridge.POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE[nearAddress] !== void 0;
 	}
 };
 

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

@@ -1,22 +1,23 @@
-import { InvalidDestinationAddressForWithdrawalError, MinWithdrawalAmountError, UnsupportedAssetIdError } from "../../classes/errors.js";
+import { DestinationAddressMatchesTokenAddressError, InvalidDestinationAddressForWithdrawalError, MinWithdrawalAmountError, UnsupportedAssetIdError } from "../../classes/errors.js";
 import { RouteEnum } from "../../constants/route-enum.js";
 import { Chains } from "../../lib/caip2.js";
 import { getFeeQuote, getUnderlyingFee } from "../../lib/estimate-fee.js";
 import { parseDefuseAssetId } from "../../lib/parse-defuse-asset-id.js";
 import { validateAddress } from "../../lib/validateAddress.js";
 import { BridgeNameEnum } from "../../constants/bridge-name-enum.js";
+import { compareAddresses } from "../../lib/compareAddresses.js";
 import { InsufficientUtxoForOmniBridgeWithdrawalError, IntentsNearOmniAvailableBalanceTooLowError, InvalidFeeValueError, OmniWithdrawalApiFeeRequestTimeoutError, TokenNotFoundInDestinationChainError } from "./error.js";
-import { FEE_SUBSIDIZED_TOKENS, INTENTS_STORAGE_BALANCE_CACHE_KEY, MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR, NEAR_NATIVE_ASSET_ID, 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 { FEE_SUBSIDIZED_TOKENS, INTENTS_STORAGE_BALANCE_CACHE_KEY, MIN_AMOUNT_SOL_OMNI_WITHDRAWAL, MIN_STORAGE_BALANCE_FOR_INTENTS_NEAR, NEAR_NATIVE_ASSET_ID, OMNI_BRIDGE_CONTRACT, SOL_OMNI_CONTRACT_ID } from "./omni-bridge-constants.js";
+import { POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE } from "../../constants/poa-tokens-migrated-to-omni-bridge.js";
 import { caip2ToChainKind, chainKindToCaip2, createWithdrawIntentsPrimitive, getAccountOmniStorageBalance, getBridgedToken, getTokenDecimals, isUtxoChain, poaContractIdToChainKind, validateOmniToken } from "./omni-bridge-utils.js";
 import { assert, getNearNep141MinStorageBalance, getNearNep141StorageBalance, withTimeout } from "@defuse-protocol/internal-utils";
 import { LRUCache } from "lru-cache";
 import TTLCache from "@isaacs/ttlcache";
-import { BridgeAPI, ChainKind, getChain, getMinimumTransferableAmount, isEvmChain, omniAddress, parseOriginChain, verifyTransferAmount } from "@omni-bridge/core";
+import { BridgeAPI, ChainKind, getAddress, getChain, getMinimumTransferableAmount, isEvmChain, omniAddress, parseOriginChain, verifyTransferAmount } from "@omni-bridge/core";
 
 //#region src/bridges/omni-bridge/omni-bridge.ts
 var OmniBridge = class {
-	constructor({ envConfig, nearProvider, solverRelayApiKey, routeMigratedPoaTokensThroughOmniBridge, bridgeConfig }) {
+	constructor({ envConfig, nearProvider, solverRelayApiKey, bridgeConfig }) {
 		this.route = RouteEnum.OmniBridge;
 		this.intentsStorageBalanceCache = new TTLCache({
 			max: 1,
@@ -32,7 +33,6 @@ var OmniBridge = class {
 		this.nearProvider = nearProvider;
 		this.omniBridgeAPI = new BridgeAPI("mainnet");
 		this.solverRelayApiKey = solverRelayApiKey;
-		this.routeMigratedPoaTokensThroughOmniBridge = routeMigratedPoaTokensThroughOmniBridge ?? false;
 		this.bridgeConfig = { prefundedNativeFeeTokens: bridgeConfig?.prefundedNativeFeeTokens ?? [] };
 	}
 	is(routeConfig) {
@@ -46,7 +46,7 @@ var OmniBridge = class {
 		const nonValidStandard = parsed.standard !== "nep141";
 		if (nonValidStandard && (omniBridgeSetWithNoChain || targetChainSpecified)) throw new UnsupportedAssetIdError(params.assetId, `Only NEP-141 tokens are supported by Omni Bridge.`);
 		if (nonValidStandard) return false;
-		const poaTokenRoutedThroughOmniBridge = this.isPoaTokenRoutedThroughOmniBridge(parsed.contractId);
+		const poaTokenRoutedThroughOmniBridge = this.isPoaTokenMigratedToOmniBridge(parsed.contractId);
 		const nonValidToken = !poaTokenRoutedThroughOmniBridge && validateOmniToken(parsed.contractId) === false;
 		if (nonValidToken && omniBridgeSetWithNoChain) throw new UnsupportedAssetIdError(params.assetId, `Non valid omni contract id ${parsed.contractId}`);
 		if (!targetChainSpecified && nonValidToken) return false;
@@ -71,7 +71,7 @@ var OmniBridge = class {
 	parseAssetId(assetId) {
 		const parsed = parseDefuseAssetId(assetId);
 		if (parsed.standard !== "nep141") return null;
-		const omniChainKind = this.isPoaTokenRoutedThroughOmniBridge(parsed.contractId) ? poaContractIdToChainKind(parsed.contractId) : parseOriginChain(parsed.contractId);
+		const omniChainKind = this.isPoaTokenMigratedToOmniBridge(parsed.contractId) ? poaContractIdToChainKind(parsed.contractId) : parseOriginChain(parsed.contractId);
 		if (omniChainKind === null) return null;
 		const blockchain = chainKindToCaip2(omniChainKind);
 		if (blockchain === null) return null;
@@ -90,7 +90,7 @@ var OmniBridge = class {
 			omniChainKind = caip2ToChainKind(routeConfig.chain);
 			blockchain = routeConfig.chain;
 		} else {
-			omniChainKind = this.isPoaTokenRoutedThroughOmniBridge(parsed.contractId) ? poaContractIdToChainKind(parsed.contractId) : parseOriginChain(parsed.contractId);
+			omniChainKind = this.isPoaTokenMigratedToOmniBridge(parsed.contractId) ? poaContractIdToChainKind(parsed.contractId) : parseOriginChain(parsed.contractId);
 			if (omniChainKind === null) return null;
 			blockchain = chainKindToCaip2(omniChainKind);
 		}
@@ -162,10 +162,12 @@ var OmniBridge = class {
 		if (validateAddress(args.destinationAddress, assetInfo.blockchain) === false) throw new InvalidDestinationAddressForWithdrawalError(args.destinationAddress, assetInfo.blockchain);
 		const omniChainKind = caip2ToChainKind(assetInfo.blockchain);
 		assert(omniChainKind !== null, `Chain ${assetInfo.blockchain} is not supported by Omni Bridge`);
-		const destTokenAddress = await this.getCachedDestinationTokenAddress(assetInfo.contractId, omniChainKind);
-		if (destTokenAddress === null) throw new TokenNotFoundInDestinationChainError(args.assetId, assetInfo.blockchain);
-		const decimals = await this.getCachedTokenDecimals(destTokenAddress);
-		assert(decimals !== null, `Failed to retrieve token decimals for address ${destTokenAddress} via OmniBridge contract. 
+		const destTokenOmniAddress = await this.getCachedDestinationTokenAddress(assetInfo.contractId, omniChainKind);
+		if (destTokenOmniAddress === null) throw new TokenNotFoundInDestinationChainError(args.assetId, assetInfo.blockchain);
+		const destTokenAddress = getAddress(destTokenOmniAddress);
+		if (compareAddresses(destTokenAddress, args.destinationAddress, assetInfo.blockchain)) throw new DestinationAddressMatchesTokenAddressError(destTokenAddress, args.assetId);
+		const decimals = await this.getCachedTokenDecimals(destTokenOmniAddress);
+		assert(decimals !== null, `Failed to retrieve token decimals for address ${destTokenOmniAddress} via OmniBridge contract. 
   Ensure the token is supported and the address is correct.`);
 		if (!args.skipMinAmountValidation) {
 			if (verifyTransferAmount(args.amount, 0n, decimals.origin_decimals, decimals.decimals) === false) throw new MinWithdrawalAmountError(getMinimumTransferableAmount(decimals.origin_decimals, decimals.decimals), args.amount, args.assetId);
@@ -193,7 +195,7 @@ var OmniBridge = class {
 				const actualAmountWithFee = args.amount + utxoMaxGasFee + utxoProtocolFee;
 				if (actualAmountWithFee < minAmount) throw new MinWithdrawalAmountError(minAmount, actualAmountWithFee, args.assetId);
 			}
-		}
+		} else if (!args.skipMinAmountValidation && omniChainKind === ChainKind.Sol && assetInfo.contractId === SOL_OMNI_CONTRACT_ID && args.amount < MIN_AMOUNT_SOL_OMNI_WITHDRAWAL) throw new MinWithdrawalAmountError(MIN_AMOUNT_SOL_OMNI_WITHDRAWAL, args.amount, args.assetId);
 	}
 	async estimateWithdrawalFee(args) {
 		const assetInfo = this.makeAssetInfo(args.withdrawalParams.assetId, args.withdrawalParams.routeConfig);
@@ -326,11 +328,10 @@ var OmniBridge = class {
 		return intentsStorageBalance;
 	}
 	/**
-	* Checks if passed token contract id is an allowlisted PoA token that should be routed via OmniBridge.
-	* Always return false when feature flag routeMigratedPoaTokensThroughOmniBridge = false.
+	* Checks if passed token contract id is a Omni migrated PoA token.
 	*/
-	isPoaTokenRoutedThroughOmniBridge(nearAddress) {
-		return this.routeMigratedPoaTokensThroughOmniBridge ? POA_TOKENS_ROUTABLE_THROUGH_OMNI_BRIDGE[nearAddress] !== void 0 : false;
+	isPoaTokenMigratedToOmniBridge(nearAddress) {
+		return POA_TOKENS_MIGRATED_TO_OMNI_BRIDGE[nearAddress] !== void 0;
 	}
 };
 

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

@@ -29,7 +29,6 @@ const caip2Mapping = {
 	[require_caip2.Chains.Arbitrum]: "eth:42161",
 	[require_caip2.Chains.Bitcoin]: "btc:mainnet",
 	[require_caip2.Chains.BitcoinCash]: "bch:mainnet",
-	[require_caip2.Chains.Solana]: "sol:mainnet",
 	[require_caip2.Chains.Dogecoin]: "doge:mainnet",
 	[require_caip2.Chains.XRPL]: "xrp:mainnet",
 	[require_caip2.Chains.Zcash]: "zec:mainnet",
@@ -37,11 +36,9 @@ const caip2Mapping = {
 	[require_caip2.Chains.Berachain]: "eth:80094",
 	[require_caip2.Chains.Tron]: "tron:mainnet",
 	[require_caip2.Chains.Sui]: "sui:mainnet",
-	[require_caip2.Chains.Aptos]: "aptos:mainnet",
 	[require_caip2.Chains.Movement]: "movement:mainnet",
 	[require_caip2.Chains.Cardano]: "cardano:mainnet",
 	[require_caip2.Chains.Litecoin]: "ltc:mainnet",
-	[require_caip2.Chains.Starknet]: "starknet:mainnet",
 	[require_caip2.Chains.Aleo]: "aleo:mainnet",
 	[require_caip2.Chains.Dash]: "dash:mainnet",
 	[require_caip2.Chains.Plasma]: "eth:9745"
@@ -56,7 +53,6 @@ const tokenPrefixMapping = {
 	arb: require_caip2.Chains.Arbitrum,
 	btc: require_caip2.Chains.Bitcoin,
 	bch: require_caip2.Chains.BitcoinCash,
-	sol: require_caip2.Chains.Solana,
 	doge: require_caip2.Chains.Dogecoin,
 	xrp: require_caip2.Chains.XRPL,
 	zec: require_caip2.Chains.Zcash,
@@ -64,11 +60,9 @@ const tokenPrefixMapping = {
 	bera: require_caip2.Chains.Berachain,
 	tron: require_caip2.Chains.Tron,
 	sui: require_caip2.Chains.Sui,
-	aptos: require_caip2.Chains.Aptos,
 	movement: require_caip2.Chains.Movement,
 	cardano: require_caip2.Chains.Cardano,
 	ltc: require_caip2.Chains.Litecoin,
-	starknet: require_caip2.Chains.Starknet,
 	aleo: require_caip2.Chains.Aleo,
 	dash: require_caip2.Chains.Dash,
 	plasma: require_caip2.Chains.Plasma