Skip to content

Commit

Permalink
Merge pull request #351 from oraidex/fix/remove-kwt
Browse files Browse the repository at this point in the history
Fix/remove kwt
  • Loading branch information
haunv3 authored Oct 30, 2024
2 parents 9915667 + d50f042 commit 36ef01b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 154 deletions.
2 changes: 1 addition & 1 deletion packages/oraidex-common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oraichain/oraidex-common",
"version": "1.1.23",
"version": "1.1.28",
"main": "build/index.js",
"files": [
"build/"
Expand Down
97 changes: 2 additions & 95 deletions packages/oraidex-common/src/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ export const oraichainNetwork: CustomChainInfo = {
coinMinimalDenom: "kwt",
type: "cw20",
contractAddress: KWT_CONTRACT,
bridgeTo: ["kawaii_6886-1", "0x38"],
bridgeTo: ["0x38"],
coinDecimals: 6,
coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/12313.png"
},
Expand All @@ -436,7 +436,7 @@ export const oraichainNetwork: CustomChainInfo = {
coinMinimalDenom: "milky",
type: "cw20",
contractAddress: MILKY_CONTRACT,
bridgeTo: ["kawaii_6886-1", "0x38"],
bridgeTo: ["0x38"],
coinDecimals: 6,
coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/14418.png"
},
Expand Down Expand Up @@ -708,64 +708,6 @@ export const chainInfos: CustomChainInfo[] = [
accountUrl: "https://scan.bridge.orai.io/account/{address}"
}
},
{
rpc: "https://tendermint1.kawaii.global",
rest: "https://cosmos1.kawaii.global",
chainId: "kawaii_6886-1",
chainName: "Kawaiiverse",
networkType: "cosmos",
stakeCurrency: KawaiiToken,
feeCurrencies: [KawaiiToken],
bip44: {
coinType: 60
},
bech32Config: defaultBech32Config("oraie"),

// features: ['ibc-transfer'],
features: ["ibc-transfer", "ibc-go", "stargate", "eth-address-gen", "eth-key-sign", "isEvm", "no-legacy-stdTx"],
currencies: [
KawaiiToken,
{
coinDenom: "MILKY",
coinGeckoId: "milky-token",
coinMinimalDenom: MILKY_SUB_NETWORK_DENOM,
coinDecimals: 18,
bridgeTo: ["Oraichain", "kawaii_6886-1"],
coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/14418.png"
},
{
coinDenom: "ERC20 MILKY",
coinMinimalDenom: "erc20_milky",
bridgeTo: ["Oraichain", "kawaii_6886-1"],
contractAddress: MILKY_ERC_CONTRACT,
coinDecimals: 18,
coinGeckoId: "milky-token",
coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/14418.png"
},
{
coinDenom: "KWT",
coinMinimalDenom: KWT_SUB_NETWORK_DENOM,
coinDecimals: 18,
bridgeTo: ["Oraichain", "kawaii_6886-1"],
coinGeckoId: "kawaii-islands",
coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/12313.png"
},
{
coinDenom: "ERC20 KWT",
bridgeTo: ["Oraichain", "kawaii_6886-1"],
coinMinimalDenom: "erc20_kwt",
contractAddress: "0x80b5a32E4F032B2a058b4F29EC95EEfEEB87aDcd",
coinDecimals: 18,
coinGeckoId: "kawaii-islands",
coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/12313.png"
}
],
txExplorer: {
name: "Kawaiiverse Scan",
txUrl: "https://scan.kawaii.global/tx/${txHash}",
accountUrl: "https://scan.kawaii.global/account/{address}"
}
},

/// popular networks already included
{
Expand Down Expand Up @@ -1154,41 +1096,6 @@ export const chainInfos: CustomChainInfo[] = [
txUrl: "https://bscscan.com/tx/${txHash}",
accountUrl: "https://bscscan.com/address/{address}"
}
},
{
rpc: "https://endpoint1.kawaii.global",
chainId: "0x1ae6",
networkType: "evm",
chainName: "Kawaiiverse EVM",
bip44: {
coinType: 60
},
features: ["isEvm"],
currencies: [
{
coinDenom: "ERC20 MILKY",
coinMinimalDenom: "erc20_milky",
bridgeTo: ["Oraichain", "kawaii_6886-1"],
contractAddress: MILKY_ERC_CONTRACT,
coinDecimals: 18,
coinGeckoId: "milky-token",
coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/14418.png"
},
{
coinDenom: "ERC20 KWT",
bridgeTo: ["Oraichain", "kawaii_6886-1"],
coinMinimalDenom: "erc20_kwt",
contractAddress: "0x80b5a32E4F032B2a058b4F29EC95EEfEEB87aDcd",
coinDecimals: 18,
coinGeckoId: "kawaii-islands",
coinImageUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/12313.png"
}
],
txExplorer: {
name: "Kawaiiverse Scan",
txUrl: "https://scan.kawaii.global/tx/${txHash}",
accountUrl: "https://scan.kawaii.global/account/{address}"
}
}
];

