Fix token gating #635

anajuliabit · 2023-05-12T17:55:04Z

Fix #627

…pdate GroupHandlerTest accordingly

…tocol-contracts into fix-token-gating

… ExchangeHandlerTest.js

zajck

Looks really good, a pointed out just some minor things.

contracts/interfaces/handlers/IBosonExchangeHandler.sol

contracts/protocol/bases/ProtocolBase.sol

contracts/protocol/bases/GroupBase.sol

contracts/protocol/facets/ExchangeHandlerFacet.sol

contracts/protocol/libs/ProtocolLib.sol

zajck

Looks good, just another small request.

contracts/protocol/bases/ProtocolBase.sol

.github/workflows/ci.yaml

…ndlerFacet.sol and update ExchangeHandlerTest.js to test for invalid token ID.

zajck

Just a few more requests.

contracts/protocol/bases/GroupBase.sol

test/example/SnapshotGateTest.js

contracts/protocol/facets/ExchangeHandlerFacet.sol

contracts/domain/BosonConstants.sol

test/protocol/ExchangeHandlerTest.js

zajck

Looks good... But I managed to find one more little thing (that's been there for ages actually, but seems a good time to fix it).

contracts/protocol/bases/GroupBase.sol

zajck

LGTM 👍

zajck

Looks good 👍

zajck · 2023-07-06T17:28:40Z

test/protocol/ExchangeHandlerTest.js

@@ -724,7 +763,7 @@ describe("IBosonExchangeHandler", function () {
          ).to.revertedWith(RevertReasons.REGION_PAUSED);
        });

