Merge pull request #200 from ConsenSys/SolcFixes

Solc fixes

Author: bmcd

Dockerfile

@@ -16,11 +16,9 @@ RUN apk add nodejs
 # survive image upgrades
 VOLUME /cakeshop/data
 
-WORKDIR /cakeshop
-
 COPY --from=builder /home/cakeshop/cakeshop-api/target/cakeshop*.war /cakeshop/cakeshop.war
 
 # for main web interface
 EXPOSE 8080
 
-ENTRYPOINT ["java", "-jar", "/cakeshop/cakeshop.war"]
+ENTRYPOINT ["java", "-Dcakeshop.config.dir=/cakeshop/data", "-Dspring.config.additional-location=file:/cakeshop/data/local/", "-jar", "/cakeshop/cakeshop.war"]

cakeshop-api/src/main/resources/bin/solc-cli/package-lock.json

@@ -5,6 +5,6 @@
   "author": "",
   "license": "Apache2",
   "dependencies": {
-    "solc-cakeshop-cli": "0.5.0"
+    "solc-cakeshop-cli": "0.5.1"
   }
 }

cakeshop-api/src/main/resources/bin/solc-cli/package.json

@@ -1,11 +1,11 @@
-pragma solidity ^0.6.6;
+pragma solidity ^0.8.0;
 contract SimpleStorage {
 
     uint public storedData;
 
     event Change(string message, uint newVal);
 
-    constructor(uint initVal) public {
+    constructor(uint initVal) {
         emit Change("initialized", initVal);
         storedData = initVal;
     }

cakeshop-api/src/main/resources/contracts/SimpleStorage.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.6;
+pragma solidity ^0.8.0;
 
 /// @title Voting with delegation.
 contract Ballot {
@@ -28,7 +28,7 @@ contract Ballot {
     Proposal[] public proposals;
 
     /// Create a new ballot to choose one of `proposalNames`.
-    constructor(bytes32[] memory proposalNames) public {
+    constructor(bytes32[] memory proposalNames) {
         chairperson = msg.sender;
         voters[chairperson].weight = 1;
 

cakeshop-api/src/main/webapp/js/sandbox/contracts/Ballot.txt

@@ -1,10 +1,10 @@
-pragma solidity ^0.6.6;
+pragma solidity ^0.8.0;
 contract Mortal {
     /* Define variable owner of the type address*/
     address payable owner;
 
     /* this function is executed at initialization and sets the owner of the contract */
-    constructor() public { owner = msg.sender; }
+    constructor() { owner = msg.sender; }
 
     /* Function to recover the funds on the contract */
     function kill() public {
@@ -18,7 +18,7 @@ contract Greeter is Mortal {
     string greeting;
 
     /* this runs when the contract is executed */
-    constructor (string memory _greeting) public {
+    constructor (string memory _greeting) {
         greeting = _greeting;
     }
 

cakeshop-api/src/main/webapp/js/sandbox/contracts/Greeter.txt

@@ -1,11 +1,11 @@
-pragma solidity ^0.6.6;
+pragma solidity ^0.8.0;
 contract SimpleStorage {
 
-    uint storedData;
+    uint public storedData;
 
     event Change(string message, uint newVal);
 
-    constructor(uint initVal) public {
+    constructor(uint initVal) {
         emit Change("initialized", initVal);
         storedData = initVal;
     }

cakeshop-api/src/main/webapp/js/sandbox/contracts/SimpleStorage.txt

@@ -483,8 +483,8 @@ import utils from '../utils'
     $(".papertape .panel-body").empty();
   });
 
-  // from https://ethereum.github.io/solc-bin/bin/list.json
-  setSolidityOptions(releases, 'v0.6.12+commit.27d51765')
+  // from http://binaries.soliditylang.org/bin/list.json
+  setSolidityOptions(releases, 'v0.8.1+commit.df193b15')
   shrinkify(".select_contract");
   shrinkify(".state");
   shrinkify(".papertape");