Skip to content

Commit 5872db6

Browse files
marslavishmarslavish
authored
Merge pull request #217 from cosmology-tech/feature/remove-osmosis
Feature/remove @chain-registry/osmosis
2 parents 2f8e5ff + f89c630 commit 5872db6

File tree

25 files changed

+3205
-522
lines changed

25 files changed

+3205
-522
lines changed

‎examples/asset-list/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
},
2020
"dependencies": {
2121
"@chain-registry/assets": "^1.21.0",
22-
"@chain-registry/osmosis": "^1.21.0",
23-
"@chain-registry/types": "^0.16.0",
22+
"@chain-registry/types": "0.44.3",
2423
"@cosmjs/amino": "^0.32.3",
2524
"@cosmjs/cosmwasm-stargate": "^0.32.3",
2625
"@cosmjs/stargate": "^0.32.3",

‎examples/asset-list/utils/assets.ts‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
import { asset_list, assets } from "@chain-registry/osmosis";
21
import { Asset as OsmosisAsset } from "@chain-registry/types";
2+
import { asset_lists } from "@chain-registry/assets"
3+
import { assets } from "chain-registry"
34

4-
// @ts-ignore
5-
export const osmosisAssets: OsmosisAsset[] = [
6-
...assets.assets,
7-
...asset_list.assets,
8-
];
5+
let osmosisAssets: OsmosisAsset[] = []
6+
// assets from @chain-registry/assets
7+
const chainInfo = asset_lists.find(({ chain_name }) => chain_name === 'osmosis')
8+
if (Array.isArray(chainInfo?.assets)) {
9+
osmosisAssets = [...chainInfo?.assets]
10+
}
11+
// assets from chain-registry
12+
let chainInfo2 = assets.find(({ chain_name }) => chain_name === 'osmosis')
13+
if (Array.isArray(chainInfo2?.assets)) {
14+
osmosisAssets = [...osmosisAssets, ...chainInfo2.assets]
15+
}
16+
17+
export {
18+
osmosisAssets
19+
};

‎examples/asset-list/yarn.lock‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,10 @@ __metadata:
145145
languageName: node
146146
linkType: hard
147147

148-
"@chain-registry/osmosis@npm:^1.21.0":
149-
version: 1.34.20
150-
resolution: "@chain-registry/osmosis@npm:1.34.20"
151-
dependencies:
152-
"@babel/runtime": "npm:^7.21.0"
153-
"@chain-registry/types": "npm:^0.18.15"
154-
checksum: 10c0/2f993889e82ba8081085e9df369ad7f1c1f520ca752112115c2ca51b6bfda871f2691b913296e803ee288a79a3e8edded1b0dd2b15cda337d04d7cf138267fb2
148+
"@chain-registry/types@npm:0.44.3":
149+
version: 0.44.3
150+
resolution: "@chain-registry/types@npm:0.44.3"
151+
checksum: 10c0/471e85e934e42ba2704fece7ca0545df5ef98e947a5d10aaefa7872145a21211036740b4b37bb8a33359561b7533c07c22e1608b372efc19be5e2ebd386ac3de
155152
languageName: node
156153
linkType: hard
157154

@@ -162,15 +159,6 @@ __metadata:
162159
languageName: node
163160
linkType: hard
164161

165-
"@chain-registry/types@npm:^0.16.0":
166-
version: 0.16.0
167-
resolution: "@chain-registry/types@npm:0.16.0"
168-
dependencies:
169-
"@babel/runtime": "npm:^7.21.0"
170-
checksum: 10c0/6101d2ce519d9982d4d40bd47dd2056d60db48d87823aa6e17d45a954b0e0ca755cfc0d1c90d9e815de8f4ab1c62d55267205c4fd8b4cbd9f4a7df1752f3b4bc
171-
languageName: node
172-
linkType: hard
173-
174162
"@chain-registry/types@npm:^0.17.0":
175163
version: 0.17.1
176164
resolution: "@chain-registry/types@npm:0.17.1"
@@ -570,8 +558,7 @@ __metadata:
570558
resolution: "@cosmology/asset-list@workspace:."
571559
dependencies:
572560
"@chain-registry/assets": "npm:^1.21.0"
573-
"@chain-registry/osmosis": "npm:^1.21.0"
574-
"@chain-registry/types": "npm:^0.16.0"
561+
"@chain-registry/types": "npm:0.44.3"
575562
"@cosmjs/amino": "npm:^0.32.3"
576563
"@cosmjs/cosmwasm-stargate": "npm:^0.32.3"
577564
"@cosmjs/stargate": "npm:^0.32.3"

‎examples/ibc-transfer/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
},
2020
"dependencies": {
2121
"@chain-registry/assets": "^1.21.0",
22-
"@chain-registry/osmosis": "^1.21.0",
23-
"@chain-registry/types": "^0.16.0",
22+
"@chain-registry/types": "0.44.3",
2423
"@cosmjs/amino": "^0.32.3",
2524
"@cosmjs/cosmwasm-stargate": "^0.32.3",
2625
"@cosmjs/stargate": "^0.32.3",

‎examples/ibc-transfer/utils/assets.ts‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
import { asset_list, assets } from "@chain-registry/osmosis";
21
import { Asset as OsmosisAsset } from "@chain-registry/types";
2+
import { asset_lists } from "@chain-registry/assets"
3+
import { assets } from "chain-registry"
34

4-
// @ts-ignore
5-
export const osmosisAssets: OsmosisAsset[] = [
6-
...assets.assets,
7-
...asset_list.assets,
8-
];
5+
let osmosisAssets: OsmosisAsset[] = []
6+
// assets from @chain-registry/assets
7+
const chainInfo = asset_lists.find(({ chain_name }) => chain_name === 'osmosis')
8+
if (Array.isArray(chainInfo?.assets)) {
9+
osmosisAssets = [...chainInfo?.assets]
10+
}
11+
// assets from chain-registry
12+
let chainInfo2 = assets.find(({ chain_name }) => chain_name === 'osmosis')
13+
if (Array.isArray(chainInfo2?.assets)) {
14+
osmosisAssets = [...osmosisAssets, ...chainInfo2.assets]
15+
}
16+
17+
export {
18+
osmosisAssets
19+
};

‎examples/ibc-transfer/yarn.lock‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,10 @@ __metadata:
147147
languageName: node
148148
linkType: hard
149149

150-
"@chain-registry/osmosis@npm:^1.21.0":
151-
version: 1.34.20
152-
resolution: "@chain-registry/osmosis@npm:1.34.20"
153-
dependencies:
154-
"@babel/runtime": "npm:^7.21.0"
155-
"@chain-registry/types": "npm:^0.18.15"
156-
checksum: 10c0/2f993889e82ba8081085e9df369ad7f1c1f520ca752112115c2ca51b6bfda871f2691b913296e803ee288a79a3e8edded1b0dd2b15cda337d04d7cf138267fb2
150+
"@chain-registry/types@npm:0.44.3":
151+
version: 0.44.3
152+
resolution: "@chain-registry/types@npm:0.44.3"
153+
checksum: 10c0/471e85e934e42ba2704fece7ca0545df5ef98e947a5d10aaefa7872145a21211036740b4b37bb8a33359561b7533c07c22e1608b372efc19be5e2ebd386ac3de
157154
languageName: node
158155
linkType: hard
159156

@@ -164,15 +161,6 @@ __metadata:
164161
languageName: node
165162
linkType: hard
166163

167-
"@chain-registry/types@npm:^0.16.0":
168-
version: 0.16.0
169-
resolution: "@chain-registry/types@npm:0.16.0"
170-
dependencies:
171-
"@babel/runtime": "npm:^7.21.0"
172-
checksum: 10c0/6101d2ce519d9982d4d40bd47dd2056d60db48d87823aa6e17d45a954b0e0ca755cfc0d1c90d9e815de8f4ab1c62d55267205c4fd8b4cbd9f4a7df1752f3b4bc
173-
languageName: node
174-
linkType: hard
175-
176164
"@chain-registry/types@npm:^0.17.0":
177165
version: 0.17.1
178166
resolution: "@chain-registry/types@npm:0.17.1"
@@ -572,8 +560,7 @@ __metadata:
572560
resolution: "@cosmology/ibc-transfer@workspace:."
573561
dependencies:
574562
"@chain-registry/assets": "npm:^1.21.0"
575-
"@chain-registry/osmosis": "npm:^1.21.0"
576-
"@chain-registry/types": "npm:^0.16.0"
563+
"@chain-registry/types": "npm:0.44.3"
577564
"@cosmjs/amino": "npm:^0.32.3"
578565
"@cosmjs/cosmwasm-stargate": "npm:^0.32.3"
579566
"@cosmjs/stargate": "npm:^0.32.3"

‎examples/injective/package.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,17 @@
2121
"@chain-registry/types": "0.16.0",
2222
"@chain-registry/utils": "1.13.2",
2323
"@chain-registry/v2": "^1.71.7",
24+
"@chakra-ui/icons": "2.0.12",
25+
"@chakra-ui/react": "2.5.1",
26+
"@cosmjs/amino": "0.32.3",
27+
"@cosmjs/cosmwasm-stargate": "0.31.3",
28+
"@cosmjs/proto-signing": "0.32.3",
29+
"@cosmjs/stargate": "0.32.3",
30+
"@cosmology/lcd": "^0.12.0",
2431
"@cosmology/telescope": "^1.10.3",
32+
"@cosmos-kit/react": "2.17.0",
33+
"@emotion/react": "11.10.6",
34+
"@emotion/styled": "11.10.6",
2535
"@interchain-kit/core": "0.0.1-beta.23",
2636
"@interchain-kit/keplr-extension": "0.0.1-beta.23",
2737
"@interchain-kit/leap-extension": "0.0.1-beta.23",

0 commit comments

Comments
 (0)