Merge branch 'master' into s/ton-mnemonic

trustwallet · Sep 10, 2024 · c8f1261 · c8f1261
2 parents 6025f72 + db50956
commit c8f1261
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/...p/src/androidTest/java/com/trustwallet/core/app/blockchains/CoinAddressDerivationTests.kt b/...p/src/androidTest/java/com/trustwallet/core/app/blockchains/CoinAddressDerivationTests.kt
@@ -45,7 +45,7 @@ class CoinAddressDerivationTests {
 
         ETHEREUM, SMARTCHAIN, POLYGON, OPTIMISM, ZKSYNC, ARBITRUM, ARBITRUMNOVA, ECOCHAIN, AVALANCHECCHAIN, XDAI,
         FANTOM, CELO, CRONOSCHAIN, SMARTBITCOINCASH, KUCOINCOMMUNITYCHAIN, BOBA, METIS,
-        AURORA, EVMOS, MOONRIVER, MOONBEAM, KAVAEVM, KLAYTN, METER, OKXCHAIN, POLYGONZKEVM, SCROLL,
+        AURORA, EVMOS, MOONRIVER, MOONBEAM, KAVAEVM, KAIA, METER, OKXCHAIN, POLYGONZKEVM, SCROLL,
         CONFLUXESPACE, ACALAEVM, OPBNB, NEON, BASE, LINEA, GREENFIELD, MANTLE, ZENEON, MANTAPACIFIC,
         ZETAEVM, MERLIN, LIGHTLINK, BLAST, BOUNCEBIT, ZKLINKNOVA,
         -> assertEquals("0x8f348F300873Fd5DA36950B2aC75a26584584feE", address)

diff --git a/codegen-v2/manifest/TWCoinType.yaml b/codegen-v2/manifest/TWCoinType.yaml
@@ -192,7 +192,7 @@ enums:
     value: 10001284
   - name: kavaEvm
     value: 10002222
-  - name: klaytn
+  - name: kaia
     value: 10008217
   - name: meter
     value: 18000

diff --git a/codegen-v2/manifest/TWEthereumChainID.yaml b/codegen-v2/manifest/TWEthereumChainID.yaml
@@ -63,7 +63,7 @@ enums:
     value: 2222
   - name: iotexevm
     value: 4689
-  - name: klaytn
+  - name: kaia
     value: 8217
   - name: avalanchec
     value: 43114

diff --git a/docs/registry.md b/docs/registry.md
@@ -130,7 +130,7 @@ This list is generated from [./registry.json](../registry.json)
 | 10004689 | IoTeX EVM        | IOTX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/iotexevm/info/logo.png" width="32" />     | <https://iotex.io/>           |
 | 10007000 | NativeZetaChain  | ZETA   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zetachain/info/logo.png" width="32" />    | <https://www.zetachain.com/>  |
 | 10007700 | NativeCanto      | CANTO  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nativecanto/info/logo.png" width="32" />  | <https://canto.io/>           |
-| 10008217 | Klaytn           | KLAY   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/klaytn/info/logo.png" width="32" />       | <https://klaytn.foundation>   |
+| 10008217 | Kaia             | KLAY   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/kaia/info/logo.png" width="32" />       | <https://kaia.io>   |
 | 10009000 | Avalanche C-Chain | AVAX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/avalanchec/info/logo.png" width="32" />   | <https://www.avalabs.org/>    |
 | 10009001 | Evmos            | EVMOS  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/evmos/info/logo.png" width="32" />        | <https://evmos.org/>          |
 | 10042170 | Arbitrum Nova    | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/arbitrumnova/info/logo.png" width="32" /> | <https://nova.arbitrum.io>    |

diff --git a/include/TrustWalletCore/TWCoinType.h b/include/TrustWalletCore/TWCoinType.h
@@ -125,7 +125,7 @@ enum TWCoinType {
     TWCoinTypeMoonriver = 10001285,
     TWCoinTypeMoonbeam = 10001284,
     TWCoinTypeKavaEvm = 10002222,
-    TWCoinTypeKlaytn = 10008217,
+    TWCoinTypeKaia = 10008217,
     TWCoinTypeMeter = 18000,
     TWCoinTypeOKXChain = 996,
     TWCoinTypeStratis = 105105,

diff --git a/...core-kotlin/src/commonTest/kotlin/com/trustwallet/core/test/CoinAddressDerivationTests.kt b/...core-kotlin/src/commonTest/kotlin/com/trustwallet/core/test/CoinAddressDerivationTests.kt
@@ -38,7 +38,7 @@ class CoinAddressDerivationTests {
 
         Ethereum, SmartChain, Polygon, Optimism, Zksync, Arbitrum, ArbitrumNova, ECOChain, AvalancheCChain, XDai,
         Fantom, Celo, CronosChain, SmartBitcoinCash, KuCoinCommunityChain, Boba, Metis,
-        Aurora, Evmos, Moonriver, Moonbeam, KavaEvm, Klaytn, Meter, OKXChain, PolygonzkEVM, Scroll,
+        Aurora, Evmos, Moonriver, Moonbeam, KavaEvm, Kaia, Meter, OKXChain, PolygonzkEVM, Scroll,
         ConfluxeSpace, AcalaEVM, OpBNB, Neon, Base, Linea, Greenfield, Mantle, ZenEON, MantaPacific,
         ZetaEVM, Merlin, Lightlink, Blast, BounceBit, ZkLinkNova,
         -> "0x8f348F300873Fd5DA36950B2aC75a26584584feE"

diff --git a/registry.json b/registry.json
@@ -4057,8 +4057,8 @@
     }
   },
   {
-    "id": "klaytn",
-    "name": "Klaytn",
+    "id": "kaia",
+    "name": "Kaia",
     "coinId": 10008217,
     "symbol": "KLAY",
     "decimals": 18,
@@ -4072,16 +4072,16 @@
     "publicKeyType": "secp256k1Extended",
     "chainId": "8217",
     "explorer": {
-      "url": "https://scope.klaytn.com",
+      "url": "https://kaiascan.io",
       "txPath": "/tx/",
       "accountPath": "/account/",
       "sampleTx": "0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7",
       "sampleAccount": "0x2ad9656bf5b82caf10847b431012e28e301e83ba"
     },
     "info": {
-      "url": "https://klaytn.foundation",
-      "rpc": "https://public-node-api.klaytnapi.com/v1/cypress",
-      "documentation": "https://docs.klaytn.foundation"
+      "url": "https://kaia.io",
+      "rpc": "https://public-en.node.kaia.io",
+      "documentation": "https://docs.kaia.io"
     }
   },
   {

diff --git a/rust/tw_any_coin/tests/coin_address_derivation_test.rs b/rust/tw_any_coin/tests/coin_address_derivation_test.rs
@@ -53,7 +53,7 @@ fn test_coin_address_derivation() {
             | CoinType::Fantom
             | CoinType::GoChain
             | CoinType::KavaEvm
-            | CoinType::Klaytn
+            | CoinType::Kaia
             | CoinType::KuCoinCommunityChain
             | CoinType::Meter
             | CoinType::Metis

diff --git a/swift/Tests/CoinAddressDerivationTests.swift b/swift/Tests/CoinAddressDerivationTests.swift
@@ -101,7 +101,7 @@ class CoinAddressDerivationTests: XCTestCase {
                      .moonriver,
                      .moonbeam,
                      .kavaEvm,
-                     .klaytn,
+                     .kaia,
                      .meter,
                      .okxchain,
                      .confluxeSpace,

diff --git a/tests/chains/Klaytn/TWCoinTypeTests.cpp b/tests/chains/Klaytn/TWCoinTypeTests.cpp
@@ -11,8 +11,8 @@
 #include <gtest/gtest.h>
 
 
-TEST(TWKlaytnCoinType, TWCoinType) {
-    const auto coin = TWCoinTypeKlaytn;
+TEST(TWKaiaCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeKaia;
     const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
     const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
     const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
@@ -22,14 +22,14 @@ TEST(TWKlaytnCoinType, TWCoinType) {
     const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x2ad9656bf5b82caf10847b431012e28e301e83ba"));
     const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
 
-    assertStringsEqual(id, "klaytn");
-    assertStringsEqual(name, "Klaytn");
+    assertStringsEqual(id, "kaia");
+    assertStringsEqual(name, "Kaia");
     assertStringsEqual(symbol, "KLAY");
     ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
     ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
     ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
     ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
     assertStringsEqual(chainId, "8217");
-    assertStringsEqual(txUrl, "https://scope.klaytn.com/tx/0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7");
-    assertStringsEqual(accUrl, "https://scope.klaytn.com/account/0x2ad9656bf5b82caf10847b431012e28e301e83ba");
+    assertStringsEqual(txUrl, "https://kaiascan.io/tx/0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7");
+    assertStringsEqual(accUrl, "https://kaiascan.io/account/0x2ad9656bf5b82caf10847b431012e28e301e83ba");
 }
diff --git a/tests/common/CoinAddressDerivationTests.cpp b/tests/common/CoinAddressDerivationTests.cpp
@@ -51,7 +51,7 @@ TEST(Coin, DeriveAddress) {
         case TWCoinTypeFantom:
         case TWCoinTypeGoChain:
         case TWCoinTypeKavaEvm:
-        case TWCoinTypeKlaytn:
+        case TWCoinTypeKaia:
         case TWCoinTypeKuCoinCommunityChain:
         case TWCoinTypeMeter:
         case TWCoinTypeMetis: