Merge branch 'master' into chore/esm-import-fixes

dynst · web-flow · commit 5a47df4aa38c · 2025-07-18T12:12:18.000-04:00
diff --git a/.changeset/loose-files-fall.md b/.changeset/loose-files-fall.md
@@ -0,0 +1,6 @@
+---
+'@xchainjs/xchain-thorchain-query': patch
+'@xchainjs/xchain-thorchain-amm': patch
+---
+
+Update to support solana for quoting and tc-amm
diff --git a/.changeset/rich-ends-find.md b/.changeset/rich-ends-find.md
@@ -0,0 +1,20 @@
+---
+'@xchainjs/xchain-mayamidgard-query': patch
+'@xchainjs/xchain-utxo-providers': patch
+'@xchainjs/xchain-evm-providers': patch
+'@xchainjs/xchain-midgard-query': patch
+'@xchainjs/xchain-bitcoincash': patch
+'@xchainjs/xchain-mayamidgard': patch
+'@xchainjs/xchain-litecoin': patch
+'@xchainjs/xchain-mayanode': patch
+'@xchainjs/xchain-thornode': patch
+'@xchainjs/xchain-bitcoin': patch
+'@xchainjs/xchain-midgard': patch
+'@xchainjs/xchain-client': patch
+'@xchainjs/xchain-cosmos': patch
+'@xchainjs/xchain-dash': patch
+'@xchainjs/xchain-doge': patch
+'@xchainjs/xchain-evm': patch
+---
+
+use a semver version range for dependencies
diff --git a/.changeset/rich-moons-poke.md b/.changeset/rich-moons-poke.md
@@ -0,0 +1,5 @@
+---
+'@xchainjs/xchain-crypto': patch
+---
+
+drop dependency on foundry-primitives fork
diff --git a/examples/aggregator/package.json b/examples/aggregator/package.json
@@ -19,7 +19,7 @@
     "@xchainjs/xchain-wallet": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/bitcoin/package.json b/examples/bitcoin/package.json
@@ -14,7 +14,7 @@
     "@xchainjs/xchain-util": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/check-tx/package.json b/examples/check-tx/package.json
@@ -24,7 +24,7 @@
     "rimraf": "~3.0.2"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/do-swap/package.json b/examples/do-swap/package.json
@@ -45,7 +45,7 @@
     "ethers": "^6.14.3"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/estimate-swap/package.json b/examples/estimate-swap/package.json
@@ -26,7 +26,7 @@
     "rimraf": "~3.0.2"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/liquidity/package.json b/examples/liquidity/package.json
@@ -34,7 +34,7 @@
     "rimraf": "~3.0.2"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/mayachain-amm/package.json b/examples/mayachain-amm/package.json
@@ -32,7 +32,7 @@
     "@xchainjs/xchain-wallet": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/prepareTx/package.json b/examples/prepareTx/package.json
@@ -19,7 +19,7 @@
     "@xchainjs/xchain-util": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/solana/package.json b/examples/solana/package.json
@@ -19,7 +19,7 @@
     "@xchainjs/xchain-util": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/thorchain-amm/package.json b/examples/thorchain-amm/package.json
@@ -32,7 +32,7 @@
     "@xchainjs/xchain-wallet": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/thorchain/package.json b/examples/thorchain/package.json
@@ -14,7 +14,7 @@
     "@xchainjs/xchain-util": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/examples/wallet/package.json b/examples/wallet/package.json
@@ -32,7 +32,7 @@
     "ethers": "^6.14.3"
   },
   "devDependencies": {
-    "@types/node": "20.11.28",
+    "@types/node": ">=22.7.5",
     "ts-node": "10.9.2",
     "typescript": "^5.0.4"
   }
diff --git a/packages/xchain-aggregator/package.json b/packages/xchain-aggregator/package.json
@@ -48,7 +48,7 @@
     "@xchainjs/xchain-bsc": "workspace:*",
     "@xchainjs/xchain-ethereum": "workspace:*",
     "@xchainjs/xchain-kujira": "workspace:*",
-    "axios": "1.8.4",
-    "axios-mock-adapter": "2.1.0"
+    "axios": "^1.8.4",
+    "axios-mock-adapter": "^2.1.0"
   }
 }
diff --git a/packages/xchain-avax/package.json b/packages/xchain-avax/package.json
@@ -45,6 +45,6 @@
     "ethers": "^6.14.3"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6"
   }
 }
diff --git a/packages/xchain-base/package.json b/packages/xchain-base/package.json
@@ -44,6 +44,6 @@
     "ethers": "^6.14.3"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6"
   }
 }
