crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize for loops in LibAddressArray

Browse Source
This commit is contained in:
Amir Bandeali 2019-03-04 16:42:51 -08:00
parent 1136e58de7
commit 350474540b
1 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
contracts/utils/contracts/src/LibAddressArray.sol
View File

@ -91,15 +91,31 @@ library LibAddressArray {
function contains(address[] memory addressArray, address target) function contains(address[] memory addressArray, address target)
internal internal
pure pure
returns (bool) returns (bool success)
{ {
uint256 length = addressArray.length; assembly {
for (uint256 i = 0; i < length; i++) {
if (addressArray[i] == target) { // Calculate byte length of array
return true; let arrayByteLen := mul(mload(addressArray), 32)
// Calculate beginning of array contents
let arrayContentsStart := add(addressArray, 32)
// Loop through array
for {let i:= 0} lt(i, arrayByteLen) {i := add(i, 32)} {
// Load array element
let arrayElement := mload(add(arrayContentsStart, i))
// Return true if array element equals target
if eq(target, arrayElement) {
// Set success to true
success := 1
// Break loop
i := arrayByteLen
} }
} }
return false; }
return success;
} }
/// @dev Finds the index of an address within an array. /// @dev Finds the index of an address within an array.
@ -109,14 +125,31 @@ library LibAddressArray {
function indexOf(address[] memory addressArray, address target) function indexOf(address[] memory addressArray, address target)
internal internal
pure pure
returns (bool, uint256) returns (bool success, uint256 index)
{ {
uint256 length = addressArray.length; assembly {
for (uint256 i = 0; i < length; i++) {
if (addressArray[i] == target) { // Calculate byte length of array
return (true, i); let arrayByteLen := mul(mload(addressArray), 32)
// Calculate beginning of array contents
let arrayContentsStart := add(addressArray, 32)
// Loop through array
for {let i:= 0} lt(i, arrayByteLen) {i := add(i, 32)} {
// Load array element
let arrayElement := mload(add(arrayContentsStart, i))
// Return true if array element equals target
if eq(target, arrayElement) {
// Set success and index
success := 1
index := div(i, 32)
// Break loop
i := arrayByteLen
} }
} }
return (false, 0); }
return (success, index);
} }
} }