Change kamikaze contract

Author: krboktv

docs/assets/js/CONTACT_DATA.js

@@ -1,5 +1,5 @@
   const contractName = "Root";
-  const contractAddress = '0xdb61d68359120f71cbfb99e0a9a0de6947acbd0c';//'0x0f61eaf9db577c0d458564d0c06376b725209269';//"0xc76e244bf79c72b02b2b98c7005785e2d4fca360";
+  const contractAddress = '0x331f2812bd36f24c32ba44ee5d846dd9d5263512';//'0xdb61d68359120f71cbfb99e0a9a0de6947acbd0c';//'0x0f61eaf9db577c0d458564d0c06376b725209269';//"0xc76e244bf79c72b02b2b98c7005785e2d4fca360";
   const abi = [
     {
       "constant": true,

docs/nav/tasks8.html

@@ -314,13 +314,13 @@ <h1>BKX : CTF</h1>
     <span style="color: #a6e22e">string</span> <span style="color: #66d9ef">public</span> <span style="color: #a6e22e">bankName</span><span style="color: #f8f8f2">;</span>
     <span style="color: #a6e22e">address</span> <span style="color: #66d9ef">public</span> <span style="color: #a6e22e">bankOwner</span><span style="color: #f8f8f2">;</span>
 
-    <span style="color: #a6e22e">modifier</span> <span style="color: #a6e22e">onlyBankOwner</span><span style="color: #f8f8f2">()</span> <span style="color: #f8f8f2">{</span>
-        <span style="color: #a6e22e">require</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span> <span style="color: #f92672">==</span> <span style="color: #a6e22e">bankOwner</span><span style="color: #f8f8f2">);</span>
+    <span style="color: #a6e22e">modifier</span> <span style="color: #a6e22e">onlyBankOwnerOrBankAccount</span><span style="color: #f8f8f2">()</span> <span style="color: #f8f8f2">{</span>
+        <span style="color: #a6e22e">require</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span> <span style="color: #f92672">==</span> <span style="color: #a6e22e">bankOwner</span> <span style="color: #f92672">||</span> <span style="color: #a6e22e">accounts</span><span style="color: #f8f8f2">[</span><span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span><span style="color: #f8f8f2">]</span> <span style="color: #f92672">!=</span> <span style="color: #a6e22e">address</span><span style="color: #f8f8f2">(</span><span style="color: #ae81ff">0</span><span style="color: #f8f8f2">));</span>
         <span style="color: #a6e22e">_</span><span style="color: #f8f8f2">;</span>
     <span style="color: #f8f8f2">}</span>
 
     <span style="color: #66d9ef">function</span> <span style="color: #a6e22e">getCoins</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">address</span> <span style="color: #a6e22e">_to</span><span style="color: #f8f8f2">,</span> <span style="color: #a6e22e">uint256</span> <span style="color: #a6e22e">_value</span><span style="color: #f8f8f2">)</span> <span style="color: #66d9ef">public</span> <span style="color: #a6e22e">returns</span> <span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bool</span><span style="color: #f8f8f2">);</span>
-    <span style="color: #66d9ef">function</span> <span style="color: #a6e22e">addNewBankAccount</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">BankAccount</span> <span style="color: #a6e22e">_address</span><span style="color: #f8f8f2">,</span> <span style="color: #a6e22e">address</span> <span style="color: #a6e22e">_accountOwner</span><span style="color: #f8f8f2">)</span> <span style="color: #a6e22e">external</span> <span style="color: #a6e22e">onlyBankOwner</span> <span style="color: #a6e22e">returns</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bool</span><span style="color: #f8f8f2">);</span>
+    <span style="color: #66d9ef">function</span> <span style="color: #a6e22e">addNewBankAccount</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">BankAccount</span> <span style="color: #a6e22e">_address</span><span style="color: #f8f8f2">,</span> <span style="color: #a6e22e">address</span> <span style="color: #a6e22e">_accountOwner</span><span style="color: #f8f8f2">)</span> <span style="color: #a6e22e">external</span> <span style="color: #a6e22e">onlyBankOwnerOrBankAccount</span> <span style="color: #a6e22e">returns</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bool</span><span style="color: #f8f8f2">);</span>
 <span style="color: #f8f8f2">}</span>
 
 <span style="color: #a6e22e">contract</span> <span style="color: #a6e22e">Bank</span> <span style="color: #a6e22e">is</span> <span style="color: #a6e22e">IBank</span> <span style="color: #f8f8f2">{</span>
@@ -337,7 +337,7 @@ <h1>BKX : CTF</h1>
         <span style="color: #66d9ef">return</span> <span style="color: #a6e22e">IERC20</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">ERC20Token</span><span style="color: #f8f8f2">).</span><span style="color: #a6e22e">transfer</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">_to</span><span style="color: #f8f8f2">,</span> <span style="color: #a6e22e">_value</span><span style="color: #f8f8f2">);</span>
     <span style="color: #f8f8f2">}</span>
 
