feat(tokenizer): allow erc20 attachment as ipt

- drops stoneage Synthesizer
- extracts IIPToken interface to be reused on Tokenizer and Permissioner
- fixes linearization of dependencies on IPToken
- adds general erc20 metadata fields to shared IPT interface
- wrapping test case
- rollout script and disable fork test
- drops size checks on builds
- add sanity checks for ipt attachment on tokenizer

Author: 0xmme

.github/workflows/test.yml

@@ -25,10 +25,11 @@ jobs:
       - name: Install node dependencies
         run: yarn --frozen-lockfile
 
+        #todo: forge build --sizes
       - name: Run Forge build
         run: |
           forge --version
-          forge build --sizes
+          forge build
         id: build
 
       - name: Run Forge tests

README.md

@@ -100,12 +100,12 @@ VDAO_TOKEN_ADDRESS=0x19A3036b828bffB5E14da2659E950E76f8e6BAA2
 
 ---
 
-### upgrading to Tokenizer 1.3
+### upgrading to Tokenizer 1.4
 
-forge script --private-key=$PRIVATE_KEY --rpc-url=$RPC_URL script/prod/RolloutTokenizerV13.s.sol --broadcast
+forge script --private-key=$PRIVATE_KEY --rpc-url=$RPC_URL script/prod/RolloutTokenizerV14.s.sol --broadcast
 
-// 0xTokenizer 0xNewImpl 0xNewTokenImpl
-cast send --rpc-url=$RPC_URL --private-key=$PRIVATE_KEY 0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e "upgradeToAndCall(address,bytes)" 0x70e0bA845a1A0F2DA3359C97E0285013525FFC49 0x84646c1f000000000000000000000000998abeb3e57409262ae5b751f60747921b33613e
+// 0xTokenizer (address, bytes)(0xNewImpl, 0xNewWrappedIPTokenImpl 0xNewIPTokenImpl)
+cast send --rpc-url=$RPC_URL --private-key=$PRIVATE_KEY 0x58EB89C69CB389DBef0c130C6296ee271b82f436 "upgradeToAndCall(address,bytes)" 0x34A1D3fff3958843C43aD80F30b94c510645C316 0x8b3d19bb0000000000000000000000007fa9385be102ac3eac297483dd6233d62b3e14960000000000000000000000005b73c5498c1e3b4dba84de0f1833c4a029d90519
 
 ### Timelocked Tokens
 

script/DeployShareDistributor.s.sol

