ERC6160 (#5)

polytope-labs · Jan 18, 2024 · 200f57d · 200f57d
1 parent b41cbbe
commit 200f57d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# multichain-token
-An example implementation of EIP-6160
+# ERC6160
+Implementation of ERC6160
 
 This set of interfaces and contracts relates to the [Multi-Chain Native Token Standard.](https://github.com/polytope-labs/EIPs/blob/master/EIPS/eip-6160.md)
 
@@ -14,9 +14,9 @@ Multi-Chain token contracts that chooses to conform to this EIP `MUST` extend th
 
 
 These example core token contracts implements the interfaces as so:
-* {{ERC20.sol}}
-* {{ERC721.sol}}
-* {{ERC1155.sol}}
+* {{ERC6160Ext20.sol}}
+* {{ERC6160Ext721.sol}}
+* {{ERC6160Ext1155.sol}}
 
 |Note | This standard is unopinionated, however, aims to set the foundation for creating multi-chain native tokens, also the specifics for authorization and access control are left for developers to implement in token contracts.|
 ----- | -----
diff --git a/src/tokens/ERC1155.sol → src/tokens/ERC6160Ext1155.sol b/src/tokens/ERC1155.sol → src/tokens/ERC6160Ext1155.sol
@@ -11,7 +11,7 @@ error PermissionDenied();
 /// @notice Thrown if account is not the admin of a given role
 error NotRoleAdmin();
 
-contract MultiChainNativeERC1155 is ERC1155, ERC165Storage, IERC6160Ext1155 {
+contract ERC6160Ext1155 is ERC1155, ERC165Storage, IERC6160Ext1155 {
     /// @notice InterfaceId for ERC6160Ext1155
     bytes4 constant _IERC6160Ext1155_ID_ = 0x9f77104c;
 

diff --git a/src/tokens/ERC20.sol → src/tokens/ERC6160Ext20.sol b/src/tokens/ERC20.sol → src/tokens/ERC6160Ext20.sol
@@ -11,7 +11,7 @@ error NotRoleAdmin();
 /// @notice Thrown if account does not have required permission
 error PermissionDenied();
 
-contract MultiChainNativeERC20 is ERC165Storage, ERC20, IERC6160Ext20 {
+contract ERC6160Ext20 is ERC165Storage, ERC20, IERC6160Ext20 {
     /// @notice InterfaceId for ERC6160Ext20
     bytes4 constant _IERC6160Ext20_ID_ = 0xbbb8b47e;
 
@@ -32,8 +32,6 @@ contract MultiChainNativeERC20 is ERC165Storage, ERC20, IERC6160Ext20 {
         _registerInterface(type(IERC5679Ext20).interfaceId);
         _registerInterface(type(IERC_ACL_CORE).interfaceId);
 
-        super._mint(admin, 1_000_000 * 10e18); // 1million initial supply
-
         _rolesAdmin[MINTER_ROLE][admin] = true;
         _roles[MINTER_ROLE][admin] = true;
 

diff --git a/src/tokens/ERC721.sol → src/tokens/ERC6160Ext721.sol b/src/tokens/ERC721.sol → src/tokens/ERC6160Ext721.sol
@@ -11,7 +11,7 @@ error PermissionDenied();
 /// @notice Thrown if account is not the admin of a given role
 error NotRoleAdmin();
 
-contract MultiChainNativeERC721 is ERC721, ERC165Storage, IERC6160Ext721 {
+contract ERC6160Ext721 is ERC721, ERC165Storage, IERC6160Ext721 {
     /// @notice InterfaceId for ERC6160Ext721
     bytes4 constant _IERC6160Ext721_ID_ = 0xa75a5a72;
 

diff --git a/test/ERC1155.t.sol b/test/ERC1155.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.13;
 import "forge-std/Test.sol";
 import "forge-std/console.sol";
 
-import "../src/tokens/ERC1155.sol";
+import "../src/tokens/ERC6160Ext1155.sol";
 
 contract ERC1155Test is Test {
-    MultiChainNativeERC1155 token;
+    ERC6160Ext1155 token;
     address beef = 0x000000000000000000000000000000000000bEEF;
     address dead = 0x000000000000000000000000000000000000dEaD;
 
@@ -23,7 +23,7 @@ contract ERC1155Test is Test {
     uint256 TOKEN2_FT = 1;
 
     function setUp() public {
-        token = new MultiChainNativeERC1155(address(this), "");
+        token = new ERC6160Ext1155(address(this), "");
     }
 
     function testRoles() public view {

diff --git a/test/ERC20.t.sol b/test/ERC20.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.13;
 import "forge-std/Test.sol";
 import "forge-std/console.sol";
 
-import "../src/tokens/ERC20.sol";
+import "../src/tokens/ERC6160Ext20.sol";
 
 contract ERC20Test is Test {
-    MultiChainNativeERC20 token;
+    ERC6160Ext20 token;
     address deployer = 0xb4c79daB8f259C7Aee6E5b2Aa729821864227e84;
 
     address beef = 0x000000000000000000000000000000000000bEEF;
@@ -21,7 +21,7 @@ contract ERC20Test is Test {
     bytes32 constant BURNER_ROLE = keccak256("BURNER ROLE");
 
     function setUp() public {
-        token = new MultiChainNativeERC20(address(this), "Multi Chain Native ERC20 TOken", "MCNT");
+        token = new ERC6160Ext20(address(this), "Multi Chain Native ERC20 TOken", "MCNT");
     }
 
     function testNameSymbol() public {

diff --git a/test/ERC721.t.sol b/test/ERC721.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.13;
 import "forge-std/Test.sol";
 import "forge-std/console.sol";
 
-import "../src/tokens/ERC721.sol";
+import "../src/tokens/ERC6160Ext721.sol";
 
 contract ERC721Test is Test {
-    MultiChainNativeERC721 token;
+    ERC6160Ext721 token;
     address beef = 0x000000000000000000000000000000000000bEEF;
     address dead = 0x000000000000000000000000000000000000dEaD;
 
@@ -20,7 +20,7 @@ contract ERC721Test is Test {
     bytes32 constant BURNER_ROLE = keccak256("BURNER ROLE");
 
     function setUp() public {
-        token = new MultiChainNativeERC721(address(this), "", "");
+        token = new ERC6160Ext721(address(this), "", "");
     }
 
     function testRoles() public view {