diff --git a/Makefile b/Makefile index 3615a47cd..a5a2879d6 100644 --- a/Makefile +++ b/Makefile @@ -8,13 +8,14 @@ clean: @rm -rf combined.json compile: clean + @# Note: using /bin/echo for macOS @git submodule update --recursive --init @solc --metadata-literal --bin --abi --combined-json=abi,bin,bin-runtime,srcmap,srcmap-runtime,ast,metadata,storage-layout --overwrite -o . deposit_contract.sol tests/deposit_contract.t.sol - @echo -n '{"abi": ' > deposit_contract.json + @/bin/echo -n '{"abi": ' > deposit_contract.json @cat DepositContract.abi >> deposit_contract.json - @echo -n ', "bytecode": "0x' >> deposit_contract.json + @/bin/echo -n ', "bytecode": "0x' >> deposit_contract.json @cat DepositContract.bin >> deposit_contract.json - @echo -n '"}' >> deposit_contract.json + @/bin/echo -n '"}' >> deposit_contract.json export DAPP_SKIP_BUILD:=1 diff --git a/circle.yml b/circle.yml index 254cdae89..70679e01e 100644 --- a/circle.yml +++ b/circle.yml @@ -3,15 +3,14 @@ version: 2.1 jobs: build: docker: - - image: cimg/base:2020.01 + - image: ethereum/solc:0.6.8-alpine steps: - checkout - run: - name: Install solidity + name: Install build essentials command: | - sudo add-apt-repository ppa:ethereum/ethereum - sudo apt-get update - sudo apt-get install solc + apk update + apk add git make - run: name: Compile the contract command: make diff --git a/deposit_contract.sol b/deposit_contract.sol index 39f7b2ba6..e6c215180 100644 --- a/deposit_contract.sol +++ b/deposit_contract.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.6.0; +pragma solidity 0.6.8; // This interface is designed to be compatible with the Vyper version. interface IDepositContract {