Add entitlement for locked account creator #423
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -661,14 +661,16 @@ access(all) contract LockedTokens { | |
| } | ||
| } | ||
|
|
||
| access(all) entitlement AccountCreator | ||
|
|
||
| access(all) resource interface AddAccount { | ||
| access(AccountCreator) fun addAccount( | ||
| sharedAccountAddress: Address, | ||
| unlockedAccountAddress: Address, | ||
| tokenAdmin: Capability<auth(FungibleToken.Withdraw) &LockedTokenManager>) | ||
| } | ||
|
|
||
| /// Resource that the Flow token admin | ||
| /// stores in their account to manage the vesting schedule | ||
| /// for all the token holders | ||
| access(all) resource TokenAdminCollection: AddAccount { | ||
|
|
@@ -682,7 +684,7 @@ access(all) contract LockedTokens { | |
|
|
||
| /// Add a new account's locked token manager capability | ||
| /// to the record | ||
| access(AccountCreator) fun addAccount( | ||
| sharedAccountAddress: Address, | ||
| unlockedAccountAddress: Address, | ||
| tokenAdmin: Capability<auth(FungibleToken.Withdraw) &LockedTokenManager>) | ||
|
|
@@ -703,27 +705,27 @@ access(all) contract LockedTokens { | |
| } | ||
|
|
||
| access(all) resource interface LockedAccountCreatorPublic { | ||
| access(all) fun addCapability(cap: Capability<auth(LockedTokens.AccountCreator) &TokenAdminCollection>) | ||
| } | ||
|
|
||
| // account creators store this resource in their account | ||
| // in order to be able to register accounts who have locked tokens | ||
| access(all) resource LockedAccountCreator: LockedAccountCreatorPublic, AddAccount { | ||
|
|
||
| access(self) var addAccountCapability: Capability<auth(LockedTokens.AccountCreator) &TokenAdminCollection>? | ||
|
There was a problem hiding this comment. This will be migrated by default, correct? We don't need a custom migration for this? There was a problem hiding this comment. I believe so since the prior capability was on the resource, but I'd want to double check with @turbolent There was a problem hiding this comment. Please try migrating the contract and see if the entitlement is inferred to be required now. From what I can see, it should and no custom migration should be required (if someone had a |
||
|
|
||
| init() { | ||
| self.addAccountCapability = nil | ||
| } | ||
|
|
||
| access(all) fun addCapability(cap: Capability<auth(LockedTokens.AccountCreator) &TokenAdminCollection>) { | ||
| pre { | ||
| cap.borrow() != nil: "Invalid token admin collection capability" | ||
| } | ||
| self.addAccountCapability = cap | ||
| } | ||
|
|
||
| access(AccountCreator) fun addAccount(sharedAccountAddress: Address, | ||
| unlockedAccountAddress: Address, | ||
| tokenAdmin: Capability<auth(FungibleToken.Withdraw) &LockedTokenManager>) { | ||
|
|
||
|
|
||
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.