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

Fix review - require funder equals issuer #116

Merged
merged 37 commits into from
Feb 28, 2023
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2eb4bae
removes all traces of Ongoing and TieredPercentage bounties, includin…
FlacoJones Feb 25, 2023
5206d9a
updates BountyFactory test to operate without Ongoing or TieredPercen…
FlacoJones Feb 25, 2023
67155c2
updates ClaimManager tests to pass without Ongoing or TieredPercentage
FlacoJones Feb 25, 2023
9c56e95
updates DepositManager test to run without Ongoing or TieredPercentag…
FlacoJones Feb 25, 2023
71ed979
updates OpenQ test to pass without Ongoing or TieredPercentage bounty…
FlacoJones Feb 25, 2023
4300bae
udpates TieredBountyCore tests to pass without Ongoing or TieredPerce…
FlacoJones Feb 25, 2023
6fb823c
updates deploy scripts to operate without Ongoing or TieredPercentage
FlacoJones Feb 25, 2023
321c8d7
removes TOKEN_ADDRESS_LIMIT from TokenWhitelist.sol
FlacoJones Feb 25, 2023
834cdb8
removes the check of token address limit on DepositManager. simply re…
FlacoJones Feb 25, 2023
dc2364a
removes tokenAddressLimitReached in DepositManager
FlacoJones Feb 25, 2023
5b11bb6
updates OpenQTokenWhitelist tests to pass without TOKEN_ADDRESS_LIMIT
FlacoJones Feb 25, 2023
29cb98e
updates deploy script for OpenQTokenWhitelist being initialized witho…
FlacoJones Feb 25, 2023
ea60cb4
removes deprecated tests in DepositManager.test.js related to TOKEN_A…
FlacoJones Feb 25, 2023
9bde618
updates OpenQ.test.js to deploy OpenQTokenWhitelist without TOKEN_ADD…
FlacoJones Feb 25, 2023
b32f0b2
further updates tests to deploy OpenQTokenWhitelist without TOKEN_ADD…
FlacoJones Feb 25, 2023
3630be4
removes nft logic from AtomicBountyV1.sol
FlacoJones Feb 25, 2023
f67a4ca
removes nft logic from BountyCore.sol
FlacoJones Feb 25, 2023
fd0fae1
removes NFT logic from TieredBountyCore
FlacoJones Feb 25, 2023
d7845b6
removes nftDepositLimit from TieredFixedBountyV1.sol
FlacoJones Feb 25, 2023
89d6386
removes nft interface methods from IBountyCore.sol
FlacoJones Feb 25, 2023
cb23808
removes logic that looped over nft deposits to transfer on claims
FlacoJones Feb 25, 2023
b25f6a6
removes nft funding logic from DepositManagerV1
FlacoJones Feb 25, 2023
69fdb97
removes unused NFT related error messages from Errors.sol
FlacoJones Feb 25, 2023
3dd7ae2
removes MockNFT contract
FlacoJones Feb 25, 2023
3d7f4f5
updates DepositManager.test.js to remove nft related tests
FlacoJones Feb 25, 2023
01d67be
removes nft related tests from ClaimManager.test.js
FlacoJones Feb 25, 2023
f7db4c9
removes nft related tests from OpenQ.test.js
FlacoJones Feb 25, 2023
983c1c4
updates deploy contract script to remove nft related logic
FlacoJones Feb 25, 2023
b6767a8
removes MockNFt from fund_bounties script
FlacoJones Feb 25, 2023
54a4500
removes nft logic from AtomicBountyV1.test.js
FlacoJones Feb 25, 2023
a10a1df
removes nft logic from BountyCore and TieredBountyCore tests
FlacoJones Feb 25, 2023
a75a383
removes nft logic from all tests
FlacoJones Feb 25, 2023
64b9284
removes ERC721Receiver imports from BountyStorageCore.sol
FlacoJones Feb 25, 2023
f7b42b9
allows for funding of contracts even after close in the case that fur…
FlacoJones Feb 25, 2023
82e68f9
removes bountyIsOpen method from DepositManager
FlacoJones Feb 25, 2023
2e6f1c8
removes test in DepositManager that formerly prevented funding after …
FlacoJones Feb 25, 2023
3c75e5d
adds require(isWhitelisted(_tokenAddress), Errors.TOKEN_NOT_ACCEPTED)…
FlacoJones Feb 26, 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
Prev Previous commit
Next Next commit
removes nft logic from all tests
FlacoJones committed Feb 25, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit a75a3836342c6e62faeaabc16a0851628ca02ed7
2 changes: 1 addition & 1 deletion test/Bounty/TieredBountyCore.test.js
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ const {
tieredFixedBountyInitOperationBuilder_permissionless
} = require('../constants');

describe.only('TieredBountyCore.sol', () => {
describe('TieredBountyCore.sol', () => {
// CONTRACT FACTORIES
let TieredFixedBountyV1;

16 changes: 0 additions & 16 deletions test/Bounty/TieredFixedBounty.test.js
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@ describe('TieredFixedBountyV1.sol', () => {
// MOCK ASSETS
let mockLink;
let mockDai;
let mockNft;

// UTILS
let abiCoder = new ethers.utils.AbiCoder;
@@ -45,7 +44,6 @@ describe('TieredFixedBountyV1.sol', () => {
TieredFixedBountyV1 = await ethers.getContractFactory('TieredFixedBountyV1');
const MockLink = await ethers.getContractFactory('MockLink');
const MockDai = await ethers.getContractFactory('MockDai');
const MockNft = await ethers.getContractFactory('MockNft');

[owner, claimManager, depositManager] = await ethers.getSigners();

@@ -56,16 +54,6 @@ describe('TieredFixedBountyV1.sol', () => {
mockDai = await MockDai.deploy();
await mockDai.deployed();

mockNft = await MockNft.deploy();
await mockNft.deployed();

await mockNft.safeMint(owner.address);
await mockNft.safeMint(owner.address);
await mockNft.safeMint(owner.address);
await mockNft.safeMint(owner.address);
await mockNft.safeMint(owner.address);
await mockNft.safeMint(owner.address);

// TIERED BOUNTY
tieredFixedContract = await TieredFixedBountyV1.deploy();
await tieredFixedContract.deployed();
@@ -78,10 +66,6 @@ describe('TieredFixedBountyV1.sol', () => {
// Pre-approve LINK and DAI for transfers during testing
await mockLink.approve(tieredFixedContract.address, 10000000);
await mockDai.approve(tieredFixedContract.address, 10000000);

await mockNft.approve(tieredFixedContract.address, 0);
await mockNft.approve(tieredFixedContract.address, 1);
await mockNft.approve(tieredFixedContract.address, 2);
});

describe('initializer', () => {