Merge the develop branch to the master branch, preparation to v5.6.0-rc0

Author: akolotov

.github/workflows/main.yml

@@ -80,9 +80,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - if: startsWith(github.ref, 'refs/tags')
-        run: echo "::set-env name=DOCKER_TAGS::${GITHUB_REF#refs/tags/},latest"
+        run: echo "DOCKER_TAGS=${GITHUB_REF#refs/tags/},latest" >> $GITHUB_ENV
       - if: startsWith(github.ref, 'refs/heads')
-        run: echo "::set-env name=DOCKER_TAGS::${GITHUB_REF#refs/heads/}-${GITHUB_SHA::8}"
+        run: echo "DOCKER_TAGS=${GITHUB_REF#refs/heads/}-${GITHUB_SHA::8}" >> $GITHUB_ENV
       - uses: docker/build-push-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}

contracts/libraries/ArbitraryMessage.sol

@@ -48,8 +48,8 @@ library ArbitraryMessage {
             gasLimit := and(shr(64, blob), 0xffffffff)
 
             dataType := byte(26, blob)
-            if gt(dataType, 0) {
-                // for now, only 0 datatype is supported - regular AMB calls
+            if gt(and(dataType, 0x7f), 0) {
+                // for now, only 0x00 and 0x80 datatypes are supported - regular AMB calls
                 // other dataType values are kept reserved for future use
                 revert(0, 0)
             }

contracts/mocks/AMBMock.sol

@@ -46,7 +46,7 @@ contract AMBMock {
     }
 
     function requireToConfirmMessage(address _contract, bytes _data, uint256 _gas) external returns (bytes32) {
-        return _sendMessage(_contract, _data, _gas, 0xf0);
+        return _sendMessage(_contract, _data, _gas, 0x80);
     }
 
     function _sendMessage(address _contract, bytes _data, uint256 _gas, uint256 _dataType) internal returns (bytes32) {

contracts/upgradeable_contracts/ReentrancyGuard.sol

@@ -1,15 +1,21 @@
 pragma solidity 0.4.24;
 
-import "../upgradeability/EternalStorage.sol";
-
-contract ReentrancyGuard is EternalStorage {
-    bytes32 internal constant LOCK = 0x6168652c307c1e813ca11cfb3a601f1cf3b22452021a5052d8b05f1f1f8a3e92; // keccak256(abi.encodePacked("lock"))
-
-    function lock() internal returns (bool) {
-        return boolStorage[LOCK];
+contract ReentrancyGuard {
+    function lock() internal returns (bool res) {
+        assembly {
+            // Even though this is not the same as boolStorage[keccak256(abi.encodePacked("lock"))],
+            // since solidity mapping introduces another level of addressing, such slot change is safe
+            // for temporary variables which are cleared at the end of the call execution.
+            res := sload(0x6168652c307c1e813ca11cfb3a601f1cf3b22452021a5052d8b05f1f1f8a3e92) // keccak256(abi.encodePacked("lock"))
+        }
     }
 
     function setLock(bool _lock) internal {
-        boolStorage[LOCK] = _lock;
+        assembly {
+            // Even though this is not the same as boolStorage[keccak256(abi.encodePacked("lock"))],
+            // since solidity mapping introduces another level of addressing, such slot change is safe
+            // for temporary variables which are cleared at the end of the call execution.
+            sstore(0x6168652c307c1e813ca11cfb3a601f1cf3b22452021a5052d8b05f1f1f8a3e92, _lock) // keccak256(abi.encodePacked("lock"))
+        }
     }
 }

contracts/upgradeable_contracts/TokenBridgeMediator.sol

@@ -10,6 +10,7 @@ import "./TransferInfoStorage.sol";
 */
 contract TokenBridgeMediator is BasicAMBMediator, BasicTokenBridge, TransferInfoStorage {
     event FailedMessageFixed(bytes32 indexed messageId, address recipient, uint256 value);
+    event TokensBridgingInitiated(address indexed sender, uint256 value, bytes32 indexed messageId);
     event TokensBridged(address indexed recipient, uint256 value, bytes32 indexed messageId);
 
     /**
@@ -32,6 +33,8 @@ contract TokenBridgeMediator is BasicAMBMediator, BasicTokenBridge, TransferInfo
 
         setMessageValue(_messageId, _value);
         setMessageRecipient(_messageId, _from);
+
+        emit TokensBridgingInitiated(_from, _value, _messageId);
     }
 
     /**

contracts/upgradeable_contracts/amb_erc20_to_native/BasicAMBErc20ToNative.sol

@@ -50,7 +50,7 @@ contract BasicAMBErc20ToNative is Initializable, Upgradeable, Claimable, Version
     * @return patch value of the version
     */
     function getBridgeInterfacesVersion() external pure returns (uint64 major, uint64 minor, uint64 patch) {
-        return (1, 1, 1);
+        return (1, 2, 0);
     }
 
     /**

contracts/upgradeable_contracts/amb_erc677_to_erc677/BasicAMBErc677ToErc677.sol

@@ -96,7 +96,7 @@ contract BasicAMBErc677ToErc677 is
     }
 
     function getBridgeInterfacesVersion() external pure returns (uint64 major, uint64 minor, uint64 patch) {
-        return (1, 3, 0);
+        return (1, 4, 0);
     }
 
     function getBridgeMode() external pure returns (bytes4 _data) {

contracts/upgradeable_contracts/amb_erc677_to_erc677/BasicStakeTokenMediator.sol

@@ -4,7 +4,7 @@ import "./BasicAMBErc677ToErc677.sol";
 
 contract BasicStakeTokenMediator is BasicAMBErc677ToErc677 {
     function getBridgeInterfacesVersion() external pure returns (uint64 major, uint64 minor, uint64 patch) {
-        return (1, 2, 0);
+        return (1, 3, 0);
     }
 
     function getBridgeMode() external pure returns (bytes4 _data) {

contracts/upgradeable_contracts/amb_native_to_erc20/BasicAMBNativeToErc20.sol

@@ -61,7 +61,7 @@ contract BasicAMBNativeToErc20 is
     * @return patch value of the version
     */
     function getBridgeInterfacesVersion() external pure returns (uint64 major, uint64 minor, uint64 patch) {
-        return (1, 1, 0);
+        return (1, 2, 0);
     }
 
     /**

contracts/upgradeable_contracts/arbitrary_message/BasicHomeAMB.sol

@@ -15,7 +15,7 @@ contract BasicHomeAMB is BasicAMB, MessageDelivery {
         uint256 NumberOfCollectedSignatures
     );
 
-    uint256 internal constant SEND_TO_MANUAL_LANE = 0xf0;
+    uint256 internal constant SEND_TO_MANUAL_LANE = 0x80;
 
     function executeAffirmation(bytes message) external onlyValidator {
         bytes32 hashMsg = keccak256(abi.encodePacked(message));