Add mainnet configs

contracts/exchange/FlowSwapPair.cdc

@@ -509,9 +509,6 @@ contract FlowSwapPair: FungibleToken {
 
     self.account.storage.save(<-vault, to: /storage/flowUsdtFspLpVault)
 
-    let admin <- create Administrator()
-    self.account.storage.save(<-admin, to: /storage/flowTokenAdmin)
-
     // Setup internal FlowToken vault
     self.token1Vault <- FlowToken.createEmptyVault(vaultType: Type<@FlowToken.Vault>())
 

contracts/exchange/RevvFlowSwapPair.cdc

@@ -84,7 +84,7 @@ pub contract RevvFlowSwapPair: FungibleToken {
     // created Vault to the context that called so it can be deposited
     // elsewhere.
     //
-    pub fun withdraw(amount: UFix64): @FungibleToken.Vault {
+    pub fun withdraw(amount: UFix64): @{FungibleToken.Vault} {
       self.balance = self.balance - amount
       emit TokensWithdrawn(amount: amount, from: self.owner?.address)
       return <-create Vault(balance: amount)
@@ -97,7 +97,7 @@ pub contract RevvFlowSwapPair: FungibleToken {
     // It is allowed to destroy the sent Vault because the Vault
     // was a temporary holder of the tokens. The Vault's balance has
     // been consumed and therefore can be destroyed.
-    pub fun deposit(from: @FungibleToken.Vault) {
+    pub fun deposit(from: @{FungibleToken.Vault}) {
       let vault <- from as! @RevvFlowSwapPair.Vault
       self.balance = self.balance + vault.balance
       emit TokensDeposited(amount: vault.balance, to: self.owner?.address)
@@ -117,7 +117,7 @@ pub contract RevvFlowSwapPair: FungibleToken {
   // and store the returned Vault in their storage in order to allow their
   // account to be able to receive deposits of this token type.
   //
-  pub fun createEmptyVault(): @FungibleToken.Vault {
+  pub fun createEmptyVault(): @{FungibleToken.Vault} {
     return <-create Vault(balance: 0.0)
   }
 
@@ -132,11 +132,11 @@ pub contract RevvFlowSwapPair: FungibleToken {
     }
 
     pub fun depositToken1(from: @REVV.Vault) {
-      self.token1.deposit(from: <- (from as! @FungibleToken.Vault))
+      self.token1.deposit(from: <- (from as! @{FungibleToken.Vault}))
     }
 
     pub fun depositToken2(from: @FlowToken.Vault) {
-      self.token2.deposit(from: <- (from as! @FungibleToken.Vault))
+      self.token2.deposit(from: <- (from as! @{FungibleToken.Vault}))
     }
 
     pub fun withdrawToken1(): @REVV.Vault {
@@ -150,11 +150,6 @@ pub contract RevvFlowSwapPair: FungibleToken {
       vault <-> self.token2
       return <- vault
     }
-
-    destroy() {
-      destroy self.token1
-      destroy self.token2
-    }
   }
 
   // createEmptyBundle
@@ -313,7 +308,7 @@ pub contract RevvFlowSwapPair: FungibleToken {
 
     assert(token2Amount > 0.0, message: "Exchanged amount too small")
 
-    self.token1Vault.deposit(from: <- (from as! @FungibleToken.Vault))
+    self.token1Vault.deposit(from: <- (from as! @{FungibleToken.Vault}))
     emit Trade(token1Amount: token1Amount, token2Amount: token2Amount, side: 1)
 
     return <- (self.token2Vault.withdraw(amount: token2Amount) as! @FlowToken.Vault)
@@ -333,7 +328,7 @@ pub contract RevvFlowSwapPair: FungibleToken {
 
     assert(token1Amount > 0.0, message: "Exchanged amount too small")
 
-    self.token2Vault.deposit(from: <- (from as! @FungibleToken.Vault))
+    self.token2Vault.deposit(from: <- (from as! @{FungibleToken.Vault}))
     emit Trade(token1Amount: token1Amount, token2Amount: token2Amount, side: 2)
 
     return <- (self.token1Vault.withdraw(amount: token1Amount) as! @REVV.Vault)

contracts/token/BloctoToken.cdc

@@ -232,7 +232,7 @@ contract BloctoToken: FungibleToken{
     // account to be able to receive deposits of this token type.
     //
     access(all)
-    fun createEmptyVault(vaultType: Type): @{FungibleToken.Vault}{ 
+    fun createEmptyVault(vaultType: Type): @BloctoToken.Vault{ 
         return <-create Vault(balance: 0.0)
     }