sushi 6.4.4 → 6.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_cjs/generic/types/{address.js → for-chain.js} +1 -1
- package/_cjs/generic/types/for-chain.js.map +1 -0
- package/_cjs/generic/utils/id.js +2 -1
- package/_cjs/generic/utils/id.js.map +1 -1
- package/_esm/generic/types/for-chain.js +2 -0
- package/_esm/generic/types/for-chain.js.map +1 -0
- package/_esm/generic/utils/id.js +3 -2
- package/_esm/generic/utils/id.js.map +1 -1
- package/_types/generic/types/for-chain.d.ts +12 -0
- package/_types/generic/types/for-chain.d.ts.map +1 -0
- package/_types/generic/types/index.d.ts +1 -1
- package/_types/generic/types/index.d.ts.map +1 -1
- package/_types/generic/utils/id.d.ts.map +1 -1
- package/generic/types/for-chain.ts +32 -0
- package/generic/types/index.ts +1 -1
- package/generic/utils/id.ts +3 -2
- package/package.json +1 -1
- package/_cjs/generic/types/address.js.map +0 -1
- package/_esm/generic/types/address.js +0 -2
- package/_esm/generic/types/address.js.map +0 -1
- package/_types/generic/types/address.d.ts +0 -7
- package/_types/generic/types/address.d.ts.map +0 -1
- package/generic/types/address.ts +0 -11
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"for-chain.js","sourceRoot":"","sources":["../../../generic/types/for-chain.ts"],"names":[],"mappings":""}
|
package/_cjs/generic/utils/id.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.getChainIdAddressFromId = getChainIdAddressFromId;
|
|
|
4
4
|
exports.getIdFromChainIdAddress = getIdFromChainIdAddress;
|
|
5
5
|
const simple_constants_js_1 = require("../../evm/config/simple-constants.js");
|
|
6
6
|
const token_js_1 = require("../../kvm/currency/token.js");
|
|
7
|
+
const token_js_2 = require("../../svm/currency/token.js");
|
|
7
8
|
function getChainIdAddressFromId(id) {
|
|
8
9
|
const [chainId, address, ...rest] = id.split(':');
|
|
9
10
|
if (rest.length > 0) {
|
|
@@ -18,7 +19,7 @@ function getIdFromChainIdAddress(chainId, address, options = {}) {
|
|
|
18
19
|
if (!chainId || !address) {
|
|
19
20
|
throw new Error(`Invalid chainId or address: ${chainId}, ${address}. Both must be provided.`);
|
|
20
21
|
}
|
|
21
|
-
if (!(0, token_js_1.isKvmTokenAddress)(address)) {
|
|
22
|
+
if (!(0, token_js_1.isKvmTokenAddress)(address) && !(0, token_js_2.isSvmAddress)(address)) {
|
|
22
23
|
address = address.toLowerCase();
|
|
23
24
|
}
|
|
24
25
|
if (address === simple_constants_js_1.nativeAddress && options.translateNative) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":";;AAMA,0DAwBC;AAED,0DA2BC;AA3DD,8EAAoE;AACpE,0DAA+D;AAC/D,0DAA0D;AAI1D,SAAgB,uBAAuB,CAIrC,EAA0B;IAK1B,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAA;IAEzE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,CAAC,OAAmB,EAAE,OAAO,EAAE,CAAA;AACnD,CAAC;AAED,SAAgB,uBAAuB,CAKrC,OAAiB,EACjB,OAAiB,EACjB,UAAkD,EAAE;IAEpD,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,KAAK,OAAO,0BAA0B,CAC7E,CAAA;IACH,CAAC;IAGD,IAAI,CAAC,IAAA,4BAAiB,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,uBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1D,OAAO,GAAG,OAAO,CAAC,WAAW,EAAc,CAAA;IAC7C,CAAC;IAED,IAAI,OAAO,KAAK,mCAAa,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QACzD,OAAO,GAAG,QAAoB,CAAA;IAChC,CAAC;IAED,OAAO,GAAG,OAAO,IAAI,OAAO,EAEF,CAAA;AAC5B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"for-chain.js","sourceRoot":"","sources":["../../../generic/types/for-chain.ts"],"names":[],"mappings":""}
|
package/_esm/generic/utils/id.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { nativeAddress } from '../../evm/config/simple-constants.js';
|
|
2
2
|
import { isKvmTokenAddress } from '../../kvm/currency/token.js';
|
|
3
|
+
import { isSvmAddress } from '../../svm/currency/token.js';
|
|
3
4
|
export function getChainIdAddressFromId(id) {
|
|
4
5
|
const [chainId, address, ...rest] = id.split(':');
|
|
5
6
|
if (rest.length > 0) {
|
|
@@ -14,8 +15,8 @@ export function getIdFromChainIdAddress(chainId, address, options = {}) {
|
|
|
14
15
|
if (!chainId || !address) {
|
|
15
16
|
throw new Error(`Invalid chainId or address: ${chainId}, ${address}. Both must be provided.`);
|
|
16
17
|
}
|
|
17
|
-
// Kvm addresses are case-sensitive
|
|
18
|
-
if (!isKvmTokenAddress(address)) {
|
|
18
|
+
// Kvm and Solana addresses are case-sensitive
|
|
19
|
+
if (!isKvmTokenAddress(address) && !isSvmAddress(address)) {
|
|
19
20
|
address = address.toLowerCase();
|
|
20
21
|
}
|
|
21
22
|
if (address === nativeAddress && options.translateNative) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"id.js","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAI1D,MAAM,UAAU,uBAAuB,CAIrC,EAA0B;IAK1B,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAA;IAEzE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,sBAAsB,EAAE,yCAAyC,CAClE,CAAA;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,CAAC,OAAmB,EAAE,OAAO,EAAE,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,uBAAuB,CAKrC,OAAiB,EACjB,OAAiB,EACjB,UAAkD,EAAE;IAEpD,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,KAAK,OAAO,0BAA0B,CAC7E,CAAA;IACH,CAAC;IAED,8CAA8C;IAC9C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1D,OAAO,GAAG,OAAO,CAAC,WAAW,EAAc,CAAA;IAC7C,CAAC;IAED,IAAI,OAAO,KAAK,aAAa,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QACzD,OAAO,GAAG,QAAoB,CAAA;IAChC,CAAC;IAED,OAAO,GAAG,OAAO,IAAI,OAAO,EAEF,CAAA;AAC5B,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { EvmCurrency } from '~/evm/currency/currency.js';
|
|
2
|
+
import type { SvmCurrency } from '~/svm/currency/currency.js';
|
|
3
|
+
import type { EvmChainId } from '../../evm/chain/chains.js';
|
|
4
|
+
import type { EvmAddress, EvmToken } from '../../evm/currency/token.js';
|
|
5
|
+
import type { SvmChainId } from '../../svm/chain/chains.js';
|
|
6
|
+
import type { SvmAddress, SvmToken } from '../../svm/currency/token.js';
|
|
7
|
+
import type { ChainId } from '../chain/chains.js';
|
|
8
|
+
import type { CurrencyMetadata } from '../currency/currency.js';
|
|
9
|
+
export type TokenFor<TChainId extends EvmChainId | SvmChainId, Metadata extends CurrencyMetadata = CurrencyMetadata> = TChainId extends EvmChainId ? EvmToken<Metadata> : TChainId extends SvmChainId ? SvmToken<Metadata> : never;
|
|
10
|
+
export type CurrencyFor<TChainId extends EvmChainId | SvmChainId, Metadata extends CurrencyMetadata = CurrencyMetadata> = TChainId extends EvmChainId ? EvmCurrency<Metadata> : TChainId extends SvmChainId ? SvmCurrency<Metadata> : never;
|
|
11
|
+
export type AddressFor<TChainId extends ChainId> = TChainId extends EvmChainId ? EvmAddress : TChainId extends SvmChainId ? SvmAddress : never;
|
|
12
|
+
//# sourceMappingURL=for-chain.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"for-chain.d.ts","sourceRoot":"","sources":["../../../generic/types/for-chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAE/D,MAAM,MAAM,QAAQ,CAClB,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,QAAQ,SAAS,gBAAgB,GAAG,gBAAgB,IAClD,QAAQ,SAAS,UAAU,GAC3B,QAAQ,CAAC,QAAQ,CAAC,GAClB,QAAQ,SAAS,UAAU,GACzB,QAAQ,CAAC,QAAQ,CAAC,GAClB,KAAK,CAAA;AAEX,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,QAAQ,SAAS,gBAAgB,GAAG,gBAAgB,IAClD,QAAQ,SAAS,UAAU,GAC3B,WAAW,CAAC,QAAQ,CAAC,GACrB,QAAQ,SAAS,UAAU,GACzB,WAAW,CAAC,QAAQ,CAAC,GACrB,KAAK,CAAA;AAEX,MAAM,MAAM,UAAU,CAAC,QAAQ,SAAS,OAAO,IAAI,QAAQ,SAAS,UAAU,GAC1E,UAAU,GACV,QAAQ,SAAS,UAAU,GACzB,UAAU,GACV,KAAK,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../generic/types/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../generic/types/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,gBAAgB,CAAA;AACnC,mBAAmB,gBAAgB,CAAA;AACnC,mBAAmB,SAAS,CAAA;AAC5B,mBAAmB,cAAc,CAAA;AACjC,mBAAmB,cAAc,CAAA;AACjC,mBAAmB,4BAA4B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../../../generic/utils/id.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAExC,wBAAgB,uBAAuB,CACrC,QAAQ,SAAS,OAAO,EACxB,QAAQ,SAAS,MAAM,EAEvB,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GACzB;IACD,OAAO,EAAE,QAAQ,CAAA;IACjB,OAAO,EAAE,QAAQ,CAAA;CAClB,CAgBA;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,SAAS,OAAO,EACxB,QAAQ,SAAS,MAAM,EACvB,gBAAgB,SAAS,OAAO,GAAG,KAAK,EAExC,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,gBAAgB,CAAA;CAAO,GAiBlB,gBAAgB,SAAS,IAAI,GAC3D,EAAE,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAC,GACjC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAC3B"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { EvmCurrency } from '~/evm/currency/currency.js'
|
|
2
|
+
import type { SvmCurrency } from '~/svm/currency/currency.js'
|
|
3
|
+
import type { EvmChainId } from '../../evm/chain/chains.js'
|
|
4
|
+
import type { EvmAddress, EvmToken } from '../../evm/currency/token.js'
|
|
5
|
+
import type { SvmChainId } from '../../svm/chain/chains.js'
|
|
6
|
+
import type { SvmAddress, SvmToken } from '../../svm/currency/token.js'
|
|
7
|
+
import type { ChainId } from '../chain/chains.js'
|
|
8
|
+
import type { CurrencyMetadata } from '../currency/currency.js'
|
|
9
|
+
|
|
10
|
+
export type TokenFor<
|
|
11
|
+
TChainId extends EvmChainId | SvmChainId,
|
|
12
|
+
Metadata extends CurrencyMetadata = CurrencyMetadata,
|
|
13
|
+
> = TChainId extends EvmChainId
|
|
14
|
+
? EvmToken<Metadata>
|
|
15
|
+
: TChainId extends SvmChainId
|
|
16
|
+
? SvmToken<Metadata>
|
|
17
|
+
: never
|
|
18
|
+
|
|
19
|
+
export type CurrencyFor<
|
|
20
|
+
TChainId extends EvmChainId | SvmChainId,
|
|
21
|
+
Metadata extends CurrencyMetadata = CurrencyMetadata,
|
|
22
|
+
> = TChainId extends EvmChainId
|
|
23
|
+
? EvmCurrency<Metadata>
|
|
24
|
+
: TChainId extends SvmChainId
|
|
25
|
+
? SvmCurrency<Metadata>
|
|
26
|
+
: never
|
|
27
|
+
|
|
28
|
+
export type AddressFor<TChainId extends ChainId> = TChainId extends EvmChainId
|
|
29
|
+
? EvmAddress
|
|
30
|
+
: TChainId extends SvmChainId
|
|
31
|
+
? SvmAddress
|
|
32
|
+
: never
|
package/generic/types/index.ts
CHANGED
package/generic/utils/id.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { nativeAddress } from '../../evm/config/simple-constants.js'
|
|
2
2
|
import { isKvmTokenAddress } from '../../kvm/currency/token.js'
|
|
3
|
+
import { isSvmAddress } from '../../svm/currency/token.js'
|
|
3
4
|
import type { ChainId } from '../chain/chains.js'
|
|
4
5
|
import type { ID } from '../types/id.js'
|
|
5
6
|
|
|
@@ -44,8 +45,8 @@ export function getIdFromChainIdAddress<
|
|
|
44
45
|
)
|
|
45
46
|
}
|
|
46
47
|
|
|
47
|
-
// Kvm addresses are case-sensitive
|
|
48
|
-
if (!isKvmTokenAddress(address)) {
|
|
48
|
+
// Kvm and Solana addresses are case-sensitive
|
|
49
|
+
if (!isKvmTokenAddress(address) && !isSvmAddress(address)) {
|
|
49
50
|
address = address.toLowerCase() as TAddress
|
|
50
51
|
}
|
|
51
52
|
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"address.js","sourceRoot":"","sources":["../../../generic/types/address.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"address.js","sourceRoot":"","sources":["../../../generic/types/address.ts"],"names":[],"mappings":""}
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import type { EvmChainId } from '../../evm/chain/chains.js';
|
|
2
|
-
import type { EvmAddress } from '../../evm/currency/token.js';
|
|
3
|
-
import type { SvmChainId } from '../../svm/chain/chains.js';
|
|
4
|
-
import type { SvmAddress } from '../../svm/currency/token.js';
|
|
5
|
-
import type { ChainId } from '../chain/chains.js';
|
|
6
|
-
export type AddressFor<TChainId extends ChainId> = TChainId extends EvmChainId ? EvmAddress : TChainId extends SvmChainId ? SvmAddress : never;
|
|
7
|
-
//# sourceMappingURL=address.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../../../generic/types/address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,MAAM,UAAU,CAAC,QAAQ,SAAS,OAAO,IAAI,QAAQ,SAAS,UAAU,GAC1E,UAAU,GACV,QAAQ,SAAS,UAAU,GACzB,UAAU,GACV,KAAK,CAAA"}
|
package/generic/types/address.ts
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import type { EvmChainId } from '../../evm/chain/chains.js'
|
|
2
|
-
import type { EvmAddress } from '../../evm/currency/token.js'
|
|
3
|
-
import type { SvmChainId } from '../../svm/chain/chains.js'
|
|
4
|
-
import type { SvmAddress } from '../../svm/currency/token.js'
|
|
5
|
-
import type { ChainId } from '../chain/chains.js'
|
|
6
|
-
|
|
7
|
-
export type AddressFor<TChainId extends ChainId> = TChainId extends EvmChainId
|
|
8
|
-
? EvmAddress
|
|
9
|
-
: TChainId extends SvmChainId
|
|
10
|
-
? SvmAddress
|
|
11
|
-
: never
|