Merge branch 'master' into bumpVersion_Support_Solidity050

remix-debug/package.json

@@ -24,7 +24,7 @@
     "notify-error": "^1.2.0",
     "npm-run-all": "^4.1.2",
     "remix-lib": "0.3.12",
-    "solc": "^0.4.24"
+    "solc": "^0.5.0"
   },
   "devDependencies": {
     "standard": "^7.0.1",

remix-debug/test/decoder/contracts/byteStorage.js

@@ -6,10 +6,10 @@ module.exports = {
     enum enum1 { e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15, e16, e17, e18, e19, e20, e21, e22, e23, e24, e25, e26, e27, e28, e29, e30, e31, e32, e33, e34, e35, e36, e37, e38, e39, e40, e41, e42, e43, e44, e45, e46, e47, e48, e49, e50, e51, e52, e53, e54, e55, e56, e57, e58, e59, e60, e61, e62, e63, e64, e65, e66, e67, e68, e69, e70, e71, e72, e73, e74, e75, e76, e77, e78, e79, e80, e81, e82, e83, e84, e85, e86, e87, e88, e89, e90, e91, e92, e93, e94, e95, e96, e97, e98, e99, e100, e101, e102, e103, e104, e105, e106, e107, e108, e109, e110, e111, e112, e113, e114, e115, e116, e117, e118, e119, e120, e121, e122, e123, e124, e125, e126, e127, e128, e129, e130, e131, e132, e133, e134, e135, e136, e137, e138, e139, e140, e141, e142, e143, e144, e145, e146, e147, e148, e149, e150, e151, e152, e153, e154, e155, e156, e157, e158, e159, e160, e161, e162, e163, e164, e165, e166, e167, e168, e169, e170, e171, e172, e173, e174, e175, e176, e177, e178, e179, e180, e181, e182, e183, e184, e185, e186, e187, e188, e189, e190, e191, e192, e193, e194, e195, e196, e197, e198, e199, e200, e201, e202, e203, e204, e205, e206, e207, e208, e209, e210, e211, e212, e213, e214, e215, e216, e217, e218, e219, e220, e221, e222, e223, e224, e225, e226, e227, e228, e229, e230, e231, e232, e233, e234, e235, e236, e237, e238, e239, e240, e241, e242, e243, e244, e245, e246, e247, e248, e249, e250, e251, e252, e253, e254, e255, e256, e257, e258, e259, e260 }
 
     bool b1 = false;
-    address a1 = 0xfe350f199f244ac9a79038d254400b632a633225;
+    address a1 = 0xfE350f199F244ac9A79038d254400b632a633225;
     bool b2 = true;
     bytes dynb1 = "dynamicbytes";
-    byte stab = 0x1;
+    byte stab = 0x01;
     bytes1 stab1 = hex"12";
     bytes2 stab2 = hex"1579";
     bytes3 stab3 = hex"359356";

remix-debug/test/decoder/contracts/intLocal.js

@@ -9,7 +9,7 @@ contract proxy {
     }
 }
 contract intLocal {
-    function intLocal () {
+    constructor () public {
       proxy.testStruct memory p;
       uint8 ui8 = 130;
       uint16 ui16 = 456;
@@ -31,11 +31,11 @@ contract intLocal {
       level11();
     }
     
-    function level11() {
+    function level11() public {
       uint8 ui8 = 123;
       level12();
     }
-    function level12() {
+    function level12() public {
       uint8 ui81 = 12;
     }
   }

remix-debug/test/decoder/contracts/mappingStorage.js

@@ -1,12 +1,12 @@
 module.exports = {
   contract: `
-  pragma solidity ^0.4.19;
+  pragma solidity ^0.5.0;
 
 contract SimpleMappingState {
     uint _num;
     mapping(string => uint) _iBreakSolidityState;
     mapping(uint => uint) _iBreakSolidityStateInt;
-    function updateNum(uint num, string str) public {
+    function updateNum(uint num, string memory str) public {
         _num = num;
         _iBreakSolidityState[str] = num;
         _iBreakSolidityStateInt[num] = num;

remix-debug/test/decoder/contracts/miscLocal.js

@@ -9,7 +9,7 @@ contract miscLocal {
             three, 
             four
         }
-        function miscLocal () {
+        constructor () public {
             bool boolFalse = false;
             bool boolTrue = true;
             enumDef testEnum;
@@ -31,7 +31,7 @@ contract miscLocal {
   }
 
   contract miscLocal2 {
-      function miscLocal2 () {
+      constructor () public {
            bytes memory dynbytes = "dynamicbytes";
            string memory smallstring = "test_test_test";
         }

remix-debug/test/decoder/contracts/simpleContract.js

@@ -17,6 +17,7 @@ module.exports = `
     
     contract test1 {
         struct str {
+            uint8 ui;
         }
     }
 

remix-debug/test/decoder/contracts/structArrayLocal.js

@@ -24,7 +24,7 @@ contract structArrayLocal {
         enumdef c;
     }    
     
-    function structArrayLocal () {
+    constructor () public {
         bytes memory bytesSimple = "test_super";
         teststruct memory e;
         e.a = "test";

remix-debug/test/decoder/contracts/structArrayStorage.js

@@ -25,7 +25,7 @@ module.exports = {
         string str;
     }
     simpleStruct[][3] arrayStruct;
-    function structArrayStorage () {
+    constructor () public {
         intStructDec.i8 = 32;
         intStructDec.i16 = -54;
         intStructDec.ui32 = 128;

remix-debug/test/decoder/decodeInfo.js

@@ -67,7 +67,6 @@ tape('solidity', function (t) {
 
     output = compiler.compile(compilerInput(simplecontracts))
     output = JSON.parse(output)
-
     state = astHelper.extractStateDefinitions('test.sol:simpleContract', output.sources)
     states = astHelper.extractStatesDefinitions(output.sources)
     stateDef = state.stateDefinitions
@@ -81,10 +80,10 @@ tape('solidity', function (t) {
     state = astHelper.extractStateDefinitions('test.sol:test2', output.sources)
     stateDef = state.stateDefinitions
     parsedType = decodeInfo.parseType(stateDef[0].attributes.type, states, 'test1', util.extractLocationFromAstVariable(stateDef[0]))
-    checkDecodeInfo(st, parsedType, 0, 32, 'struct test1.str')
+    checkDecodeInfo(st, parsedType, 1, 32, 'struct test1.str')
 
     state = stateDecoder.extractStateVariables('test.sol:test2', output.sources)
-    checkDecodeInfo(st, parsedType, 0, 32, 'struct test1.str')
+    checkDecodeInfo(st, parsedType, 1, 32, 'struct test1.str')
 
     st.end()
   })

remix-debug/test/decoder/stateTests/mapping.js

@@ -48,7 +48,7 @@ function testMapping (st, vm, privateKey, contractAddress, output, cb) {
                 var traceManager = new TraceManager({web3: vm.web3})
                 traceManager.resolveTrace(tx, () => {
                   var storageViewer = new StorageViewer({
-                    stepIndex: 213,
+                    stepIndex: 268,
                     tx: tx,
                     address: contractAddress
                   }, new StorageResolver({web3: vm.web3}), traceManager)

remix-debug/test/tests.js

@@ -109,8 +109,8 @@ function testDebugging (t, debugManager) {
 
   breakPointManager.event.register('breakpointHit', function (sourceLocation, step) {
     console.log('breakpointHit')
-    t.equal(JSON.stringify(sourceLocation), JSON.stringify({ start: 591, length: 1, file: 0, jump: '-' }))
+    t.equal(JSON.stringify(sourceLocation), JSON.stringify({ start: 587, length: 1, file: 0, jump: '-' }))
-    t.equal(step, 75)
+    t.equal(step, 74)
   })
 
   breakPointManager.event.register('noBreakpointHit', function () {
@@ -120,7 +120,7 @@ function testDebugging (t, debugManager) {
   breakPointManager.jumpNextBreakpoint(0, true)
 }
 
-var ballot = `pragma solidity ^0.4.0;
+var ballot = `pragma solidity ^0.5.0;
 contract Ballot {
 
     struct Voter {
@@ -138,13 +138,13 @@ contract Ballot {
     Proposal[] proposals;
 
     /// Create a new ballot with $(_numProposals) different proposals.
-    function Ballot() public {
+    constructor() public {
         uint p = 45;
         chairperson = msg.sender;
         address addressLocal = msg.sender; // copy of state variable
         voters[chairperson].weight = 1;
         proposals.length = 1;
-        Proposal[] proposalsLocals = proposals; // copy of state variable
+        Proposal[] storage proposalsLocals = proposals; // copy of state variable
     }
 
     /// Give $(toVoter) the right to vote on this ballot.
@@ -179,7 +179,7 @@ contract Ballot {
         proposals[toProposal].voteCount += sender.weight;
     }
 
-    function winningProposal() public constant returns (uint8 _winningProposal) {
+    function winningProposal() public view returns (uint8 _winningProposal) {
         uint256 winningVoteCount = 0;
         for (uint8 prop = 0; prop < proposals.length; prop++)
             if (proposals[prop].voteCount > winningVoteCount) {

remix-lib/package.json

@@ -27,7 +27,7 @@
     "ethereumjs-vm": "^2.3.3",
     "ethers": "^3.0.15",
     "fast-async": "^6.1.2",
-    "solc": "^0.4.13",
+    "solc": "^0.5.0",
     "standard": "^7.0.1",
     "tape": "^4.6.0",
     "web3": "0.20.6"

remix-lib/test/sourceMappingDecoder.js

@@ -107,12 +107,12 @@ tape('SourceMappingDecoder', function (t) {
 })
 
 var contracts = `contract test {
-    function f1() returns (uint) {
+    function f1() public returns (uint) {
         uint t = 4;
         return t;
     }
     
-    function f2() {
+    function f2() public {
         
     }
 }

remix-lib/test/txFormat.js

@@ -15,7 +15,7 @@ tape('ContractParameters - (TxFormat.buildData) - format input parameters', func
   output = JSON.parse(output)
   var contract = output.contracts['test.sol']['uintContractTest']
   context = { output, contract }
-  var bytecode = '608060405234801561001057600080fd5b50610111806100206000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680634b521953146044575b600080fd5b348015604f57600080fd5b50609660048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506098565b005b8260008190555081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505600a165627a7a7230582028c4b7d4bd450fb198ccfdf15510df1721e4f8abda2487d4b452c533bed8880b0029'
+  var bytecode = '608060405234801561001057600080fd5b5061011e806100206000396000f3fe608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680634b521953146044575b600080fd5b348015604f57600080fd5b5060a360048036036060811015606457600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505060a5565b005b8260008190555081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505056fea165627a7a7230582053a6bee96a62b9079722b2a0004a405aa29803abc12ed6dd0322007ebb44a5f60029'
   t.test('(TxFormat.buildData)', function (st) {
     st.plan(3)
     testWithInput(st, '123123, "0xf7a10e525d4b168f45f74db1b61f63d3e7619ea8", "34"', bytecode + '000000000000000000000000000000000000000000000000000000000001e0f3000000000000000000000000f7a10e525d4b168f45f74db1b61f63d3e7619ea80000000000000000000000000000000000000000000000000000000000000022')
@@ -29,7 +29,7 @@ function testWithInput (st, params, expected) {
   txFormat.buildData('uintContractTest', context.contract, context.output.contracts, true, context.contract.abi[0], params, (error, data) => {
     if (error) { return st.fails(error) }
     console.log(data)
-    st.equal(data.dataHex, expected)
+    st.equal(expected, data.dataHex)
   }, () => {}, () => {})
 }
 
@@ -96,7 +96,8 @@ function testLinkLibrary2 (st, callbackDeployLibraries) {
       'lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2': '0xf7a10e525d4b168f45f74db1b61f63d3e7619e33'
     }
   }
-  var data = '608060405234801561001057600080fd5b5061026b806100206000396000f300608060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680636d4ce63c14610046575b600080fd5b34801561005257600080fd5b5061005b61005d565b005b73f7a10e525d4b168f45f74db1b61f63d3e7619e116344733ae16040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b1580156100bd57600080fd5b505af41580156100d1573d6000803e3d6000fd5b5050505073f7a10e525d4b168f45f74db1b61f63d3e7619e336344733ae16040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b15801561013557600080fd5b505af4158015610149573d6000803e3d6000fd5b5050505073f7a10e525d4b168f45f74db1b61f63d3e7619e336344733ae16040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b1580156101ad57600080fd5b505af41580156101c1573d6000803e3d6000fd5b5050505073f7a10e525d4b168f45f74db1b61f63d3e7619e116344733ae16040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b15801561022557600080fd5b505af4158015610239573d6000803e3d6000fd5b505050505600a165627a7a7230582007a22a440570c53944d704e68b3fd4ba3ba4a0fba71c4abd66b195d87f065bcd0029'
+
+  var data = '608060405234801561001057600080fd5b5061026b806100206000396000f3fe608060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680636d4ce63c14610046575b600080fd5b34801561005257600080fd5b5061005b61005d565b005b73f7a10e525d4b168f45f74db1b61f63d3e7619e116344733ae16040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b1580156100bd57600080fd5b505af41580156100d1573d6000803e3d6000fd5b5050505073f7a10e525d4b168f45f74db1b61f63d3e7619e336344733ae16040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b15801561013557600080fd5b505af4158015610149573d6000803e3d6000fd5b5050505073f7a10e525d4b168f45f74db1b61f63d3e7619e336344733ae16040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b1580156101ad57600080fd5b505af41580156101c1573d6000803e3d6000fd5b5050505073f7a10e525d4b168f45f74db1b61f63d3e7619e116344733ae16040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b15801561022557600080fd5b505af4158015610239573d6000803e3d6000fd5b5050505056fea165627a7a72305820d2fdcf2968ba13c89dd82748af1cac609a670e333fce635bc2212c2a50508be70029'
 
   var deployMsg = ['creation of library test.sol:lib1 pending...',
   'creation of library test.sol:lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2 pending...']
@@ -216,26 +217,26 @@ tape('test abiEncoderV2 array of tuple', function (t) {
 var uintContract = `contract uintContractTest {
     uint _tp;
     address _ap;
-    function test(uint _t, address _a, uint _i) {
+    function test(uint _t, address _a, uint _i) public {
         _tp = _t;
         _ap = _a;
     }
 }`
 
-var deploySimpleLib = `pragma solidity ^0.4.4;
+var deploySimpleLib = `pragma solidity ^0.5.0;
 
 library lib1 {
-    function getEmpty () {
+    function getEmpty () public {
     }
 }
 
 library lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2 {
-    function getEmpty () {
+    function getEmpty () public {
     }
 }
 
 contract testContractLinkLibrary { 
-    function get () {
+    function get () public {
         lib1.getEmpty();
         lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2.getEmpty();
         lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2.getEmpty();
@@ -243,22 +244,20 @@ contract testContractLinkLibrary {
  }
  }`
 
-var encodeFunctionCall = `pragma solidity ^0.4.4;
+var encodeFunctionCall = `pragma solidity ^0.5.0;
 
 contract testContractLinkLibrary { 
-    function get (uint _p, string _o) {
+    function get (uint _p, string memory _o) public {
-        
+    }
- }
  }`
 
-var fallbackFunction = `pragma solidity ^0.4.4;
+var fallbackFunction = `pragma solidity ^0.5.0;
 
 contract fallbackFunctionContract { 
-    function get (uint _p, string _o) {
+    function get (uint _p, string memory _o) public {
-        
     }
     
-    function () {}
+    function () external {}
  }`
 
 var abiEncoderV2 = `pragma experimental ABIEncoderV2;
@@ -269,12 +268,12 @@ contract test {
         uint b;
         string s;
     }
-    function t (p _p, uint _i) returns (p) {
+    function t (p memory _p, uint _i) public returns (p memory) {
         return _p;
     }
     
-     function t () returns (p) {
+     function t () public returns (p memory) {
-        p mm;
+        p memory mm;
         mm.a = 123;
         mm.b = 133;
         return mm;
@@ -284,17 +283,17 @@ contract test {
 var abiEncoderV2ArrayOfTuple = `pragma experimental ABIEncoderV2;
 contract test {
     
-    struct MyStruct {uint256 num; string _string;}
+    struct MyStruct {uint256 num; string  _string;}
     
-    constructor (MyStruct[] _structs, string _str) {
+    constructor (MyStruct[] memory _structs, string memory _str) public {
         
     }
     
-    function addStructs(MyStruct[] _structs) public returns (MyStruct[] strucmts) { 
+    function addStructs(MyStruct[] memory _structs) public returns (MyStruct[] memory strucmts) {
        strucmts = _structs;
     }
     
-    function addStructs(MyStruct _structs) public returns (MyStruct _strucmts) { 
+    function addStructs(MyStruct memory _structs) public returns (MyStruct memory _strucmts) {
       _strucmts = _structs;
     }
 }`

remix-tests/examples/simple_storage2_test.sol

@@ -1,4 +1,4 @@
-ppragma solidity ^0.5.0;
+pragma solidity ^0.5.0;
 import "remix_tests.sol";
 import "./simple_storage.sol";
 

remix-tests/package.json

@@ -45,7 +45,7 @@
     "remix-simulator": "0.0.7",
     "remix-solidity": "0.2.13",
     "signale": "^1.2.1",
-    "solc": "^0.4.24",
+    "solc": "^0.5.0",
     "standard": "^10.0.3",
     "web3": "1.0.0-beta.36",
     "winston": "^3.0.0"

remix-tests/sol/tests.sol.js

@@ -1,6 +1,4 @@
 module.exports = `
-pragma solidity >=0.4.22 <0.6.0;
-
 library Assert {
 
   event AssertionEvent(

remix-tests/sol/tests_accounts.sol.js

@@ -1,7 +1,6 @@
-module.exports = `pragma solidity ^0.4.7;
+module.exports = `
-
 library TestsAccounts {
-    function getAccount(uint index) returns (address) {
+    function getAccount(uint index) public returns (address) {
         >accounts<
         return accounts[index];
     }

remix-tests/src/compiler.js

@@ -11,7 +11,8 @@ String.prototype.regexIndexOf = function (regex, startpos) {
 
 function writeTestAccountsContract (accounts) {
   var testAccountContract = require('../sol/tests_accounts.sol.js')
-  var body = 'address[' + accounts.length + '] memory accounts'
+  // TODO: this will only work for solidity 0.5.0
+  var body = 'address payable[' + accounts.length + '] memory accounts'
   if (!accounts.length) body += ';'
   else {
     body += '= [' + accounts.map((value) => { return `address(${value})` }).join(',') + '];'

remix-tests/tests/various_sender/sender_test.sol

@@ -1,10 +1,9 @@
-pragma solidity ^0.4.7;
 import "remix_tests.sol"; // this import is automatically injected by Remix.
 import "remix_accounts.sol";
 
 contract SenderTest {
    
-    function beforeAll () {}
+    function beforeAll () public {}
     
     /// 1
     function checkSenderIs1 () public {