From cc6da0c75822b22293487b0f5620725b9e9445f0 Mon Sep 17 00:00:00 2001
From: cryptoDev222 <genius.developer.63@gmail.com>
Date: Wed, 25 Aug 2021 11:18:31 -0500
Subject: [PATCH] refactor/implement getId/setId

---
 .../connectors/basic-ERC721/events.sol        |  8 +++--
 .../mainnet/connectors/basic-ERC721/main.sol  | 32 +++++++++++++------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/contracts/mainnet/connectors/basic-ERC721/events.sol b/contracts/mainnet/connectors/basic-ERC721/events.sol
index ebe059e5..7b367145 100644
--- a/contracts/mainnet/connectors/basic-ERC721/events.sol
+++ b/contracts/mainnet/connectors/basic-ERC721/events.sol
@@ -4,11 +4,15 @@ contract Events {
     event LogDepositERC721(
         address indexed erc721,
         address from,
-        uint256 tokenId
+        uint256 tokenId,
+        uint256 getId,
+        uint256 setId
     );
     event LogWithdrawERC721(
         address indexed erc721,
         uint256 tokenId,
-        address indexed to
+        address indexed to,
+        uint256 getId,
+        uint256 setId
     );
 }
diff --git a/contracts/mainnet/connectors/basic-ERC721/main.sol b/contracts/mainnet/connectors/basic-ERC721/main.sol
index 98878ada..9e6f86b2 100644
--- a/contracts/mainnet/connectors/basic-ERC721/main.sol
+++ b/contracts/mainnet/connectors/basic-ERC721/main.sol
@@ -17,16 +17,25 @@ abstract contract BasicResolver is Events, DSMath, Basic {
      * @param token The address of the token to deposit.
      * @param tokenId The id of token to deposit.
      */
-    function depositERC721(address token, uint256 tokenId)
+    function depositERC721(
+        address token,
+        uint256 tokenId,
+        uint256 getId,
+        uint256 setId
+    )
         public
         payable
         returns (string memory _eventName, bytes memory _eventParam)
     {
-        IERC721 tokenContract = IERC721(token);
-        tokenContract.safeTransferFrom(msg.sender, address(this), tokenId);
+        uint256 _tokenId = getUint(getId, tokenId);
 
-        _eventName = "LogDepositERC721(address,address,uint256)";
-        _eventParam = abi.encode(token, msg.sender, tokenId);
+        IERC721 tokenContract = IERC721(token);
+        tokenContract.safeTransferFrom(msg.sender, address(this), _tokenId);
+
+        setUint(setId, _tokenId);
+
+        _eventName = "LogDepositERC721(address,address,uint256,uint256,uint256)";
+        _eventParam = abi.encode(token, msg.sender, _tokenId, getId, setId);
     }
 
     /**
@@ -39,17 +48,22 @@ abstract contract BasicResolver is Events, DSMath, Basic {
     function withdrawERC721(
         address token,
         uint256 tokenId,
-        address payable to
+        address payable to,
+        uint256 getId,
+        uint256 setId
     )
         public
         payable
         returns (string memory _eventName, bytes memory _eventParam)
     {
+        uint256 _tokenId = getUint(getId, tokenId);
         IERC721 tokenContract = IERC721(token);
-        tokenContract.safeTransferFrom(address(this), to, tokenId);
+        tokenContract.safeTransferFrom(address(this), to, _tokenId);
 
-        _eventName = "LogWithdrawERC721(address,uint256,address)";
-        _eventParam = abi.encode(token, tokenId, to);
+        setUint(setId, _tokenId);
+
+        _eventName = "LogWithdrawERC721(address,uint256,address,uint256,uint256)";
+        _eventParam = abi.encode(token, _tokenId, to, getId, setId);
     }
 }