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
10 changes: 6 additions & 4 deletions contracts/hardhat.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,21 +134,21 @@ module.exports = {
yul: true
}
},
evmVersion: "shanghai" // for ethereum mainnet, use shanghai, for polygon, use london
evmVersion: "cancun"
},
},
{
version: "0.8.22",
version: "0.8.35",
settings: {
viaIR: false,
optimizer: {
enabled: true,
runs: 100,
runs: 50,
details: {
yul: true
}
},
evmVersion: "shanghai" // for ethereum mainnet, use shanghai, for polygon, use london
evmVersion: "cancun"
}
},
{
Expand Down Expand Up @@ -178,6 +178,8 @@ module.exports = {
hardhat: {
allowUnlimitedContractSize: true,
chainId: 31337,
blockGasLimit: 16_000_000,
hardfork: "cancun",
accounts: ACCOUNTS.map(({ privateKey }) => ({
privateKey,
balance: "1000000000000000000000000000"
Expand Down
2 changes: 1 addition & 1 deletion contracts/other-contracts/mock/MockBosonSellerHandler.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.22;
pragma solidity 0.8.35;

import { BosonTypes } from "../../protocol-contracts/contracts/domain/BosonTypes.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/other-contracts/mock/MockBosonVoucher.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.22;
pragma solidity 0.8.35;

contract MockBosonVoucher {
uint256 private sellerId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.22;
pragma solidity 0.8.35;
import { IBosonExchangeHandler } from "../../protocol-contracts/contracts/interfaces/handlers/IBosonExchangeHandler.sol";
import { IBosonOfferHandler } from "../../protocol-contracts/contracts/interfaces/handlers/IBosonOfferHandler.sol";
import { DAIAliases as DAI } from "../../protocol-contracts/contracts/interfaces/DAIAliases.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.22;
pragma solidity 0.8.35;

import { OpenSeaWrapper } from './OpenSeaWrapper.sol';
import { BosonTypes } from "../../protocol-contracts/contracts/domain/BosonTypes.sol";
Expand Down
908 changes: 484 additions & 424 deletions contracts/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"name": "hardhat-project",
"scripts": {
"postinstall": "patch-package && node ./scripts/postinstall.js --protocolVersion=2.5.0",
"postinstall": "patch-package && node ./scripts/postinstall.js --protocolVersion=2.5.1",
"deploy": "hardhat run ./scripts/deploy.js --network localhost",
"deploy:ropsten": "hardhat run ./scripts/deploy.js --network ropsten",
"deploy:kovan": "hardhat run ./scripts/deploy.js --network kovan",
"node": "hardhat node --hostname 0.0.0.0"
},
"devDependencies": {
"@bosonprotocol/boson-protocol-contracts": "github:bosonprotocol/boson-protocol-contracts#efd5d1a8f23c3bca7c25273ea4c912a367250119",
"@bosonprotocol/boson-protocol-contracts": "github:bosonprotocol/boson-protocol-contracts#858661679cc8ba2be97eedf3cbc3acd0f5c1903e",
"@manifoldxyz/royalty-registry-solidity": "github:manifoldxyz/royalty-registry-solidity#e5369fc79279ce2e4c6ea2eb5914df51e89e8bd8",
"@nomicfoundation/hardhat-ethers": "^3.0.9",
"@nomicfoundation/hardhat-network-helpers": "^1.0.13",
"@nomicfoundation/hardhat-toolbox": "^6.0.0",
"chai": "^4.3.6",
"dotenv": "^16.0.1",
"ethereum-waffle": "^3.4.4",
"ethers": "^6.15.0",
"ethers": "^6.16.0",
"ethersv5": "npm:ethers@^5.7.2",
"glob": "^9.1.0",
"hardhat": "^2.25.0",
"hardhat": "^2.28.6",
"hardhat-abi-exporter": "^2.9.0",
"patch-package": "^8.0.0",
"seaport": "github:ProjectOpenSea/seaport#e9c5a9f17cb5ee658ccc9cb1a8eeab02c1f5a4cd"
Expand Down
4 changes: 2 additions & 2 deletions e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ services:
- host.docker.internal:host-gateway

boson-protocol-node:
image: boson-protocol-node:efd5d1a8f23c3bca7c25273ea4c912a367250119_2
image: boson-protocol-node:858661679cc8ba2be97eedf3cbc3acd0f5c1903e_2
build:
context: ../.
dockerfile: ./contracts/Dockerfile
ports:
- "8545:8545"

boson-subgraph:
image: boson-subgraph:efd5d1a8f23c3bca7c25273ea4c912a367250119_3
image: boson-subgraph:858661679cc8ba2be97eedf3cbc3acd0f5c1903e_1
build:
context: ../
dockerfile: ./packages/subgraph/Dockerfile
Expand Down
Loading
Loading