update connector to support custom URI's

package.json

@@ -31,6 +31,7 @@
     "@nestjs/websockets": "^8.0.11",
     "class-transformer": "^0.4.0",
     "class-validator": "^0.13.1",
+    "lru-cache": "^7.10.1",
     "nanoid": "^3.1.31",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.4.0",
@@ -44,6 +45,7 @@
     "@nestjs/testing": "^8.0.11",
     "@types/express": "^4.17.8",
     "@types/jest": "^26.0.15",
+    "@types/lru-cache": "^7.10.10",
     "@types/node": "^14.14.6",
     "@types/supertest": "^2.0.10",
     "@types/uuid": "^8.3.1",

samples/solidity/contracts/ERC721WithData.sol

@@ -124,4 +124,8 @@ contract ERC721WithData is Context, Ownable, ERC721, IERC721WithData {
         require(_exists(tokenId), "ERC721WithData: Token does not exist");
         _tokenURIs[tokenId] = _tokenURI;
     }
+
+    function baseTokenUri() public view virtual override returns (string memory) {
+        return _baseURI();
+    }
 }

samples/solidity/contracts/IERC721WithData.sol

@@ -49,4 +49,6 @@ interface IERC721WithData is IERC165 {
         bool approved,
         bytes calldata data
     ) external;
+
+    function baseTokenUri() external returns(string memory);
 }

samples/solidity/test/ERC721WithData.ts

