add token address when burn from chain33

plugin/dapp/x2Ethereum/ebrelayer/ethcontract/sol_contracts/BridgeBank/Chain33Bank.sol

@@ -379,6 +379,5 @@ contract Chain33Bank {
     {
         bytes32 symHash = keccak256(abi.encodePacked(_symbol));
         return token2address[symHash];
-
     }
 }
\ No newline at end of file

plugin/dapp/x2Ethereum/ebrelayer/ethcontract/sol_contracts/Chain33Bridge.sol

@@ -208,6 +208,7 @@ contract Chain33Bridge {
         bytes memory _chain33Sender,
         address payable _ethereumReceiver,
         address _originalValidator,
+        address _tokenAddress,
         string memory _symbol,
         uint256 _amount
     )
@@ -219,7 +220,10 @@ contract Chain33Bridge {
         prophecyClaimCount = prophecyClaimCount.add(1);
         ClaimType claimType = ClaimType(_claimType);
 
-        address tokenAddress = bridgeBank.getToken2address(_symbol);
+        //overwrite the token address in case of lock
+        if (claimType == ClaimType.Lock) {
+            _tokenAddress = bridgeBank.getToken2address(_symbol);
+        }
 
         // Create the new ProphecyClaim
         ProphecyClaim memory prophecyClaim = ProphecyClaim(
@@ -227,7 +231,7 @@ contract Chain33Bridge {
             _chain33Sender,
             _ethereumReceiver,
             _originalValidator,
-            tokenAddress,
+            _tokenAddress,
             _symbol,
             _amount,
             Status.Pending
@@ -242,7 +246,7 @@ contract Chain33Bridge {
             _chain33Sender,
             _ethereumReceiver,
             _originalValidator,
-            tokenAddress,
+            _tokenAddress,
             _symbol,
             _amount
         );

plugin/dapp/x2Ethereum/ebrelayer/ethcontract/sol_contracts/Oracle.sol

@@ -130,6 +130,7 @@ contract Oracle {
         ClaimType _claimType,
         bytes memory _chain33Sender,
         address payable _ethereumReceiver,
+        address _tokenAddress,
         string memory _symbol,
         uint256 _amount,
         bytes32 _claimID,
@@ -163,6 +164,7 @@ contract Oracle {
                             _chain33Sender,
                             _ethereumReceiver,
                             validatorAddress,
+                            _tokenAddress,
                             _symbol,
                             _amount);
         }

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/auxiliary.go

@@ -467,7 +467,7 @@ func MakeNewProphecyClaim(newProphecyClaimPara *NewProphecyClaimPara, client *et
 		return "", err
 	}
 
-	tx, err := x2EthContracts.Oracle.NewOracleClaim(authVali, newProphecyClaimPara.ClaimType, newProphecyClaimPara.Chain33Sender, ethReceiver, newProphecyClaimPara.Symbol, amount, claimID, signature)
+	tx, err := x2EthContracts.Oracle.NewOracleClaim(authVali, newProphecyClaimPara.ClaimType, newProphecyClaimPara.Chain33Sender, ethReceiver, newProphecyClaimPara.TokenAddr, newProphecyClaimPara.Symbol, amount, claimID, signature)
 	if nil != err {
 		return "", err
 	}

plugin/dapp/x2Ethereum/ebrelayer/ethtxs/relayToEthereum.go

@@ -40,7 +40,7 @@ func RelayOracleClaimToEthereum(oracleInstance *generated.Oracle, client *ethcli
 		return "", err
 	}
 
-	tx, err := oracleInstance.NewOracleClaim(auth, uint8(claim.ClaimType), claim.Chain33Sender, claim.EthereumReceiver, claim.Symbol, claim.Amount, claimID, signature)
+	tx, err := oracleInstance.NewOracleClaim(auth, uint8(claim.ClaimType), claim.Chain33Sender, claim.EthereumReceiver, claim.TokenContractAddress, claim.Symbol, claim.Amount, claimID, signature)
 	if nil != err {
 		txslog.Error("RelayProphecyClaimToEthereum", "NewOracleClaim failed due to:", err.Error())
 		return "", err