Add additional checks to checkContractIsRegistered - #309
Merged
Conversation
JonoPrest
force-pushed
the
jp/fix-is-registered-check
branch
from
October 30, 2024 15:09
dd413c2 to
eaf9e61
Compare
JonoPrest
commented
Oct 30, 2024
Comment on lines
+142
to
+148
| !checkContractIsRegistered(~chain, ~contractAddress, ~contractName=contractType) && | ||
| !checkContractIsInCurrentRegistrations( | ||
| ~dynamicContractRegistrations, | ||
| ~chain, | ||
| ~contractAddress, | ||
| ~contractType, | ||
| ) |
Collaborator
Author
There was a problem hiding this comment.
Previously it would be possible for two events in a batch to register the same contract
JonoPrest
commented
Oct 30, 2024
Comment on lines
+878
to
+890
| let rec checkBaseRegisterContainsRegisteredContract = ( | ||
| register: register, | ||
| ~contractName, | ||
| self: register, | ||
| ~contractAddress, | ||
| ) => { | ||
| let addresses = | ||
| self.contractAddressMapping | ||
| ->ContractAddressingMap.getAddresses(contractName) | ||
| ->Option.mapWithDefault(addresses, newAddresses => { | ||
| addresses->Set.String.union(newAddresses) | ||
| }) | ||
|
|
||
| switch self.registerType { | ||
| | RootRegister(_) => addresses | ||
| | DynamicContractRegister({nextRegister}) => | ||
| nextRegister->getAllAddressesForContract(~addresses, ~contractName) | ||
| switch register.contractAddressMapping->ContractAddressingMap.getAddresses(contractName) { | ||
| | Some(addresses) if addresses->Belt.Set.String.has(contractAddress->Address.toString) => true | ||
| | _ => | ||
| switch register.registerType { | ||
| | RootRegister(_) => false | ||
| | DynamicContractRegister({nextRegister}) => | ||
| nextRegister->checkBaseRegisterContainsRegisteredContract(~contractName, ~contractAddress) | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
Improved this function to early return rather than always iterate over all registers
JonoPrest
commented
Oct 30, 2024
Comment on lines
+899
to
+904
| self.baseRegister->checkBaseRegisterContainsRegisteredContract(~contractName, ~contractAddress) || | ||
| self.pendingDynamicContracts->Array.some(({dynamicContracts}) => | ||
| dynamicContracts->Array.some(dcr => | ||
| dcr.contractAddress == contractAddress && (dcr.contractType :> string) == contractName | ||
| ) | ||
| ) |
Collaborator
Author
There was a problem hiding this comment.
Add the check for pending dynamic contracts as well over here
JonoPrest
force-pushed
the
jp/fix-is-registered-check
branch
from
October 30, 2024 15:15
eaf9e61 to
1212125
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Two potential cases for double registration handled: