sushi 6.6.4 → 6.6.6

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/_cjs/svm/config/simple-constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple-constants.js","sourceRoot":"","sources":["../../../svm/config/simple-constants.ts"],"names":[],"mappings":";;;AAAA,mDAAiD;AAEpC,QAAA,gBAAgB,GAAG,IAAA,qBAAU,EAAC,kCAAkC,CAAC,CAAA"}
+{"version":3,"file":"simple-constants.js","sourceRoot":"","sources":["../../../svm/config/simple-constants.ts"],"names":[],"mappings":";;;AAAA,mDAAkE;AAErD,QAAA,gBAAgB,GAC3B,IAAA,qBAAU,EAAC,kCAAkC,CAAC,CAAA"}

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/_esm/svm/config/simple-constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple-constants.js","sourceRoot":"","sources":["../../../svm/config/simple-constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,UAAU,CAAC,kCAAkC,CAAC,CAAA"}
+{"version":3,"file":"simple-constants.js","sourceRoot":"","sources":["../../../svm/config/simple-constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAElE,MAAM,CAAC,MAAM,gBAAgB,GAC3B,UAAU,CAAC,kCAAkC,CAAC,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/_types/svm/config/simple-constants.d.ts

@@ -1,2 +1,3 @@
-export declare const svmNativeAddress: import("@solana/addresses/dist/types/address.js").Address<"11111111111111111111111111111111">;
+import { type SvmAddress } from '../currency/token.js';
+export declare const svmNativeAddress: SvmAddress<'11111111111111111111111111111111'>;
 //# sourceMappingURL=simple-constants.d.ts.map

package/_types/svm/config/simple-constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simple-constants.d.ts","sourceRoot":"","sources":["../../../svm/config/simple-constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,+FAAiD,CAAA"}
+{"version":3,"file":"simple-constants.d.ts","sourceRoot":"","sources":["../../../svm/config/simple-constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAc,MAAM,sBAAsB,CAAA;AAElE,eAAO,MAAM,gBAAgB,EAAE,UAAU,CAAC,kCAAkC,CAC5B,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sushi",
   "description": "Sushi",
-  "version": "6.6.4",
+  "version": "6.6.6",
   "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)
 }

package/svm/config/simple-constants.ts

@@ -1,3 +1,4 @@
-import { svmAddress } from '../currency/token.js'
+import { type SvmAddress, svmAddress } from '../currency/token.js'
 
-export const svmNativeAddress = svmAddress('11111111111111111111111111111111')
+export const svmNativeAddress: SvmAddress<'11111111111111111111111111111111'> =
+  svmAddress('11111111111111111111111111111111')