Rename of proof method names

contracts/tokens/ChainableXcert.sol

@@ -14,7 +14,7 @@ contract ChainableXcert is Xcert {
     Xcert(_name, _symbol)
     public
   {
-    supportedInterfaces[0xc1dcb551] = true; // ChainableXcert
+    supportedInterfaces[0x6ea3dd92] = true; // ChainableXcert
   }
 
   /*
@@ -41,7 +41,7 @@ contract ChainableXcert is Xcert {
    * @param _tokenId Id of the Xcert we want to get proof of.
    * @param _index Index of the proof we want to get.
    */
-  function getProofByIndex(uint256 _tokenId,
+  function tokenProofByIndex(uint256 _tokenId,
                            uint256 _index)
     validNFToken(_tokenId)
     external
@@ -56,7 +56,7 @@ contract ChainableXcert is Xcert {
    * @dev Gets the count of all proofs for a Xcert.
    * @param _tokenId Id of the Xcert we want to get proof of.
    */
-  function getProofCount(uint256 _tokenId)
+  function tokenProofCount(uint256 _tokenId)
     validNFToken(_tokenId)
     external
     view

contracts/tokens/Xcert.sol

@@ -158,7 +158,7 @@ contract Xcert is Ownable, ERC721, ERC721Metadata, ERC165 {
     supportedInterfaces[0x01ffc9a7] = true; // ERC165
     supportedInterfaces[0x80ac58cd] = true; // ERC721
     supportedInterfaces[0x5b5e139f] = true; // ERC721Metadata
-    supportedInterfaces[0x58c66b9f] = true; // Xcert
+    supportedInterfaces[0x355d09e9] = true; // Xcert
   }
 
   /*
@@ -396,7 +396,7 @@ contract Xcert is Ownable, ERC721, ERC721Metadata, ERC165 {
    * @dev Gets proof for _tokenId.
    * @param _tokenId Id of the NFToken we want to get proof of.
    */
-  function getProof(uint256 _tokenId)
+  function tokenProof(uint256 _tokenId)
     validNFToken(_tokenId)
     external
     view

contracts/utils/Selector.sol

@@ -13,7 +13,7 @@ contract Selector {
     function calculateXcertSelector() public pure returns (bytes4) {
       Xcert i;
       return i.mint.selector
-         ^ i.getProof.selector
+         ^ i.tokenProof.selector
          ^ i.setMintAuthorizedAddress.selector
          ^ i.isMintAuthorizedAddress.selector;
     }
@@ -31,8 +31,8 @@ contract Selector {
     function calculateChainableXcertSelector() public pure returns (bytes4) {
       ChainableXcert i;
       return i.chain.selector
-         ^ i.getProofByIndex.selector
-         ^ i.getProofCount.selector;
+         ^ i.tokenProofByIndex.selector
+         ^ i.tokenProofCount.selector;
     }
 
     function calculateMinterSelector() public pure returns (bytes4) {

test/tokens/ChainableXcert.test.js

@@ -15,7 +15,7 @@ contract('ChainableXcert', (accounts) => {
 
   it('correctly chains additional proof', async () => {
     await xcert.chain(id1, mockProof2);
-    var proof = await xcert.getProof(id1);
+    var proof = await xcert.tokenProof(id1);
     assert.equal(proof, mockProof2);
   });
 
@@ -25,20 +25,20 @@ contract('ChainableXcert', (accounts) => {
 
   it('correctly gets proof by index', async () => {
     await xcert.chain(id1, mockProof2);
-    var proof = await xcert.getProofByIndex(id1, 1);
+    var proof = await xcert.tokenProofByIndex(id1, 1);
     assert.equal(proof, mockProof2);
   });
 
   it('reverts trying to get proof for none existant index', async () => {
-    await assertRevert(xcert.getProofByIndex(id1, 1));
+    await assertRevert(xcert.tokenProofByIndex(id1, 1));
   });
 
   it('returns correct proof count', async () => {
-    var proofCount = await xcert.getProofCount(id1);
+    var proofCount = await xcert.tokenProofCount(id1);
     assert.equal(proofCount, 1);
 
     await xcert.chain(id1, mockProof2);
-    proofCount = await xcert.getProofCount(id1);
+    proofCount = await xcert.tokenProofCount(id1);
     assert.equal(proofCount, 2);
   });
 });

test/tokens/Xcert.test.js

@@ -234,7 +234,7 @@ contract('Xcert', (accounts) => {
     var recipient = accounts[2];
 
     await xcert.mint(sender, id2, mockProof, 'url2');
-    var { logs } = await xcert.safeTransferFrom(sender, recipient, id2, {from: sender});
+    var { logs } = await xcert.safeTransferFrom(sender, recipient, id2, "", {from: sender});
     let transferEvent = logs.find(e => e.event === 'Transfer');
     assert.notEqual(transferEvent, undefined);
 
@@ -252,7 +252,7 @@ contract('Xcert', (accounts) => {
     var recipient = xcert.address;
 
     await xcert.mint(sender, id2, mockProof, 'url2');
-    await assertRevert(xcert.safeTransferFrom(sender, recipient, id2, {from: sender}));
+    await assertRevert(xcert.safeTransferFrom(sender, recipient, id2, "", {from: sender}));
   });
 
   it('corectly safe transfers NFToken from owner to smart contract that can recieve NFTokens', async () => {
@@ -261,7 +261,7 @@ contract('Xcert', (accounts) => {
     var recipient = tokenReceiverMock.address;
 
     await xcert.mint(sender, id2, mockProof, 'url2');
-    var { logs } = await xcert.safeTransferFrom(sender, recipient, id2, {from: sender});
+    var { logs } = await xcert.safeTransferFrom(sender, recipient, id2, "", {from: sender});
     let transferEvent = logs.find(e => e.event === 'Transfer');
     assert.notEqual(transferEvent, undefined);
 
@@ -286,7 +286,7 @@ contract('Xcert', (accounts) => {
 
   it('returns the correct proof for NFToken id', async () => {
     await xcert.mint(accounts[1], id2, mockProof, 'url2');
-    var proof = await xcert.getProof(id2);
+    var proof = await xcert.tokenProof(id2);
     assert.equal(proof, mockProof);
   });
 

test/tokens/XcertMock.test.js

@@ -29,7 +29,7 @@ contract('XcertMock', (accounts) => {
 
   it('correctly chains additional proof', async () => {
     await xcert.chain(id1, mockProof2);
-    var proof = await xcert.getProof(id1);
+    var proof = await xcert.tokenProof(id1);
     assert.equal(proof, mockProof2);
   });