@@ -16,13 +16,7 @@ contract DeployShareDistributor is Script {
 
         SalesShareDistributor impl = new SalesShareDistributor();
 
-        SalesShareDistributor salesShareDistributor = SalesShareDistributor(
-            address(
-                new ERC1967Proxy(
-                    address(impl), ""
-                )
-            )
-        );
+        SalesShareDistributor salesShareDistributor = SalesShareDistributor(address(new ERC1967Proxy(address(impl), "")));
         salesShareDistributor.initialize(SchmackoSwap(sosAddress));
         vm.stopBroadcast();
 

script/IPNFT.s.sol

@@ -9,12 +9,7 @@ import "../src/IPNFT.sol";
 contract Deploy is Script {
     function run() public {
         vm.startBroadcast();
-        IPNFT ipnft = IPNFT(
-            address(
-                new ERC1967Proxy(address(new IPNFT()), 
-                abi.encodeWithSelector(IPNFT.initialize.selector, ""))
-            )
-        );
+        IPNFT ipnft = IPNFT(address(new ERC1967Proxy(address(new IPNFT()), abi.encodeWithSelector(IPNFT.initialize.selector, ""))));
         vm.stopBroadcast();
 
         console.log("IPNFT_ADDRESS=%s", address(ipnft));

script/dev/CrowdSale.s.sol

@@ -37,7 +37,7 @@ contract DeployStakedCrowdSale is CommonScript {
         vm.startBroadcast(deployer);
         TimelockedToken lockingCrowdsaleImplementation = new TimelockedToken();
         StakedLockingCrowdSale stakedLockingCrowdSale = new StakedLockingCrowdSale(lockingCrowdsaleImplementation);
-        
+
         TokenVesting vestedDaoToken = TokenVesting(vm.envAddress("VDAO_TOKEN_ADDRESS"));
         vestedDaoToken.grantRole(vestedDaoToken.ROLE_CREATE_SCHEDULE(), address(stakedLockingCrowdSale));
         stakedLockingCrowdSale.trustVestingContract(vestedDaoToken);

script/dev/Ipnft.s.sol

@@ -24,12 +24,7 @@ contract DeployIpnftSuite is CommonScript {
     function run() public {
         prepareAddresses();
         vm.startBroadcast(deployer);
-        IPNFT ipnft = IPNFT(
-            address(
-                new ERC1967Proxy(address(new IPNFT()), 
-                abi.encodeWithSelector(IPNFT.initialize.selector, ""))
-            )
-        );
+        IPNFT ipnft = IPNFT(address(new ERC1967Proxy(address(new IPNFT()), abi.encodeWithSelector(IPNFT.initialize.selector, ""))));
 
         SchmackoSwap swap = new SchmackoSwap();
 

script/dev/Synthesizer.s.sol

@@ -5,7 +5,10 @@ import "forge-std/Script.sol";
 import "forge-std/console.sol";
 import { IPNFT } from "../../src/IPNFT.sol";
 import { Tokenizer } from "../../src/Tokenizer.sol";
-import { Metadata, IPToken } from "../../src/IPToken.sol";
+import { Metadata } from "../../src/IIPToken.sol";
+import { IPToken } from "../../src/IPToken.sol";
+import { WrappedIPToken } from "../../src/WrappedIPToken.sol";
+
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import { IPermissioner, TermsAcceptedPermissioner } from "../../src/Permissioner.sol";
 import { CommonScript } from "./Common.sol";
@@ -23,9 +26,13 @@ contract DeployTokenizer is CommonScript {
         IPToken initialIpTokenImplementation = new IPToken();
         tokenizer.setIPTokenImplementation(initialIpTokenImplementation);
 
+        WrappedIPToken initialWrappedIpTokenImplementation = new WrappedIPToken();
+        tokenizer.setWrappedIPTokenImplementation(initialWrappedIpTokenImplementation);
+
         vm.stopBroadcast();
         console.log("TOKENIZER_ADDRESS=%s", address(tokenizer));
         console.log("iptoken implementation=%s", address(initialIpTokenImplementation));
+        console.log("wrapped iptoken implementation=%s", address(initialWrappedIpTokenImplementation));
     }
 }
 

script/dev/Tokenizer.s.sol

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.18;
+
+import "forge-std/Script.sol";
+import { Tokenizer } from "../../src/Tokenizer.sol";
+import { IPToken } from "../../src/IPToken.sol";
+import { WrappedIPToken } from "../../src/WrappedIPToken.sol";
+import { console } from "forge-std/console.sol";
+
+contract RolloutTokenizerV14 is Script {
+    function run() public {
+        vm.startBroadcast();
+
+        // Deploy new implementations
+        IPToken ipTokenImplementation = new IPToken();
+        WrappedIPToken wrappedIpTokenImplementation = new WrappedIPToken();
+        Tokenizer newTokenizerImplementation = new Tokenizer();
+
+        // Prepare upgrade call data using reinit function
+        bytes memory upgradeCallData =
+            abi.encodeWithSelector(Tokenizer.reinit.selector, address(wrappedIpTokenImplementation), address(ipTokenImplementation));
+
+        console.log("IPTOKENIMPLEMENTATION=%s", address(ipTokenImplementation));
+        console.log("WRAPPEDTOKENIMPLEMENTATION=%s", address(wrappedIpTokenImplementation));
+        console.log("NEWTOKENIZER=%s", address(newTokenizerImplementation));
+        console.log("UpgradeCallData:");
+        console.logBytes(upgradeCallData);
+
+        vm.stopBroadcast();
+    }
+}