New libs and clean up (#156)

* Added bitcoin libs (#153)

* added bitcoin libs

* renamed BitcoinHelper to EndianConverter

* refactored natspec

* review fixes
coverage 100%

* BtcTxParser -> TxParser

* updated readme

* refactored tests for txParser

* fixed  parseBlockHeader LE numbers

* refactored endianConverter

* added bytes to bytes conversion in EndianConverter

* cleaned headers data for tests

* review fixes

* package json fix

* refactored parseCuint in TxParser

* refactored naming in EndianConverter

* natspec EndianConverter

* removed convertion function from bytes to uint and vice versa

* covereage for EndianConverter

* refactored _reverseUint128 in EndianConverter

* fixed pragma solidity

* Update ERC7947 interface (#154)

* Update ERC7947 interface

* Fix unit tests

* typo

* added check for insertion attack in TxMerkleProof;
added isBitcoinTransaction and parseCuintMemory to TxParser

* utilized addHexPrefix

* TxMerkleProof now uses txIndex to calculate hashing directions

* fixed typo

* consistency in codestyle

* updated version to 3.2.0

* removed unused test case

* removed excess comment

* fixed natspec

* refactored helpers

* added reference for insertion attack

* update readme

---------

Co-authored-by: Oleh Komendant <44612825+Hrom131@users.noreply.github.com>
Co-authored-by: Artem Chystiakov <artem.ch31@gmail.com>

* remove some contracts

* removed compilation for pragma solidity 0.7.6

* removed bignumber.js from dependencies

* Update AAccountRecovery contract

* update changelog, revert version

---------

Co-authored-by: Yuliia Aritkulova <94910987+aritkulova@users.noreply.github.com>
Co-authored-by: Oleh Komendant <44612825+Hrom131@users.noreply.github.com>
Co-authored-by: Oleh Komendant <oleg02kom@gmail.com>

Author: 3 people

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [minor]
+
+Added several new libs to work with Bitcoin:
+
+- `BlockHeader` to parse and format Bitcoin block headers.
+- `TxMerkleProof` to verify the inclusion of a Bitcoin transaction in a block.
+- `TxParser` to parse and format Bitcoin transactions.
+- `EndianConverter` to convert between little-endian and big-endian formats.
+
+Removed rarely used, legacy libs and contracts:
+
+- `SetHelper`.
+- `UniswapV2Oracle`.
+- `UniswapV3Oracle`.
+
 ## [none]
 
-- Improved package publishing process
+- Improved package publishing process.

README.md

@@ -45,8 +45,11 @@ contracts
 ├── libs
 │   ├── arrays
 │   │   ├── ArrayHelper — "Common functions to work with arrays"
-│   │   ├── Paginator — "Return array slices from view function"
-│   │   └── SetHelper — "Array abstraction over sets"
+│   │   └── Paginator — "Return array slices from view function"
+│   ├── bitcoin
+│   │   ├── BlockHeader — "Parse and format Bitcoin block headers"
+│   │   ├── TxMerkleProof — "Verify transaction inclusion in Bitcoin block"
+│   │   └── TxParser — "Parse and format Bitcoin transactions"
 │   ├── bn
 │   │   └── U512 — "A hyperoptimized uint512 implementation"
 │   ├── crypto
@@ -67,15 +70,13 @@ contracts
 │   │       └── Vector — "A pushable memory array"
 │   ├── utils
 │   │   ├── DecimalsConverter — "Simplify interaction with ERC-20 decimals"
+│   │   ├── EndianConverter — "Convert between little-endian and big-endian formats"
 │   │   ├── MemoryUtils — "Functions for memory manipulation"
 │   │   ├── ReturnDataProxy — "Bypass extra returndata copy when returning data"
 │   │   └── Typecaster — "Cast between various Solidity types"
 │   └── zkp
 │       ├── Groth16VerifierHelper — "Simplify integration with Groth16 proofs"
 │       └── PlonkVerifierHelper — "Simplify integration with Plonk proofs"
-├── oracles
-│   ├── AUniswapV2Oracle — "Uniswap V2 oracle with custom TWAP"
-│   └── UniswapV3Oracle — "Uniswap V3 oracle with a clean interface"
 ├── proxy
 │   └── adminable
 │       ├── AdminableProxy — "A slight modification of a transparent proxy"

contracts/access/AMultiOwnable.sol

@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.21;
 
-import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import {SetHelper} from "../libs/arrays/SetHelper.sol";
 import {TypeCaster} from "../libs/utils/TypeCaster.sol";
 import {IMultiOwnable} from "../interfaces/access/IMultiOwnable.sol";
 
@@ -24,7 +23,6 @@ import {IMultiOwnable} from "../interfaces/access/IMultiOwnable.sol";
 abstract contract AMultiOwnable is IMultiOwnable, Initializable {
     using EnumerableSet for EnumerableSet.AddressSet;
     using TypeCaster for address;
-    using SetHelper for EnumerableSet.AddressSet;
 
     struct AMultiOwnableStorage {
         EnumerableSet.AddressSet owners;
@@ -113,7 +111,9 @@ abstract contract AMultiOwnable is IMultiOwnable, Initializable {
     function _addOwners(address[] memory newOwners_) private {
         AMultiOwnableStorage storage $ = _getAMultiOwnableStorage();
 
-        $.owners.add(newOwners_);
+        for (uint256 i = 0; i < newOwners_.length; ++i) {
+            $.owners.add(newOwners_[i]);
+        }
 
         if ($.owners.contains(address(0))) revert InvalidOwner();
 
@@ -132,7 +132,9 @@ abstract contract AMultiOwnable is IMultiOwnable, Initializable {
     function _removeOwners(address[] memory oldOwners_) private {
         AMultiOwnableStorage storage $ = _getAMultiOwnableStorage();
 
-        $.owners.remove(oldOwners_);
+        for (uint256 i = 0; i < oldOwners_.length; ++i) {
+            $.owners.remove(oldOwners_[i]);
+        }
 
         emit OwnersRemoved(oldOwners_);
     }

contracts/access/ARBAC.sol

@@ -6,7 +6,6 @@ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Ini
 import {IRBAC} from "../interfaces/access/IRBAC.sol";
 
 import {TypeCaster} from "../libs/utils/TypeCaster.sol";
-import {SetHelper} from "../libs/arrays/SetHelper.sol";
 import {DynamicSet} from "../libs/data-structures/DynamicSet.sol";
 
 /**
@@ -32,7 +31,6 @@ import {DynamicSet} from "../libs/data-structures/DynamicSet.sol";
  */
 abstract contract ARBAC is IRBAC, Initializable {
     using DynamicSet for DynamicSet.StringSet;
-    using SetHelper for DynamicSet.StringSet;
     using TypeCaster for string;
 
     struct ARBACStorage {
@@ -234,7 +232,9 @@ abstract contract ARBAC is IRBAC, Initializable {
     function _grantRoles(address to_, string[] memory rolesToGrant_) internal {
         ARBACStorage storage $ = _getARBACStorage();
 
-        $.userRoles[to_].add(rolesToGrant_);
+        for (uint256 i = 0; i < rolesToGrant_.length; ++i) {
+            $.userRoles[to_].add(rolesToGrant_[i]);
+        }
 
         emit GrantedRoles(to_, rolesToGrant_);
     }
@@ -247,7 +247,9 @@ abstract contract ARBAC is IRBAC, Initializable {
     function _revokeRoles(address from_, string[] memory rolesToRevoke_) internal {
         ARBACStorage storage $ = _getARBACStorage();
 
-        $.userRoles[from_].remove(rolesToRevoke_);
+        for (uint256 i = 0; i < rolesToRevoke_.length; ++i) {
+            $.userRoles[from_].remove(rolesToRevoke_[i]);
+        }
 
         emit RevokedRoles(from_, rolesToRevoke_);
     }
@@ -272,7 +274,10 @@ abstract contract ARBAC is IRBAC, Initializable {
             resourceToAdd_
         ];
 
-        _permissions.add(permissionsToAdd_);
+        for (uint256 i = 0; i < permissionsToAdd_.length; ++i) {
+            _permissions.add(permissionsToAdd_[i]);
+        }
+
         _resources.add(resourceToAdd_);
 
         emit AddedPermissions(role_, resourceToAdd_, permissionsToAdd_, allowed_);
@@ -298,7 +303,9 @@ abstract contract ARBAC is IRBAC, Initializable {
             resourceToRemove_
         ];
 
-        _permissions.remove(permissionsToRemove_);
+        for (uint256 i = 0; i < permissionsToRemove_.length; ++i) {
+            _permissions.remove(permissionsToRemove_[i]);
+        }
 
         if (_permissions.length() == 0) {
             _resources.remove(resourceToRemove_);

contracts/access/extensions/ARBACGroupable.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.21;
 import {IRBACGroupable} from "../../interfaces/access/extensions/IRBACGroupable.sol";
 
 import {DynamicSet} from "../../libs/data-structures/DynamicSet.sol";
-import {SetHelper} from "../../libs/arrays/SetHelper.sol";
 
 import {ARBAC} from "../ARBAC.sol";
 
@@ -24,7 +23,6 @@ import {ARBAC} from "../ARBAC.sol";
  */
 abstract contract ARBACGroupable is IRBACGroupable, ARBAC {
     using DynamicSet for DynamicSet.StringSet;
-    using SetHelper for DynamicSet.StringSet;
 
     struct ARBACGroupableStorage {
         uint256 defaultGroupEnabled;
@@ -211,7 +209,9 @@ abstract contract ARBACGroupable is IRBACGroupable, ARBAC {
     function _addUserToGroups(address who_, string[] memory groupsToAddTo_) internal {
         ARBACGroupableStorage storage $ = _getARBACGroupableStorage();
 
-        $.userGroups[who_].add(groupsToAddTo_);
+        for (uint256 i = 0; i < groupsToAddTo_.length; ++i) {
+            $.userGroups[who_].add(groupsToAddTo_[i]);
+        }
 
         emit AddedToGroups(who_, groupsToAddTo_);
     }
@@ -224,7 +224,9 @@ abstract contract ARBACGroupable is IRBACGroupable, ARBAC {
     function _removeUserFromGroups(address who_, string[] memory groupsToRemoveFrom_) internal {
         ARBACGroupableStorage storage $ = _getARBACGroupableStorage();
 
-        $.userGroups[who_].remove(groupsToRemoveFrom_);
+        for (uint256 i = 0; i < groupsToRemoveFrom_.length; ++i) {
+            $.userGroups[who_].remove(groupsToRemoveFrom_[i]);
+        }
 
         emit RemovedFromGroups(who_, groupsToRemoveFrom_);
     }
@@ -237,7 +239,9 @@ abstract contract ARBACGroupable is IRBACGroupable, ARBAC {
     function _grantGroupRoles(string memory groupTo_, string[] memory rolesToGrant_) internal {
         ARBACGroupableStorage storage $ = _getARBACGroupableStorage();
 
-        $.groupRoles[groupTo_].add(rolesToGrant_);
+        for (uint256 i = 0; i < rolesToGrant_.length; ++i) {
+            $.groupRoles[groupTo_].add(rolesToGrant_[i]);
+        }
 
         emit GrantedGroupRoles(groupTo_, rolesToGrant_);
     }
@@ -250,7 +254,9 @@ abstract contract ARBACGroupable is IRBACGroupable, ARBAC {
     function _revokeGroupRoles(string memory groupFrom_, string[] memory rolesToRevoke_) internal {
         ARBACGroupableStorage storage $ = _getARBACGroupableStorage();
 
-        $.groupRoles[groupFrom_].remove(rolesToRevoke_);
+        for (uint256 i = 0; i < rolesToRevoke_.length; ++i) {
+            $.groupRoles[groupFrom_].remove(rolesToRevoke_[i]);
+        }
 
         emit RevokedGroupRoles(groupFrom_, rolesToRevoke_);
     }

contracts/account-abstraction/AAccountRecovery.sol

@@ -76,27 +76,31 @@ abstract contract AAccountRecovery is IAccountRecovery {
     /**
      * @notice Should be called in the `addRecoveryProvider` function
      */
-    function _addRecoveryProvider(address provider_, bytes memory recoveryData_) internal virtual {
+    function _addRecoveryProvider(
+        address provider_,
+        bytes memory recoveryData_,
+        uint256 value_
+    ) internal virtual {
         if (provider_ == address(0)) revert ZeroAddress();
 
         AAccountRecoveryStorage storage $ = _getAAccountRecoveryStorage();
 
         if (!$.recoveryProviders.add(provider_)) revert ProviderAlreadyAdded(provider_);
 
-        IRecoveryProvider(provider_).subscribe(recoveryData_);
+        IRecoveryProvider(provider_).subscribe{value: value_}(recoveryData_);
 
         emit RecoveryProviderAdded(provider_);
     }
 
     /**
      * @notice Should be called in the `removeRecoveryProvider` function
      */
-    function _removeRecoveryProvider(address provider_) internal virtual {
+    function _removeRecoveryProvider(address provider_, uint256 value_) internal virtual {
         AAccountRecoveryStorage storage $ = _getAAccountRecoveryStorage();
 
         if (!$.recoveryProviders.remove(provider_)) revert ProviderNotRegistered(provider_);
 
-        IRecoveryProvider(provider_).unsubscribe();
+        IRecoveryProvider(provider_).unsubscribe{value: value_}();
 
         emit RecoveryProviderRemoved(provider_);
     }

contracts/finance/staking/AStaking.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.21;
 
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 import {AValueDistributor} from "./AValueDistributor.sol";