Skip to content

Commit

Permalink
Merge branch 'master' into tom/release/interlay/2.41.5
Browse files Browse the repository at this point in the history
* master: (221 commits)
  chore: release v2.41.5
  chore: bump bridge (#1631)
  chore: release v2.41.4
  api: rewrite python functions in javascript (#1630)
  chore: release v2.41.3
  Switch Bifrost RPC node (#1627)
  chore: release v2.41.2
  api: add dia fair price feed (#1619)
  chore: release v2.41.1
  Tom/update parallel xcm nodes (#1621)
  Tom/hotfix/disable parallel xcm channel (#1620)
  chore: release v2.41.0
  Feat: expose TVLs fetched via lib as part of api endpoints (#1605)
  [release] Interlay 2.40.2 (#1611)
  chore: release v2.40.2
  update staking labels and format valuers (#1609)
  fix: add rewards alert and remove insights (#1607)
  fix: subwallet logo (#1606)
  Peter/fix dex volumes query (#1608)
  [release] Interlay 2.40.1 (#1603)
  ...

# Conflicts:
#	package.json
#	yarn.lock
  • Loading branch information
tomjeatt committed Feb 5, 2024
2 parents 3a20f18 + 68b1115 commit b2c9586
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "interbtc-ui",
"version": "2.41.4",
"version": "2.41.5",
"private": true,
"dependencies": {
"@craco/craco": "^6.1.1",
"@headlessui/react": "^1.1.1",
"@heroicons/react": "^2.0.18",
"@interlay/bridge": "^0.4.1",
"@interlay/bridge": "^0.4.4",
"@interlay/interbtc-api": "2.6.0",
"@interlay/monetary-js": "0.7.3",
"@polkadot/api": "10.9.1",
Expand Down
30 changes: 18 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2966,18 +2966,18 @@
resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==

"@interlay/bridge@^0.4.1":
version "0.4.1"
resolved "https://registry.yarnpkg.com/@interlay/bridge/-/bridge-0.4.1.tgz#8df57a2c9f8d51cb7ee1028144f485828df9b625"
integrity sha512-7fW/j0TUEmpBA5zAUfbxxSQReM7LwwHQD10VzUA95+oasjR/hTMALXtSnMAT4tyWZzFk5KZvp5G5RG6Xypm1RA==
"@interlay/bridge@^0.4.4":
version "0.4.4"
resolved "https://registry.yarnpkg.com/@interlay/bridge/-/bridge-0.4.4.tgz#e208c1d56b7c4490778104bdb48fc98a03a50959"
integrity sha512-vJjT2zxueN5WImI/aR+pxczs6pGFvA7mDc9b+/3ss9cYM2k479u60H/WDu62XR1QTKaG2hVeXi8C4Lp4rmqf/g==
dependencies:
"@acala-network/api" "^5"
"@acala-network/sdk" "^4.1.9-7"
"@acala-network/sdk-core" "^4.1.9-7"
"@polkadot/api" "^10.9.1"
"@polkadot/apps-config" "^0.132.1"
"@polkadot/types" "^10.9.1"
axios "^0.27.2"
axios "^1.6.2"
lodash "^4.17.20"

"@interlay/[email protected]":
Expand Down Expand Up @@ -9364,13 +9364,14 @@ axios@^0.24.0:
dependencies:
follow-redirects "^1.14.4"

axios@^0.27.2:
version "0.27.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
axios@^1.6.2:
version "1.6.7"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
dependencies:
follow-redirects "^1.14.9"
follow-redirects "^1.15.4"
form-data "^4.0.0"
proxy-from-env "^1.1.0"

axobject-query@^2.2.0:
version "2.2.0"
Expand Down Expand Up @@ -13187,11 +13188,16 @@ flush-write-stream@^1.0.0:
inherits "^2.0.3"
readable-stream "^2.3.6"

follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.9:
follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.4:
version "1.15.2"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==

follow-redirects@^1.15.4:
version "1.15.5"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==

for-in@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
Expand Down Expand Up @@ -18937,7 +18943,7 @@ [email protected]:
proxy-from-env "^1.0.0"
socks-proxy-agent "^5.0.0"

proxy-from-env@^1.0.0:
proxy-from-env@^1.0.0, proxy-from-env@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
Expand Down

0 comments on commit b2c9586

Please sign in to comment.