From c7a26f1a7e8a0e434991d9b67a37635e41d38f17 Mon Sep 17 00:00:00 2001
From: snsd0805 <levi900227@gmail.com>
Date: Fri, 9 Jun 2023 22:16:36 +0800
Subject: [PATCH] fix something about contracts

---
 contracts/Bank.sol           |  4 ++--
 contracts/SoulboundToken.sol | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/contracts/Bank.sol b/contracts/Bank.sol
index 2f37738..bb78968 100644
--- a/contracts/Bank.sol
+++ b/contracts/Bank.sol
@@ -65,7 +65,7 @@ contract Bank {
 		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) {
@@ -110,7 +110,7 @@ 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];
 	}
 
diff --git a/contracts/SoulboundToken.sol b/contracts/SoulboundToken.sol
index 80a4a89..2aafcad 100644
--- a/contracts/SoulboundToken.sol
+++ b/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 Borrow(address client, address shop, address bank, uint id, uint amount);
     event Repay(address client, address bank, uint id, uint amount);
     event Warning(address client, address 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];
     }
 }
\ No newline at end of file