decode returnData before return

ensdomains · Aug 4, 2023 · 61ab409 · 61ab409
1 parent f888108
commit 61ab409
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/contracts/dnsregistrar/OffchainDNSResolver.sol b/contracts/dnsregistrar/OffchainDNSResolver.sol
@@ -252,7 +252,11 @@ contract OffchainDNSResolver is IExtendedResolver {
             );
             uint256 size = LowLevelCallUtils.returnDataSize();
             if (result) {
-                return LowLevelCallUtils.readReturnData(0, size);
+                bytes memory returnData = LowLevelCallUtils.readReturnData(
+                    0,
+                    size
+                );
+                return abi.decode(returnData, (bytes));
             }
             // Failure
             if (size >= 4) {

diff --git a/test/dnsregistrar/TestOffchainDNSResolver.js b/test/dnsregistrar/TestOffchainDNSResolver.js
@@ -282,9 +282,9 @@ contract('OffchainDNSResolver', function (accounts) {
       [`ENS1 ${resolver.address} foobie bletch`],
       callData,
     )
-    expect(
-      ethers.utils.defaultAbiCoder.decode(['bytes', 'string'], result)[1],
-    ).to.equal('foobie bletch')
+    expect(ethers.utils.defaultAbiCoder.decode(['string'], result)[0]).to.equal(
+      'foobie bletch',
+    )
   })
 
   it('correctly resolves using legacy resolvers without resolve() support', async function () {