Expand Down
37 changes: 1 addition & 36 deletions packages/universal-swap/tests/helper.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,24 +179,7 @@ describe("test helper functions", () => {
{ swapRoute: "", universalSwapType: "other-networks-to-oraichain", isSmartRouter: false },
false
],
[
"kawaii-islands",
"kawaii_6886-1",
"airight",
"Oraichain",
"",
{ swapRoute: "", universalSwapType: "other-networks-to-oraichain", isSmartRouter: false },
false
],
[
"kawaii-islands",
"0x1ae6",
"airight",
"Oraichain",
"",
{ swapRoute: "", universalSwapType: "other-networks-to-oraichain", isSmartRouter: false },
false
],

[
"airight",
"0x38",
Expand Down Expand Up @@ -336,24 +319,6 @@ describe("test helper functions", () => {
{ swapRoute: "", universalSwapType: "oraichain-to-evm", isSmartRouter: false },
false
],
[
"kawaii-islands",
"0x1ae6",
"oraichain-token",
"Oraichain",
"orai1234",
{ swapRoute: "", universalSwapType: "other-networks-to-oraichain", isSmartRouter: false },
true
],
[
"kawaii-islands",
"kawaii_6886-1",
"oraichain-token",
"Oraichain",
"orai1234",
{ swapRoute: "", universalSwapType: "other-networks-to-oraichain", isSmartRouter: false },
true
],
[
"kawaii-islands",
"0x38",
Expand Down
22 changes: 0 additions & 22 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3657,28 +3657,6 @@
resolved "https://registry.yarnpkg.com/@oraichain/immutable/-/immutable-4.3.9.tgz#ff8d5a7b39b5b01f3f72a902cffbfea32ccb20c3"
integrity sha512-INpHnhL970OCkR7I71Kssb2aLl2l4Y/x8W6FlyRO0KmC8GHjxc/hlNB1t44BiI7lkOYmcWMRQoC8dwParsp1RQ==

"@oraichain/oraidex-common@^1.1.27":
version "1.1.27"
resolved "https://registry.yarnpkg.com/@oraichain/oraidex-common/-/oraidex-common-1.1.27.tgz#446c35441c450e9db0c035b300a51c6cab916701"
integrity sha512-u4MiZYk3e7W1a/EaKhMQG/6RHImG6DsuuxNeDbuF7Ndv0h2of5BK8Bhc9D57fb+fYWzQcJFmaes1gMYTj4QJ2g==
dependencies:
"@cosmjs/amino" "0.31.3"
"@cosmjs/cosmwasm-stargate" "0.31.3"
"@cosmjs/crypto" "0.31.3"
"@cosmjs/proto-signing" "0.31.3"
"@cosmjs/stargate" "0.31.3"
"@cosmjs/tendermint-rpc" "0.31.3"
"@ethersproject/providers" "^5.0.10"
"@injectivelabs/sdk-ts" "1.12.1"
"@keplr-wallet/types" "^0.11.38"
"@oraichain/oraidex-contracts-sdk" latest
axios "1.7.2"
axios-extensions "3.1.7"
bignumber.js "^9.1.2"
cosmjs-types "0.8.0"
ethers "^5.0.15"
tronweb "6.0.0-beta.4"

"@oraichain/oraidex-contracts-sdk@latest":
version "1.0.44"
resolved "https://registry.yarnpkg.com/@oraichain/oraidex-contracts-sdk/-/oraidex-contracts-sdk-1.0.44.tgz#9ff41ec388dd92ba112c2eef545d11fd6e18c684"
Expand Down

0 comments on commit 36ef01b

Please sign in to comment.