diff --git a/plasma_framework/contracts/mocks/Imports.sol b/plasma_framework/contracts/mocks/Imports.sol index 2c2a9046d..8faffdf5b 100644 --- a/plasma_framework/contracts/mocks/Imports.sol +++ b/plasma_framework/contracts/mocks/Imports.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; // Import contracts from third party Solidity libraries to make them available in tests. diff --git a/plasma_framework/contracts/mocks/exits/ExpectedOutputGuardHandler.sol b/plasma_framework/contracts/mocks/exits/ExpectedOutputGuardHandler.sol index edf5be6e3..8ef76a5ca 100644 --- a/plasma_framework/contracts/mocks/exits/ExpectedOutputGuardHandler.sol +++ b/plasma_framework/contracts/mocks/exits/ExpectedOutputGuardHandler.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../src/exits/interfaces/IOutputGuardHandler.sol"; diff --git a/plasma_framework/contracts/mocks/exits/SpendingConditionMock.sol b/plasma_framework/contracts/mocks/exits/SpendingConditionMock.sol index cf2029433..a13075f49 100644 --- a/plasma_framework/contracts/mocks/exits/SpendingConditionMock.sol +++ b/plasma_framework/contracts/mocks/exits/SpendingConditionMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../src/exits/interfaces/ISpendingCondition.sol"; diff --git a/plasma_framework/contracts/mocks/exits/SpyPlasmaFrameworkForExitGame.sol b/plasma_framework/contracts/mocks/exits/SpyPlasmaFrameworkForExitGame.sol index 501dfa5c6..2bec0b055 100644 --- a/plasma_framework/contracts/mocks/exits/SpyPlasmaFrameworkForExitGame.sol +++ b/plasma_framework/contracts/mocks/exits/SpyPlasmaFrameworkForExitGame.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../src/framework/PlasmaFramework.sol"; diff --git a/plasma_framework/contracts/mocks/exits/StateTransitionVerifierMock.sol b/plasma_framework/contracts/mocks/exits/StateTransitionVerifierMock.sol index 57707e9d0..c2697be03 100644 --- a/plasma_framework/contracts/mocks/exits/StateTransitionVerifierMock.sol +++ b/plasma_framework/contracts/mocks/exits/StateTransitionVerifierMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../src/exits/interfaces/IStateTransitionVerifier.sol"; diff --git a/plasma_framework/contracts/mocks/exits/dummyVaults/SpyErc20VaultForExitGame.sol b/plasma_framework/contracts/mocks/exits/dummyVaults/SpyErc20VaultForExitGame.sol index 35acb560d..718241c15 100644 --- a/plasma_framework/contracts/mocks/exits/dummyVaults/SpyErc20VaultForExitGame.sol +++ b/plasma_framework/contracts/mocks/exits/dummyVaults/SpyErc20VaultForExitGame.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/vaults/Erc20Vault.sol"; import "../../../src/framework/PlasmaFramework.sol"; diff --git a/plasma_framework/contracts/mocks/exits/dummyVaults/SpyEthVaultForExitGame.sol b/plasma_framework/contracts/mocks/exits/dummyVaults/SpyEthVaultForExitGame.sol index 47729e14a..f05a363b7 100644 --- a/plasma_framework/contracts/mocks/exits/dummyVaults/SpyEthVaultForExitGame.sol +++ b/plasma_framework/contracts/mocks/exits/dummyVaults/SpyEthVaultForExitGame.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/vaults/EthVault.sol"; import "../../../src/framework/PlasmaFramework.sol"; diff --git a/plasma_framework/contracts/mocks/exits/payment/routers/PaymentInFlightExitRouterMock.sol b/plasma_framework/contracts/mocks/exits/payment/routers/PaymentInFlightExitRouterMock.sol index f22bad5c5..c2c4d59b4 100644 --- a/plasma_framework/contracts/mocks/exits/payment/routers/PaymentInFlightExitRouterMock.sol +++ b/plasma_framework/contracts/mocks/exits/payment/routers/PaymentInFlightExitRouterMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../../../src/exits/payment/PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/mocks/exits/payment/routers/PaymentStandardExitRouterMock.sol b/plasma_framework/contracts/mocks/exits/payment/routers/PaymentStandardExitRouterMock.sol index 5947dd2df..2a4d1207f 100644 --- a/plasma_framework/contracts/mocks/exits/payment/routers/PaymentStandardExitRouterMock.sol +++ b/plasma_framework/contracts/mocks/exits/payment/routers/PaymentStandardExitRouterMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../../../src/exits/payment/routers/PaymentStandardExitRouter.sol"; diff --git a/plasma_framework/contracts/mocks/exits/utils/ExitIdWrapper.sol b/plasma_framework/contracts/mocks/exits/utils/ExitIdWrapper.sol index 1968b5b09..af8aa3605 100644 --- a/plasma_framework/contracts/mocks/exits/utils/ExitIdWrapper.sol +++ b/plasma_framework/contracts/mocks/exits/utils/ExitIdWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/utils/UtxoPosLib.sol"; import "../../../src/exits/utils/ExitId.sol"; diff --git a/plasma_framework/contracts/mocks/exits/utils/ExitableTimestampWrapper.sol b/plasma_framework/contracts/mocks/exits/utils/ExitableTimestampWrapper.sol index 81c831125..6fe7f5688 100644 --- a/plasma_framework/contracts/mocks/exits/utils/ExitableTimestampWrapper.sol +++ b/plasma_framework/contracts/mocks/exits/utils/ExitableTimestampWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/exits/utils/ExitableTimestamp.sol"; diff --git a/plasma_framework/contracts/mocks/exits/utils/OutputGuardWrapper.sol b/plasma_framework/contracts/mocks/exits/utils/OutputGuardWrapper.sol index c13f9d48e..56f3f0f71 100644 --- a/plasma_framework/contracts/mocks/exits/utils/OutputGuardWrapper.sol +++ b/plasma_framework/contracts/mocks/exits/utils/OutputGuardWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/exits/utils/OutputGuard.sol"; diff --git a/plasma_framework/contracts/mocks/exits/utils/OutputIdWrapper.sol b/plasma_framework/contracts/mocks/exits/utils/OutputIdWrapper.sol index 2381d56b3..d51590b1e 100644 --- a/plasma_framework/contracts/mocks/exits/utils/OutputIdWrapper.sol +++ b/plasma_framework/contracts/mocks/exits/utils/OutputIdWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/exits/utils/OutputId.sol"; diff --git a/plasma_framework/contracts/mocks/framework/DummyExitGame.sol b/plasma_framework/contracts/mocks/framework/DummyExitGame.sol index d9a87f350..2eca67529 100644 --- a/plasma_framework/contracts/mocks/framework/DummyExitGame.sol +++ b/plasma_framework/contracts/mocks/framework/DummyExitGame.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "./registries/ExitGameRegistryMock.sol"; diff --git a/plasma_framework/contracts/mocks/framework/DummyVault.sol b/plasma_framework/contracts/mocks/framework/DummyVault.sol index 78418690b..30c8265e0 100644 --- a/plasma_framework/contracts/mocks/framework/DummyVault.sol +++ b/plasma_framework/contracts/mocks/framework/DummyVault.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "./registries/VaultRegistryMock.sol"; import "../../src/framework/BlockController.sol"; diff --git a/plasma_framework/contracts/mocks/framework/ProtocolWrapper.sol b/plasma_framework/contracts/mocks/framework/ProtocolWrapper.sol index c8e0f31be..be8b5aa9c 100644 --- a/plasma_framework/contracts/mocks/framework/ProtocolWrapper.sol +++ b/plasma_framework/contracts/mocks/framework/ProtocolWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/framework/Protocol.sol"; diff --git a/plasma_framework/contracts/mocks/framework/ReentracyExitGame.sol b/plasma_framework/contracts/mocks/framework/ReentracyExitGame.sol index 437b94052..d92205369 100644 --- a/plasma_framework/contracts/mocks/framework/ReentracyExitGame.sol +++ b/plasma_framework/contracts/mocks/framework/ReentracyExitGame.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "./registries/ExitGameRegistryMock.sol"; diff --git a/plasma_framework/contracts/mocks/framework/registries/ExitGameRegistryMock.sol b/plasma_framework/contracts/mocks/framework/registries/ExitGameRegistryMock.sol index 19d95bc8c..0370458e8 100644 --- a/plasma_framework/contracts/mocks/framework/registries/ExitGameRegistryMock.sol +++ b/plasma_framework/contracts/mocks/framework/registries/ExitGameRegistryMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/framework/registries/ExitGameRegistry.sol"; diff --git a/plasma_framework/contracts/mocks/framework/registries/VaultRegistryMock.sol b/plasma_framework/contracts/mocks/framework/registries/VaultRegistryMock.sol index 1d74f9c01..d6340ee24 100644 --- a/plasma_framework/contracts/mocks/framework/registries/VaultRegistryMock.sol +++ b/plasma_framework/contracts/mocks/framework/registries/VaultRegistryMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/framework/registries/VaultRegistry.sol"; diff --git a/plasma_framework/contracts/mocks/framework/utils/ExitPriorityWrapper.sol b/plasma_framework/contracts/mocks/framework/utils/ExitPriorityWrapper.sol index 6c1ef03db..a7e149977 100644 --- a/plasma_framework/contracts/mocks/framework/utils/ExitPriorityWrapper.sol +++ b/plasma_framework/contracts/mocks/framework/utils/ExitPriorityWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/framework/utils/ExitPriority.sol"; import "../../../src/utils/TxPosLib.sol"; diff --git a/plasma_framework/contracts/mocks/framework/utils/OperatedMock.sol b/plasma_framework/contracts/mocks/framework/utils/OperatedMock.sol index 663516c76..6624672e5 100644 --- a/plasma_framework/contracts/mocks/framework/utils/OperatedMock.sol +++ b/plasma_framework/contracts/mocks/framework/utils/OperatedMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/framework/utils/Operated.sol"; diff --git a/plasma_framework/contracts/mocks/transactions/PaymentTransactionModelMock.sol b/plasma_framework/contracts/mocks/transactions/PaymentTransactionModelMock.sol index 15c9c0ffc..ebf58a848 100644 --- a/plasma_framework/contracts/mocks/transactions/PaymentTransactionModelMock.sol +++ b/plasma_framework/contracts/mocks/transactions/PaymentTransactionModelMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../src/transactions/PaymentTransactionModel.sol"; diff --git a/plasma_framework/contracts/mocks/transactions/WireTransactionWrapper.sol b/plasma_framework/contracts/mocks/transactions/WireTransactionWrapper.sol index a7c5f09a2..1baf09d52 100644 --- a/plasma_framework/contracts/mocks/transactions/WireTransactionWrapper.sol +++ b/plasma_framework/contracts/mocks/transactions/WireTransactionWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../src/transactions/WireTransaction.sol"; diff --git a/plasma_framework/contracts/mocks/transactions/eip712Libs/PaymentEip712LibMock.sol b/plasma_framework/contracts/mocks/transactions/eip712Libs/PaymentEip712LibMock.sol index c6fcad5f1..b79027cd4 100644 --- a/plasma_framework/contracts/mocks/transactions/eip712Libs/PaymentEip712LibMock.sol +++ b/plasma_framework/contracts/mocks/transactions/eip712Libs/PaymentEip712LibMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../../src/transactions/eip712Libs/PaymentEip712Lib.sol"; import "../../../src/transactions/PaymentTransactionModel.sol"; diff --git a/plasma_framework/contracts/mocks/transactions/outputs/PaymentOutputModelMock.sol b/plasma_framework/contracts/mocks/transactions/outputs/PaymentOutputModelMock.sol index 43b97ab69..b5e1e9997 100644 --- a/plasma_framework/contracts/mocks/transactions/outputs/PaymentOutputModelMock.sol +++ b/plasma_framework/contracts/mocks/transactions/outputs/PaymentOutputModelMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../../src/transactions/outputs/PaymentOutputModel.sol"; diff --git a/plasma_framework/contracts/mocks/utils/AddressPayableWrapper.sol b/plasma_framework/contracts/mocks/utils/AddressPayableWrapper.sol index 7255c8c2d..fc694a88b 100644 --- a/plasma_framework/contracts/mocks/utils/AddressPayableWrapper.sol +++ b/plasma_framework/contracts/mocks/utils/AddressPayableWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/utils/AddressPayable.sol"; diff --git a/plasma_framework/contracts/mocks/utils/BitsWrapper.sol b/plasma_framework/contracts/mocks/utils/BitsWrapper.sol index db68774ee..4b2c56cbf 100644 --- a/plasma_framework/contracts/mocks/utils/BitsWrapper.sol +++ b/plasma_framework/contracts/mocks/utils/BitsWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/utils/Bits.sol"; diff --git a/plasma_framework/contracts/mocks/utils/BondSizeMock.sol b/plasma_framework/contracts/mocks/utils/BondSizeMock.sol index f4114cb9b..88b29bceb 100644 --- a/plasma_framework/contracts/mocks/utils/BondSizeMock.sol +++ b/plasma_framework/contracts/mocks/utils/BondSizeMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/exits/utils/BondSize.sol"; diff --git a/plasma_framework/contracts/mocks/utils/IsDepositWrapper.sol b/plasma_framework/contracts/mocks/utils/IsDepositWrapper.sol index 90068c8dd..1f29137a8 100644 --- a/plasma_framework/contracts/mocks/utils/IsDepositWrapper.sol +++ b/plasma_framework/contracts/mocks/utils/IsDepositWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/utils/IsDeposit.sol"; diff --git a/plasma_framework/contracts/mocks/utils/MerkleWrapper.sol b/plasma_framework/contracts/mocks/utils/MerkleWrapper.sol index 1fa61e9d3..4f64be5fe 100644 --- a/plasma_framework/contracts/mocks/utils/MerkleWrapper.sol +++ b/plasma_framework/contracts/mocks/utils/MerkleWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/utils/Merkle.sol"; diff --git a/plasma_framework/contracts/mocks/utils/OnlyWithValueMock.sol b/plasma_framework/contracts/mocks/utils/OnlyWithValueMock.sol index 686a566e8..d0f21f7e7 100644 --- a/plasma_framework/contracts/mocks/utils/OnlyWithValueMock.sol +++ b/plasma_framework/contracts/mocks/utils/OnlyWithValueMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/utils/OnlyWithValue.sol"; diff --git a/plasma_framework/contracts/mocks/utils/QuarantineMock.sol b/plasma_framework/contracts/mocks/utils/QuarantineMock.sol index 42ec1e045..928ddc4e2 100644 --- a/plasma_framework/contracts/mocks/utils/QuarantineMock.sol +++ b/plasma_framework/contracts/mocks/utils/QuarantineMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/framework/utils/Quarantine.sol"; diff --git a/plasma_framework/contracts/mocks/utils/RLPMock.sol b/plasma_framework/contracts/mocks/utils/RLPMock.sol index 04f2a8bab..729616b7c 100644 --- a/plasma_framework/contracts/mocks/utils/RLPMock.sol +++ b/plasma_framework/contracts/mocks/utils/RLPMock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../src/utils/RLP.sol"; diff --git a/plasma_framework/contracts/mocks/utils/TxPosLibWrapper.sol b/plasma_framework/contracts/mocks/utils/TxPosLibWrapper.sol index e095544a1..dc0fb85d7 100644 --- a/plasma_framework/contracts/mocks/utils/TxPosLibWrapper.sol +++ b/plasma_framework/contracts/mocks/utils/TxPosLibWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../src/utils/TxPosLib.sol"; diff --git a/plasma_framework/contracts/mocks/utils/UtxoPosLibWrapper.sol b/plasma_framework/contracts/mocks/utils/UtxoPosLibWrapper.sol index c3a0c30a2..6d31b112d 100644 --- a/plasma_framework/contracts/mocks/utils/UtxoPosLibWrapper.sol +++ b/plasma_framework/contracts/mocks/utils/UtxoPosLibWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../src/utils/TxPosLib.sol"; diff --git a/plasma_framework/contracts/mocks/vaults/NonCompliantERC20.sol b/plasma_framework/contracts/mocks/vaults/NonCompliantERC20.sol index af4ad6e8a..674592dc1 100644 --- a/plasma_framework/contracts/mocks/vaults/NonCompliantERC20.sol +++ b/plasma_framework/contracts/mocks/vaults/NonCompliantERC20.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; diff --git a/plasma_framework/contracts/src/exits/interfaces/IOutputGuardHandler.sol b/plasma_framework/contracts/src/exits/interfaces/IOutputGuardHandler.sol index b2f6eb43c..80eefd728 100644 --- a/plasma_framework/contracts/src/exits/interfaces/IOutputGuardHandler.sol +++ b/plasma_framework/contracts/src/exits/interfaces/IOutputGuardHandler.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../models/OutputGuardModel.sol"; diff --git a/plasma_framework/contracts/src/exits/interfaces/ISpendingCondition.sol b/plasma_framework/contracts/src/exits/interfaces/ISpendingCondition.sol index f9afc41ff..7abb7a6c1 100644 --- a/plasma_framework/contracts/src/exits/interfaces/ISpendingCondition.sol +++ b/plasma_framework/contracts/src/exits/interfaces/ISpendingCondition.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** * @notice interface of the spending condition. diff --git a/plasma_framework/contracts/src/exits/interfaces/IStateTransitionVerifier.sol b/plasma_framework/contracts/src/exits/interfaces/IStateTransitionVerifier.sol index 4ba886361..3197f8833 100644 --- a/plasma_framework/contracts/src/exits/interfaces/IStateTransitionVerifier.sol +++ b/plasma_framework/contracts/src/exits/interfaces/IStateTransitionVerifier.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; interface IStateTransitionVerifier { diff --git a/plasma_framework/contracts/src/exits/models/OutputGuardModel.sol b/plasma_framework/contracts/src/exits/models/OutputGuardModel.sol index d4ba8fe3d..67e1840f4 100644 --- a/plasma_framework/contracts/src/exits/models/OutputGuardModel.sol +++ b/plasma_framework/contracts/src/exits/models/OutputGuardModel.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; library OutputGuardModel { diff --git a/plasma_framework/contracts/src/exits/payment/PaymentExitDataModel.sol b/plasma_framework/contracts/src/exits/payment/PaymentExitDataModel.sol index 3ce558538..34a248d0e 100644 --- a/plasma_framework/contracts/src/exits/payment/PaymentExitDataModel.sol +++ b/plasma_framework/contracts/src/exits/payment/PaymentExitDataModel.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** * @notice Model library for PaymentExit diff --git a/plasma_framework/contracts/src/exits/payment/PaymentExitGame.sol b/plasma_framework/contracts/src/exits/payment/PaymentExitGame.sol index 3bb7f83a0..87b0cde2e 100644 --- a/plasma_framework/contracts/src/exits/payment/PaymentExitGame.sol +++ b/plasma_framework/contracts/src/exits/payment/PaymentExitGame.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "./routers/PaymentStandardExitRouter.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/PaymentInFlightExitModelUtils.sol b/plasma_framework/contracts/src/exits/payment/PaymentInFlightExitModelUtils.sol index 4c2032e64..e5434dc9a 100644 --- a/plasma_framework/contracts/src/exits/payment/PaymentInFlightExitModelUtils.sol +++ b/plasma_framework/contracts/src/exits/payment/PaymentInFlightExitModelUtils.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../utils/Bits.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/PaymentTransactionStateTransitionVerifier.sol b/plasma_framework/contracts/src/exits/payment/PaymentTransactionStateTransitionVerifier.sol index 642a31fa7..7f897a6bf 100644 --- a/plasma_framework/contracts/src/exits/payment/PaymentTransactionStateTransitionVerifier.sol +++ b/plasma_framework/contracts/src/exits/payment/PaymentTransactionStateTransitionVerifier.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../interfaces/IStateTransitionVerifier.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFEInputSpent.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFEInputSpent.sol index ade76ab47..ec402fef0 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFEInputSpent.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFEInputSpent.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFENotCanonical.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFENotCanonical.sol index a03e15560..323779ad0 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFENotCanonical.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFENotCanonical.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFEOutputSpent.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFEOutputSpent.sol index 75e93fad3..ed6f5ec6e 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFEOutputSpent.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFEOutputSpent.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeStandardExit.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeStandardExit.sol index d0f4f84f0..eb5327c77 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeStandardExit.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeStandardExit.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentPiggybackInFlightExit.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentPiggybackInFlightExit.sol index 471f0ecc3..4d39062d7 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentPiggybackInFlightExit.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentPiggybackInFlightExit.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessInFlightExit.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessInFlightExit.sol index 66b23b8db..a9d6442b4 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessInFlightExit.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessInFlightExit.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessStandardExit.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessStandardExit.sol index da6326361..50c4c032f 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessStandardExit.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessStandardExit.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartInFlightExit.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartInFlightExit.sol index c329f9dd5..4b22ce492 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartInFlightExit.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartInFlightExit.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartStandardExit.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartStandardExit.sol index 46f58df77..883b443c1 100644 --- a/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartStandardExit.sol +++ b/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartStandardExit.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentExitDataModel.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/outputGuardHandlers/PaymentOutputGuardHandler.sol b/plasma_framework/contracts/src/exits/payment/outputGuardHandlers/PaymentOutputGuardHandler.sol index 8157476c3..b00f9be96 100644 --- a/plasma_framework/contracts/src/exits/payment/outputGuardHandlers/PaymentOutputGuardHandler.sol +++ b/plasma_framework/contracts/src/exits/payment/outputGuardHandlers/PaymentOutputGuardHandler.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../interfaces/IOutputGuardHandler.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouter.sol b/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouter.sol index 15f2c7881..61c8afed4 100644 --- a/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouter.sol +++ b/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouter.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "./PaymentInFlightExitRouterArgs.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouterArgs.sol b/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouterArgs.sol index b2a9b5900..49afe577e 100644 --- a/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouterArgs.sol +++ b/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouterArgs.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; library PaymentInFlightExitRouterArgs { /** diff --git a/plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouter.sol b/plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouter.sol index 1f19ac8c4..2e7534ef9 100644 --- a/plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouter.sol +++ b/plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouter.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "./PaymentStandardExitRouterArgs.sol"; diff --git a/plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouterArgs.sol b/plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouterArgs.sol index 5715198d0..1c2aff699 100644 --- a/plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouterArgs.sol +++ b/plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouterArgs.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; library PaymentStandardExitRouterArgs { /** diff --git a/plasma_framework/contracts/src/exits/payment/spendingConditions/PaymentOutputToPaymentTxCondition.sol b/plasma_framework/contracts/src/exits/payment/spendingConditions/PaymentOutputToPaymentTxCondition.sol index 0f37b770f..291d5dde0 100644 --- a/plasma_framework/contracts/src/exits/payment/spendingConditions/PaymentOutputToPaymentTxCondition.sol +++ b/plasma_framework/contracts/src/exits/payment/spendingConditions/PaymentOutputToPaymentTxCondition.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "openzeppelin-solidity/contracts/cryptography/ECDSA.sol"; diff --git a/plasma_framework/contracts/src/exits/registries/OutputGuardHandlerRegistry.sol b/plasma_framework/contracts/src/exits/registries/OutputGuardHandlerRegistry.sol index 611898cb7..4878f76b3 100644 --- a/plasma_framework/contracts/src/exits/registries/OutputGuardHandlerRegistry.sol +++ b/plasma_framework/contracts/src/exits/registries/OutputGuardHandlerRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; import "../interfaces/IOutputGuardHandler.sol"; diff --git a/plasma_framework/contracts/src/exits/registries/SpendingConditionRegistry.sol b/plasma_framework/contracts/src/exits/registries/SpendingConditionRegistry.sol index efbcfa40f..0ca7b26fb 100644 --- a/plasma_framework/contracts/src/exits/registries/SpendingConditionRegistry.sol +++ b/plasma_framework/contracts/src/exits/registries/SpendingConditionRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; import "../interfaces/ISpendingCondition.sol"; diff --git a/plasma_framework/contracts/src/exits/utils/BondSize.sol b/plasma_framework/contracts/src/exits/utils/BondSize.sol index 5b6fc1a1e..9b7e14c62 100644 --- a/plasma_framework/contracts/src/exits/utils/BondSize.sol +++ b/plasma_framework/contracts/src/exits/utils/BondSize.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** * @notice Stores an updateable bond size. diff --git a/plasma_framework/contracts/src/exits/utils/ExitId.sol b/plasma_framework/contracts/src/exits/utils/ExitId.sol index 67204de69..1f75ed8fa 100644 --- a/plasma_framework/contracts/src/exits/utils/ExitId.sol +++ b/plasma_framework/contracts/src/exits/utils/ExitId.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../utils/Bits.sol"; import "../../utils/UtxoPosLib.sol"; diff --git a/plasma_framework/contracts/src/exits/utils/ExitableTimestamp.sol b/plasma_framework/contracts/src/exits/utils/ExitableTimestamp.sol index b10a70755..8f74ea08f 100644 --- a/plasma_framework/contracts/src/exits/utils/ExitableTimestamp.sol +++ b/plasma_framework/contracts/src/exits/utils/ExitableTimestamp.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "openzeppelin-solidity/contracts/math/Math.sol"; diff --git a/plasma_framework/contracts/src/exits/utils/OutputGuard.sol b/plasma_framework/contracts/src/exits/utils/OutputGuard.sol index 125b6a6a0..b45bcc01c 100644 --- a/plasma_framework/contracts/src/exits/utils/OutputGuard.sol +++ b/plasma_framework/contracts/src/exits/utils/OutputGuard.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** * @notice Utils library that builds the output guard diff --git a/plasma_framework/contracts/src/exits/utils/OutputId.sol b/plasma_framework/contracts/src/exits/utils/OutputId.sol index 72545deac..d2f7c65b3 100644 --- a/plasma_framework/contracts/src/exits/utils/OutputId.sol +++ b/plasma_framework/contracts/src/exits/utils/OutputId.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; library OutputId { /** diff --git a/plasma_framework/contracts/src/exits/utils/TxFinalizationVerifier.sol b/plasma_framework/contracts/src/exits/utils/TxFinalizationVerifier.sol index 00617afaf..af46198b5 100644 --- a/plasma_framework/contracts/src/exits/utils/TxFinalizationVerifier.sol +++ b/plasma_framework/contracts/src/exits/utils/TxFinalizationVerifier.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../interfaces/ITxFinalizationVerifier.sol"; diff --git a/plasma_framework/contracts/src/framework/BlockController.sol b/plasma_framework/contracts/src/framework/BlockController.sol index 06c82ec4a..5630f26e6 100644 --- a/plasma_framework/contracts/src/framework/BlockController.sol +++ b/plasma_framework/contracts/src/framework/BlockController.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "./models/BlockModel.sol"; import "./registries/VaultRegistry.sol"; diff --git a/plasma_framework/contracts/src/framework/ExitGameController.sol b/plasma_framework/contracts/src/framework/ExitGameController.sol index df81e6b54..afcb30092 100644 --- a/plasma_framework/contracts/src/framework/ExitGameController.sol +++ b/plasma_framework/contracts/src/framework/ExitGameController.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "./interfaces/IExitProcessor.sol"; diff --git a/plasma_framework/contracts/src/framework/PlasmaFramework.sol b/plasma_framework/contracts/src/framework/PlasmaFramework.sol index b5fb73bf5..4b125f04e 100644 --- a/plasma_framework/contracts/src/framework/PlasmaFramework.sol +++ b/plasma_framework/contracts/src/framework/PlasmaFramework.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "./BlockController.sol"; diff --git a/plasma_framework/contracts/src/framework/Protocol.sol b/plasma_framework/contracts/src/framework/Protocol.sol index 0591be8ca..ee7f4292c 100644 --- a/plasma_framework/contracts/src/framework/Protocol.sol +++ b/plasma_framework/contracts/src/framework/Protocol.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; library Protocol { uint8 constant internal MVP_VALUE = 1; diff --git a/plasma_framework/contracts/src/framework/interfaces/IExitProcessor.sol b/plasma_framework/contracts/src/framework/interfaces/IExitProcessor.sol index e1980afec..8cafe6dfd 100644 --- a/plasma_framework/contracts/src/framework/interfaces/IExitProcessor.sol +++ b/plasma_framework/contracts/src/framework/interfaces/IExitProcessor.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; interface IExitProcessor { /** diff --git a/plasma_framework/contracts/src/framework/models/BlockModel.sol b/plasma_framework/contracts/src/framework/models/BlockModel.sol index e842a979d..82c682db2 100644 --- a/plasma_framework/contracts/src/framework/models/BlockModel.sol +++ b/plasma_framework/contracts/src/framework/models/BlockModel.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; library BlockModel { struct Block { diff --git a/plasma_framework/contracts/src/framework/registries/ExitGameRegistry.sol b/plasma_framework/contracts/src/framework/registries/ExitGameRegistry.sol index f24cecb68..b54a1d489 100644 --- a/plasma_framework/contracts/src/framework/registries/ExitGameRegistry.sol +++ b/plasma_framework/contracts/src/framework/registries/ExitGameRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../Protocol.sol"; import "../utils/Operated.sol"; diff --git a/plasma_framework/contracts/src/framework/registries/VaultRegistry.sol b/plasma_framework/contracts/src/framework/registries/VaultRegistry.sol index 109943546..5edb2b1b5 100644 --- a/plasma_framework/contracts/src/framework/registries/VaultRegistry.sol +++ b/plasma_framework/contracts/src/framework/registries/VaultRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../utils/Operated.sol"; import "../utils/Quarantine.sol"; diff --git a/plasma_framework/contracts/src/framework/utils/ExitPriority.sol b/plasma_framework/contracts/src/framework/utils/ExitPriority.sol index c0f99ae64..a87f638e4 100644 --- a/plasma_framework/contracts/src/framework/utils/ExitPriority.sol +++ b/plasma_framework/contracts/src/framework/utils/ExitPriority.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../../utils/TxPosLib.sol"; diff --git a/plasma_framework/contracts/src/framework/utils/Operated.sol b/plasma_framework/contracts/src/framework/utils/Operated.sol index c5b6cefb8..80081524d 100644 --- a/plasma_framework/contracts/src/framework/utils/Operated.sol +++ b/plasma_framework/contracts/src/framework/utils/Operated.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; contract Operated { address private _operator; diff --git a/plasma_framework/contracts/src/framework/utils/PriorityQueue.sol b/plasma_framework/contracts/src/framework/utils/PriorityQueue.sol index 867f5b693..0729ec9d4 100644 --- a/plasma_framework/contracts/src/framework/utils/PriorityQueue.sol +++ b/plasma_framework/contracts/src/framework/utils/PriorityQueue.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; diff --git a/plasma_framework/contracts/src/framework/utils/Quarantine.sol b/plasma_framework/contracts/src/framework/utils/Quarantine.sol index 36ca4a729..5252e292a 100644 --- a/plasma_framework/contracts/src/framework/utils/Quarantine.sol +++ b/plasma_framework/contracts/src/framework/utils/Quarantine.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** * @title Provides a way to quarantine (disable) contracts for a period of time diff --git a/plasma_framework/contracts/src/transactions/PaymentTransactionModel.sol b/plasma_framework/contracts/src/transactions/PaymentTransactionModel.sol index 7ec0c2a81..c36cc1d57 100644 --- a/plasma_framework/contracts/src/transactions/PaymentTransactionModel.sol +++ b/plasma_framework/contracts/src/transactions/PaymentTransactionModel.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "./outputs/PaymentOutputModel.sol"; import "../utils/RLP.sol"; diff --git a/plasma_framework/contracts/src/transactions/WireTransaction.sol b/plasma_framework/contracts/src/transactions/WireTransaction.sol index 533a69cbf..0d7314e56 100644 --- a/plasma_framework/contracts/src/transactions/WireTransaction.sol +++ b/plasma_framework/contracts/src/transactions/WireTransaction.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "../utils/RLP.sol"; diff --git a/plasma_framework/contracts/src/transactions/eip712Libs/PaymentEip712Lib.sol b/plasma_framework/contracts/src/transactions/eip712Libs/PaymentEip712Lib.sol index 5b6844d1f..9e7dc6b46 100644 --- a/plasma_framework/contracts/src/transactions/eip712Libs/PaymentEip712Lib.sol +++ b/plasma_framework/contracts/src/transactions/eip712Libs/PaymentEip712Lib.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../PaymentTransactionModel.sol"; diff --git a/plasma_framework/contracts/src/transactions/outputs/PaymentOutputModel.sol b/plasma_framework/contracts/src/transactions/outputs/PaymentOutputModel.sol index d9abd00f5..b9a65defd 100644 --- a/plasma_framework/contracts/src/transactions/outputs/PaymentOutputModel.sol +++ b/plasma_framework/contracts/src/transactions/outputs/PaymentOutputModel.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; pragma experimental ABIEncoderV2; import "../../utils/RLP.sol"; diff --git a/plasma_framework/contracts/src/utils/AddressPayable.sol b/plasma_framework/contracts/src/utils/AddressPayable.sol index 5124fb08a..fa1dab5b9 100644 --- a/plasma_framework/contracts/src/utils/AddressPayable.sol +++ b/plasma_framework/contracts/src/utils/AddressPayable.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; library AddressPayable { diff --git a/plasma_framework/contracts/src/utils/Bits.sol b/plasma_framework/contracts/src/utils/Bits.sol index e1c7af821..921c3cbf5 100644 --- a/plasma_framework/contracts/src/utils/Bits.sol +++ b/plasma_framework/contracts/src/utils/Bits.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** * @title Bits diff --git a/plasma_framework/contracts/src/utils/IsDeposit.sol b/plasma_framework/contracts/src/utils/IsDeposit.sol index 545c16d34..5236a4ce4 100644 --- a/plasma_framework/contracts/src/utils/IsDeposit.sol +++ b/plasma_framework/contracts/src/utils/IsDeposit.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; library IsDeposit { struct Predicate { diff --git a/plasma_framework/contracts/src/utils/Merkle.sol b/plasma_framework/contracts/src/utils/Merkle.sol index 759dedaad..bd5f3eeac 100644 --- a/plasma_framework/contracts/src/utils/Merkle.sol +++ b/plasma_framework/contracts/src/utils/Merkle.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** * @title Merkle diff --git a/plasma_framework/contracts/src/utils/OnlyFromAddress.sol b/plasma_framework/contracts/src/utils/OnlyFromAddress.sol index f4fc5ba04..e4d1fdbc8 100644 --- a/plasma_framework/contracts/src/utils/OnlyFromAddress.sol +++ b/plasma_framework/contracts/src/utils/OnlyFromAddress.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; contract OnlyFromAddress { diff --git a/plasma_framework/contracts/src/utils/OnlyWithValue.sol b/plasma_framework/contracts/src/utils/OnlyWithValue.sol index 979be2fcc..0cf5e9e6a 100644 --- a/plasma_framework/contracts/src/utils/OnlyWithValue.sol +++ b/plasma_framework/contracts/src/utils/OnlyWithValue.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; contract OnlyWithValue { modifier onlyWithValue(uint256 _value) { diff --git a/plasma_framework/contracts/src/utils/RLP.sol b/plasma_framework/contracts/src/utils/RLP.sol index 5bdcf7cff..3ad5f989a 100644 --- a/plasma_framework/contracts/src/utils/RLP.sol +++ b/plasma_framework/contracts/src/utils/RLP.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** diff --git a/plasma_framework/contracts/src/utils/TxPosLib.sol b/plasma_framework/contracts/src/utils/TxPosLib.sol index 65272aceb..b6fa30297 100644 --- a/plasma_framework/contracts/src/utils/TxPosLib.sol +++ b/plasma_framework/contracts/src/utils/TxPosLib.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; /** @dev transaction position = (blockNumber * BLOCK_OFFSET_FOR_TX_POS + txIndex). diff --git a/plasma_framework/contracts/src/utils/UtxoPosLib.sol b/plasma_framework/contracts/src/utils/UtxoPosLib.sol index 4e6c0f9e0..45de2d292 100644 --- a/plasma_framework/contracts/src/utils/UtxoPosLib.sol +++ b/plasma_framework/contracts/src/utils/UtxoPosLib.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "./TxPosLib.sol"; diff --git a/plasma_framework/contracts/src/vaults/Erc20Vault.sol b/plasma_framework/contracts/src/vaults/Erc20Vault.sol index c35aaf6dd..22d56dc08 100644 --- a/plasma_framework/contracts/src/vaults/Erc20Vault.sol +++ b/plasma_framework/contracts/src/vaults/Erc20Vault.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "./Vault.sol"; import "./verifiers/IErc20DepositVerifier.sol"; diff --git a/plasma_framework/contracts/src/vaults/EthVault.sol b/plasma_framework/contracts/src/vaults/EthVault.sol index 35392b0d8..935164b44 100644 --- a/plasma_framework/contracts/src/vaults/EthVault.sol +++ b/plasma_framework/contracts/src/vaults/EthVault.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "./Vault.sol"; import "./verifiers/IEthDepositVerifier.sol"; diff --git a/plasma_framework/contracts/src/vaults/Vault.sol b/plasma_framework/contracts/src/vaults/Vault.sol index 918101248..4b49a5f77 100644 --- a/plasma_framework/contracts/src/vaults/Vault.sol +++ b/plasma_framework/contracts/src/vaults/Vault.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "./ZeroHashesProvider.sol"; import "../framework/PlasmaFramework.sol"; diff --git a/plasma_framework/contracts/src/vaults/ZeroHashesProvider.sol b/plasma_framework/contracts/src/vaults/ZeroHashesProvider.sol index 0965bd7f5..31d305634 100644 --- a/plasma_framework/contracts/src/vaults/ZeroHashesProvider.sol +++ b/plasma_framework/contracts/src/vaults/ZeroHashesProvider.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; library ZeroHashesProvider { diff --git a/plasma_framework/contracts/src/vaults/verifiers/Erc20DepositVerifier.sol b/plasma_framework/contracts/src/vaults/verifiers/Erc20DepositVerifier.sol index 7d8ec935d..e2a19c29e 100644 --- a/plasma_framework/contracts/src/vaults/verifiers/Erc20DepositVerifier.sol +++ b/plasma_framework/contracts/src/vaults/verifiers/Erc20DepositVerifier.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol"; diff --git a/plasma_framework/contracts/src/vaults/verifiers/EthDepositVerifier.sol b/plasma_framework/contracts/src/vaults/verifiers/EthDepositVerifier.sol index f9ffe8c77..6646f6095 100644 --- a/plasma_framework/contracts/src/vaults/verifiers/EthDepositVerifier.sol +++ b/plasma_framework/contracts/src/vaults/verifiers/EthDepositVerifier.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; import "./IEthDepositVerifier.sol"; import {PaymentTransactionModel as DepositTx} from "../../transactions/PaymentTransactionModel.sol"; diff --git a/plasma_framework/contracts/src/vaults/verifiers/IErc20DepositVerifier.sol b/plasma_framework/contracts/src/vaults/verifiers/IErc20DepositVerifier.sol index ba7ff20ff..5c7450462 100644 --- a/plasma_framework/contracts/src/vaults/verifiers/IErc20DepositVerifier.sol +++ b/plasma_framework/contracts/src/vaults/verifiers/IErc20DepositVerifier.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; interface IErc20DepositVerifier { /** diff --git a/plasma_framework/contracts/src/vaults/verifiers/IEthDepositVerifier.sol b/plasma_framework/contracts/src/vaults/verifiers/IEthDepositVerifier.sol index 796dfe32b..e58f8eb22 100644 --- a/plasma_framework/contracts/src/vaults/verifiers/IEthDepositVerifier.sol +++ b/plasma_framework/contracts/src/vaults/verifiers/IEthDepositVerifier.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.11; +pragma solidity 0.5.12; interface IEthDepositVerifier { /** diff --git a/plasma_framework/truffle-config.js b/plasma_framework/truffle-config.js index 9820d0a95..833ffce0f 100644 --- a/plasma_framework/truffle-config.js +++ b/plasma_framework/truffle-config.js @@ -60,7 +60,7 @@ module.exports = { // Configure your compilers compilers: { solc: { - version: '0.5.11', + version: '0.5.12', settings: { optimizer: { enabled: true,