diff --git a/packages/xchain-bitcoin/package.json b/packages/xchain-bitcoin/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
-    "@ledgerhq/hw-app-btc": "10.9.0",
+    "@ledgerhq/hw-app-btc": "^10.9.0",
     "@scure/bip32": "^1.7.0",
     "@xchainjs/xchain-client": "workspace:*",
     "@xchainjs/xchain-crypto": "workspace:*",
@@ -46,9 +46,9 @@
     "ecpair": "2.1.0"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6",
-    "axios": "1.8.4",
-    "axios-mock-adapter": "2.1.0"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6",
+    "axios": "^1.8.4",
+    "axios-mock-adapter": "^2.1.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/xchain-bitcoincash/package.json b/packages/xchain-bitcoincash/package.json
@@ -34,7 +34,7 @@
     "postversion": "git push --follow-tags"
   },
   "dependencies": {
-    "@ledgerhq/hw-app-btc": "10.9.0",
+    "@ledgerhq/hw-app-btc": "^10.9.0",
     "@scure/bip32": "^1.7.0",
     "@xchainjs/xchain-client": "workspace:*",
     "@xchainjs/xchain-crypto": "workspace:*",
@@ -46,11 +46,11 @@
     "coinselect": "3.1.12"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6",
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6",
     "@types/bchaddrjs": "0.4.0",
     "@types/bitcore-lib-cash": "^8.23.8",
-    "axios": "1.8.4",
-    "axios-mock-adapter": "2.1.0"
+    "axios": "^1.8.4",
+    "axios-mock-adapter": "^2.1.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/xchain-client/package.json b/packages/xchain-client/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "@xchainjs/xchain-crypto": "workspace:*",
     "@xchainjs/xchain-util": "workspace:*",
-    "axios": "1.8.4"
+    "axios": "^1.8.4"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/xchain-cosmos/package.json b/packages/xchain-cosmos/package.json
@@ -38,7 +38,7 @@
     "@cosmjs/ledger-amino": "0.33.1",
     "@cosmjs/proto-signing": "0.33.1",
     "@cosmjs/stargate": "0.33.1",
-    "@ledgerhq/hw-app-cosmos": "6.32.0",
+    "@ledgerhq/hw-app-cosmos": "^6.32.0",
     "@ledgerhq/hw-transport": "^6.31.6",
     "@scure/base": "^1.2.6",
     "@scure/bip32": "^1.7.0",
@@ -52,7 +52,7 @@
     "protobufjs": "6.11.4"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/xchain-crypto/package.json b/packages/xchain-crypto/package.json
@@ -41,14 +41,14 @@
   "devDependencies": {
     "@types/bip39": "^3.0.0",
     "@types/crypto-js": "^4.1.1",
-    "@types/node": "^18.15.12",
+    "@types/node": "^22.7.5",
     "@types/uuid": "^9.0.1"
   },
   "dependencies": {
+    "@noble/hashes": "^1.8.0",
     "@scure/base": "^1.2.6",
     "bip39": "^3.1.0",
     "crypto-js": "4.2.0",
-    "foundry-primitives-xchainjs": "github:xchainjs/foundry-primitives-js#master",
     "uuid": "^9.0.0"
   },
   "publishConfig": {
diff --git a/packages/xchain-crypto/src/crypto.ts b/packages/xchain-crypto/src/crypto.ts
@@ -1,6 +1,6 @@
 import * as bip39 from 'bip39'
 import crypto from 'crypto'
-import { blake256 } from 'foundry-primitives-xchainjs'
+import { blake256 } from '@noble/hashes/blake1.js'
 import { v4 as uuidv4 } from 'uuid'
 
 import { pbkdf2Async } from './utils'
@@ -123,7 +123,8 @@ export const encryptToKeyStore = async (phrase: string, password: string): Promi
   const derivedKey = await pbkdf2Async(Buffer.from(password), salt, kdfParams.c, kdfParams.dklen, hashFunction)
   const cipherIV = crypto.createCipheriv(cipher, derivedKey.slice(0, 16), iv)
   const cipherText = Buffer.concat([cipherIV.update(Buffer.from(phrase, 'utf8')), cipherIV.final()])
-  const mac = blake256(Buffer.concat([derivedKey.slice(16, 32), Buffer.from(cipherText)]))
+  const mac_bytes: Uint8Array = blake256(Buffer.concat([derivedKey.slice(16, 32), Buffer.from(cipherText)]))
+  const mac: string = Buffer.from(mac_bytes).toString('hex')
 
   const cryptoStruct = {
     cipher: cipher,
@@ -162,7 +163,8 @@ export const decryptFromKeystore = async (keystore: Keystore, password: string):
   )
 
   const ciphertext = Buffer.from(keystore.crypto.ciphertext, 'hex')
-  const mac = blake256(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+  const mac_bytes: Uint8Array = blake256(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+  const mac: string = Buffer.from(mac_bytes).toString('hex')
 
   if (mac !== keystore.crypto.mac) throw new Error('Invalid password')
   const decipher = crypto.createDecipheriv(
diff --git a/packages/xchain-dash/package.json b/packages/xchain-dash/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
     "@dashevo/dashcore-lib": "^0.25.0",
-    "@ledgerhq/hw-app-btc": "10.9.0",
+    "@ledgerhq/hw-app-btc": "^10.9.0",
     "@scure/bip32": "^1.7.0",
     "@xchainjs/xchain-client": "workspace:*",
     "@xchainjs/xchain-crypto": "workspace:*",
@@ -47,9 +47,9 @@
     "ecpair": "2.1.0"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6",
-    "axios": "1.8.4",
-    "axios-mock-adapter": "2.1.0"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6",
+    "axios": "^1.8.4",
+    "axios-mock-adapter": "^2.1.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/xchain-doge/package.json b/packages/xchain-doge/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
-    "@ledgerhq/hw-app-btc": "10.9.0",
+    "@ledgerhq/hw-app-btc": "^10.9.0",
     "@scure/bip32": "^1.7.0",
     "@xchainjs/xchain-client": "workspace:*",
     "@xchainjs/xchain-crypto": "workspace:*",
@@ -46,9 +46,9 @@
     "ecpair": "2.1.0"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6",
-    "axios": "1.8.4",
-    "axios-mock-adapter": "2.1.0"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6",
+    "axios": "^1.8.4",
+    "axios-mock-adapter": "^2.1.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/xchain-evm-providers/package.json b/packages/xchain-evm-providers/package.json
@@ -31,7 +31,7 @@
     "@supercharge/promise-pool": "2.4.0",
     "@xchainjs/xchain-client": "workspace:*",
     "@xchainjs/xchain-util": "workspace:*",
-    "axios": "1.8.4",
+    "axios": "^1.8.4",
     "ethers": "^6.14.3"
   }
 }
diff --git a/packages/xchain-evm/package.json b/packages/xchain-evm/package.json
@@ -36,7 +36,7 @@
     "directory": "release/package"
   },
   "dependencies": {
-    "@ledgerhq/hw-app-eth": "6.45.4",
+    "@ledgerhq/hw-app-eth": "^6.45.4",
     "@xchainjs/xchain-client": "workspace:*",
     "@xchainjs/xchain-crypto": "workspace:*",
     "@xchainjs/xchain-evm-providers": "workspace:*",
@@ -46,8 +46,8 @@
   },
   "devDependencies": {
     "@ledgerhq/hw-transport": "^6.31.6",
-    "@ledgerhq/hw-transport-node-hid": "6.28.6",
-    "axios": "1.8.4",
-    "axios-mock-adapter": "2.1.0"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6",
+    "axios": "^1.8.4",
+    "axios-mock-adapter": "^2.1.0"
   }
 }
diff --git a/packages/xchain-litecoin/package.json b/packages/xchain-litecoin/package.json
@@ -34,21 +34,21 @@
   },
   "dependencies": {
     "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
-    "@ledgerhq/hw-app-btc": "10.9.0",
+    "@ledgerhq/hw-app-btc": "^10.9.0",
     "@scure/bip32": "^1.7.0",
     "@xchainjs/xchain-client": "workspace:*",
     "@xchainjs/xchain-crypto": "workspace:*",
     "@xchainjs/xchain-util": "workspace:*",
     "@xchainjs/xchain-utxo": "workspace:*",
     "@xchainjs/xchain-utxo-providers": "workspace:*",
-    "axios": "1.8.4",
+    "axios": "^1.8.4",
     "bitcoinjs-lib": "^6.1.7",
     "coinselect": "3.1.12",
     "ecpair": "2.1.0"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6",
-    "axios-mock-adapter": "2.1.0"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6",
+    "axios-mock-adapter": "^2.1.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/xchain-mayachain-amm/package.json b/packages/xchain-mayachain-amm/package.json
@@ -54,9 +54,9 @@
     "ethers": "^6.14.3"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.28.6",
-    "axios": "1.8.4",
-    "axios-mock-adapter": "2.1.0"
+    "@ledgerhq/hw-transport-node-hid": "^6.28.6",
+    "axios": "^1.8.4",
+    "axios-mock-adapter": "^2.1.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/xchain-mayamidgard-query/package.json b/packages/xchain-mayamidgard-query/package.json
diff --git a/packages/xchain-mayamidgard/package.json b/packages/xchain-mayamidgard/package.json
diff --git a/packages/xchain-mayanode/package.json b/packages/xchain-mayanode/package.json
diff --git a/packages/xchain-midgard-query/package.json b/packages/xchain-midgard-query/package.json
diff --git a/packages/xchain-midgard/package.json b/packages/xchain-midgard/package.json
diff --git a/packages/xchain-thorchain-amm/package.json b/packages/xchain-thorchain-amm/package.json
diff --git a/packages/xchain-thorchain-amm/src/thorchain-amm.ts b/packages/xchain-thorchain-amm/src/thorchain-amm.ts
diff --git a/packages/xchain-thorchain-amm/src/utils.ts b/packages/xchain-thorchain-amm/src/utils.ts
diff --git a/packages/xchain-thorchain-query/src/chain-defaults.ts b/packages/xchain-thorchain-query/src/chain-defaults.ts
diff --git a/packages/xchain-thorchain-query/src/utils/const.ts b/packages/xchain-thorchain-query/src/utils/const.ts
diff --git a/packages/xchain-thorchain-query/src/utils/utils.ts b/packages/xchain-thorchain-query/src/utils/utils.ts
diff --git a/packages/xchain-thornode/package.json b/packages/xchain-thornode/package.json
diff --git a/packages/xchain-utxo-providers/package.json b/packages/xchain-utxo-providers/package.json
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@xchainjs/xchain-crypto': patch
 +---
++
 +drop dependency on foundry-primitives fork
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`"@xchainjs/xchain-wallet": "workspace:*"`
`20`	`20`	`},`
`21`	`21`	`"devDependencies": {`
`22`		`- "@types/node": "20.11.28",`
	`22`	`+ "@types/node": ">=22.7.5",`
`23`	`23`	`"ts-node": "10.9.2",`
`24`	`24`	`"typescript": "^5.0.4"`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"@xchainjs/xchain-util": "workspace:*"`
`15`	`15`	`},`
`16`	`16`	`"devDependencies": {`
`17`		`- "@types/node": "20.11.28",`
	`17`	`+ "@types/node": ">=22.7.5",`
`18`	`18`	`"ts-node": "10.9.2",`
`19`	`19`	`"typescript": "^5.0.4"`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"rimraf": "~3.0.2"`
`25`	`25`	`},`
`26`	`26`	`"devDependencies": {`
`27`		`- "@types/node": "20.11.28",`
	`27`	`+ "@types/node": ">=22.7.5",`
`28`	`28`	`"ts-node": "10.9.2",`
`29`	`29`	`"typescript": "^5.0.4"`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`"ethers": "^6.14.3"`
`46`	`46`	`},`
`47`	`47`	`"devDependencies": {`
`48`		`- "@types/node": "20.11.28",`
	`48`	`+ "@types/node": ">=22.7.5",`
`49`	`49`	`"ts-node": "10.9.2",`
`50`	`50`	`"typescript": "^5.0.4"`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"rimraf": "~3.0.2"`
`27`	`27`	`},`
`28`	`28`	`"devDependencies": {`
`29`		`- "@types/node": "20.11.28",`
	`29`	`+ "@types/node": ">=22.7.5",`
`30`	`30`	`"ts-node": "10.9.2",`
`31`	`31`	`"typescript": "^5.0.4"`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`"rimraf": "~3.0.2"`
`35`	`35`	`},`
`36`	`36`	`"devDependencies": {`
`37`		`- "@types/node": "20.11.28",`
	`37`	`+ "@types/node": ">=22.7.5",`
`38`	`38`	`"ts-node": "10.9.2",`
`39`	`39`	`"typescript": "^5.0.4"`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`"@xchainjs/xchain-wallet": "workspace:*"`
`33`	`33`	`},`
`34`	`34`	`"devDependencies": {`
`35`		`- "@types/node": "20.11.28",`
	`35`	`+ "@types/node": ">=22.7.5",`
`36`	`36`	`"ts-node": "10.9.2",`
`37`	`37`	`"typescript": "^5.0.4"`
`38`	`38`	`}`