-    <span style="color: #66d9ef">function</span> <span style="color: #a6e22e">addNewBankAccount</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">BankAccount</span> <span style="color: #a6e22e">_address</span><span style="color: #f8f8f2">,</span> <span style="color: #a6e22e">address</span> <span style="color: #a6e22e">_accountOwner</span><span style="color: #f8f8f2">)</span> <span style="color: #a6e22e">external</span> <span style="color: #a6e22e">onlyBankOwner</span> <span style="color: #a6e22e">returns</span> <span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bool</span><span style="color: #f8f8f2">)</span> <span style="color: #f8f8f2">{</span>
+    <span style="color: #66d9ef">function</span> <span style="color: #a6e22e">addNewBankAccount</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">BankAccount</span> <span style="color: #a6e22e">_address</span><span style="color: #f8f8f2">,</span> <span style="color: #a6e22e">address</span> <span style="color: #a6e22e">_accountOwner</span><span style="color: #f8f8f2">)</span> <span style="color: #a6e22e">external</span> <span style="color: #a6e22e">onlyBankOwnerOrBankAccount</span> <span style="color: #a6e22e">returns</span> <span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bool</span><span style="color: #f8f8f2">)</span> <span style="color: #f8f8f2">{</span>
         <span style="color: #66d9ef">return</span> <span style="color: #a6e22e">addNewBankAccount_</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">_address</span><span style="color: #f8f8f2">,</span> <span style="color: #a6e22e">_accountOwner</span><span style="color: #f8f8f2">);</span>
     <span style="color: #f8f8f2">}</span>
 
@@ -356,19 +356,19 @@ <h1>BKX : CTF</h1>
     <span style="color: #a6e22e">uint</span> <span style="color: #a6e22e">constant</span> <span style="color: #a6e22e">CLIENT_SHARE</span> <span style="color: #f92672">=</span> <span style="color: #a6e22e">DECIMAL_MULTIPLIER</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">sub</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">BANK_FEE</span><span style="color: #f8f8f2">);</span>
 
     <span style="color: #a6e22e">address</span> <span style="color: #66d9ef">public</span> <span style="color: #a6e22e">bank</span><span style="color: #f8f8f2">;</span>
-    <span style="color: #a6e22e">address</span> <span style="color: #66d9ef">public</span> <span style="color: #a6e22e">owner</span><span style="color: #f8f8f2">;</span>
+    <span style="color: #a6e22e">mapping</span> <span style="color: #f8f8f2">(</span><span style="color: #a6e22e">address</span> <span style="color: #f92672">=&gt;</span> <span style="color: #a6e22e">bool</span><span style="color: #f8f8f2">)</span> <span style="color: #66d9ef">public</span> <span style="color: #a6e22e">owners</span><span style="color: #f8f8f2">;</span>
 
     <span style="color: #a6e22e">uint256</span> <span style="color: #a6e22e">internal</span> <span style="color: #a6e22e">frozenBalance</span><span style="color: #f8f8f2">;</span>
     <span style="color: #a6e22e">uint256</span> <span style="color: #a6e22e">internal</span> <span style="color: #a6e22e">releasedETH</span><span style="color: #f8f8f2">;</span>
 
     <span style="color: #a6e22e">modifier</span> <span style="color: #a6e22e">onlyBankOrAccountOwner</span><span style="color: #f8f8f2">()</span> <span style="color: #f8f8f2">{</span>
         <span style="color: #a6e22e">address</span> <span style="color: #a6e22e">bankOwner</span> <span style="color: #f92672">=</span> <span style="color: #a6e22e">IBank</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bank</span><span style="color: #f8f8f2">).</span><span style="color: #a6e22e">bankOwner</span><span style="color: #f8f8f2">();</span>
