Merge pull request #872 from oceanprotocol/feature/access_list_events

add AccessList events

Author: alexcos20

contracts/accesslists/AccessList.sol

@@ -22,9 +22,23 @@ import "@openzeppelin/contracts/access/Ownable.sol";
 contract AccessList is Ownable, ERC721Enumerable,ERC721URIStorage {
     using Counters for Counters.Counter;
     Counters.Counter private _tokenIds;
+
+
+    event NewAccessList(
+        address indexed contractAddress,
+        address indexed owner
+    );
+    event AddressAdded(
+        address indexed wallet,
+        uint256 tokenId
+    );
+    event AddressRemoved(
+        uint256 tokenId
+    );
+
     constructor(string memory _name, string memory _symbol)
     ERC721(_name, _symbol) {
-         
+         emit NewAccessList(address(this),_msgSender());
     }
 
     function tokenURI(uint256 tokenId)
@@ -54,6 +68,7 @@ contract AccessList is Ownable, ERC721Enumerable,ERC721URIStorage {
     function _add(address user, string memory _tokenURI) private returns (uint256) {
         _tokenIds.increment();
         uint256 newItemId = _tokenIds.current();
+        emit AddressAdded(user,newItemId);
         _mint(user, newItemId);
         _setTokenURI(newItemId, _tokenURI);
         return newItemId;
@@ -67,17 +82,18 @@ contract AccessList is Ownable, ERC721Enumerable,ERC721URIStorage {
     /**
      * @notice Batch Mint only for owner
      */
-    function batchMint(address[] memory user,string[] memory tokenURI) external onlyOwner
+    function batchMint(address[] memory user,string[] memory _tokenURI) external onlyOwner
     {
         uint256 i;
-        require(user.length==tokenURI.length);
+        require(user.length==_tokenURI.length);
         for(i=0;i<user.length;i++){
-            _add(user[i],tokenURI[i]);
+            _add(user[i],_tokenURI[i]);
         }
     }
 
     function burn(uint256 tokenId) public {
         require(_msgSender() == super.owner() || _msgSender()==super._ownerOf(tokenId),"ERC721: Not owner");
+        emit AddressRemoved(tokenId);
         _burn(tokenId);
     }
     // The following functions are overrides required by Solidity.

test/unit/accesslists/AccessList.test.js

@@ -1,6 +1,9 @@
-const { expect } = require('chai');
+const { expect, assert } = require('chai');
 const { ethers } = require("hardhat");
 const { json } = require('hardhat/internal/core/params/argumentTypes');
+const { getEventFromTx } = require("../../helpers/utils")
+
+
 
 let metadata = {"uptime":100,"image":"ipfs://123"}
 let signers
@@ -11,7 +14,11 @@ describe('AccessLists tests', function () {
     this.accessListContract = await ethers.getContractFactory('AccessList');
     this.accessListContract = await this.accessListContract.deploy("AccessList","A");
     await this.accessListContract.deployed();
-
+    const txReceipt = await this.accessListContract.deployTransaction.wait();
+    let event = getEventFromTx(txReceipt, 'NewAccessList')
+    assert(event, "Cannot find NewAccessList event")
+    const contractAddress = event.args[0];
+    assert(contractAddress==this.accessListContract.address,"Access list contract address missmatch")
     // Get the contractOwner and collector address
     signers = await ethers.getSigners();
 
@@ -30,7 +37,12 @@ describe('AccessLists tests', function () {
 
 
   it('Mints one token, using mint', async function () {
-    await this.accessListContract.mint(signers[0].address,JSON.stringify(metadata));
+    const tx=await this.accessListContract.mint(signers[0].address,JSON.stringify(metadata));
+    const txReceipt = await tx.wait();
+    let event = getEventFromTx(txReceipt, 'AddressAdded')
+    assert(event, "Cannot find AddressAdded event")
+    const walletAddress = event.args[0];
+    assert(walletAddress==signers[0].address,"AddressAdded event:  wallet address missmatch")
     this.tokenID++;
     expect(await this.accessListContract.balanceOf(signers[0].address)).to.equal(1);
     expect(await this.accessListContract.ownerOf(this.tokenID)).to.equal(signers[0].address);
@@ -93,9 +105,15 @@ describe('AccessLists tests', function () {
   });
 
   it('Owner should be able to burn', async function () {
+    const thisTokenId=6
     const howMany=await this.accessListContract.balanceOf(signers[1].address)
-    expect(await this.accessListContract.ownerOf(6)).to.equal(signers[1].address);
-    await this.accessListContract.burn(6);
+    expect(await this.accessListContract.ownerOf(thisTokenId)).to.equal(signers[1].address);
+    const tx=await this.accessListContract.burn(thisTokenId);
+    const txReceipt = await tx.wait();
+    let event = getEventFromTx(txReceipt, 'AddressRemoved')
+    assert(event, "Cannot find AddressRemoved event")
+    const walletAddress = event.args[0];
+    assert(event.args[0]==thisTokenId,"AddressRemoved event:  tokenId missmatch")
     expect(await this.accessListContract.balanceOf(signers[1].address)).to.equal(howMany-1);