use context metadat field

dm3-org · Jul 27, 2023 · 443b2aa · 443b2aa
1 parent e5b1cbb
commit 443b2aa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/contracts/verifier/optimism-bedrock/BedrockCcipVerifier.sol b/contracts/verifier/optimism-bedrock/BedrockCcipVerifier.sol
@@ -61,15 +61,15 @@ contract BedrockCcipVerifier is CcipResponseVerifier {
      * @return coinType Resolvers coin type (60 for Ethereum)
      * @return graphqlUrl The GraphQL URL used by the resolver
      * @return storageType Storage Type (0 for EVM)
-     * @return encodedData Encoded data representing the resolver ("CCIP RESOLVER")
+     * @return context can be l2 resolver contract address for evm chain but can be any l2 storage identifier for non evm chain
      */
     function metadata(bytes calldata name) external view override returns (string memory, uint256, string memory, uint8, bytes memory) {
         return (
             string("Optimism Goerli"), //The name of the resolver
             convertEVMChainIdToCoinType(420), //CoinType Accoridng to ENSIP-11 for Chain Id 420
             this.graphqlUrl(), //The GraphQl Url
             uint8(0), //Storage Type 0 => EVM
-            abi.encodePacked("Optimism Goerli")
+            abi.encodePacked(target) //Context => L2 Resolver Address
         );
     }
 }
diff --git a/contracts/verifier/signature/SignatureCcipVerifier.sol b/contracts/verifier/signature/SignatureCcipVerifier.sol
@@ -84,13 +84,13 @@ contract SignatureCcipVerifier is CcipResponseVerifier {
      * @return coinType Resolvers coin type (60 for Ethereum)
      * @return graphqlUrl The GraphQL URL used by the resolver
      * @return storageType Storage Type (0 for EVM)
-     * @return encodedData Encoded data representing the resolver ("CCIP RESOLVER")
+     * @return context can be l2 resolver contract address for evm chain but can be any l2 storage identifier for non evm chain
      */
     function metadata(
         bytes calldata domainName
     ) external view override returns (string memory, uint256, string memory, uint8, bytes memory) {
         return (
-            string(name), //The name of the resolver
+            name, //The name of the resolver
             convertEVMChainIdToCoinType(60), //Resolvers coin type => Etheruem
             this.graphqlUrl(), //The GraphQl Url
             uint8(1), //Storage Type 0 => Offchain Databas

diff --git a/test/contracts/BedrockCcipVerifier.test.ts b/test/contracts/BedrockCcipVerifier.test.ts
@@ -119,12 +119,12 @@ describe("Bedrock CcipVerifier", () => {
                 .connect(owner)
                 .deploy(owner.address, "http://localhost:8080/graphql", bedrockProofVerifier.address, resolver.address);
 
-            const [name, coinType, graphqlUrl, storageType, encodedData] = await bedrockCcipVerifier.metadata(dnsEncode("alice.eth"));
+            const [name, coinType, graphqlUrl, storageType, context] = await bedrockCcipVerifier.metadata(dnsEncode("alice.eth"));
             expect(name).to.equal("Optimism Goerli");
             expect(convertCoinTypeToEVMChainId(BigNumber.from(coinType).toNumber())).to.equal(420);
             expect(graphqlUrl).to.equal("http://localhost:8080/graphql");
             expect(storageType).to.equal(storageType);
-            expect(ethers.utils.toUtf8String(encodedData)).to.equal("Optimism Goerli");
+            expect(ethers.utils.getAddress(context)).to.equal(resolver.address);
         });
     });
 });
diff --git a/test/contracts/CcipResolver.test.ts b/test/contracts/CcipResolver.test.ts
@@ -1,4 +1,5 @@
 import { FakeContract, smock } from "@defi-wonderland/smock";
+import { asL2Provider } from "@eth-optimism/sdk";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { expect } from "chai";
 import { BigNumber, ethers } from "ethers";
@@ -432,12 +433,12 @@ describe("CCIpResolver Test", () => {
                 .setVerifierForDomain(ethers.utils.namehash("alice.eth"), bedrockCcipVerifier.address, [
                     "http://localhost:8080/{sender}/{data}",
                 ]);
-            const [name, coinType, graphqlUrl, storageType, encodedData] = await ccipResolver.metadata(dnsEncode("alice.eth"));
+            const [name, coinType, graphqlUrl, storageType, context] = await ccipResolver.metadata(dnsEncode("alice.eth"));
             expect(name).to.equal("Optimism Goerli");
             expect(convertCoinTypeToEVMChainId(BigNumber.from(coinType).toNumber())).to.equal(420);
             expect(graphqlUrl).to.equal("http://localhost:8081/graphql");
             expect(storageType).to.equal(storageType);
-            expect(ethers.utils.toUtf8String(encodedData)).to.equal("Optimism Goerli");
+            expect(ethers.utils.getAddress(context)).to.equal("0x5FbDB2315678afecb367f032d93F642f64180aa3");
         });
     });
 });