sushi 6.6.5 → 6.6.7

package/_cjs/generic/utils/normalize-address.js

@@ -2,15 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeAddress = normalizeAddress;
 const chains_js_1 = require("../../evm/chain/chains.js");
+const token_js_1 = require("../../evm/currency/token.js");
 const normalize_address_js_1 = require("../../evm/utils/normalize-address.js");
 const chains_js_2 = require("../../mvm/chain/chains.js");
+const token_js_2 = require("../../mvm/currency/token.js");
 const normalize_address_js_2 = require("../../mvm/utils/normalize-address.js");
+const address_js_1 = require("../../stellar/address.js");
 const chains_js_3 = require("../../stellar/chain/chains.js");
 const normalize_address_js_3 = require("../../stellar/utils/normalize-address.js");
 const chains_js_4 = require("../../svm/chain/chains.js");
+const token_js_3 = require("../../svm/currency/token.js");
 const normalize_address_js_4 = require("../../svm/utils/normalize-address.js");
 const assert_never_js_1 = require("./assert-never.js");
-function normalizeAddress(chainId, address) {
+function normalizeAddress(chainIdOrAddress, address) {
+    if (address === undefined) {
+        if (typeof chainIdOrAddress !== 'string') {
+            throw new Error(`normalizeAddress, unsupported address: ${chainIdOrAddress}`);
+        }
+        return normalizeAddressByFormat(chainIdOrAddress);
+    }
+    return normalizeAddressByChainId(chainIdOrAddress, address);
+}
+function normalizeAddressByChainId(chainId, address) {
     if ((0, chains_js_1.isEvmChainId)(chainId)) {
         return (0, normalize_address_js_1.normalizeEvmAddress)(address);
     }
@@ -25,4 +38,19 @@ function normalizeAddress(chainId, address) {
     }
     (0, assert_never_js_1.assertNever)(chainId, `normalizeAddress, unsupported chainId: ${chainId}`);
 }
+function normalizeAddressByFormat(address) {
+    if ((0, token_js_2.isMvmAddress)(address)) {
+        return (0, normalize_address_js_2.normalizeMvmAddress)(address);
+    }
+    if ((0, token_js_1.isEvmAddress)(address)) {
+        return (0, normalize_address_js_1.normalizeEvmAddress)(address);
+    }
+    if ((0, token_js_3.isSvmAddress)(address)) {
+        return (0, normalize_address_js_4.normalizeSvmAddress)(address);
+    }
+    if ((0, address_js_1.isStellarAddress)(address.toUpperCase())) {
+        return (0, normalize_address_js_3.normalizeStellarAddress)(address);
+    }
+    throw new Error(`normalizeAddress, unsupported address: ${address}`);
+}
 //# sourceMappingURL=normalize-address.js.map

package/_cjs/generic/utils/normalize-address.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-address.js","sourceRoot":"","sources":["../../../generic/utils/normalize-address.ts"],"names":[],"mappings":";;AAgBA,4CA6BC;AA5CD,yDAAwD;AACxD,+EAA0E;AAE1E,yDAAwD;AACxD,+EAA0E;AAE1E,6DAAgE;AAChE,mFAAkF;AAElF,yDAAwD;AACxD,+EAA0E;AAG1E,uDAA+C;AAE/C,SAAgB,gBAAgB,CAC9B,OAAiB,EACjB,OAA6B;IAE7B,IAAI,IAAA,wBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EACxB,OAAiC,CACV,CAAA;IAC3B,CAAC;IAED,IAAI,IAAA,wBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EACxB,OAAiC,CACV,CAAA;IAC3B,CAAC;IAED,IAAI,IAAA,wBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EACxB,OAAiC,CACV,CAAA;IAC3B,CAAC;IAED,IAAI,IAAA,4BAAgB,EAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAA,8CAAuB,EAC5B,OAAqC,CACd,CAAA;IAC3B,CAAC;IAED,IAAA,6BAAW,EAAC,OAAO,EAAE,0CAA0C,OAAO,EAAE,CAAC,CAAA;AAC3E,CAAC"}
+{"version":3,"file":"normalize-address.js","sourceRoot":"","sources":["../../../generic/utils/normalize-address.ts"],"names":[],"mappings":";;AA2BA,4CAeC;AAzCD,yDAAwD;AACxD,0DAA2E;AAC3E,+EAA0E;AAE1E,yDAAwD;AACxD,0DAA0D;AAC1D,+EAA0E;AAC1E,yDAAgF;AAEhF,6DAAgE;AAChE,mFAAkF;AAElF,yDAAwD;AACxD,0DAA2E;AAC3E,+EAA0E;AAG1E,uDAA+C;AAS/C,SAAgB,gBAAgB,CAC9B,gBAA+C,EAC/C,OAA6B;IAE7B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,0CAA0C,gBAAgB,EAAE,CAC7D,CAAA;QACH,CAAC;QAED,OAAO,wBAAwB,CAAC,gBAAgB,CAAC,CAAA;IACnD,CAAC;IAED,OAAO,yBAAyB,CAAC,gBAA2B,EAAE,OAAO,CAAC,CAAA;AACxE,CAAC;AAED,SAAS,yBAAyB,CAChC,OAAgB,EAChB,OAA4B;IAE5B,IAAI,IAAA,wBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EAAC,OAAiC,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,IAAA,wBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EAAC,OAAiC,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,IAAA,wBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EAAC,OAAiC,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,IAAA,4BAAgB,EAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAA,8CAAuB,EAAC,OAAqC,CAAC,CAAA;IACvE,CAAC;IAED,IAAA,6BAAW,EAAC,OAAO,EAAE,0CAA0C,OAAO,EAAE,CAAC,CAAA;AAC3E,CAAC;AAED,SAAS,wBAAwB,CAC/B,OAA4B;IAE5B,IAAI,IAAA,uBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EAAC,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,IAAI,IAAA,uBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EAAC,OAAqB,CAAC,CAAA;IACnD,CAAC;IAED,IAAI,IAAA,uBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,0CAAmB,EAAC,OAAqB,CAAC,CAAA;IACnD,CAAC;IAED,IAAI,IAAA,6BAAgB,EAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAA,8CAAuB,EAAC,OAAyB,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAA;AACtE,CAAC"}

package/_cjs/stellar/address.js

@@ -4,14 +4,15 @@ exports.isStellarAccountAddress = isStellarAccountAddress;
 exports.isStellarContractAddress = isStellarContractAddress;
 exports.isStellarAddress = isStellarAddress;
 const stellarAccountAddressRegex = /^G[A-Z2-7]{55}$/;
+const stellarContractAddressRegex = /^C[A-Z2-7]{55}$/;
+const stellarAddressRegex = /^[GC][A-Z2-7]{55}$/;
 function isStellarAccountAddress(address) {
     return stellarAccountAddressRegex.test(address);
 }
-const stellarContractAddressRegex = /^C[A-Z2-7]{55}$/;
 function isStellarContractAddress(address) {
     return stellarContractAddressRegex.test(address);
 }
 function isStellarAddress(address) {
-    return isStellarAccountAddress(address) || isStellarContractAddress(address);
+    return stellarAddressRegex.test(address);
 }
 //# sourceMappingURL=address.js.map

package/_cjs/stellar/address.js.map

@@ -1 +1 @@
-{"version":3,"file":"address.js","sourceRoot":"","sources":["../../stellar/address.ts"],"names":[],"mappings":";;AAOA,0DAIC;AAID,4DAIC;AAED,4CAEC;AAlBD,MAAM,0BAA0B,GAAG,iBAAiB,CAAA;AAEpD,SAAgB,uBAAuB,CACrC,OAAe;IAEf,OAAO,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACjD,CAAC;AAED,MAAM,2BAA2B,GAAG,iBAAiB,CAAA;AAErD,SAAgB,wBAAwB,CACtC,OAAe;IAEf,OAAO,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAClD,CAAC;AAED,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,OAAO,uBAAuB,CAAC,OAAO,CAAC,IAAI,wBAAwB,CAAC,OAAO,CAAC,CAAA;AAC9E,CAAC"}
+{"version":3,"file":"address.js","sourceRoot":"","sources":["../../stellar/address.ts"],"names":[],"mappings":";;AASA,0DAIC;AAED,4DAIC;AAED,4CAEC;AAlBD,MAAM,0BAA0B,GAAG,iBAAiB,CAAA;AACpD,MAAM,2BAA2B,GAAG,iBAAiB,CAAA;AACrD,MAAM,mBAAmB,GAAG,oBAAoB,CAAA;AAEhD,SAAgB,uBAAuB,CACrC,OAAe;IAEf,OAAO,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACjD,CAAC;AAED,SAAgB,wBAAwB,CACtC,OAAe;IAEf,OAAO,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAClD,CAAC;AAED,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,OAAO,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC1C,CAAC"}

package/_esm/generic/utils/normalize-address.js

@@ -1,13 +1,26 @@
 import { isEvmChainId } from '../../evm/chain/chains.js';
+import { isEvmAddress } from '../../evm/currency/token.js';
 import { normalizeEvmAddress } from '../../evm/utils/normalize-address.js';
 import { isMvmChainId } from '../../mvm/chain/chains.js';
+import { isMvmAddress } from '../../mvm/currency/token.js';
 import { normalizeMvmAddress } from '../../mvm/utils/normalize-address.js';
+import { isStellarAddress } from '../../stellar/address.js';
 import { isStellarChainId } from '../../stellar/chain/chains.js';
 import { normalizeStellarAddress } from '../../stellar/utils/normalize-address.js';
 import { isSvmChainId } from '../../svm/chain/chains.js';
+import { isSvmAddress } from '../../svm/currency/token.js';
 import { normalizeSvmAddress } from '../../svm/utils/normalize-address.js';
 import { assertNever } from './assert-never.js';
-export function normalizeAddress(chainId, address) {
+export function normalizeAddress(chainIdOrAddress, address) {
+    if (address === undefined) {
+        if (typeof chainIdOrAddress !== 'string') {
+            throw new Error(`normalizeAddress, unsupported address: ${chainIdOrAddress}`);
+        }
+        return normalizeAddressByFormat(chainIdOrAddress);
+    }
+    return normalizeAddressByChainId(chainIdOrAddress, address);
+}
+function normalizeAddressByChainId(chainId, address) {
     if (isEvmChainId(chainId)) {
         return normalizeEvmAddress(address);
     }
@@ -22,4 +35,19 @@ export function normalizeAddress(chainId, address) {
     }
     assertNever(chainId, `normalizeAddress, unsupported chainId: ${chainId}`);
 }
+function normalizeAddressByFormat(address) {
+    if (isMvmAddress(address)) {
+        return normalizeMvmAddress(address);
+    }
+    if (isEvmAddress(address)) {
+        return normalizeEvmAddress(address);
+    }
+    if (isSvmAddress(address)) {
+        return normalizeSvmAddress(address);
+    }
+    if (isStellarAddress(address.toUpperCase())) {
+        return normalizeStellarAddress(address);
+    }
+    throw new Error(`normalizeAddress, unsupported address: ${address}`);
+}
 //# sourceMappingURL=normalize-address.js.map

package/_esm/generic/utils/normalize-address.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-address.js","sourceRoot":"","sources":["../../../generic/utils/normalize-address.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAA;AAElF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAG1E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,MAAM,UAAU,gBAAgB,CAC9B,OAAiB,EACjB,OAA6B;IAE7B,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CACxB,OAAiC,CACV,CAAA;IAC3B,CAAC;IAED,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CACxB,OAAiC,CACV,CAAA;IAC3B,CAAC;IAED,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CACxB,OAAiC,CACV,CAAA;IAC3B,CAAC;IAED,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,OAAO,uBAAuB,CAC5B,OAAqC,CACd,CAAA;IAC3B,CAAC;IAED,WAAW,CAAC,OAAO,EAAE,0CAA0C,OAAO,EAAE,CAAC,CAAA;AAC3E,CAAC"}
+{"version":3,"file":"normalize-address.js","sourceRoot":"","sources":["../../../generic/utils/normalize-address.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAmB,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAC1E,OAAO,EAAE,gBAAgB,EAAuB,MAAM,0BAA0B,CAAA;AAEhF,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAA;AAElF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,YAAY,EAAmB,MAAM,6BAA6B,CAAA;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAG1E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAS/C,MAAM,UAAU,gBAAgB,CAC9B,gBAA+C,EAC/C,OAA6B;IAE7B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,0CAA0C,gBAAgB,EAAE,CAC7D,CAAA;QACH,CAAC;QAED,OAAO,wBAAwB,CAAC,gBAAgB,CAAC,CAAA;IACnD,CAAC;IAED,OAAO,yBAAyB,CAAC,gBAA2B,EAAE,OAAO,CAAC,CAAA;AACxE,CAAC;AAED,SAAS,yBAAyB,CAChC,OAAgB,EAChB,OAA4B;IAE5B,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CAAC,OAAiC,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CAAC,OAAiC,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CAAC,OAAiC,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,OAAO,uBAAuB,CAAC,OAAqC,CAAC,CAAA;IACvE,CAAC;IAED,WAAW,CAAC,OAAO,EAAE,0CAA0C,OAAO,EAAE,CAAC,CAAA;AAC3E,CAAC;AAED,SAAS,wBAAwB,CAC/B,OAA4B;IAE5B,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CAAC,OAAqB,CAAC,CAAA;IACnD,CAAC;IAED,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CAAC,OAAqB,CAAC,CAAA;IACnD,CAAC;IAED,IAAI,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QAC5C,OAAO,uBAAuB,CAAC,OAAyB,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAA;AACtE,CAAC"}

package/_esm/stellar/address.js

@@ -1,12 +1,13 @@
 const stellarAccountAddressRegex = /^G[A-Z2-7]{55}$/;
+const stellarContractAddressRegex = /^C[A-Z2-7]{55}$/;
+const stellarAddressRegex = /^[GC][A-Z2-7]{55}$/;
 export function isStellarAccountAddress(address) {
     return stellarAccountAddressRegex.test(address);
 }
-const stellarContractAddressRegex = /^C[A-Z2-7]{55}$/;
 export function isStellarContractAddress(address) {
     return stellarContractAddressRegex.test(address);
 }
 export function isStellarAddress(address) {
-    return isStellarAccountAddress(address) || isStellarContractAddress(address);
+    return stellarAddressRegex.test(address);
 }
 //# sourceMappingURL=address.js.map

package/_esm/stellar/address.js.map

@@ -1 +1 @@
-{"version":3,"file":"address.js","sourceRoot":"","sources":["../../stellar/address.ts"],"names":[],"mappings":"AAKA,MAAM,0BAA0B,GAAG,iBAAiB,CAAA;AAEpD,MAAM,UAAU,uBAAuB,CACrC,OAAe;IAEf,OAAO,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACjD,CAAC;AAED,MAAM,2BAA2B,GAAG,iBAAiB,CAAA;AAErD,MAAM,UAAU,wBAAwB,CACtC,OAAe;IAEf,OAAO,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,OAAO,uBAAuB,CAAC,OAAO,CAAC,IAAI,wBAAwB,CAAC,OAAO,CAAC,CAAA;AAC9E,CAAC"}
+{"version":3,"file":"address.js","sourceRoot":"","sources":["../../stellar/address.ts"],"names":[],"mappings":"AAKA,MAAM,0BAA0B,GAAG,iBAAiB,CAAA;AACpD,MAAM,2BAA2B,GAAG,iBAAiB,CAAA;AACrD,MAAM,mBAAmB,GAAG,oBAAoB,CAAA;AAEhD,MAAM,UAAU,uBAAuB,CACrC,OAAe;IAEf,OAAO,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,OAAe;IAEf,OAAO,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,OAAO,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC1C,CAAC"}

package/_types/generic/utils/normalize-address.d.ts

@@ -1,4 +1,5 @@
 import type { ChainId } from '../chain/chains.js';
 import type { AddressFor } from '../types/for-chain.js';
-export declare function normalizeAddress<TChainId extends ChainId>(chainId: TChainId, address: AddressFor<TChainId>): AddressFor<TChainId>;
+export declare function normalizeAddress<TAddress extends AddressFor<ChainId>>(address: TAddress): TAddress;
+export declare function normalizeAddress<TChainId extends ChainId, TAddress extends AddressFor<TChainId>>(chainId: TChainId, address: TAddress): TAddress;
 //# sourceMappingURL=normalize-address.d.ts.map

package/_types/generic/utils/normalize-address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-address.d.ts","sourceRoot":"","sources":["../../../generic/utils/normalize-address.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD,wBAAgB,gBAAgB,CAAC,QAAQ,SAAS,OAAO,EACvD,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,GAC5B,UAAU,CAAC,QAAQ,CAAC,CA0BtB"}
+{"version":3,"file":"normalize-address.d.ts","sourceRoot":"","sources":["../../../generic/utils/normalize-address.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD,wBAAgB,gBAAgB,CAAC,QAAQ,SAAS,UAAU,CAAC,OAAO,CAAC,EACnE,OAAO,EAAE,QAAQ,GAChB,QAAQ,CAAA;AACX,wBAAgB,gBAAgB,CAC9B,QAAQ,SAAS,OAAO,EACxB,QAAQ,SAAS,UAAU,CAAC,QAAQ,CAAC,EACrC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAAA"}

package/_types/stellar/address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../../stellar/address.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG,IAAI,MAAM,EAAE,CAAA;AAChD,MAAM,MAAM,sBAAsB,GAAG,IAAI,MAAM,EAAE,CAAA;AACjD,MAAM,MAAM,cAAc,GAAG,qBAAqB,GAAG,sBAAsB,CAAA;AAC3E,MAAM,MAAM,aAAa,GAAG,MAAM,CAAA;AAIlC,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,IAAI,qBAAqB,CAElC;AAID,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,GACd,OAAO,IAAI,sBAAsB,CAEnC;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,IAAI,cAAc,CAE3E"}
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../../stellar/address.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG,IAAI,MAAM,EAAE,CAAA;AAChD,MAAM,MAAM,sBAAsB,GAAG,IAAI,MAAM,EAAE,CAAA;AACjD,MAAM,MAAM,cAAc,GAAG,qBAAqB,GAAG,sBAAsB,CAAA;AAC3E,MAAM,MAAM,aAAa,GAAG,MAAM,CAAA;AAMlC,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,IAAI,qBAAqB,CAElC;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,GACd,OAAO,IAAI,sBAAsB,CAEnC;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,IAAI,cAAc,CAE3E"}

package/generic/utils/normalize-address.test-d.ts

@@ -0,0 +1,110 @@
+import { describe, expectTypeOf, it } from 'vitest'
+import { EvmChainId } from '../../evm/chain/chains.js'
+import type { EvmAddress } from '../../evm/currency/token.js'
+import type { MvmAddress } from '../../mvm/currency/token.js'
+import type {
+  StellarAccountAddress,
+  StellarContractAddress,
+} from '../../stellar/address.js'
+import { StellarChainId } from '../../stellar/chain/chains.js'
+import { SvmChainId } from '../../svm/chain/chains.js'
+import type { SvmAddress } from '../../svm/currency/token.js'
+import { normalizeAddress } from './normalize-address.js'
+
+describe('normalizeAddress types', () => {
+  it('preserves EVM address types', () => {
+    const address = '0x0000000000000000000000000000000000000000' as EvmAddress
+
+    expectTypeOf(
+      normalizeAddress(EvmChainId.ETHEREUM, address),
+    ).toEqualTypeOf<EvmAddress>()
+  })
+
+  it('preserves SVM address types', () => {
+    const address = 'So11111111111111111111111111111111111111112' as SvmAddress
+
+    expectTypeOf(
+      normalizeAddress(SvmChainId.SOLANA, address),
+    ).toEqualTypeOf<SvmAddress>()
+  })
+
+  it('preserves Stellar account and contract address types', () => {
+    const accountAddress =
+      'GAAZI4TCR3TY5OJHCTJC2A4QSY6CJWJH5IAJTGKIN2ER7LBNVKOCCWN7' as StellarAccountAddress
+    const contractAddress =
+      'CCRSMJDITH3VK5QOGYCVZDAKIY5GL3RCG4TCVLIAVB662IW2V5KJGZGF' as StellarContractAddress
+
+    expectTypeOf(
+      normalizeAddress(StellarChainId.STELLAR, accountAddress),
+    ).toEqualTypeOf<StellarAccountAddress>()
+    expectTypeOf(
+      normalizeAddress(StellarChainId.STELLAR, contractAddress),
+    ).toEqualTypeOf<StellarContractAddress>()
+  })
+
+  it('preserves same-chain address unions', () => {
+    function normalizeStellarUnion(
+      address: StellarAccountAddress | StellarContractAddress,
+    ) {
+      expectTypeOf(
+        normalizeAddress(StellarChainId.STELLAR, address),
+      ).toEqualTypeOf<StellarAccountAddress | StellarContractAddress>()
+    }
+
+    expectTypeOf(normalizeStellarUnion).returns.toEqualTypeOf<void>()
+  })
+
+  it('preserves cross-chain address unions', () => {
+    function normalizeEvmOrSvmUnion(
+      chainId: typeof EvmChainId.ETHEREUM | typeof SvmChainId.SOLANA,
+      address: EvmAddress | SvmAddress,
+    ) {
+      expectTypeOf(normalizeAddress(chainId, address)).toEqualTypeOf<
+        EvmAddress | SvmAddress
+      >()
+    }
+
+    expectTypeOf(normalizeEvmOrSvmUnion).returns.toEqualTypeOf<void>()
+  })
+
+  it('preserves address types without chain ids', () => {
+    const evmAddress =
+      '0x0000000000000000000000000000000000000000' as EvmAddress
+    const mvmAddress = '0x1::coin::T' as MvmAddress
+    const svmAddress =
+      'So11111111111111111111111111111111111111112' as SvmAddress
+    const stellarAccountAddress =
+      'GAAZI4TCR3TY5OJHCTJC2A4QSY6CJWJH5IAJTGKIN2ER7LBNVKOCCWN7' as StellarAccountAddress
+    const stellarContractAddress =
+      'CCRSMJDITH3VK5QOGYCVZDAKIY5GL3RCG4TCVLIAVB662IW2V5KJGZGF' as StellarContractAddress
+
+    expectTypeOf(normalizeAddress(evmAddress)).toEqualTypeOf<EvmAddress>()
+    expectTypeOf(normalizeAddress(mvmAddress)).toEqualTypeOf<MvmAddress>()
+    expectTypeOf(normalizeAddress(svmAddress)).toEqualTypeOf<SvmAddress>()
+    expectTypeOf(
+      normalizeAddress(stellarAccountAddress),
+    ).toEqualTypeOf<StellarAccountAddress>()
+    expectTypeOf(
+      normalizeAddress(stellarContractAddress),
+    ).toEqualTypeOf<StellarContractAddress>()
+  })
+
+  it('preserves address unions without chain ids', () => {
+    function normalizeStellarUnion(
+      address: StellarAccountAddress | StellarContractAddress,
+    ) {
+      expectTypeOf(normalizeAddress(address)).toEqualTypeOf<
+        StellarAccountAddress | StellarContractAddress
+      >()
+    }
+
+    function normalizeEvmOrSvmUnion(address: EvmAddress | SvmAddress) {
+      expectTypeOf(normalizeAddress(address)).toEqualTypeOf<
+        EvmAddress | SvmAddress
+      >()
+    }
+
+    expectTypeOf(normalizeStellarUnion).returns.toEqualTypeOf<void>()
+    expectTypeOf(normalizeEvmOrSvmUnion).returns.toEqualTypeOf<void>()
+  })
+})

package/generic/utils/normalize-address.test.ts

@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest'
+import type { EvmAddress } from '../../evm/currency/token.js'
+import type { MvmAddress } from '../../mvm/currency/token.js'
+import type { StellarContractAddress } from '../../stellar/address.js'
+import type { SvmAddress } from '../../svm/currency/token.js'
+import { normalizeAddress } from './normalize-address.js'
+
+describe('normalizeAddress', () => {
+  it('normalizes addresses without chain ids by address format', () => {
+    expect(
+      normalizeAddress(
+        '0x000000000000000000000000000000000000dEaD' as EvmAddress,
+      ),
+    ).toBe('0x000000000000000000000000000000000000dead')
+
+    const mvmAddress = '0xABC::Coin::T' as MvmAddress
+    expect(normalizeAddress(mvmAddress)).toBe(mvmAddress)
+
+    const svmAddress =
+      'So11111111111111111111111111111111111111112' as SvmAddress
+    expect(normalizeAddress(svmAddress)).toBe(svmAddress)
+
+    expect(
+      normalizeAddress(
+        'ccrsmjdith3vk5qogycvzdakiy5gl3rcg4tcvliavb662iw2v5kjgzgf' as StellarContractAddress,
+      ),
+    ).toBe('CCRSMJDITH3VK5QOGYCVZDAKIY5GL3RCG4TCVLIAVB662IW2V5KJGZGF')
+  })
+})

package/generic/utils/normalize-address.ts

@@ -1,46 +1,88 @@
 import type { EvmChainId } from '../../evm/chain/chains.js'
 import { isEvmChainId } from '../../evm/chain/chains.js'
+import { type EvmAddress, isEvmAddress } from '../../evm/currency/token.js'
 import { normalizeEvmAddress } from '../../evm/utils/normalize-address.js'
 import type { MvmChainId } from '../../mvm/chain/chains.js'
 import { isMvmChainId } from '../../mvm/chain/chains.js'
+import { isMvmAddress } from '../../mvm/currency/token.js'
 import { normalizeMvmAddress } from '../../mvm/utils/normalize-address.js'
+import { isStellarAddress, type StellarAddress } from '../../stellar/address.js'
 import type { StellarChainId } from '../../stellar/chain/chains.js'
 import { isStellarChainId } from '../../stellar/chain/chains.js'
 import { normalizeStellarAddress } from '../../stellar/utils/normalize-address.js'
 import type { SvmChainId } from '../../svm/chain/chains.js'
 import { isSvmChainId } from '../../svm/chain/chains.js'
+import { isSvmAddress, type SvmAddress } from '../../svm/currency/token.js'
 import { normalizeSvmAddress } from '../../svm/utils/normalize-address.js'
 import type { ChainId } from '../chain/chains.js'
 import type { AddressFor } from '../types/for-chain.js'
 import { assertNever } from './assert-never.js'
 
-export function normalizeAddress<TChainId extends ChainId>(
-  chainId: TChainId,
-  address: AddressFor<TChainId>,
-): AddressFor<TChainId> {
+export function normalizeAddress<TAddress extends AddressFor<ChainId>>(
+  address: TAddress,
+): TAddress
+export function normalizeAddress<
+  TChainId extends ChainId,
+  TAddress extends AddressFor<TChainId>,
+>(chainId: TChainId, address: TAddress): TAddress
+export function normalizeAddress(
+  chainIdOrAddress: ChainId | AddressFor<ChainId>,
+  address?: AddressFor<ChainId>,
+): AddressFor<ChainId> {
+  if (address === undefined) {
+    if (typeof chainIdOrAddress !== 'string') {
+      throw new Error(
+        `normalizeAddress, unsupported address: ${chainIdOrAddress}`,
+      )
+    }
+
+    return normalizeAddressByFormat(chainIdOrAddress)
+  }
+
+  return normalizeAddressByChainId(chainIdOrAddress as ChainId, address)
+}
+
+function normalizeAddressByChainId(
+  chainId: ChainId,
+  address: AddressFor<ChainId>,
+) {
   if (isEvmChainId(chainId)) {
-    return normalizeEvmAddress(
-      address as AddressFor<EvmChainId>,
-    ) as AddressFor<TChainId>
+    return normalizeEvmAddress(address as AddressFor<EvmChainId>)
   }
 
   if (isMvmChainId(chainId)) {
-    return normalizeMvmAddress(
-      address as AddressFor<MvmChainId>,
-    ) as AddressFor<TChainId>
+    return normalizeMvmAddress(address as AddressFor<MvmChainId>)
   }
 
   if (isSvmChainId(chainId)) {
-    return normalizeSvmAddress(
-      address as AddressFor<SvmChainId>,
-    ) as AddressFor<TChainId>
+    return normalizeSvmAddress(address as AddressFor<SvmChainId>)
   }
 
   if (isStellarChainId(chainId)) {
-    return normalizeStellarAddress(
-      address as AddressFor<StellarChainId>,
-    ) as AddressFor<TChainId>
+    return normalizeStellarAddress(address as AddressFor<StellarChainId>)
   }
 
   assertNever(chainId, `normalizeAddress, unsupported chainId: ${chainId}`)
 }
+
+function normalizeAddressByFormat(
+  address: AddressFor<ChainId>,
+): AddressFor<ChainId> {
+  if (isMvmAddress(address)) {
+    return normalizeMvmAddress(address)
+  }
+
+  if (isEvmAddress(address)) {
+    return normalizeEvmAddress(address as EvmAddress)
+  }
+
+  if (isSvmAddress(address)) {
+    return normalizeSvmAddress(address as SvmAddress)
+  }
+
+  if (isStellarAddress(address.toUpperCase())) {
+    return normalizeStellarAddress(address as StellarAddress)
+  }
+
+  throw new Error(`normalizeAddress, unsupported address: ${address}`)
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sushi",
   "description": "Sushi",
-  "version": "6.6.5",
+  "version": "6.6.7",
   "type": "module",
   "main": "./_cjs/generic/index.js",
   "module": "./_esm/generic/index.js",

package/stellar/address.test.ts

@@ -21,10 +21,11 @@ describe('stellar addresses', () => {
     expect(isStellarContractAddress(contractAddress)).toBe(true)
   })
 
-  it('accepts both account and contract addresses as Stellar addresses', () => {
+  it('accepts account and contract addresses as Stellar addresses', () => {
     expect(isStellarAddress(accountAddress)).toBe(true)
     expect(isStellarAddress(contractAddress)).toBe(true)
     expect(isStellarAddress('0x1234')).toBe(false)
+    expect(isStellarAddress(`M${'A'.repeat(68)}`)).toBe(false)
   })
 
   it('normalizes account, contract, and chain addresses', () => {

package/stellar/address.ts

@@ -4,6 +4,8 @@ export type StellarAddress = StellarAccountAddress | StellarContractAddress
 export type StellarTxHash = string
 
 const stellarAccountAddressRegex = /^G[A-Z2-7]{55}$/
+const stellarContractAddressRegex = /^C[A-Z2-7]{55}$/
+const stellarAddressRegex = /^[GC][A-Z2-7]{55}$/
 
 export function isStellarAccountAddress(
   address: string,
@@ -11,8 +13,6 @@ export function isStellarAccountAddress(
   return stellarAccountAddressRegex.test(address)
 }
 
-const stellarContractAddressRegex = /^C[A-Z2-7]{55}$/
-
 export function isStellarContractAddress(
   address: string,
 ): address is StellarContractAddress {
@@ -20,5 +20,5 @@ export function isStellarContractAddress(
 }
 
 export function isStellarAddress(address: string): address is StellarAddress {
-  return isStellarAccountAddress(address) || isStellarContractAddress(address)
+  return stellarAddressRegex.test(address)
 }