--- 4ac4e974d68f3a29bed8b362b266365fc9a481863aa81503ec69e41192976e32.39353402 +++ crescendo-migration.85981134 @@ -9,17 +9,18 @@ import FungibleToken from 0xf233dcee88fe0abe -pub contract PrivateReceiverForwarder { +access(all) contract PrivateReceiverForwarder { + // Event that is emitted when tokens are deposited to the target receiver - pub event PrivateDeposit(amount: UFix64, to: Address?) + access(all) event PrivateDeposit(amount: UFix64, depositedUUID: UInt64, from: Address?, to: Address?, toUUID: UInt64) - pub let SenderStoragePath: StoragePath + access(all) let SenderStoragePath: StoragePath - pub let PrivateReceiverStoragePath: StoragePath - pub let PrivateReceiverPublicPath: PublicPath + access(all) let PrivateReceiverStoragePath: StoragePath + access(all) let PrivateReceiverPublicPath: PublicPath - pub resource Forwarder { + access(all) resource Forwarder { // This is where the deposited tokens will be sent. // The type indicates that it is a reference to a receiver @@ -31,14 +27,16 @@ // Function that takes a Vault object as an argument and forwards // it to the recipient's Vault using the stored reference // - access(contract) fun deposit(from: @FungibleToken.Vault) { + access(contract) fun deposit(from: @{FungibleToken.Vault}) { let receiverRef = self.recipient.borrow()! let balance = from.balance + let uuid = from.uuid + receiverRef.deposit(from: <-from) - emit PrivateDeposit(amount: balance, to: self.owner?.address) + emit PrivateDeposit(amount: balance, depositedUUID: uuid, from: self.owner?.address, to: receiverRef.owner?.address, toUUID: receiverRef.uuid) } init(recipient: Capability<&{FungibleToken.Receiver}>) { @@ -51,27 +43,23 @@ // createNewForwarder creates a new Forwarder reference with the provided recipient // - pub fun createNewForwarder(recipient: Capability<&{FungibleToken.Receiver}>): @Forwarder { + access(all) fun createNewForwarder(recipient: Capability<&{FungibleToken.Receiver}>): @Forwarder { return <-create Forwarder(recipient: recipient) } - pub resource Sender { - pub fun sendPrivateTokens(_ address: Address, tokens: @FungibleToken.Vault) { + access(all) resource Sender { + access(all) fun sendPrivateTokens(_ address: Address, tokens: @{FungibleToken.Vault}) { let account = getAccount(address) - let privateReceiver = account.getCapability<&PrivateReceiverForwarder.Forwarder>(PrivateReceiverForwarder.PrivateReceiverPublicPath) - .borrow() ?? panic("Could not borrow reference to private forwarder") + let privateReceiver = account.capabilities.borrow<&PrivateReceiverForwarder.Forwarder>( + PrivateReceiverForwarder.PrivateReceiverPublicPath + ) ?? panic("Could not borrow reference to private forwarder") privateReceiver.deposit(from: <-tokens) } - - - pub fun replicate(): @Sender { - return <-create Sender() - } } init(senderPath: StoragePath, storagePath: StoragePath, publicPath: PublicPath) { @@ -81,7 +58,7 @@ self.PrivateReceiverStoragePath = storagePath self.PrivateReceiverPublicPath = publicPath - self.account.save(<-create Sender(), to: self.SenderStoragePath) + self.account.storage.save(<-create Sender(), to: self.SenderStoragePath) } } \ No newline at end of file

Contract