-        it("buyer address is the zero address", async function () {
+        it("buyer.address is the zero address", async function () {


Funny change, but I can live with it :)

mischat

looks good to me.

mischat · 2023-07-06T17:40:05Z

contracts/protocol/bases/GroupBase.sol

-     * - EvaluationMethod.None and has fields different from 0
-     * - EvaluationMethod.Threshold and token address or maxCommits is zero
-     * - EvaluationMethod.SpecificToken and token address or maxCommits is zero
+     * A invalid condition is one that fits any of the following criteria:


s/A invalid/An invalid/ ... one for the future

I fixed on #656 :)

mischat · 2023-07-06T17:40:31Z

contracts/protocol/bases/GroupBase.sol

+     * A invalid condition is one that fits any of the following criteria:
+     * - EvaluationMethod.None: any field different from zero
+     * - EvaluationMethod.Threshold: 
+          -Token address, maxCommits, or threshold is zero. 


s/-T/- T/ for later

I fixed on #656 :)

anajuliabit added 13 commits May 12, 2023 14:54

Fix token gating

eed3f13

ExchangeHandlerTest:commitToConditionalOffer

5921565

Fix stack to deep and fix getReceipt unit tests

31aec22

Add length validation to GroupBase's validateCondition function and u…

d1ad44f

…pdate GroupHandlerTest accordingly

Adding missing tests to ExchangeHandler

8676813

Adding missing tests to ExchangeHandler

6104cff

Merge branch 'fix-token-gating' of github.com:bosonprotocol/boson-pro…

b068a1e

…tocol-contracts into fix-token-gating

Fix validation function in GroupBase.sol and add new revert reason in…

00b97fb

… ExchangeHandlerTest.js

Fix domains tests

d0e1cf2

Fix invalid condition parameter checks in GroupHandlerTes

e760eba

Allow condition with SpecificToken to be used for ERC1155 tokens

382634e

Fix SnapshopGate tests

b9f9070

Add tests to validate 1155 with SpecificToken

e09749b

anajuliabit marked this pull request as ready for review May 19, 2023 00:00

anajuliabit requested review from mischat and zajck and removed request for mischat May 19, 2023 00:01

Add mising validation to group creation

c50622d

anajuliabit self-assigned this May 19, 2023

zajck requested changes May 22, 2023

View reviewed changes

anajuliabit force-pushed the fix-token-gating branch from 67603dc to ff43c33 Compare May 22, 2023 16:41

anajuliabit requested a review from zajck May 22, 2023 16:43

Review changes

2b8f815

anajuliabit force-pushed the fix-token-gating branch from ff43c33 to 2b8f815 Compare May 22, 2023 18:10

Increase MAX_SKIPPED

bf001c8

mischat added the v2.3.0 label May 26, 2023

zajck requested changes May 29, 2023

View reviewed changes

contracts/protocol/bases/ProtocolBase.sol Show resolved Hide resolved

Review changes

934b5b9

anajuliabit requested a review from zajck May 29, 2023 18:25

zajck reviewed May 30, 2023

View reviewed changes

.github/workflows/ci.yaml Outdated Show resolved Hide resolved

anajuliabit marked this pull request as draft June 2, 2023 11:25

anajuliabit added 3 commits June 2, 2023 14:54

Allow for more use cases

2008253

Fixing missing tests and adding natspec comments

14ab5dd

Merge branch 'main' into fix-token-gating

7ae320e

anajuliabit marked this pull request as ready for review June 5, 2023 16:11

anajuliabit added 3 commits June 5, 2023 15:26

Added Contracts CI badge to README.md file.

374545e

Remove log

2ee5ef4

Add token ID validation for threshold evaluation method in ExchangeHa…

0e0f4a5

…ndlerFacet.sol and update ExchangeHandlerTest.js to test for invalid token ID.

zajck requested changes Jun 6, 2023

View reviewed changes

anajuliabit requested a review from zajck June 6, 2023 14:02

Apply review requests

16a05b5

anajuliabit force-pushed the fix-token-gating branch from 8113c1a to 16a05b5 Compare June 6, 2023 14:28

zajck requested changes Jun 6, 2023

View reviewed changes

contracts/protocol/bases/GroupBase.sol Outdated Show resolved Hide resolved

contracts/protocol/bases/GroupBase.sol Outdated Show resolved Hide resolved

anajuliabit added 2 commits June 6, 2023 18:03

Merge branch 'main' into fix-token-gating

52e3595

Turn arg to calldata

f286097

anajuliabit requested a review from zajck June 6, 2023 21:04

zajck previously approved these changes Jun 7, 2023

View reviewed changes

anajuliabit requested a review from mischat June 9, 2023 12:45

Merge branch 'main' into fix-token-gating

eb336b0

anajuliabit dismissed zajck’s stale review via eb336b0 July 6, 2023 15:27

anajuliabit requested a review from zajck July 6, 2023 15:27

anajuliabit added 5 commits July 6, 2023 12:27

Merge branch 'main' into fix-token-gating

9d9345a

Tidy

12595e3

Fix Condition:isValid method

21b2c00

Turn alterations on this PR compatible with ether.js 6

1cc0b32

Fixing merge conflicts

99de86b

zajck approved these changes Jul 6, 2023

View reviewed changes

mischat approved these changes Jul 6, 2023

View reviewed changes

mischat merged commit 2026a63 into main Jul 6, 2023
9 checks passed

mischat deleted the fix-token-gating branch July 6, 2023 17:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix token gating #635

Fix token gating #635

anajuliabit commented May 12, 2023 •

edited

Loading

zajck left a comment

zajck left a comment

zajck left a comment

zajck left a comment

zajck left a comment

zajck left a comment

zajck Jul 6, 2023

mischat left a comment

mischat Jul 6, 2023

anajuliabit Jul 6, 2023

mischat Jul 6, 2023

anajuliabit Jul 6, 2023

Fix token gating #635

Fix token gating #635

Conversation

anajuliabit commented May 12, 2023 • edited Loading

zajck left a comment

Choose a reason for hiding this comment

zajck left a comment

Choose a reason for hiding this comment

zajck left a comment

Choose a reason for hiding this comment

zajck left a comment

Choose a reason for hiding this comment

zajck left a comment

Choose a reason for hiding this comment

zajck left a comment

Choose a reason for hiding this comment

zajck Jul 6, 2023

Choose a reason for hiding this comment

mischat left a comment

Choose a reason for hiding this comment

mischat Jul 6, 2023

Choose a reason for hiding this comment

anajuliabit Jul 6, 2023

Choose a reason for hiding this comment

mischat Jul 6, 2023

Choose a reason for hiding this comment

anajuliabit Jul 6, 2023

Choose a reason for hiding this comment

anajuliabit commented May 12, 2023 •

edited

Loading