Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ether.js v6 migration #688

Merged
merged 33 commits into from
Jul 4, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
80c5c8a
Bump @nomicfoundation/hardhat-toolbox from 2.0.2 to 3.0.0
dependabot[bot] Jun 8, 2023
665d677
Migrate validations.js and constants.js
anajuliabit Jun 15, 2023
7d85454
Migrate more files
anajuliabit Jun 15, 2023
195a1ab
Remediate BigNumbers and contracts functions
anajuliabit Jun 15, 2023
03b1fbe
remedianting address to getAddress
anajuliabit Jun 16, 2023
f54f3b7
Continue refactor
anajuliabit Jun 19, 2023
529d51b
Fixing diamond utils and related
anajuliabit Jun 20, 2023
52781ee
Remediate scripts
anajuliabit Jun 20, 2023
9288716
Continue remediation
anajuliabit Jun 20, 2023
7d1d6d3
Refactor until GroupHandler
anajuliabit Jun 20, 2023
14fe23d
Continue remediation
anajuliabit Jun 21, 2023
70a380b
Fixing domains
anajuliabit Jun 22, 2023
7cfd04e
Fixing ProtoclInitializationHandler
anajuliabit Jun 22, 2023
f8a53e7
Fixing BosonVoucherTests
anajuliabit Jun 22, 2023
9ddbf8a
Fixing FundsHandlerTest
anajuliabit Jun 23, 2023
67d04c6
Fixing MetaTransactionHandler
anajuliabit Jun 23, 2023
51ebe02
Fixing DisputeHandlerTest
anajuliabit Jun 23, 2023
bf28608
Fixing tests left behind
anajuliabit Jun 23, 2023
89ccd43
Refactor BosonVoucher
anajuliabit Jun 26, 2023
772338c
Finalise refactor on BV
anajuliabit Jun 26, 2023
3947575
Tidy
anajuliabit Jun 27, 2023
86d4f38
Fixing broken tests on FundsHandler
anajuliabit Jun 27, 2023
336c3f9
Merge main
anajuliabit Jun 27, 2023
92430e3
Review changes
anajuliabit Jun 27, 2023
676a603
Fixing integration tests
anajuliabit Jun 27, 2023
60b8404
Fix integration test 04
anajuliabit Jun 28, 2023
11dba7b
Fixing upgrade tests
anajuliabit Jun 28, 2023
57a6ae5
Remove maxPremintedVouchers check
anajuliabit Jun 28, 2023
8c3762f
Add dates checks back again
anajuliabit Jun 29, 2023
e8a4973
Review changes
anajuliabit Jun 29, 2023
ba46cc9
Replacing toHexString
anajuliabit Jun 30, 2023
ab1d685
Review changes
anajuliabit Jun 30, 2023
353cb4d
tidy
anajuliabit Jun 30, 2023
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
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