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

Update core contracts to latest stable cadence #382

Merged
merged 23 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Apply suggestions from code review
Co-authored-by: Bastian Müller <bastian@axiomzen.co>
  • Loading branch information
SupunS and turbolent authored Sep 21, 2023
commit 63062908d72845771c8e08b2f4e5c2216de3472c
2 changes: 1 addition & 1 deletion transactions/flowToken/create_forwarder.cdc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ transaction(receiver: Address) {

if let cap = acct.capabilities.get<&{FungibleToken.Receiver}>(/public/flowTokenReceiver) {
if cap.check() {
acct.unlink(/public/flowTokenReceiver)
acct.capabilities.unpublish(/public/flowTokenReceiver)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ transaction {
)
acct.capabilities.publish(
delegatorCap,
at:/public/flowStakingDelegator,
at: /public/flowStakingDelegator,
)
}
}
4 changes: 2 additions & 2 deletions transactions/idTableStaking/node/node_add_capability.cdc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ transaction {
prepare(acct: auth(BorrowValue) &Account) {

if acct.storage.borrow<auth(FlowIDTableStaking.NodeOperator) &FlowIDTableStaking.NodeStaker>(from: FlowIDTableStaking.NodeStakerStoragePath) == nil ||
acct.capabilities.get<&{FlowIDTableStaking.NodeStakerPublic}>(FlowIDTableStaking.NodeStakerPublicPath)!.check()
acct.capabilities.get<&{FlowIDTableStaking.NodeStakerPublic}>(FlowIDTableStaking.NodeStakerPublicPath)?.check() ?? false
{
return
}
Expand All @@ -20,7 +20,7 @@ transaction {

acct.capabilities.publish(
nodeStakerCap,
at: FlowIDTableStaking.NodeStakerPublicPath,
at: FlowIDTableStaking.NodeStakerPublicPath
)
}
}
2 changes: 1 addition & 1 deletion transactions/idTableStaking/node/register_node.cdc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ transaction(

acct.capabilities.publish(
nodeStakerCap,
at: FlowIDTableStaking.NodeStakerPublicPath,
at: FlowIDTableStaking.NodeStakerPublicPath
)
} else {
destroy nodeStaker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ transaction(
let lockedTokensManagerCap = sharedAccount.capabilties.storage.issue<&{FungibleToken.Receiver}>(LockedTokens.LockedTokenManagerStoragePath)
sharedAccount.capabilties.publish(
lockedTokensManagerCap,
at: /public/flowTokenReceiver,
at: /public/flowTokenReceiver
)

// put normal receiver in a separate unique path
let tokenReceiverCap = sharedAccount.capabilties.storage.issue<&{FungibleToken.Receiver}>(/storage/flowTokenVault)
sharedAccount.capabilties.publish(
tokenReceiverCap
at: /public/lockedFlowTokenReceiver,
tokenReceiverCap,
at: /public/lockedFlowTokenReceiver
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ transaction(
LockedTokens.LockedTokenManagerStoragePath
)

let lockedAccountCreator = custodyProvider.storage.
let lockedAccountCreator = custodyProvider.storage
.borrow<&LockedTokens.LockedAccountCreator>(from: LockedTokens.LockedAccountCreatorStoragePath)

lockedAccountCreator.addAccount(
Expand All @@ -64,14 +64,14 @@ transaction(
let lockedTokensManagerCap = sharedAccount.capabilties.storage.issue<&{FungibleToken.Receiver}>(LockedTokens.LockedTokenManagerStoragePath)
sharedAccount.capabilties.publish(
lockedTokensManagerCap,
at: /public/flowTokenReceiver,
at: /public/flowTokenReceiver
)

// put normal receiver in a separate unique path.
let tokenReceiverCap = sharedAccount.capabilties.storage.issue<&{FungibleToken.Receiver}>(/storage/flowTokenVault)
sharedAccount.capabilties.publish(
tokenReceiverCap
at: /public/lockedFlowTokenReceiver,
tokenReceiverCap,
at: /public/lockedFlowTokenReceiver
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ transaction(
LockedTokens.LockedTokenManagerStoragePath
)

let lockedAccountCreator = custodyProvider.storage.
let lockedAccountCreator = custodyProvider.storage
.borrow<&LockedTokens.LockedAccountCreator>(from: LockedTokens.LockedAccountCreatorStoragePath)

lockedAccountCreator.addAccount(
Expand All @@ -65,14 +65,14 @@ transaction(
let lockedTokensManagerCap = sharedAccount.capabilties.storage.issue<&{FungibleToken.Receiver}>(LockedTokens.LockedTokenManagerStoragePath)
sharedAccount.capabilties.publish(
lockedTokensManagerCap,
at: /public/flowTokenReceiver,
at: /public/flowTokenReceiver
)

// put normal receiver in a separate unique path.
let tokenReceiverCap = sharedAccount.capabilties.storage.issue<&{FungibleToken.Receiver}>(/storage/flowTokenVault)
sharedAccount.capabilties.publish(
tokenReceiverCap
at: /public/lockedFlowTokenReceiver,
tokenReceiverCap,
at: /public/lockedFlowTokenReceiver
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ transaction(
LockedTokens.LockedTokenManagerStoragePath
)

let lockedAccountCreator = custodyProvider.storage.
let lockedAccountCreator = custodyProvider.storage
.borrow<&LockedTokens.LockedAccountCreator>(from: LockedTokens.LockedAccountCreatorStoragePath)

lockedAccountCreator.addAccount(
Expand All @@ -67,14 +67,14 @@ transaction(
let lockedTokensManagerCap = sharedAccount.capabilties.storage.issue<&{FungibleToken.Receiver}>(LockedTokens.LockedTokenManagerStoragePath)
sharedAccount.capabilties.publish(
lockedTokensManagerCap,
at: /public/flowTokenReceiver,
at: /public/flowTokenReceiver
)

// put normal receiver in a separate unique path.
let tokenReceiverCap = sharedAccount.capabilties.storage.issue<&{FungibleToken.Receiver}>(/storage/flowTokenVault)
sharedAccount.capabilties.publish(
tokenReceiverCap
at: /public/lockedFlowTokenReceiver,
tokenReceiverCap,
at: /public/lockedFlowTokenReceiver
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ transaction(
self.NodeVersionBeaconAdminRef.setVersionBoundary(versionBoundary: self.newVersionBoundary)
}

post{
post {
NodeVersionBeacon.getVersionBoundary(effectiveAtBlockHeight: blockHeight).version
.strictEqualTo(self.newVersionBoundary.version) : "New version was not added to the versionTable"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,17 @@ transaction(publicKeys: [Crypto.KeyListEntry]) {
to: LockedTokens.TokenHolderStoragePath,
)

let tokenHolderCap = newAccount.capabilities.storage.issue<&LockedTokens.TokenHolder{LockedTokens.LockedAccountInfo}>(LockedTokens.TokenHolderStoragePath)
let tokenHolderCap = newAccount.capabilities.storage
.issue<&LockedTokens.TokenHolder{LockedTokens.LockedAccountInfo}>(LockedTokens.TokenHolderStoragePath)
newAccount.capabilities.publish(
tokenHolderCap
at: LockedTokens.LockedAccountInfoPublicPath,
)


// Create capabilities for the token holder and unlocked vault.
let lockedHolder = newAccount.capabilities.storage.issue<&LockedTokens.TokenHolder>(LockedTokens.TokenHolderStoragePath)!
let flowToken = newAccount.capabilities.storage.issue<&FlowToken.Vault>(/storage/flowTokenVault)!
let lockedHolder = newAccount.capabilities.storage.issue<&LockedTokens.TokenHolder>(LockedTokens.TokenHolderStoragePath)
let flowToken = newAccount.capabilities.storage.issue<&FlowToken.Vault>(/storage/flowTokenVault)

// Create a new Staking Collection and put it in storage.
if lockedHolder.check() {
Expand Down