fix: set indexed address to filter

contracts/Bank.sol

@@ -11,7 +11,7 @@ struct Order {
 
 contract Bank {
 	using Counters for Counters.Counter;
-	Counters.Counter private id_counter;
+	// Counters.Counter private id_counter;
 
 	SoulboundToken public sbt;
 	address public owner;
@@ -55,47 +55,42 @@ contract Bank {
 		require(target == number, "This is not your SBT number.");
 		require(sbt_number[msg.sender] == 0, "You have registered.");
 		sbt_number[msg.sender] = target;
+		credits[msg.sender] = 1000000000000000000;
 	}
 
-	function pay(address shop, uint amount) public onlyClient {
+	function pay(uint id, address shop, uint amount) public onlyClient {
 		require(amount <= (credits[msg.sender]-arrears[msg.sender]), "You don't have enough credit.");
-		id_counter.increment();
-		uint id = id_counter.current();
+		// id_counter.increment();
+		// uint id = id_counter.current();
 		arrears[msg.sender] += amount;
 		order_info[id] = Order(false, amount, shop);
 		client_orders[msg.sender].push(id);
 		payable(shop).transfer(amount);
-		sbt.logBorrowing(msg.sender, id, amount);
+		sbt.logBorrowing(msg.sender, shop, id, amount);
 	}
 
-	function repay() public payable onlyClient returns (uint, uint) {
+	function repay() public payable onlyClient {
 		require(recv, "It's not the time to repay.");
 		uint value = msg.value;
-		uint repay_amount = 0;
-		uint should_pay;
-		uint refund;
-		uint item_counter = 0;
+		// uint repay_amount = 0;
+		uint should_pay = 0;
+		// uint refund;
+		// uint item_counter = 0;
 		
 		for (uint i=0; i<client_orders[msg.sender].length; i++) {
-			should_pay = order_info[client_orders[msg.sender][i]].amount;
-			if ((value - repay_amount) >= should_pay){
-				repay_amount += should_pay;
-				order_info[client_orders[msg.sender][i]].isFinished = true;
-				sbt.logRepaying(msg.sender, client_orders[msg.sender][i], should_pay);
-			} else {
-				client_orders[msg.sender][item_counter] = client_orders[msg.sender][i];
-				item_counter += 1;
-			}
+			should_pay += order_info[client_orders[msg.sender][i]].amount;
 		}
-		for(uint i=0; i<(client_orders[msg.sender].length-item_counter); i++){
-			client_orders[msg.sender].pop();
+		require(value>=should_pay, "You dont have enough ETH to repay");
+		for (uint i=0; i<client_orders[msg.sender].length; i++) {
+			order_info[client_orders[msg.sender][i]].isFinished = true;
+			sbt.logRepaying(msg.sender, client_orders[msg.sender][i], should_pay);
 		}
-		refund = value - repay_amount;
-		arrears[msg.sender] -= repay_amount;
-		if (refund != 0){
-			payable(msg.sender).transfer(refund);
-		}
-		return (client_orders[msg.sender].length, refund);
+		client_orders[msg.sender] = new uint[](0);
+		arrears[msg.sender] = 0;
+	}
+
+	function warning(address client) public onlyBank {
+		sbt.logWarning(client);
 	}
 
 	function start_recv() public onlyBank {
@@ -110,15 +105,19 @@ contract Bank {
 		return credits[client];
 	}
 
-	function getArrear(address client) public view onlySelfOrBank(client) return (uint) {
+	function getArrear(address client) public view onlySelfOrBank(client) returns (uint) {
 		return arrears[client];
 	}
 
-	function getClientOrders(address client) public view onlySelfOrBank(client) returns (Order[] memory){
-		Order[] memory orders = new Order[]( client_orders[client].length );
-		for(uint i=0; i<client_orders[client].length; i++){
-			orders[i] = order_info[client_orders[client][i]];
-		}
-		return orders;
+	function getClientOrders(address client) public view onlySelfOrBank(client) returns (uint[] memory){
+		// Order[] memory orders = new Order[]( client_orders[client].length );
+		// for(uint i=0; i<client_orders[client].length; i++){
+		// 	orders[i] = order_info[client_orders[client][i]];
+		// }
+		return client_orders[client];
+	}
+
+	function getSBTNumber(address client) public view onlySelfOrBank(client) returns (uint) {
+		return sbt_number[client];
 	}
 }

contracts/SoulboundToken.sol

@@ -19,13 +19,13 @@ contract SoulboundToken is ERC721, Ownable {
     mapping(address => Certificate[]) private certificates;
     mapping(address => uint) private address_to_number;
 
-    event Borrow(address client, address bank, uint id, uint amount);
-    event Repay(address client, address bank, uint id, uint amount);
-    event Warning(address client, address bank);
+    event Borrow(address indexed client, address indexed shop, address indexed bank, uint id, uint amount);
+    event Repay(address indexed client, address indexed bank, uint id, uint amount);
+    event Warning(address indexed client, address indexed bank);
 
     constructor() ERC721("Credit System Soulbound Token", "CS_SBT") {}
 
-    function mint(address player) public onlyOwner returns (uint256) {
+    function mint(address player) public returns (uint256) {
         _tokenIds.increment();
         uint256 newItemId = _tokenIds.current();
         _mint(player, newItemId);
@@ -72,11 +72,9 @@ contract SoulboundToken is ERC721, Ownable {
         require(isReliableBank[msg.sender] == true, "Only bank can access this function");
         _;
     }
-    event HERE(address);
 
 	modifier onlySelfOrBank(address addr) {
-        emit HERE(addr);
-		require((msg.sender == owner()) || (msg.sender == addr), "Only the owner can access this function.");
+		require(isReliableBank[msg.sender] == true || (msg.sender == addr), "Only the owner can access this function.");
 		_;
 	}
 
@@ -93,8 +91,8 @@ contract SoulboundToken is ERC721, Ownable {
         isReliableBank[bank] = false;
     }
 
-    function logBorrowing(address client, uint id, uint amount) public onlyBank {
-        emit Borrow(client, msg.sender, id, amount);
+    function logBorrowing(address client, address shop, uint id, uint amount) public onlyBank {
+        emit Borrow(client, shop, msg.sender, id, amount);
     }
 
     function logRepaying(address client, uint id, uint amount) public onlyBank {
@@ -113,8 +111,7 @@ contract SoulboundToken is ERC721, Ownable {
         return certificates[client];
     }
 
-    function getAccountNumber(address client) public onlySelfOrBank(client) returns (uint) {
-        
+    function getAccountNumber(address client) public view onlySelfOrBank(client) returns (uint) {
         return address_to_number[client];
     }
 }