--- 785ee633ef0f962aff191c1cc875228f2a7a3ee4f1dfdb09fed72891b13521b5.18011715 +++ crescendo-migration.85981134 @@ -1,176 +1,224 @@ import FungibleToken from 0xf233dcee88fe0abe import BloctoToken from 0x0f9df91c9121c460 -pub contract TeleportCustodyEthereum { +access(all) +contract TeleportCustodyEthereum { + access(all)entitlement AdministratorEntitlement + access(all)entitlement AdminEntitlement - pub event TeleportAdminCreated(allowedAmount: UFix64) - pub event Locked(amount: UFix64, to: [UInt8]) - pub event Unlocked(amount: UFix64, from: [UInt8], txHash: String) - pub event FeeCollected(amount: UFix64, type: UInt8) - - pub let AdminStoragePath: StoragePath - pub let TeleportAdminStoragePath: StoragePath - pub let TeleportAdminTeleportUserPath: PublicPath - pub let TeleportAdminTeleportControlPath: PrivatePath - pub let teleportAddressLength: Int - pub let teleportTxHashLength: Int - - pub var isFrozen: Bool - access(contract) var unlocked: {String: Bool} - access(contract) let lockVault: @BloctoToken.Vault - - pub resource Allowance { - pub var balance: UFix64 - - init(balance: UFix64) { + access(all) + event TeleportAdminCreated(allowedAmount: UFix64) + + access(all) + event Locked(amount: UFix64, to: [UInt8]) + + access(all) + event Unlocked(amount: UFix64, from: [UInt8], txHash: String) + + access(all) + event FeeCollected(amount: UFix64, type: UInt8) + + access(all) + let AdminStoragePath: StoragePath + + access(all) + let TeleportAdminStoragePath: StoragePath + + access(all) + let TeleportAdminTeleportUserPath: PublicPath + + access(all) + let TeleportAdminTeleportControlPath: PrivatePath + + access(all) + let teleportAddressLength: Int + + access(all) + let teleportTxHashLength: Int + + access(all) + var isFrozen: Bool + + access(contract) + var unlocked:{ String: Bool} + + access(contract) + let lockVault: @BloctoToken.Vault + + access(all) + resource Allowance{ + access(all) + var balance: UFix64 + + init(balance: UFix64){ self.balance = balance } } - - pub resource Administrator { - - pub fun createNewTeleportAdmin(allowedAmount: UFix64): @TeleportAdmin { + + access(all) + resource Administrator { + access(AdministratorEntitlement) + fun createNewTeleportAdmin(allowedAmount: UFix64): @TeleportAdmin { emit TeleportAdminCreated(allowedAmount: allowedAmount) - return <- create TeleportAdmin(allowedAmount: allowedAmount) + return <-create TeleportAdmin(allowedAmount: allowedAmount) } - - pub fun freeze() { + + access(AdministratorEntitlement) + fun freeze(){ TeleportCustodyEthereum.isFrozen = true } - - pub fun unfreeze() { + + access(AdministratorEntitlement) + fun unfreeze(){ TeleportCustodyEthereum.isFrozen = false } - - pub fun createAllowance(allowedAmount: UFix64): @Allowance { - return <- create Allowance(balance: allowedAmount) + + access(AdministratorEntitlement) + fun createAllowance(allowedAmount: UFix64): @Allowance { + return <-create Allowance(balance: allowedAmount) } } - - pub resource interface TeleportUser { - pub var lockFee: UFix64 - - pub var unlockFee: UFix64 - - pub var allowedAmount: UFix64 - - pub fun lock(from: @FungibleToken.Vault, to: [UInt8]) - - pub fun depositAllowance(from: @Allowance) + + access(all) + resource interface TeleportUser { + access(all) + var lockFee: UFix64 + + access(all) + var unlockFee: UFix64 + + access(all) + var allowedAmount: UFix64 + + access(all) + fun lock(from: @{FungibleToken.Vault}, to: [UInt8]): Void + + access(all) + fun depositAllowance(from: @Allowance) } - - pub resource interface TeleportControl { - pub fun unlock(amount: UFix64, from: [UInt8], txHash: String): @FungibleToken.Vault - - pub fun withdrawFee(amount: UFix64): @FungibleToken.Vault - - pub fun updateLockFee(fee: UFix64) - - pub fun updateUnlockFee(fee: UFix64) + + access(all) + resource interface TeleportControl { + access(AdminEntitlement) + fun unlock(amount: UFix64, from: [UInt8], txHash: String): @{FungibleToken.Vault} + + access(AdminEntitlement) + fun withdrawFee(amount: UFix64): @{FungibleToken.Vault} + + access(AdminEntitlement) + fun updateLockFee(fee: UFix64) + + access(AdminEntitlement) + fun updateUnlockFee(fee: UFix64) } - - pub resource TeleportAdmin: TeleportUser, TeleportControl { - pub var lockFee: UFix64 - - pub var unlockFee: UFix64 - - pub var allowedAmount: UFix64 - - pub let feeCollector: @BloctoToken.Vault - - pub fun lock(from: @FungibleToken.Vault, to: [UInt8]) { - pre { - !TeleportCustodyEthereum.isFrozen: "Teleport service is frozen" - to.length == TeleportCustodyEthereum.teleportAddressLength: "Teleport address should be teleportAddressLength bytes" + + access(all) + resource TeleportAdmin: TeleportUser, TeleportControl { + access(all) + var lockFee: UFix64 + + access(all) + var unlockFee: UFix64 + + access(all) + var allowedAmount: UFix64 + + access(all) + let feeCollector: @BloctoToken.Vault + + access(all) + fun lock(from: @{FungibleToken.Vault}, to: [UInt8]) { + pre { + !TeleportCustodyEthereum.isFrozen: + "Teleport service is frozen" + to.length == TeleportCustodyEthereum.teleportAddressLength: + "Teleport address should be teleportAddressLength bytes" } - let vault <- from as! @BloctoToken.Vault let fee <- vault.withdraw(amount: self.lockFee) - self.feeCollector.deposit(from: <-fee) - let amount = vault.balance TeleportCustodyEthereum.lockVault.deposit(from: <-vault) - emit Locked(amount: amount, to: to) emit FeeCollected(amount: self.lockFee, type: 0) } - - pub fun unlock(amount: UFix64, from: [UInt8], txHash: String): @FungibleToken.Vault { - pre { - !TeleportCustodyEthereum.isFrozen: "Teleport service is frozen" - amount <= self.allowedAmount: "Amount unlocked must be less than the allowed amount" - amount > self.unlockFee: "Amount unlocked must be greater than unlock fee" - from.length == TeleportCustodyEthereum.teleportAddressLength: "Teleport address should be teleportAddressLength bytes" - txHash.length == TeleportCustodyEthereum.teleportTxHashLength: "Teleport tx hash should be teleportTxHashLength bytes" - !(TeleportCustodyEthereum.unlocked[txHash] ?? false): "Same unlock txHash has been executed" + + access(AdminEntitlement) + fun unlock(amount: UFix64, from: [UInt8], txHash: String): @{FungibleToken.Vault} { + pre { + !TeleportCustodyEthereum.isFrozen: + "Teleport service is frozen" + amount <= self.allowedAmount: + "Amount unlocked must be less than the allowed amount" + amount > self.unlockFee: + "Amount unlocked must be greater than unlock fee" + from.length == TeleportCustodyEthereum.teleportAddressLength: + "Teleport address should be teleportAddressLength bytes" + txHash.length == TeleportCustodyEthereum.teleportTxHashLength: + "Teleport tx hash should be teleportTxHashLength bytes" + !(TeleportCustodyEthereum.unlocked[txHash] ?? false): + "Same unlock txHash has been executed" } self.allowedAmount = self.allowedAmount - amount - TeleportCustodyEthereum.unlocked[txHash] = true emit Unlocked(amount: amount, from: from, txHash: txHash) - let vault <- TeleportCustodyEthereum.lockVault.withdraw(amount: amount) let fee <- vault.withdraw(amount: self.unlockFee) - self.feeCollector.deposit(from: <-fee) emit FeeCollected(amount: self.unlockFee, type: 1) - - return <- vault + return <-vault } - - pub fun withdrawFee(amount: UFix64): @FungibleToken.Vault { - return <- self.feeCollector.withdraw(amount: amount) + + access(AdminEntitlement) + fun withdrawFee(amount: UFix64): @{FungibleToken.Vault} { + return <-self.feeCollector.withdraw(amount: amount) } - - pub fun updateLockFee(fee: UFix64) { + + access(AdminEntitlement) + fun updateLockFee(fee: UFix64) { self.lockFee = fee } - - pub fun updateUnlockFee(fee: UFix64) { + + access(AdminEntitlement) + fun updateUnlockFee(fee: UFix64) { self.unlockFee = fee } - - pub fun getFeeAmount(): UFix64 { + + access(all) + fun getFeeAmount(): UFix64{ return self.feeCollector.balance } - - pub fun depositAllowance(from: @Allowance) { + + access(all) + fun depositAllowance(from: @Allowance) { self.allowedAmount = self.allowedAmount + from.balance - destroy from } - - init(allowedAmount: UFix64) { + + init(allowedAmount: UFix64) { self.allowedAmount = allowedAmount - - self.feeCollector <- BloctoToken.createEmptyVault() as! @BloctoToken.Vault + self.feeCollector <- BloctoToken.createEmptyVault(vaultType: Type<@BloctoToken.Vault>()) as! @BloctoToken.Vault self.lockFee = 3.0 self.unlockFee = 0.01 } - - destroy() { - destroy self.feeCollector - } } - - pub fun getLockVaultBalance(): UFix64 { + + access(all) + fun getLockVaultBalance(): UFix64 { return TeleportCustodyEthereum.lockVault.balance } - - init() { + + init() { self.teleportAddressLength = 20 self.teleportTxHashLength = 64 self.AdminStoragePath = /storage/teleportCustodyEthereumAdmin self.TeleportAdminStoragePath = /storage/teleportCustodyEthereumTeleportAdmin self.TeleportAdminTeleportUserPath = /public/teleportCustodyEthereumTeleportUser self.TeleportAdminTeleportControlPath = /private/teleportCustodyEthereumTeleportControl - self.isFrozen = false - self.unlocked = {} - self.lockVault <- BloctoToken.createEmptyVault() as! @BloctoToken.Vault - - let admin <- create Administrator() - self.account.save(<-admin, to: self.AdminStoragePath) + self.unlocked = {} + self.lockVault <- BloctoToken.createEmptyVault(vaultType: Type<@BloctoToken.Vault>()) as! @BloctoToken.Vault + let admin: @TeleportCustodyEthereum.Administrator <- create Administrator() + self.account.storage.save(<-admin, to: self.AdminStoragePath) } } \ No newline at end of file

Contract