From 50afa0fe9ef9ad1fc3fa0603161873a7cbe95814 Mon Sep 17 00:00:00 2001
From: Hendrik Hofstadt <hendrik@nexantic.com>
Date: Thu, 26 Aug 2021 13:19:56 +0200
Subject: [PATCH] Prefix wormhole token names

Change-Id: Ieea61ea2833f66c29a2fa0f52ae1a914a3956146
---
 ethereum/contracts/bridge/token/TokenImplementation.sol  | 4 ++--
 .../token_bridge/program/src/api/create_wrapped.rs       | 9 +++++++--
 terra/contracts/cw20-wrapped/src/contract.rs             | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ethereum/contracts/bridge/token/TokenImplementation.sol b/ethereum/contracts/bridge/token/TokenImplementation.sol
index fb5a59ee..585dc551 100644
--- a/ethereum/contracts/bridge/token/TokenImplementation.sol
+++ b/ethereum/contracts/bridge/token/TokenImplementation.sol
@@ -34,11 +34,11 @@ contract TokenImplementation is TokenState, Context {
     }
 
     function name() public view returns (string memory) {
-        return _state.name;
+        return string(abi.encodePacked("Wormhole: ", _state.name));
     }
 
     function symbol() public view returns (string memory) {
-        return _state.symbol;
+        return string(abi.encodePacked("wh", _state.symbol));
     }
 
     function owner() public view returns (address) {
diff --git a/solana/modules/token_bridge/program/src/api/create_wrapped.rs b/solana/modules/token_bridge/program/src/api/create_wrapped.rs
index 90b1463f..9c19f822 100644
--- a/solana/modules/token_bridge/program/src/api/create_wrapped.rs
+++ b/solana/modules/token_bridge/program/src/api/create_wrapped.rs
@@ -140,6 +140,11 @@ pub fn create_wrapped(
         },
     )?;
 
+    let mut name = String::from("Wormhole: ") + accs.vaa.name.as_str();
+    name.truncate(32);
+    let mut symbol = String::from("wh") + accs.vaa.symbol.as_str();
+    symbol.truncate(10);
+
     let spl_token_metadata_ix = spl_token_metadata::instruction::create_metadata_accounts(
         spl_token_metadata::id(),
         *accs.spl_metadata.key,
@@ -147,8 +152,8 @@ pub fn create_wrapped(
         *accs.mint_authority.info().key,
         *accs.payer.info().key,
         *accs.mint_authority.info().key,
-        accs.vaa.name.clone(),
-        accs.vaa.symbol.clone(),
+        name,
+        symbol,
         String::from(""),
         None,
         0,
diff --git a/terra/contracts/cw20-wrapped/src/contract.rs b/terra/contracts/cw20-wrapped/src/contract.rs
index 8922ffbe..56363dd5 100644
--- a/terra/contracts/cw20-wrapped/src/contract.rs
+++ b/terra/contracts/cw20-wrapped/src/contract.rs
@@ -23,8 +23,8 @@ pub fn init<S: Storage, A: Api, Q: Querier>(
 ) -> StdResult<InitResponse> {
     // store token info using cw20-base format
     let data = TokenInfo {
-        name: msg.name,
-        symbol: msg.symbol,
+        name: String::from("Wormhole:") + msg.name.as_str(),
+        symbol: String::from("wh") + msg.symbol.as_str(),
         decimals: msg.decimals,
         total_supply: Uint128(0),
         // set creator as minter