Skip to content

Commit

Permalink
Merge pull request #688 from bosonprotocol/etherv6_migration
Browse files Browse the repository at this point in the history
ether.js v6 migration
  • Loading branch information
mischat committed Jul 4, 2023
2 parents ab3d4ba + 353cb4d commit 65f8f9a
Show file tree
Hide file tree
Showing 103 changed files with 8,812 additions and 8,124 deletions.
14 changes: 6 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"extends": [
"eslint:recommended",
"prettier"
],
"extends": ["eslint:recommended", "prettier"],
"env": {
"node": true,
"es6": true,
"es2020": true,
"commonjs": true,
"mocha": true
},
Expand All @@ -17,7 +14,8 @@
"no-empty": "off",
"no-only-tests/no-only-tests": "error"
},
"plugins": [
"no-only-tests"
]
"plugins": ["no-only-tests"],
"globals": {
"BigInt": true
}
}
6 changes: 1 addition & 5 deletions contracts/protocol/clients/voucher/BosonVoucher.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.18;

import "../../../domain/BosonConstants.sol";
import { ERC721Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";
import { IERC721Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
Expand Down Expand Up @@ -296,11 +297,6 @@ contract BosonVoucherBase is IBosonVoucher, BeaconClientBase, OwnableUpgradeable
// End should be greater than start
require(end > start, NOTHING_TO_BURN);

// If amount to burn is more than maxPremintedVouchers, burn only maxPremintedVouchers
if (end > start + maxPremintedVouchers) {
end = start + maxPremintedVouchers;
}

// Burn the range
address rangeOwner = range.owner;
uint256 burned;
Expand Down
Loading

0 comments on commit 65f8f9a

Please sign in to comment.