-        <span style="color: #a6e22e">require</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span> <span style="color: #f92672">==</span> <span style="color: #a6e22e">bankOwner</span> <span style="color: #f92672">||</span> <span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span> <span style="color: #f92672">==</span> <span style="color: #a6e22e">owner</span><span style="color: #f8f8f2">);</span>
+        <span style="color: #a6e22e">require</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bankOwner</span> <span style="color: #f92672">==</span> <span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span>  <span style="color: #f92672">||</span> <span style="color: #a6e22e">owners</span><span style="color: #f8f8f2">[</span><span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span><span style="color: #f8f8f2">]</span> <span style="color: #f92672">==</span> <span style="color: #66d9ef">true</span><span style="color: #f8f8f2">);</span>
         <span style="color: #a6e22e">_</span><span style="color: #f8f8f2">;</span>
     <span style="color: #f8f8f2">}</span>
 
     <span style="color: #a6e22e">modifier</span> <span style="color: #a6e22e">onlyOwner</span><span style="color: #f8f8f2">()</span> <span style="color: #f8f8f2">{</span>
-        <span style="color: #a6e22e">require</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span> <span style="color: #f92672">==</span> <span style="color: #a6e22e">owner</span><span style="color: #f8f8f2">);</span>
+        <span style="color: #a6e22e">require</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">owners</span><span style="color: #f8f8f2">[</span><span style="color: #a6e22e">tx</span><span style="color: #f8f8f2">.</span><span style="color: #a6e22e">origin</span><span style="color: #f8f8f2">]</span> <span style="color: #f92672">==</span> <span style="color: #66d9ef">true</span><span style="color: #f8f8f2">);</span>
         <span style="color: #a6e22e">_</span><span style="color: #f8f8f2">;</span>
     <span style="color: #f8f8f2">}</span>
 
@@ -390,10 +390,19 @@ <h1>BKX : CTF</h1>
 
     <span style="color: #a6e22e">constructor</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">address</span> <span style="color: #a6e22e">_bank</span><span style="color: #f8f8f2">,</span> <span style="color: #a6e22e">address</span> <span style="color: #a6e22e">_owner</span><span style="color: #f8f8f2">)</span> <span style="color: #f8f8f2">{</span>
         <span style="color: #a6e22e">bank</span> <span style="color: #f92672">=</span> <span style="color: #a6e22e">_bank</span><span style="color: #f8f8f2">;</span>
-        <span style="color: #a6e22e">owner</span> <span style="color: #f92672">=</span> <span style="color: #a6e22e">_owner</span><span style="color: #f8f8f2">;</span>
+        <span style="color: #a6e22e">owners</span><span style="color: #f8f8f2">[</span><span style="color: #a6e22e">_owner</span><span style="color: #f8f8f2">]</span> <span style="color: #f92672">=</span> <span style="color: #66d9ef">true</span><span style="color: #f8f8f2">;</span>
         <span style="color: #a6e22e">frozenBalance</span> <span style="color: #f92672">=</span> <span style="color: #ae81ff">1</span><span style="color: #a6e22e">e3</span><span style="color: #f8f8f2">;</span>
     <span style="color: #f8f8f2">}</span>
 
