Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: "3.11"
- name: Set up uv
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
with:
enable-cache: true
- name: Install dependencies
Expand All @@ -31,23 +31,35 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: "3.11"
- name: Set up uv
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
with:
enable-cache: true
- name: Set up Foundry
uses: foundry-rs/foundry-toolchain@8789b3e21e6c11b2697f5eb56eddae542f746c10
uses: foundry-rs/foundry-toolchain@8789b3e21e6c11b2697f5eb56eddae542f746c10 # v1.7.0
with:
version: stable
- name: Install dependencies
run: |
uv sync --frozen --no-install-project
npm ci
- name: Install Solidity compiler
run: |
set -euo pipefail
solcx_dir="$HOME/.solcx"
temp_dir="$(mktemp -d)"
compiler_path="$temp_dir/solc-static-linux"
compiler_url="https://github.com/ethereum/solidity/releases/download/v0.8.34/solc-static-linux"
compiler_sha256="d40adc6f9fdbb22a97d32a02fa05688bf2ee7886affc48c9851b0afd4a726b39"
mkdir -p "$solcx_dir"
curl -fsSL "$compiler_url" -o "$compiler_path"
echo "$compiler_sha256 $compiler_path" | sha256sum --check --status
install -m 0755 "$compiler_path" "$solcx_dir/solc-v0.8.34"
- name: Import Brownie network settings
run: uv run brownie networks import data/networks.yml true
- name: Compile contracts
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A prototype implementation of escrow information concealment using Joux's Tripar
- bls12_381 curve operations
- [Solidity](https://docs.soliditylang.org/)
- We are using Solidity to implement our smart contracts.
- Currently, we are using v0.8.23.
- Currently, we are using v0.8.34.
- [eth-brownie](https://github.com/eth-brownie/brownie)
- We are using the eth-brownie framework for developing and testing our contracts.
- [Anvil](https://www.getfoundry.sh/anvil)
Expand Down
2 changes: 1 addition & 1 deletion brownie-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ networks:
compiler:
evm_version: berlin
solc:
version: 0.8.23
version: 0.8.34
dependencies:
OpenZeppelin/openzeppelin-contracts@4.9.3
2 changes: 1 addition & 1 deletion contracts/access/Ownable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "../utils/Errors.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/exchange/DVPStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "../access/Ownable.sol";
import "../utils/Errors.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/exchange/IbetSecurityTokenDVP.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "OpenZeppelin/openzeppelin-contracts@4.9.3/contracts/utils/math/SafeMath.sol";
import "./DVPStorage.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/ledger/PersonalInfo.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "../utils/Errors.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/token/IbetShare.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "OpenZeppelin/openzeppelin-contracts@4.9.3/contracts/utils/math/SafeMath.sol";
import "../access/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/IbetStandardToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "OpenZeppelin/openzeppelin-contracts@4.9.3/contracts/utils/math/SafeMath.sol";
import "../access/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/IbetStraightBond.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "OpenZeppelin/openzeppelin-contracts@4.9.3/contracts/utils/math/SafeMath.sol";
import "../access/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/utils/Errors.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

library ErrorCode {
// 10XXXX
Expand Down
2 changes: 1 addition & 1 deletion contracts/utils/TripartiteKeyExchange.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

/// @title Joux's tripartite diffie-hellmann key exchange
contract TripartiteKeyExchange {
Expand Down
2 changes: 1 addition & 1 deletion interfaces/ContractReceiver.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

interface ContractReceiver {
function tokenFallback(
Expand Down
2 changes: 1 addition & 1 deletion interfaces/IbetExchangeInterface.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "./ContractReceiver.sol";

Expand Down
2 changes: 1 addition & 1 deletion interfaces/IbetSecurityTokenInterface.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

import "./IbetStandardTokenInterface.sol";

Expand Down
2 changes: 1 addition & 1 deletion interfaces/IbetStandardTokenInterface.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
pragma solidity ^0.8.0;
pragma solidity ^0.8.34;

/// @title ibet Standard Token Interface
abstract contract IbetStandardTokenInterface {
Expand Down
Loading