adds general erc20 metadata fields to shared IPT interface

wrapping test case

Signed-off-by: Stefan Adolf <[email protected]>

Author: elmariachi111

src/IIPToken.sol

@@ -15,4 +15,7 @@ interface IIPToken {
     function issue(address, uint256) external;
     function cap() external;
     function uri() external view returns (string memory);
+    function name() external view returns (string memory);
+    function symbol() external view returns (string memory);
+    function decimals() external view returns (uint8);
 }

src/IPToken.sol

@@ -31,12 +31,12 @@ contract IPToken is IIPToken, ERC20Upgradeable, ERC20BurnableUpgradeable, Ownabl
 
     Metadata internal _metadata;
 
-    function initialize(uint256 ipnftId, string calldata name, string calldata symbol, address originalOwner, string memory agreementCid)
+    function initialize(uint256 ipnftId, string calldata name_, string calldata symbol_, address originalOwner, string memory agreementCid)
         external
         initializer
     {
         __Ownable_init();
-        __ERC20_init(name, symbol);
+        __ERC20_init(name_, symbol_);
         _metadata = Metadata({ ipnftId: ipnftId, originalOwner: originalOwner, agreementCid: agreementCid });
     }
 
@@ -59,6 +59,17 @@ contract IPToken is IIPToken, ERC20Upgradeable, ERC20BurnableUpgradeable, Ownabl
         return ERC20Upgradeable.balanceOf(account);
     }
 
+    function name() public view override(ERC20Upgradeable, IIPToken) returns (string memory) {
+        return ERC20Upgradeable.name();
+    }
+
+    function symbol() public view override(ERC20Upgradeable, IIPToken) returns (string memory) {
+        return ERC20Upgradeable.symbol();
+    }
+
+    function decimals() public view override(ERC20Upgradeable, IIPToken) returns (uint8) {
+        return ERC20Upgradeable.decimals();
+    }
     /**
      * @notice the supply of IP Tokens is controlled by the tokenizer contract.
      * @param receiver address
@@ -109,7 +120,7 @@ contract IPToken is IIPToken, ERC20Upgradeable, ERC20BurnableUpgradeable, Ownabl
                     string.concat(
                         '{"name": "IP Tokens of IPNFT #',
                         tokenId,
-                        '","description": "IP Tokens, derived from IP-NFTs, are ERC-20 tokens governing IP pools.","decimals": 18,"external_url": "https://molecule.to","image": "",',
+                        '","description": "IP Tokens, derived from IP-NFTs, are ERC-20 tokens governing IP pools.","decimals": 18,"external_url": "https://molecule.xyz","image": "",',
                         props,
                         "}"
                     )

src/Tokenizer.sol

@@ -109,8 +109,9 @@ contract Tokenizer is UUPSUpgradeable, OwnableUpgradeable, IControlIPTs {
     /**
      * @dev sets legacy IPTs on the tokenized mapping
      */
-    function reinit(WrappedIPToken _wrappedIpTokenImplementation) public onlyOwner reinitializer(6) {
+    function reinit(WrappedIPToken _wrappedIpTokenImplementation, IPToken _ipTokenImplementation) public onlyOwner reinitializer(6) {
         wrappedTokenImplementation = _wrappedIpTokenImplementation;
+        setIPTokenImplementation(_ipTokenImplementation);
     }
 
     /**

src/WrappedIPToken.sol

@@ -75,7 +75,7 @@ contract WrappedIPToken is IIPToken, Initializable {
             '","original_owner": "',
             Strings.toHexString(_metadata.originalOwner),
             '","erc20_contract": "',
-            Strings.toHexString(address(this)),
+            Strings.toHexString(address(wrappedToken)),
             '","supply": "',
             Strings.toString(wrappedToken.totalSupply()),
             '"}'

test/TokenizerWrapped.t.sol

@@ -14,7 +14,7 @@ import { AcceptAllAuthorizer } from "./helpers/AcceptAllAuthorizer.sol";
 
 import { FakeERC20 } from "../src/helpers/FakeERC20.sol";
 import { MustControlIpnft, AlreadyTokenized, Tokenizer, ZeroAddress, IPTNotControlledByTokenizer } from "../src/Tokenizer.sol";
-import { Metadata as TokenMetadata } from "../src/IIPToken.sol";
+import { IIPToken, Metadata as TokenMetadata } from "../src/IIPToken.sol";
 import { IPToken, TokenCapped } from "../src/IPToken.sol";
 import { WrappedIPToken } from "../src/WrappedIPToken.sol";
 import { IPermissioner, BlindPermissioner } from "../src/Permissioner.sol";
@@ -57,6 +57,9 @@ contract TokenizerWrappedTest is Test {
         tokenizer.initialize(ipnft, blindPermissioner);
         tokenizer.setIPTokenImplementation(new IPToken());
 
+        WrappedIPToken wrappedTokenImplementation = new WrappedIPToken();
+        tokenizer.reinit(wrappedTokenImplementation, tokenizer.ipTokenImplementation());
+
         vm.stopPrank();
 
         vm.deal(originalOwner, MINTING_FEE);
@@ -65,10 +68,16 @@ contract TokenizerWrappedTest is Test {
         ipnft.mintReservation{ value: MINTING_FEE }(originalOwner, reservationId, ipfsUri, DEFAULT_SYMBOL, "");
     }
 
-    function testInitWrappedIPTokenImplementation() public {
-        vm.startPrank(deployer);
-        WrappedIPToken wrappedTokenImplementation = new WrappedIPToken();
-        tokenizer.reinit(wrappedTokenImplementation);
-        assertEq(address(tokenizer.wrappedTokenImplementation()), address(wrappedTokenImplementation));
+    function testAdoptERC20AsWrappedIPToken() public {
+        vm.startPrank(originalOwner);
+        erc20 = new FakeERC20("URORiif", "UROR");
+        erc20.mint(originalOwner, 1_000_000 ether);
+
+        IIPToken tokenContract = tokenizer.attachIpt(1, agreementCid, "", erc20);
+
+        assertEq(tokenContract.balanceOf(originalOwner), 1_000_000 ether);
+        assertNotEq(address(tokenizer.synthesized(1)), address(erc20)); // the synthesized member tracks the wrapped ipt
+        assertEq(tokenContract.totalIssued(), 1_000_000 ether);
+        assertEq(tokenContract.name(), "URORiif");
     }
 }