Merge a1e46e7 into 80d393f

Author: MoMannn

Diff for: common/config/rush/npm-shrinkwrap.json

@@ -4,7 +4,7 @@ pragma solidity 0.8.6;
 /**
  * @title ERC-2477 Non-Fungible Token Metadata Integrity Standard
  * @dev See https://eips.ethereum.org/EIPS/eip-2477
- * @dev The ERC-165 identifier for this interface is 0x#######. //TODO: FIX THIS
+ * @dev The ERC-165 identifier for this interface is 0x832a7e0e
  */
 interface ERC2477 /* is ERC165 */ {
   /**

Diff for: dist/0xcert-ethereum-asset-ledger.min.js

@@ -2,6 +2,7 @@
 
 pragma solidity 0.8.6;
 
+import "../ierc-2477.sol";
 import "../ixcert.sol";
 import "../ixcert-burnable.sol";
 import "../ixcert-mutable.sol";
@@ -16,6 +17,17 @@ import "../ixcert-revokable.sol";
 contract Selector
 {
 
+  /**
+   * @dev Calculates and returns interface ID for the erc2477 smart contract.
+   */
+  function calculateERC2477Selector()
+    external
+    pure
+    returns (bytes4)
+  {
+    return type(ERC2477).interfaceId;
+  }
+
   /**
    * @dev Calculates and returns interface ID for the Xcert smart contract.
    */
@@ -24,8 +36,7 @@ contract Selector
     pure
     returns (bytes4)
   {
-    Xcert i;
-    return (i.create.selector ^ i.setUri.selector);
+    return type(Xcert).interfaceId;
   }
 
   /**
@@ -36,8 +47,7 @@ contract Selector
     pure
     returns (bytes4)
   {
-    XcertBurnable i;
-    return i.destroy.selector;
+    return type(XcertBurnable).interfaceId;
   }
 
   /**
@@ -48,8 +58,7 @@ contract Selector
     pure
     returns (bytes4)
   {
-    XcertRevokable i;
-    return i.revoke.selector;
+    return type(XcertRevokable).interfaceId;
   }
 
   /**
@@ -60,8 +69,7 @@ contract Selector
     pure
     returns (bytes4)
   {
-    XcertMutable i;
-    return i.updateTokenURIIntegrityDigest.selector;
+    return type(XcertMutable).interfaceId;
   }
 
   /**
@@ -72,8 +80,7 @@ contract Selector
     pure
     returns (bytes4)
   {
-    XcertPausable i;
-    return i.setPause.selector;
+    return type(XcertPausable).interfaceId;
   }
 
 }

Diff for: dist/0xcert-ethereum-gateway.min.js

@@ -156,6 +156,7 @@ contract XcertToken is
   constructor()
   {
     supportedInterfaces[0x39541724] = true; // Xcert
+    supportedInterfaces[0x832a7e0e] = true; // ERC2477
   }
 
   /**

Diff for: dist/0xcert-ethereum-http-provider.min.js

@@ -20,6 +20,19 @@ spec.beforeEach(async (ctx) => {
   ctx.set('selector', selector);
 });
 
+spec.test('checks erc2477 selector', async (ctx) => {
+  const selector = ctx.get('selector');
+  const xcert = await ctx.deploy({
+    src: './build/xcert-mock.json',
+    contract: 'XcertMock',
+    args: ['Foo', 'F', 'https://0xcert.org/', '.json', '0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658', []],
+  });
+
+  const bytes = await selector.instance.methods.calculateERC2477Selector().call();
+  const supports = await xcert.instance.methods.supportsInterface(bytes).call();
+  ctx.is(supports, true);
+});
+
 spec.test('checks Xcert selector', async (ctx) => {
   const selector = ctx.get('selector');
   const xcert = await ctx.deploy({