@@ -30,12 +30,13 @@ describe('ERC721WithData - Unit Tests', function () {
   it('Verify interface ID', async function () {
     const checkerFactory = await ethers.getContractFactory('InterfaceCheck');
     const checker: InterfaceCheck = await checkerFactory.connect(deployerSignerA).deploy();
-    expect(await checker.erc721WithData()).to.equal('0xfd0771df');
+    expect(await checker.erc721WithData()).to.equal('0x8706707d');
   });
 
   it('Create - Should create a new ERC721 instance with default state', async function () {
     expect(await deployedERC721WithData.name()).to.equal(contractName);
     expect(await deployedERC721WithData.symbol()).to.equal(contractSymbol);
+    expect(await deployedERC721WithData.baseTokenUri()).to.equal("firefly://token/");
   });
 
   it('Mint - Should mint successfully with a custom URI', async function () {

src/tokens/tokens.interfaces.ts

@@ -132,6 +132,10 @@ export class TokenPoolConfig {
   @ApiProperty()
   @IsOptional()
   blockNumber?: string;
+
+  @ApiProperty()
+  @IsOptional()
+  uri?: string;
 }
 
 export class TokenPool {
@@ -300,7 +304,11 @@ export class TokenTransfer {
   data?: string;
 }
 
-export class TokenMint extends OmitType(TokenTransfer, ['from']) {}
+export class TokenMint extends OmitType(TokenTransfer, ['from']) {
+  @ApiProperty()
+  @IsOptional()
+  uri?: string;
+}
 export class TokenBurn extends OmitType(TokenTransfer, ['to']) {}
 
 // Websocket notifications
@@ -332,6 +340,10 @@ export class TokenPoolEventInfo {
 
   @ApiProperty()
   schema: string;
+
+  @ApiProperty()
+  @IsOptional()
+  uri?: string;
 }
 
 export class TokenPoolEvent extends tokenEventBase {

src/tokens/tokens.service.spec.ts

@@ -81,19 +81,24 @@ const APPROVE_NO_DATA = 'approve';
 const APPROVE_ALL_NO_DATA = 'setApprovalForAll';
 
 const MINT_WITH_DATA = 'mintWithData';
+const MINT_WITH_URI = 'mintWithURI';
+const SUPPORTS_INTERFACE = 'supportsInterface';
 const TRANSFER_WITH_DATA = 'transferWithData';
 const BURN_WITH_DATA = 'burnWithData';
 const APPROVE_WITH_DATA = 'approveWithData';
 const APPROVE_ALL_WITH_DATA = 'setApprovalForAllWithData';
+const BASE_URI = 'baseTokenUri';
 
 const METHODS_NO_DATA = [MINT_NO_DATA, BURN_NO_DATA, APPROVE_NO_DATA, APPROVE_ALL_NO_DATA];
 
 const METHODS_WITH_DATA = [
   MINT_WITH_DATA,
+  MINT_WITH_URI,
   BURN_WITH_DATA,
   TRANSFER_WITH_DATA,
   APPROVE_WITH_DATA,
   APPROVE_ALL_WITH_DATA,
+  BASE_URI,
 ];
 
 const TRANSFER_EVENT = 'Transfer';
@@ -159,6 +164,19 @@ describe('TokensService', () => {
         }),
       );
     }
+    http.post.mockReturnValueOnce(
+      new FakeObservable(<EthConnectReturn>{
+        output: 'test',
+      }),
+    );
+  };
+
+  const mockURIQuery = (withURI: boolean) => {
+    http.post.mockReturnValueOnce(
+      new FakeObservable(<EthConnectReturn>{
+        output: withURI,
+      }),
+    );
   };
 
   beforeEach(async () => {
@@ -212,6 +230,7 @@ describe('TokensService', () => {
         symbol: SYMBOL,
       };
 
+      mockURIQuery(false);
       mockPoolQuery(false, true);
 
       await service.createPool(request).then(resp => {
@@ -384,6 +403,7 @@ describe('TokensService', () => {
         symbol: SYMBOL,
       };
 
+      mockURIQuery(false);
       mockPoolQuery(true, true);
 
       await service.createPool(request).then(resp => {
@@ -414,6 +434,7 @@ describe('TokensService', () => {
         symbol: SYMBOL,
       };
 
+      mockURIQuery(false);
       mockPoolQuery(true, true);
 
       await service.createPool(request).then(resp => {
@@ -582,6 +603,7 @@ describe('TokensService', () => {
         symbol: SYMBOL,
       };
 
+      mockURIQuery(false);
       mockPoolQuery(false, false);
 
       await service.createPool(request).then(resp => {
@@ -767,7 +789,8 @@ describe('TokensService', () => {
         symbol: SYMBOL,
       };
 
-      mockPoolQuery(true, false);
+      mockURIQuery(true);
+      mockPoolQuery(undefined, false);
 
       await service.createPool(request).then(resp => {
         expect(resp).toEqual({
@@ -781,6 +804,7 @@ describe('TokensService', () => {
             name: NAME,
             address: CONTRACT_ADDRESS,
             schema: ERC721_WITH_DATA_SCHEMA,
+            uri: 'test',
           },
         } as TokenPoolEvent);
       });
@@ -797,6 +821,7 @@ describe('TokensService', () => {
         symbol: SYMBOL,
       };
 
+      mockURIQuery(false);
       mockPoolQuery(true, false);
 
       await service.createPool(request).then(resp => {
@@ -840,6 +865,7 @@ describe('TokensService', () => {
         },
       };
 
+      // mockURIQuery(false);
       mockPoolQuery(undefined, false);
 
       eventstream.createOrUpdateStream = jest.fn(() => mockEventStream);
@@ -904,6 +930,52 @@ describe('TokensService', () => {
       expect(http.post).toHaveBeenCalledWith(BASE_URL, mockEthConnectRequest, OPTIONS);
     });
 
+    it('should mint ERC721WithData token with correct abi, custom uri, and inputs', async () => {
+      const request: TokenMint = {
+        tokenIndex: '721',
+        signer: IDENTITY,
+        poolLocator: ERC721_WITH_DATA_POOL_ID,
+        to: '0x123',
+        uri: 'ipfs://CID',
+      };
+
+      const mockEthConnectURIQuery: EthConnectMsgRequest = {
+        headers: {
+          type: 'Query',
+        },
+        to: CONTRACT_ADDRESS,
+        method: abiTypeMap.ERC721WithData.find(
+          abi => abi.name === SUPPORTS_INTERFACE,
+        ) as IAbiMethod,
+        params: ['0x8706707d'],
+      };
+
+      const mockEthConnectRequest: EthConnectMsgRequest = {
+        headers: {
+          type: 'SendTransaction',
+        },
+        from: IDENTITY,
+        to: CONTRACT_ADDRESS,
+        method: abiTypeMap.ERC721WithData.find(abi => abi.name === MINT_WITH_URI) as IAbiMethod,
+        params: ['0x123', '721', '0x00', 'ipfs://CID'],
+      };
+
+      const response: EthConnectAsyncResponse = {
+        id: 'responseId',
+        sent: true,
+      };
+
+      mockURIQuery(true);
+
+      http.post.mockReturnValueOnce(new FakeObservable(response));
+      await expect(service.mint(request)).resolves.toEqual({
+        id: 'responseId',
+      } as AsyncResponse);
+
+      expect(http.post).toHaveBeenCalledWith(BASE_URL, mockEthConnectURIQuery, OPTIONS);
+      expect(http.post).toHaveBeenCalledWith(BASE_URL, mockEthConnectRequest, OPTIONS);
+    });
+
     it('should transfer ERC721WithData token with correct abi and inputs', async () => {
       const request: TokenTransfer = {
         tokenIndex: '721',