Update UCS Contracts Lib

Author: kaihiroi

devkit/core/Dictionary.sol

@@ -19,7 +19,7 @@ import {TypeGuard, TypeStatus} from "devkit/types/TypeGuard.sol";
 import {DictionaryMock} from "devkit/mocks/DictionaryMock.sol";
 // External Libs
 import {IDictionary} from "@ucs.mc/dictionary/IDictionary.sol";
-import {DictionaryEtherscan} from "@ucs.mc/dictionary/DictionaryEtherscan.sol";
+import {Dictionary as UCSDictionary} from "@ucs.mc/dictionary/Dictionary.sol";
 
 // Core Types
 import {Function} from "devkit/core/Function.sol";
@@ -52,7 +52,7 @@ library DictionaryLib {
         Validate.MUST_AddressIsNotZero(owner);
         /// @dev Until Etherscan supports UCS, we are deploying contracts with additional features for Etherscan compatibility by default.
         return Dictionary({
-            addr: address(new DictionaryEtherscan(owner)),
+            addr: address(new UCSDictionary(owner)),
             kind: DictionaryKind.Verifiable,
             status: TypeStatus.Building
         }).finishProcess(pid);
@@ -124,7 +124,7 @@ library DictionaryLib {
         uint pid = ProcessLib.startDictionaryLibProcess("upgradeFacade");
         Validate.MUST_AddressIsContract(newFacade);
         Validate.MUST_Verifiable(dictionary);
-        DictionaryEtherscan(dictionary.addr).upgradeFacade(newFacade);
+        IDictionary(dictionary.addr).upgradeFacade(newFacade);
         return dictionary.finishProcess(pid);
     }
 

devkit/core/Proxy.sol

@@ -14,7 +14,7 @@ import {TypeGuard, TypeStatus} from "devkit/types/TypeGuard.sol";
     using TypeGuard for Proxy global;
 
 // External Lib Contract
-import {ERC7546ProxyEtherscan} from "@ucs.mc/proxy/ERC7546ProxyEtherscan.sol";
+import {Proxy as UCSProxy} from "@ucs.mc/proxy/Proxy.sol";
 // Mock Contract
 import {ProxySimpleMock} from "devkit/mocks/ProxySimpleMock.sol";
 
@@ -41,7 +41,7 @@ library ProxyLib {
         uint pid = ProcessLib.startProxyLibProcess("deploy");
         Validate.MUST_haveContract(dictionary);
         return Proxy({
-            addr: address(new ERC7546ProxyEtherscan(dictionary.addr, initData)),
+            addr: address(new UCSProxy(dictionary.addr, initData)),
             kind: ProxyKind.Verifiable,
             status: TypeStatus.Building
         }).finishProcess(pid);

devkit/mocks/DictionaryMock.sol

@@ -4,13 +4,13 @@ pragma solidity ^0.8.24;
 // Core
 import {Function} from "devkit/core/Function.sol";
 // External Lib
-import {DictionaryEtherscan} from "@ucs.mc/dictionary/DictionaryEtherscan.sol";
+import {Dictionary} from "@ucs.mc/dictionary/Dictionary.sol";
 
 /**
     @title Mock Dictionary Contract
  */
-contract DictionaryMock is DictionaryEtherscan {
-    constructor (address owner, Function[] memory functions) DictionaryEtherscan(owner) {
+contract DictionaryMock is Dictionary {
+    constructor (address owner, Function[] memory functions) Dictionary(owner) {
         for (uint i; i < functions.length; ++i) {
             setImplementation(functions[i].selector, functions[i].implementation);
         }

lib/ucs-contracts

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
-import {ERC7546ProxyEtherscan} from "@ucs.mc/proxy/ERC7546ProxyEtherscan.sol";
-import {ERC7546Utils} from "@ucs.mc/proxy/ERC7546Utils.sol";
+import {Proxy} from "@ucs.mc/proxy/Proxy.sol";
+import {ProxyUtils} from "@ucs.mc/proxy/ProxyUtils.sol";
 
 /**
     < MC Standard Function >
@@ -15,7 +15,7 @@ contract Clone {
     event ProxyCloned(address proxy);
 
     function clone(bytes calldata initData) external returns (address proxy) {
-        proxy = address(new ERC7546ProxyEtherscan(ERC7546Utils.getDictionary(), initData));
+        proxy = address(new Proxy(ProxyUtils.getDictionary(), initData));
         emit ProxyCloned(proxy);
     }
 

src/std/functions/Clone.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.22;
 
 import {Dep} from "../storage/Schema.sol";
 
-import {ERC7546Utils} from "@ucs.mc/proxy/ERC7546Utils.sol";
-import {DictionaryBase} from "@ucs.mc/dictionary/DictionaryBase.sol";
+import {ProxyUtils} from "@ucs.mc/proxy/ProxyUtils.sol";
+import {IDictionary} from "@ucs.mc/dictionary/IDictionary.sol";
 
 /**
     < MC Standard Function >
@@ -16,7 +16,7 @@ contract GetDeps {
     /// DO NOT USE STORAGE DIRECTLY !!!
 
     function getDeps() external view returns(Dep[] memory) {
-        DictionaryBase dictionary = DictionaryBase(ERC7546Utils.getDictionary()); // TODO IDictionary
+        IDictionary dictionary = IDictionary(ProxyUtils.getDictionary());
         bytes4[] memory selectors = dictionary.supportsInterfaces();
         Dep[] memory deps = new Dep[](selectors.length);
         for (uint i; i < selectors.length; ++i) {

src/std/functions/GetDeps.sol

@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
-import {ERC7546ProxyEtherscan} from "@ucs.mc/proxy/ERC7546ProxyEtherscan.sol";
-import {ERC7546Utils} from "@ucs.mc/proxy/ERC7546Utils.sol";
-
 /**
     < MC Standard Function >
     @title Receive

src/std/functions/Receive.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import {ERC7546Utils} from "@ucs.mc/proxy/ERC7546Utils.sol";
+import {ProxyUtils} from "@ucs.mc/proxy/ProxyUtils.sol";
 import {ProtectionBase} from "./utils/ProtectionBase.sol";
 
 /**
@@ -14,7 +14,7 @@ contract UpgradeDictionary is ProtectionBase {
     /// DO NOT USE STORAGE DIRECTLY !!!
 
     function upgradeDictionary(address newDictionary) external onlyAdmin {
-        ERC7546Utils.upgradeDictionaryToAndCall({
+        ProxyUtils.upgradeDictionaryToAndCall({
             newDictionary: newDictionary,
             data: ""
         });

src/std/functions/protected/UpgradeDictionary.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import {ERC7546ProxyEvents} from "@ucs.mc/proxy/ERC7546ProxyEvents.sol";
+import {IProxy} from "@ucs.mc/proxy/IProxy.sol";
 import {Dep} from "../storage/Schema.sol";
 
-interface IStd is ERC7546ProxyEvents {
+interface IStd is IProxy {
     function clone(bytes calldata initData) external returns (address proxy);
     function getDeps() external view returns(Dep[] memory);
     function featureToggle(bytes4 selector) external;