feat: Added proxy infra

.github/workflows/forge-pr.yaml

@@ -22,29 +22,36 @@ jobs:
       - name: Run tests
         run: forge test
 
-  # coverage_report:
-  #   name: Generate coverage report
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - uses: actions/checkout@v2
-
-  #   - name: Install Foundry
-  #     uses: onbjerg/foundry-toolchain@v1
-  #     with:
-  #       version: nightly
-
-  #   - name: Install submodules
-  #     run: |
-  #       git config --global url."https://github.com/".insteadOf "[email protected]:"
-  #       git submodule update --init --recursive
-  #   - name: Generate coverage report
-  #     run: |
-  #       forge coverage --report lcov
-  #   - name: Report code coverage
-  #     uses: zgosalvez/github-actions-report-lcov@v1
-  #     with:
-  #       coverage-files: lcov.info
-  #       minimum-coverage: 95
-  #       artifact-name: code-coverage-report
-  #       github-token: ${{ secrets.GITHUB_TOKEN }}
-  #       working-directory: ./
+  coverage_report:
+    name: Generate coverage report
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install Foundry
+      uses: onbjerg/foundry-toolchain@v1
+      with:
+        version: nightly
+
+    - name: Install submodules
+      run: |
+        git config --global url."https://github.com/".insteadOf "[email protected]:"
+        git submodule update --init --recursive
+    - name: Generate coverage report
+      run: |
+        forge coverage --report lcov
+
+    - name: Install lcov
+      run: sudo apt-get install lcov
+
+    - name: Remove Tests from coverage
+      run:  lcov --remove ./lcov.info -o ./lcov.info.pruned 'tests/*'
+
+    - name: Report code coverage
+      uses: zgosalvez/github-actions-report-lcov@v1
+      with:
+        coverage-files: lcov.info.pruned
+        minimum-coverage: 90
+        artifact-name: code-coverage-report
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: ./

.github/workflows/forge.yaml

@@ -28,29 +28,36 @@ jobs:
         env:
           FOUNDRY_PROFILE: production
 
-    # coverage_report:
-    # name: Generate coverage report
-    # runs-on: ubuntu-latest
-    # steps:
-    # - uses: actions/checkout@v2
-
-    # - name: Install Foundry
-    #   uses: onbjerg/foundry-toolchain@v1
-    #   with:
-    #     version: nightly
-
-    # - name: Install submodules
-    #   run: |
-    #     git config --global url."https://github.com/".insteadOf "[email protected]:"
-    #     git submodule update --init --recursive
-    # - name: Generate coverage report
-    #   run: |
-    #     forge coverage --report lcov
-    # - name: Report code coverage
-    #   uses: zgosalvez/github-actions-report-lcov@v1
-    #   with:
-    #     coverage-files: lcov.info
-    #     minimum-coverage: 95
-    #     artifact-name: code-coverage-report
-    #     github-token: ${{ secrets.GITHUB_TOKEN }}
-    #     working-directory: ./
+    coverage_report:
+    name: Generate coverage report
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install Foundry
+      uses: onbjerg/foundry-toolchain@v1
+      with:
+        version: nightly
+
+    - name: Install submodules
+      run: |
+        git config --global url."https://github.com/".insteadOf "[email protected]:"
+        git submodule update --init --recursive
+    - name: Generate coverage report
+      run: |
+        forge coverage --report lcov
+
+    - name: Install lcov
+      run: sudo apt-get install lcov
+
+    - name: Remove Tests from coverage
+      run:  lcov --remove ./lcov.info -o ./lcov.info.pruned 'tests/*'
+
+    - name: Report code coverage
+      uses: zgosalvez/github-actions-report-lcov@v1
+      with:
+        coverage-files: lcov.info.pruned
+        minimum-coverage: 90
+        artifact-name: code-coverage-report
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: ./

contracts/MapleToken.sol

@@ -1,9 +1,37 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.18;
 
-import { ERC20 }                 from "../modules/erc20/contracts/ERC20.sol";
+import { ERC20Proxied }             from "../modules/erc20/contracts/ERC20Proxied.sol";
 import { NonTransparentProxied } from "../modules/ntp/contracts/NonTransparentProxied.sol";
 
-import { IMapleToken } from "./interfaces/IMapleToken.sol";
+import { IMapleToken, IERC20 } from "./interfaces/IMapleToken.sol";
 
