Contract changes to support ERC1155 #381
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…itlementGatedV2 contract.
…lement to have V2 naming.
clemire
requested review from
texuf,
sergekh2,
erikolsson,
giuseppecrj,
bas-vk,
brianathere,
pfives and
jterzis
as code owners
…nsibility for decoding params.
giuseppecrj
requested changes
Jul 17, 2024
| transaction.roleIds.push(roleId); | ||
|
|
||
| for (uint256 i = 0; i < selectedNodes.length; i++) { | ||
| transaction.nodeVotesArray[roleId].push( |
There was a problem hiding this comment.
use EnumerableSet not arrays
There was a problem hiding this comment.
This is a straight copy of previous implementation, do you think we could defer to a follow-up PR?
contracts/src/spaces/facets/gated/EntitlementGatedStorageV2.sol
Outdated
Show resolved
Hide resolved
brianathere
reviewed
Jul 17, 2024
| @@ -65,7 +67,8 @@ export type CheckOperation = { | |||
| checkType: CheckOperationType | |||
| chainId: bigint | |||
| contractAddress: Address | |||
| threshold: bigint | |||
| threshold?: bigint | |||
There was a problem hiding this comment.
This should be params bytes, not specific data, so we never have to go through this again for new operation types.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
RuleEntitlement, EntitlementGated, and EntitlementDataQueryable are now deprecated for new spaces in favor of RuleEntitlementV2, EntitlementGatedV2, and EntitlementDataQueryableV2, all of which expose their respective V1 interfaces for legacy interoperability. Old contracts are left in code for reference and for the sake of generating bindings, but should no longer be deployed once these contract changes are deployed.
Since V1 contracts are deprecated, contract tests are updated to run against V2 contract versions.
I added a
RuleDataUtillibrary that converts between V2 and V1 rule data so that v2 contracts can return RuleData in v1 format for stream and xchain nodes. Role creation and updating would have required creating creating V2 versions of entitlements manager, IEntitlements, and many other contracts, but this happens exclusively through the client, so we can just upgrade all role creation to use V2 rule data and force client upgrades once these contracts are deployed.The client is updated entirely to use V2 rule data, but stream nodes and xchain nodes are still using V1 endpoints on the new contracts. There will be a follow-up PR that migrates core services to use V2 endpoints.
Tested locally on harmony with some staged changes ready for a follow-up PR and gating on spaces and channels works fine.