Merge pull request #3 from TSxo/proxy

TSxo · web-flow · commit 11b827c3fd84 · 2025-04-20T12:46:33.000+10:00
feat: CallContext
diff --git a/README.md b/README.md
@@ -18,7 +18,10 @@ The smart contracts are located in the `src` directory.
 │       ├── IAuthManager.sol
 │       └── IAuthority.sol
 ├── mixins
+│   ├── CallContext.sol
 │   └── Mutex.sol
+└── proxy
+    ├── Proxy.sol
 ```
 
 ## Purpose & License
diff --git a/src/mocks/auth/OwnedMock.sol b/src/mocks/auth/OwnedMock.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.20;
 
 import { Owned } from "@tsxo/libsol/auth/Owned.sol";
 
-contract OwnedImpl is Owned {
+contract OwnedMock is Owned {
     uint256 public count;
 
     constructor(address initialOwner) {
diff --git a/src/mocks/auth/managed/AuthManagedMock.sol b/src/mocks/auth/managed/AuthManagedMock.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.20;
 
 import { AuthManaged } from "@tsxo/libsol/auth/managed/AuthManaged.sol";
 
-contract AuthManagedImpl is AuthManaged {
+contract AuthManagedMock is AuthManaged {
     uint256 public count;
 
     constructor(address initialAuthority) {
diff --git a/src/mocks/auth/managed/AuthManagerMock.sol b/src/mocks/auth/managed/AuthManagerMock.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.20;
 import { AuthManager } from "@tsxo/libsol/auth/managed/AuthManager.sol";
 import { Owned } from "@tsxo/libsol/auth/Owned.sol";
 
-contract AuthManagerImpl is Owned, AuthManager {
+contract AuthManagerMock is Owned, AuthManager {
     constructor(address initialOwner) {
         _initializeOwned(initialOwner);
     }
diff --git a/src/mocks/mixins/CallContextMock.sol b/src/mocks/mixins/CallContextMock.sol
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.20;
+
+import { CallContext } from "@tsxo/libsol/mixins/CallContext.sol";
+import { Proxy } from "@tsxo/libsol/proxy/Proxy.sol";
+
+contract CallContextMock is CallContext {
+    function implementationCall() public view returns (bool) {
+        return _implementationCall();
+    }
+
+    function selfAddress() public view returns (address) {
+        return _self();
+    }
+
+    function assertImplCall() public view notDelegated { }
+
+    function assertProxyCall() public view onlyProxy { }
+}
+
+contract CallContextProxy is Proxy {
+    address immutable _target;
+
+    constructor(address target) {
+        _target = target;
+    }
+
+    function _implementation() internal view override returns (address result) {
+        return _target;
+    }
+}
diff --git a/src/mocks/mixins/MutexMock.sol b/src/mocks/mixins/MutexMock.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 
 import { Mutex } from "@tsxo/libsol/mixins/Mutex.sol";
 
-contract MutexImpl is Mutex {
+contract MutexMock is Mutex {
     uint256 private _count;
 
     constructor() {
diff --git a/src/mocks/proxy/ProxyMock.sol b/src/mocks/proxy/ProxyMock.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 
 import { Proxy } from "@tsxo/libsol/proxy/Proxy.sol";
 
-contract ProxyImpl is Proxy {
+contract ProxyMock is Proxy {
     address immutable _target;
 
     constructor(address target) {
diff --git a/test/auth/Owned.t.sol b/test/auth/Owned.t.sol
@@ -2,7 +2,7 @@ pragma solidity 0.8.20;
 
 import { Test } from "forge-std/Test.sol";
 import { IOwned } from "@tsxo/libsol/auth/IOwned.sol";
-import { OwnedImpl } from "@tsxo/libsol/mocks/auth/OwnedImpl.sol";
+import { OwnedMock } from "@tsxo/libsol/mocks/auth/OwnedMock.sol";
 
 interface TestEvents {
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
@@ -12,14 +12,14 @@ contract OwnedTest is Test, TestEvents {
     // -------------------------------------------------------------------------
     // State
 
-    OwnedImpl owned;
+    OwnedMock owned;
     address constant owner = address(0x1234);
 
     // -------------------------------------------------------------------------
     // Set Up
 
     function setUp() public {
-        owned = new OwnedImpl(owner);
+        owned = new OwnedMock(owner);
     }
 
     // -------------------------------------------------------------------------
@@ -32,7 +32,7 @@ contract OwnedTest is Test, TestEvents {
     function test_RevertsOnConstructionWithZeroAddress() public {
         bytes4 err = IOwned.Owned__ZeroAddress.selector;
         vm.expectRevert(err);
-        new OwnedImpl(address(0));
+        new OwnedMock(address(0));
     }
 
     // -------------------------------------------------------------------------
diff --git a/test/auth/managed/AuthManaged.t.sol b/test/auth/managed/AuthManaged.t.sol
@@ -5,8 +5,8 @@ import { Test } from "forge-std/Test.sol";
 import { IAuthManaged } from "@tsxo/libsol/auth/managed/IAuthManaged.sol";
 import { IAuthManager } from "@tsxo/libsol/auth/managed/IAuthManager.sol";
 
-import { AuthManagedImpl } from "@tsxo/libsol/mocks/auth/managed/AuthManagedImpl.sol";
-import { AuthManagerImpl } from "@tsxo/libsol/mocks/auth/managed/AuthManagerImpl.sol";
+import { AuthManagedMock } from "@tsxo/libsol/mocks/auth/managed/AuthManagedMock.sol";
+import { AuthManagerMock } from "@tsxo/libsol/mocks/auth/managed/AuthManagerMock.sol";
 
 interface TestEvents {
     event AuthorityUpdated(address indexed previousAuthority, address indexed newAuthority);
@@ -23,15 +23,15 @@ contract AuthManagedTest is Test, TestEvents {
     address constant owner = address(0x1234);
     address constant user = address(0x2345);
 
-    AuthManagerImpl manager;
-    AuthManagedImpl managed;
+    AuthManagerMock manager;
+    AuthManagedMock managed;
 
     // -------------------------------------------------------------------------
     // Set Up
 
     function setUp() public {
-        manager = new AuthManagerImpl(owner);
-        managed = new AuthManagedImpl(address(manager));
+        manager = new AuthManagerMock(owner);
+        managed = new AuthManagedMock(address(manager));
     }
 
     // -------------------------------------------------------------------------
diff --git a/test/auth/managed/AuthManager.t.sol b/test/auth/managed/AuthManager.t.sol
@@ -5,8 +5,8 @@ import { Test } from "forge-std/Test.sol";
 import { IAuthManaged } from "@tsxo/libsol/auth/managed/IAuthManaged.sol";
 import { IAuthManager } from "@tsxo/libsol/auth/managed/IAuthManager.sol";
 
-import { AuthManagedImpl } from "@tsxo/libsol/mocks/auth/managed/AuthManagedImpl.sol";
-import { AuthManagerImpl } from "@tsxo/libsol/mocks/auth/managed/AuthManagerImpl.sol";
+import { AuthManagedMock } from "@tsxo/libsol/mocks/auth/managed/AuthManagedMock.sol";
+import { AuthManagerMock } from "@tsxo/libsol/mocks/auth/managed/AuthManagerMock.sol";
 
 interface TestEvents {
     event UserRoleUpdated(address indexed user, uint8 indexed role, bool enabled);
@@ -28,15 +28,15 @@ contract AuthManagerTest is Test, TestEvents {
     address constant userB = address(0x3456);
     address constant userC = address(0x4567);
 
-    AuthManagerImpl manager;
-    AuthManagedImpl managed;
+    AuthManagerMock manager;
+    AuthManagedMock managed;
 
     // -------------------------------------------------------------------------
     // Set Up
 
     function setUp() public {
-        manager = new AuthManagerImpl(owner);
-        managed = new AuthManagedImpl(address(manager));
+        manager = new AuthManagerMock(owner);
+        managed = new AuthManagedMock(address(manager));
     }
 
     // -------------------------------------------------------------------------
diff --git a/test/mixins/CallContext.t.sol b/test/mixins/CallContext.t.sol
@@ -0,0 +1,81 @@
+pragma solidity 0.8.20;
+
+import { Test } from "forge-std/Test.sol";
+import { CallContext } from "@tsxo/libsol/mixins/CallContext.sol";
+import { CallContextMock, CallContextProxy } from "@tsxo/libsol/mocks/mixins/CallContextMock.sol";
+
+contract CallContextTest is Test {
+    // -------------------------------------------------------------------------
+    // State
+
+    CallContextMock callContext;
+    CallContextProxy proxy;
+
+    // -------------------------------------------------------------------------
+    // Set Up
+
+    function setUp() public {
+        callContext = new CallContextMock();
+        proxy = new CallContextProxy(address(callContext));
+    }
+
+    // -------------------------------------------------------------------------
+    // Tests
+
+    function test_ImplementationCall_OnImplementation() public view {
+        assert(callContext.implementationCall());
+    }
+
+    function test_ImplementationCall_ThroughProxy() public view {
+        // Wrapped.
+        CallContextMock asImpl = CallContextMock(address(proxy));
+
+        bool result = asImpl.implementationCall();
+        assert(!result);
+
+        // Static Call.
+        bytes memory implCall = abi.encodeWithSignature("implementationCall()");
+
+        (bool success, bytes memory data) = address(proxy).staticcall(implCall);
+        bool isImplCall = abi.decode(data, (bool));
+
+        assert(success);
+        assert(!isImplCall);
+    }
+
+    function test_Self_OnImplementation() public view {
+        address self = callContext.selfAddress();
+        assertEq(self, address(callContext));
+    }
+
+    function test_Self_ThroughProxy() public view {
+        CallContextMock asImpl = CallContextMock(address(proxy));
+
+        address self = asImpl.selfAddress();
+        assertEq(self, address(callContext));
+    }
+
+    function test_NotDelegated_OnImplementation() public view {
+        callContext.assertImplCall();
+    }
+
+    function test_NotDelegatedModifier_ThroughProxy() public {
+        CallContextMock asImpl = CallContextMock(address(proxy));
+        bytes4 err = CallContext.CallContext__Unauthorized.selector;
+
+        vm.expectRevert(err);
+        asImpl.assertImplCall();
+    }
+
+    function test_OnlyProxyModifier_OnImplementation() public {
+        bytes4 err = CallContext.CallContext__Unauthorized.selector;
+        vm.expectRevert(err);
+        callContext.assertProxyCall();
+    }
+
+    function test_OnlyProxyModifier_ThroughProxy() public view {
+        CallContextMock asImpl = CallContextMock(address(proxy));
+
+        asImpl.assertProxyCall();
+    }
+}
diff --git a/test/mixins/Mutex.t.sol b/test/mixins/Mutex.t.sol
@@ -2,20 +2,20 @@ pragma solidity 0.8.20;
 
 import { Test } from "forge-std/Test.sol";
 import { Mutex } from "@tsxo/libsol/mixins/Mutex.sol";
-import { MutexImpl, MutexAttack } from "@tsxo/libsol/mocks/mixins/MutexImpl.sol";
+import { MutexMock, MutexAttack } from "@tsxo/libsol/mocks/mixins/MutexMock.sol";
 
 contract MutextTest is Test {
     // -------------------------------------------------------------------------
     // State
 
-    MutexImpl mutex;
+    MutexMock mutex;
     MutexAttack attacker;
 
     // -------------------------------------------------------------------------
     // Set Up
 
     function setUp() public {
-        mutex = new MutexImpl();
+        mutex = new MutexMock();
         attacker = new MutexAttack();
     }
 
diff --git a/test/proxy/Proxy.t.sol b/test/proxy/Proxy.t.sol

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ pragma solidity 0.8.20;`
`5`	`5`	`import { AuthManager } from "@tsxo/libsol/auth/managed/AuthManager.sol";`
`6`	`6`	`import { Owned } from "@tsxo/libsol/auth/Owned.sol";`
`7`	`7`
`8`		`-contract AuthManagerImpl is Owned, AuthManager {`
	`8`	`+contract AuthManagerMock is Owned, AuthManager {`
`9`	`9`	`constructor(address initialOwner) {`
`10`	`10`	`_initializeOwned(initialOwner);`
`11`	`11`	`}`