decouple verifier from sender

ensdomains · Feb 15, 2024 · 92756cd · 92756cd
1 parent 952914d
commit 92756cd
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/packages/contracts/contracts/OffchainResolver.sol b/packages/contracts/contracts/OffchainResolver.sol
@@ -6,7 +6,7 @@ import "./IExtendedResolver.sol";
 import "./SignatureVerifier.sol";
 
 interface IResolverService {
-    function resolve(bytes calldata name, bytes calldata data) external view returns(bytes memory result, uint64 expires, bytes memory sig);
+    function resolve(bytes calldata name, bytes calldata data, address verifier) external view returns(bytes memory result, uint64 expires, bytes memory sig);
 }
 
 /**
@@ -39,15 +39,15 @@ contract OffchainResolver is IExtendedResolver, SupportsInterface {
      * @return The return data, ABI encoded identically to the underlying function.
      */
     function resolve(bytes calldata name, bytes calldata data) external override view returns(bytes memory) {
-        bytes memory callData = abi.encodeWithSelector(IResolverService.resolve.selector, name, data);
+        bytes memory callData = abi.encodeWithSelector(IResolverService.resolve.selector, name, data, address(this));
         string[] memory urls = new string[](1);
         urls[0] = url;
         revert OffchainLookup(
             address(this),
             urls,
             callData,
             OffchainResolver.resolveWithProof.selector,
-            abi.encode(callData, address(this))
+            callData
         );
     }
 

diff --git a/packages/contracts/contracts/SignatureVerifier.sol b/packages/contracts/contracts/SignatureVerifier.sol
@@ -25,8 +25,7 @@ library SignatureVerifier {
      */
     function verify(bytes calldata request, bytes calldata response) internal view returns(address, bytes memory) {
         (bytes memory result, uint64 expires, bytes memory sig) = abi.decode(response, (bytes, uint64, bytes));
-        (bytes memory extraData, address sender) = abi.decode(request, (bytes, address));
-        address signer = ECDSA.recover(makeSignatureHash(sender, expires, extraData, result), sig);
+        address signer = ECDSA.recover(makeSignatureHash(address(this), expires, request, result), sig);
         require(
             expires >= block.timestamp,
             "SignatureVerifier: Signature expired");

diff --git a/packages/contracts/test/TestOffchainResolver.js b/packages/contracts/test/TestOffchainResolver.js
@@ -78,10 +78,9 @@ describe('OffchainResolver', function (accounts) {
         it('resolves an address given a valid signature', async () => {
             // Generate the response data
             const response = defaultAbiCoder.encode(['bytes', 'uint64', 'bytes'], [resultData, expires, hexConcat([sig.r, sig._vs])]);
-            const encodedData = ethers.utils.defaultAbiCoder.encode(['bytes', 'address'], [callData, resolver.address]);
 
             // Call the function with the request and response
-            const [result] = iface.decodeFunctionResult("addr", await resolver.resolveWithProof(response, encodedData));
+            const [result] = iface.decodeFunctionResult("addr", await resolver.resolveWithProof(response, callData));
             expect(result).to.equal(TEST_ADDRESS);
         });
 

diff --git a/packages/gateway-worker/src/server.ts b/packages/gateway-worker/src/server.ts
@@ -102,7 +102,7 @@ export function makeServer(
   server.add(IResolverService_abi, [
     {
       type: 'resolve',
-      func: async ([encodedName, data]: Result, request) => {
+      func: async ([encodedName, data, verifier]: Result, request) => {
         const name = decodeDnsName(Buffer.from(encodedName.slice(2), 'hex'));
         // Query the database
         const { result, validUntil } = await query(await db, name, data);
@@ -112,7 +112,7 @@ export function makeServer(
           ['bytes', 'address', 'uint64', 'bytes32', 'bytes32'],
           [
             '0x1900',
-            request?.to,
+            verifier,
             validUntil,
             ethers.utils.keccak256(request?.data || '0x'),
             ethers.utils.keccak256(result),

diff --git a/packages/gateway-worker/test/server.test.ts b/packages/gateway-worker/test/server.test.ts
@@ -77,6 +77,7 @@ describe('makeServer', () => {
     const outerData = IResolverService.encodeFunctionData('resolve', [
       dnsName(name),
       innerData,
+      TEST_ADDRESS,
     ]);
     // Call the server with address and data
     const { status, body } = await server.call({

diff --git a/packages/gateway/src/server.ts b/packages/gateway/src/server.ts
@@ -97,7 +97,7 @@ export function makeServer(signer: ethers.utils.SigningKey, db: Database) {
   server.add(IResolverService_abi, [
     {
       type: 'resolve',
-      func: async ([encodedName, data]: Result, request) => {
+      func: async ([encodedName, data, verifier]: Result, request) => {
         const name = decodeDnsName(Buffer.from(encodedName.slice(2), 'hex'));
         // Query the database
         const { result, validUntil } = await query(db, name, data);
@@ -107,7 +107,7 @@ export function makeServer(signer: ethers.utils.SigningKey, db: Database) {
           ['bytes', 'address', 'uint64', 'bytes32', 'bytes32'],
           [
             '0x1900',
-            request?.to,
+            verifier,
             validUntil,
             ethers.utils.keccak256(request?.data || '0x'),
             ethers.utils.keccak256(result),

diff --git a/packages/gateway/test/server.test.ts b/packages/gateway/test/server.test.ts
@@ -77,6 +77,7 @@ describe('makeServer', () => {
     const outerData = IResolverService.encodeFunctionData('resolve', [
       dnsName(name),
       innerData,
+      TEST_ADDRESS,
     ]);
     // Call the server with address and data
     const { status, body } = await server.call({