changes

blockarraygroup · Jun 20, 2018 · 4f85e0b · 4f85e0b
1 parent 7f371b1
commit 4f85e0b
Show file tree

Hide file tree

Showing 31 changed files with 617 additions and 108 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This Dapp allows a user to send thousands of token transfers in a very effecient
 2. Make sure you have an account in MetaMask which has a token balance.
 3. Make sure your MetaMask is pointed to the network that you would like to use.
 4. Make sure your MetaMask account is unlocked.
-5. Go to https://poanetwork.github.io/multisender/#/
+5. Go to https://rstormsf.github.io/multisender/#/
 6. Wait for the full page to load.
 7. Select a token from the dropdown that you would like to send.
 8. Provide either JSON or CSV text in the textarea (see example below).

diff --git a/contracts/contracts/DeprecatedStormSender.sol b/contracts/contracts/DeprecatedStormSender.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**

diff --git a/contracts/contracts/EternalStorage.sol b/contracts/contracts/EternalStorage.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**

diff --git a/contracts/contracts/EternalStorageProxyForStormMultisender.sol b/contracts/contracts/EternalStorageProxyForStormMultisender.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./EternalStorage.sol";
 import "./OwnedUpgradeabilityProxy.sol";

diff --git a/contracts/contracts/Migrations.sol b/contracts/contracts/Migrations.sol
@@ -1,5 +1,5 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity ^0.4.17;
 
 contract Migrations {

diff --git a/contracts/contracts/OwnedUpgradeabilityProxy.sol b/contracts/contracts/OwnedUpgradeabilityProxy.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./UpgradeabilityProxy.sol";
 import "./UpgradeabilityOwnerStorage.sol";

diff --git a/contracts/contracts/OwnedUpgradeabilityStorage.sol b/contracts/contracts/OwnedUpgradeabilityStorage.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./EternalStorage.sol";
 import "./UpgradeabilityStorage.sol";

diff --git a/contracts/contracts/Proxy.sol b/contracts/contracts/Proxy.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**

diff --git a/contracts/contracts/SafeMath.sol b/contracts/contracts/SafeMath.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**

diff --git a/contracts/contracts/UpgradeabilityOwnerStorage.sol b/contracts/contracts/UpgradeabilityOwnerStorage.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**

diff --git a/contracts/contracts/UpgradeabilityProxy.sol b/contracts/contracts/UpgradeabilityProxy.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./Proxy.sol";
 import "./UpgradeabilityStorage.sol";

diff --git a/contracts/contracts/UpgradeabilityStorage.sol b/contracts/contracts/UpgradeabilityStorage.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**

diff --git a/contracts/contracts/multisender/Claimable.sol b/contracts/contracts/multisender/Claimable.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./Ownable.sol";
 import "../EternalStorage.sol";

diff --git a/contracts/contracts/multisender/Ownable.sol b/contracts/contracts/multisender/Ownable.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "../EternalStorage.sol";
 

diff --git a/contracts/contracts/multisender/UpgradebleStormSender.sol b/contracts/contracts/multisender/UpgradebleStormSender.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "../OwnedUpgradeabilityStorage.sol";
 import "./Claimable.sol";
@@ -100,16 +100,36 @@ contract UpgradebleStormSender is OwnedUpgradeabilityStorage, Claimable {
     }
 
     function multisendToken(address token, address[] _contributors, uint256[] _balances) public hasFee payable {
-        uint256 total = 0;
+        if (token == 0x000000000000000000000000000000000000bEEF){
+            multisendEther(_contributors, _balances);
+        } else {
+            uint256 total = 0;
+            require(_contributors.length <= arrayLimit());
+            ERC20 erc20token = ERC20(token);
+            uint8 i = 0;
+            for (i; i < _contributors.length; i++) {
+                erc20token.transferFrom(msg.sender, _contributors[i], _balances[i]);
+                total += _balances[i];
+            }
+            setTxCount(msg.sender, txCount(msg.sender).add(1));
+            Multisended(total, token);
+        }
+    }
+
+    function multisendEther(address[] _contributors, uint256[] _balances) public payable {
+        uint256 total = msg.value;
+        uint256 fee = currentFee(msg.sender);
+        require(total >= fee);
         require(_contributors.length <= arrayLimit());
-        ERC20 erc20token = ERC20(token);
-        uint8 i = 0;
+        total = total.sub(fee);
+        uint256 i = 0;
         for (i; i < _contributors.length; i++) {
-            erc20token.transferFrom(msg.sender, _contributors[i], _balances[i]);
-            total += _balances[i];
+            require(total >= _balances[i]);
+            total = total.sub(_balances[i]);
+            _contributors[i].transfer(_balances[i]);
         }
         setTxCount(msg.sender, txCount(msg.sender).add(1));
-        Multisended(total, token);
+        Multisended(msg.value, 0x000000000000000000000000000000000000bEEF);
     }
 
     function claimTokens(address _token) public onlyOwner {

diff --git a/contracts/flats/EternalStorageProxyForStormMultisender_flat.sol b/contracts/flats/EternalStorageProxyForStormMultisender_flat.sol
@@ -2,7 +2,7 @@
 // File: contracts/EternalStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -24,7 +24,7 @@ contract EternalStorage {
 // File: contracts/UpgradeabilityOwnerStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -56,7 +56,7 @@ contract UpgradeabilityOwnerStorage {
 // File: contracts/Proxy.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -98,7 +98,7 @@ contract Proxy {
 // File: contracts/UpgradeabilityStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -133,7 +133,7 @@ contract UpgradeabilityStorage {
 // File: contracts/UpgradeabilityProxy.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -167,7 +167,7 @@ contract UpgradeabilityProxy is Proxy, UpgradeabilityStorage {
 // File: contracts/OwnedUpgradeabilityProxy.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -244,7 +244,7 @@ contract OwnedUpgradeabilityProxy is UpgradeabilityOwnerStorage, UpgradeabilityP
 // File: contracts/EternalStorageProxyForStormMultisender.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;