Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@satoshiotomakan
satoshiotomakan authored Dec 19, 2024
2 parents d4af84a + 7b1bee5 commit dee25d4
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion docs/registry.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,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 | Kaia | KAIA | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/kaia/info/logo.png" width="32" /> | <https://kaia.io> |
| 10008217 | Kaia | KAIA | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/klaytn/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> |
Expand Down
14 changes: 7 additions & 7 deletions registry.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,7 @@
"publicKeyType": "ed25519Blake2b",
"url": "https://nano.org",
"explorer": {
"url": "https://www.nanolooker.com",
"url": "https://nanexplorer.com/nano",
"txPath": "/block/",
"accountPath": "/account/",
"sampleTx": "C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F",
Expand Down Expand Up @@ -1786,8 +1786,8 @@
"curve": "ed25519",
"publicKeyType": "ed25519",
"explorer": {
"url": "https://app.dappflow.org/explorer",
"txPath": "/transaction/",
"url": "https://allo.info",
"txPath": "/tx/",
"accountPath": "/account/",
"sampleTx": "CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A",
"sampleAccount": "J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM"
Expand Down Expand Up @@ -3186,7 +3186,7 @@
"publicKeyType": "secp256k1",
"hrp": "thor",
"addressHasher": "sha256ripemd",
"chainId": "thorchain-mainnet-v1",
"chainId": "thorchain-1",
"explorer": {
"url": "https://viewblock.io/thorchain",
"txPath": "/tx/",
Expand All @@ -3197,7 +3197,7 @@
"info": {
"url": "https://thorchain.org",
"source": "https://gitlab.com/thorchain/thornode",
"rpc": "https://seed.thorchain.info",
"rpc": "https://thornode.ninerealms.com",
"documentation": "https://docs.thorchain.org"
}
},
Expand Down Expand Up @@ -3810,7 +3810,7 @@
"chainId": "10000",
"addressHasher": "keccak256",
"explorer": {
"url": "https://www.smartscan.cash",
"url": "https://www.smartscout.cash",
"txPath": "/tx/",
"accountPath": "/address/",
"sampleTx": "0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9",
Expand Down Expand Up @@ -3872,7 +3872,7 @@
"chainId": "288",
"addressHasher": "keccak256",
"explorer": {
"url": "https://blockexplorer.boba.network",
"url": "https://eth.bobascan.com",
"txPath": "/tx/",
"accountPath": "/address/",
"sampleTx": "0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103",
Expand Down
2 changes: 1 addition & 1 deletion tests/chains/Algorand/SignerTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ TEST(AlgorandSigner, Sign) {
}

TEST(AlgorandSigner, SignAssetNFTTransfer) {
// Successfully broadcasted: https://app.dappflow.org/explorer/transaction/FFLUH4QKZHG744RIQ2AZNWZUSIIH262KZ4MEWSY4RXMWN5NMOOJA
// Successfully broadcasted: https://allo.info/tx/FFLUH4QKZHG744RIQ2AZNWZUSIIH262KZ4MEWSY4RXMWN5NMOOJA
auto key = PrivateKey(parse_hex("dc6051ffc7b3ec601bde432f6dea34d40fe3855e4181afa0f0524c42194a6da7"));
auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
auto from = Address(publicKey);
Expand Down
2 changes: 1 addition & 1 deletion tests/chains/Algorand/TWAnySignerTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using namespace TW;
namespace TW::Algorand::tests {

TEST(TWAnySignerAlgorand, SignAssetNFTTransfer) {
// Successfully broadcasted: https://app.dappflow.org/explorer/transaction/FFLUH4QKZHG744RIQ2AZNWZUSIIH262KZ4MEWSY4RXMWN5NMOOJA
// Successfully broadcasted: https://allo.info/tx/FFLUH4QKZHG744RIQ2AZNWZUSIIH262KZ4MEWSY4RXMWN5NMOOJA
auto privateKey = parse_hex("dc6051ffc7b3ec601bde432f6dea34d40fe3855e4181afa0f0524c42194a6da7");
Data note = Base64::decode("VFdUIFRPIFRIRSBNT09O");
auto genesisHash = Base64::decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=");
Expand Down
4 changes: 2 additions & 2 deletions tests/chains/Algorand/TWCoinTypeTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ TEST(TWAlgorandCoinType, TWCoinType) {
ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAlgorand));
ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAlgorand));
assertStringsEqual(symbol, "ALGO");
assertStringsEqual(txUrl, "https://app.dappflow.org/explorer/transaction/CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A");
assertStringsEqual(accUrl, "https://app.dappflow.org/explorer/account/J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM");
assertStringsEqual(txUrl, "https://allo.info/tx/CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A");
assertStringsEqual(accUrl, "https://allo.info/account/J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM");
assertStringsEqual(id, "algorand");
assertStringsEqual(name, "Algorand");
}
4 changes: 2 additions & 2 deletions tests/chains/Boba/TWCoinTypeTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ TEST(TWBobaCoinType, TWCoinType) {
ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBoba));
ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBoba));
assertStringsEqual(symbol, "BOBAETH");
assertStringsEqual(txUrl, "https://blockexplorer.boba.network/tx/0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103");
assertStringsEqual(accUrl, "https://blockexplorer.boba.network/address/0x4F96F50eDB37a19216d87693E5dB241e31bD3735");
assertStringsEqual(txUrl, "https://eth.bobascan.com/tx/0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103");
assertStringsEqual(accUrl, "https://eth.bobascan.com/address/0x4F96F50eDB37a19216d87693E5dB241e31bD3735");
assertStringsEqual(id, "boba");
assertStringsEqual(name, "Boba");
}
7 changes: 5 additions & 2 deletions tests/chains/Cosmos/THORChain/TWSwapTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ TEST(TWTHORChainSwap, SwapRuneDoge) {
// invoke swap
const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
EXPECT_EQ(outputData.size(), 153ul);
EXPECT_EQ(outputData.size(), 144ul);
// parse result in proto
Proto::SwapOutput outputProto;
EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
Expand All @@ -322,6 +322,8 @@ TEST(TWTHORChainSwap, SwapRuneDoge) {
auto& fee = *txInput.mutable_fee();
fee.set_gas(50000000);

// Override the chainId as it has been after a hardfork recently.
txInput.set_chain_id("thorchain-mainnet-v1");
txInput.set_account_number(75247);
txInput.set_sequence(8);

Expand Down Expand Up @@ -367,7 +369,7 @@ TEST(TWTHORChainSwap, SwapRuneBnbStreamParams) {
// invoke swap
const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
EXPECT_EQ(outputData.size(), 156ul);
EXPECT_EQ(outputData.size(), 147ul);
// parse result in proto
Proto::SwapOutput outputProto;
EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
Expand All @@ -382,6 +384,7 @@ TEST(TWTHORChainSwap, SwapRuneBnbStreamParams) {
auto& fee = *txInput.mutable_fee();
fee.set_gas(50000000);

txInput.set_chain_id("thorchain-mainnet-v1");
txInput.set_account_number(76456);
txInput.set_sequence(0);

Expand Down
4 changes: 2 additions & 2 deletions tests/chains/Nano/TWCoinTypeTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ TEST(TWNanoCoinType, TWCoinType) {
ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNano));
ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNano));
assertStringsEqual(symbol, "XNO");
assertStringsEqual(txUrl, "https://www.nanolooker.com/block/C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F");
assertStringsEqual(accUrl, "https://www.nanolooker.com/account/nano_1wpj616kwhe1y38y1mspd8aub8i334cwybqco511iyuxm55zx8d67ptf1tsf");
assertStringsEqual(txUrl, "https://nanexplorer.com/nano/block/C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F");
assertStringsEqual(accUrl, "https://nanexplorer.com/nano/account/nano_1wpj616kwhe1y38y1mspd8aub8i334cwybqco511iyuxm55zx8d67ptf1tsf");
assertStringsEqual(id, "nano");
assertStringsEqual(name, "Nano");
}
4 changes: 2 additions & 2 deletions tests/chains/SmartBitcoinCash/TWCoinTypeTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ TEST(TWSmartBitcoinCashCoinType, TWCoinType) {
ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeSmartBitcoinCash));
ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeSmartBitcoinCash));
assertStringsEqual(symbol, "BCH");
assertStringsEqual(txUrl, "https://www.smartscan.cash/tx/0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9");
assertStringsEqual(accUrl, "https://www.smartscan.cash/address/0xFeEc227410E1DF9f3b4e6e2E284DC83051ae468F");
assertStringsEqual(txUrl, "https://www.smartscout.cash/tx/0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9");
assertStringsEqual(accUrl, "https://www.smartscout.cash/address/0xFeEc227410E1DF9f3b4e6e2E284DC83051ae468F");
assertStringsEqual(id, "smartbch");
assertStringsEqual(name, "Smart Bitcoin Cash");
}

0 comments on commit dee25d4

Please sign in to comment.