Remove nearTokenId argument

Near-One · May 30, 2024 · e2c3442 · e2c3442
1 parent e6f987b
commit e2c3442
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/erc20-bridge-token/contracts/BridgeTokenFactory.sol b/erc20-bridge-token/contracts/BridgeTokenFactory.sol
@@ -98,12 +98,9 @@ contract BridgeTokenFactory is
     }
 
     function newBridgeToken(
-        string calldata nearTokenId,
         bytes memory proofData,
         uint64 proofBlockHeight
     ) external returns (address) {
-        require(!_isBridgeToken[_nearToEthToken[nearTokenId]], "ERR_TOKEN_EXIST");
-
         ProofDecoder.ExecutionStatus memory status = _parseAndConsumeProof(
             proofData,
             proofBlockHeight
@@ -112,6 +109,8 @@ contract BridgeTokenFactory is
             status.successValue
         );
 
+        require(!_isBridgeToken[_nearToEthToken[result.token]], "ERR_TOKEN_EXIST");
+
         address bridgeTokenProxy = address(
             new ERC1967Proxy(
                 tokenImplementationAddress,
@@ -127,8 +126,8 @@ contract BridgeTokenFactory is
         emit SetMetadata(bridgeTokenProxy, result.name, result.symbol, result.decimals);
 
         _isBridgeToken[address(bridgeTokenProxy)] = true;
-        _ethToNearToken[address(bridgeTokenProxy)] = nearTokenId;
-        _nearToEthToken[nearTokenId] = address(bridgeTokenProxy);
+        _ethToNearToken[address(bridgeTokenProxy)] = result.token;
+        _nearToEthToken[result.token] = address(bridgeTokenProxy);
 
         return bridgeTokenProxy;
     }