+    <span style="color: #75715e">/**</span>
+<span style="color: #75715e">    * If you want to add new teammates to resolve this task - use this function</span>
+<span style="color: #75715e">    */</span>
+    <span style="color: #66d9ef">function</span>  <span style="color: #a6e22e">addBankAccountOwners</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">address</span> <span style="color: #a6e22e">_newOwner</span><span style="color: #f8f8f2">)</span> <span style="color: #a6e22e">onlyOwner</span> <span style="color: #a6e22e">returns</span> <span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bool</span><span style="color: #f8f8f2">)</span> <span style="color: #f8f8f2">{</span>
+        <span style="color: #a6e22e">owners</span><span style="color: #f8f8f2">[</span><span style="color: #a6e22e">_newOwner</span><span style="color: #f8f8f2">]</span> <span style="color: #f92672">=</span> <span style="color: #66d9ef">true</span><span style="color: #f8f8f2">;</span>
+        <span style="color: #a6e22e">IBank</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">bank</span><span style="color: #f8f8f2">).</span><span style="color: #a6e22e">addNewBankAccount</span><span style="color: #f8f8f2">(</span><span style="color: #a6e22e">BankAccount</span> <span style="color: #a6e22e">address</span><span style="color: #f8f8f2">(</span><span style="color: #66d9ef">this</span><span style="color: #f8f8f2">),</span> <span style="color: #a6e22e">_newOwner</span><span style="color: #f8f8f2">);</span>
+        <span style="color: #66d9ef">return</span> <span style="color: #66d9ef">true</span><span style="color: #f8f8f2">;</span>
+    <span style="color: #f8f8f2">}</span>
+
     <span style="color: #66d9ef">function</span> <span style="color: #f8f8f2">()</span> <span style="color: #a6e22e">payable</span> <span style="color: #a6e22e">onlyBankOwner</span> <span style="color: #f8f8f2">{</span>
 
     <span style="color: #f8f8f2">}</span>
@@ -435,6 +444,8 @@ <h1>BKX : CTF</h1>
 <span style="color: #f8f8f2">}</span>
 </pre></div>
 
+    
+    
         </div>
 
         </p>

smart-contracts/contracts/tasks/Kamikaze.sol

@@ -243,13 +243,13 @@ contract IBank {
     string public bankName;
     address public bankOwner;
 
-    modifier onlyBankOwner() {
-        require(tx.origin == bankOwner);
+    modifier onlyBankOwnerOrBankAccount() {
+        require(tx.origin == bankOwner || accounts[tx.origin] != address(0));
         _;
     }
 
     function getCoins(address _to, uint256 _value) public returns (bool);
-    function addNewBankAccount(BankAccount _address, address _accountOwner) external onlyBankOwner returns(bool);
+    function addNewBankAccount(BankAccount _address, address _accountOwner) external onlyBankOwnerOrBankAccount returns(bool);
 }
 
 contract Bank is IBank {
@@ -266,7 +266,7 @@ contract Bank is IBank {
         return IERC20(ERC20Token).transfer(_to, _value);
     }
 
-    function addNewBankAccount(BankAccount _address, address _accountOwner) external onlyBankOwner returns (bool) {
+    function addNewBankAccount(BankAccount _address, address _accountOwner) external onlyBankOwnerOrBankAccount returns (bool) {
         return addNewBankAccount_(_address, _accountOwner);
     }
 
@@ -285,19 +285,19 @@ contract IBankAccount {
     uint constant CLIENT_SHARE = DECIMAL_MULTIPLIER.sub(BANK_FEE);
 
     address public bank;
-    address public owner;
+    mapping (address => bool) public owners;
 
     uint256 internal frozenBalance;
     uint256 internal releasedETH;
 
     modifier onlyBankOrAccountOwner() {
         address bankOwner = IBank(bank).bankOwner();
-        require(tx.origin == bankOwner || tx.origin == owner);
+        require(bankOwner == tx.origin  || owners[tx.origin] == true);
         _;
     }
 
     modifier onlyOwner() {
-        require(tx.origin == owner);
+        require(owners[tx.origin] == true);
         _;
     }
 
@@ -319,10 +319,19 @@ contract BankAccount is IBankAccount {
 
     constructor(address _bank, address _owner) {
         bank = _bank;
-        owner = _owner;
+        owners[_owner] = true;
         frozenBalance = 1e3;
     }
 
+    /**
+    * If you want to add new teammates to resolve this task - use this function
+    */
+    function  addBankAccountOwners(address _newOwner) onlyOwner returns (bool) {
+        owners[_newOwner] = true;
+        IBank(bank).addNewBankAccount(this, _newOwner);
+        return true;
+    }
+
     function () payable onlyBankOwner {
 
     }