-abstract contract MapleToken is IMapleToken, ERC20, NonTransparentProxied { }
+contract MapleToken is IMapleToken, ERC20Proxied, NonTransparentProxied {
+
+    bytes32 internal constant GLOBALS_SLOT = bytes32(uint256(keccak256("eip1967.proxy.globals")) - 1);
+
+    /**************************************************************************************************************************************/
+    /*** Pure Functions                                                                                                                 ***/
+    /**************************************************************************************************************************************/
+
+    function decimals() public pure override(ERC20Proxied, IERC20) returns (uint8 decimals_) {
+        decimals_ = 18;
+    }
+
+    function name() public pure override(ERC20Proxied, IERC20) returns (string memory name_) {
+        name_ = "MPL";
+    }
+
+    function symbol() public pure override(ERC20Proxied, IERC20) returns (string memory symbol_) {
+        symbol_ = "MPL";
+    }
+
+    /**************************************************************************************************************************************/
+    /*** View Functions                                                                                                                 ***/
+    /**************************************************************************************************************************************/
+
+    function globals() public view override returns (address globals_) {
+        globals_ = _getAddress(GLOBALS_SLOT);
+    }
+
+}

contracts/MapleTokenProxy.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.18;
+
+import { NonTransparentProxy } from "../modules/ntp/contracts/NonTransparentProxy.sol";
+
+contract MapleTokenProxy is NonTransparentProxy {
+
+    bytes32 internal constant GLOBALS_SLOT = bytes32(uint256(keccak256("eip1967.proxy.globals")) - 1);
+
+    constructor(address admin_, address implementation_, address globals_) NonTransparentProxy(admin_, implementation_) {
+        _setAddress(GLOBALS_SLOT, globals_);
+    }
+
+    /**************************************************************************************************************************************/
+    /*** Overridden Functions                                                                                                           ***/
+    /**************************************************************************************************************************************/
+
+    function setImplementation(address newImplementation_) override external {
+        // TODO: Check globals for scheduled call
+        require(msg.sender == _admin(), "NTP:SI:NOT_ADMIN");
+        _setAddress(IMPLEMENTATION_SLOT, newImplementation_);
+    }
+
+}

tests/MapleToken.t.sol

@@ -3,7 +3,57 @@ pragma solidity 0.8.18;
 
 import { TestBase } from "./utils/TestBase.sol";
 
-// TODO: Potentially split up into multiple test files.
-contract MapleTokenTests is TestBase {
+import { MapleTokenProxy } from "../contracts/MapleTokenProxy.sol";
+import { MapleToken }      from "../contracts/MapleToken.sol";
 
+import { MockGlobals } from "./utils/Mocks.sol";
+
+contract MapleTokenTestsBase is TestBase {
+
+    address governor = makeAddr("governor");
+
+    address implementation;
+    address token;
+
+    MockGlobals globals;
+
+    function setUp() public virtual {
+        globals = new MockGlobals();
+        globals.__setGovernor(governor);
+
+        implementation = address(new MapleToken());
+        token          = address(new MapleTokenProxy(governor, (implementation), address(globals)));
+    }
+
+}
+
+contract ProxyTests is MapleTokenTestsBase {
+
+    function test_proxySetup() external {
+        MapleToken token_ = MapleToken(token);
+
+        assertEq(token_.implementation(), address(implementation));
+        assertEq(token_.globals(),        address(globals));
+        assertEq(token_.admin(),          governor);
+
+        assertEq(token_.name(),     "MPL");
+        assertEq(token_.symbol(),   "MPL");
+        assertEq(token_.decimals(), 18);
+    }
+
+}
+
+contract SetImplementationTests is MapleTokenTestsBase {
+
+    function test_setImplementation_notAdmin() external {
+        vm.expectRevert("NTP:SI:NOT_ADMIN");
+        MapleTokenProxy(token).setImplementation(address(0x1));
+    }
+
+    function test_setImplementation_success() external {
+        address newImplementation = address(new MapleToken());
+
+        vm.prank(governor);
+        MapleTokenProxy(token).setImplementation(newImplementation);
+    }
 }

tests/utils/Mocks.sol

@@ -1,2 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.18;
+
+contract MockGlobals {
+
+    address public governor;
+
+    function __setGovernor(address governor_) external {
+        governor = governor_;
+    }
+
+}