add view functions to Balance and change transactions to use Balance …

…instead of concrete type

contracts/FungibleToken.cdc

@@ -62,6 +62,8 @@ access(all) contract interface FungibleToken: ViewResolver {
     ///
     access(all) resource interface Balance {
         access(all) var balance: UFix64
+        access(all) view fun getViews(): [Type]
+        access(all) fun resolveView(_ view: Type): AnyStruct?
     }
 
     /// Provider

tests/scripts/get_unsupported_view.cdc

@@ -11,7 +11,7 @@ access(all) fun main(address: Address, type: Type): AnyStruct? {
 
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>())
 
-    let vaultRef = account.capabilities.borrow<&{FungibleToken.Vault}>(vaultData.metadataPath)
+    let vaultRef = account.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
         ?? panic("Could not borrow Balance reference to the Vault")
 
     return vaultRef.resolveView(type)

tests/scripts/get_vault_display.cdc

@@ -12,7 +12,7 @@ access(all) fun main(address: Address): FungibleTokenMetadataViews.FTDisplay {
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
         ?? panic("Could not get vault data view for the contract")
 
-    let vaultRef = account.capabilities.borrow<&{FungibleToken.Vault}>(vaultData.metadataPath)
+    let vaultRef = account.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
         ?? panic("Could not borrow Balance reference to the Vault")
 
     let ftDisplay = FungibleTokenMetadataViews.getFTDisplay(vaultRef)

tests/scripts/get_views.cdc

@@ -12,7 +12,7 @@ access(all) fun main(address: Address): [Type] {
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
         ?? panic("Could not get vault data view for the contract")
 
-    let vaultRef = account.capabilities.borrow<&{FungibleToken.Vault}>(vaultData.metadataPath)
+    let vaultRef = account.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
         ?? panic("Could not borrow Balance reference to the Vault")
 
     return vaultRef.getViews()

transactions/create_forwarder.cdc

@@ -35,7 +35,7 @@ transaction(receiver: Address) {
         let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
             ?? panic("Could not get vault data view for the contract")
 
-        let vaultRef = signer.capabilities.borrow<&{FungibleToken.Vault}>(vaultData.metadataPath)
+        let vaultRef = signer.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
             ?? panic("Could not borrow Balance reference to the Vault")
 
         // Get the receiver capability for the account being forwarded to

transactions/metadata/setup_account_from_vault_reference.cdc

@@ -28,7 +28,7 @@ transaction(address: Address, publicPath: PublicPath) {
         signer.storage.save(<-emptyVault, to: ftVaultData.storagePath)
 
         // Create a public capability for the vault which includes the .Resolver interface
-        let vaultCap = signer.capabilities.storage.issue<&{FungibleToken.Vault}>(ftVaultData.storagePath)
+        let vaultCap = signer.capabilities.storage.issue<&{FungibleToken.Balance}>(ftVaultData.storagePath)
         signer.capabilities.publish(vaultCap, at: ftVaultData.metadataPath)
 
         // Create a public capability for the vault exposing the receiver interface

transactions/scripts/get_balance.cdc

@@ -9,7 +9,7 @@ access(all) fun main(address: Address): UFix64 {
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
         ?? panic("Could not get vault data view for the contract")
 
-    return getAccount(address).capabilities.borrow<&{FungibleToken.Vault}>(
+    return getAccount(address).capabilities.borrow<&{FungibleToken.Balance}>(
             vaultData.metadataPath
         )?.balance
         ?? panic("Could not borrow Balance reference to the Vault")

transactions/scripts/metadata/get_token_metadata.cdc

@@ -1,5 +1,6 @@
 import ExampleToken from "ExampleToken"
 import FungibleTokenMetadataViews from "FungibleTokenMetadataViews"
+import FungibleToken from "FungibleToken"
 import ViewResolver from "ViewResolver"
 
 access(all) fun main(address: Address): FungibleTokenMetadataViews.FTView {
@@ -8,7 +9,7 @@ access(all) fun main(address: Address): FungibleTokenMetadataViews.FTView {
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
         ?? panic("Could not get vault data view for the contract")
 
-    let vaultRef = account.capabilities.borrow<&{ViewResolver.Resolver}>(vaultData.metadataPath)
+    let vaultRef = account.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
         ?? panic("Could not borrow a reference to the vault resolver")
 
     let ftView = FungibleTokenMetadataViews.getFTView(viewResolver: vaultRef)

transactions/scripts/metadata/get_vault_data.cdc

@@ -1,5 +1,6 @@
 import ExampleToken from "ExampleToken"
 import FungibleTokenMetadataViews from "FungibleTokenMetadataViews"
+import FungibleToken from "FungibleToken"
 import ViewResolver from "ViewResolver"
 
 access(all) fun main(address: Address): FungibleTokenMetadataViews.FTVaultData {
@@ -8,7 +9,7 @@ access(all) fun main(address: Address): FungibleTokenMetadataViews.FTVaultData {
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
         ?? panic("Could not get vault data view for the contract")
 
-    let vaultRef = account.capabilities.borrow<&{ViewResolver.Resolver}>(vaultData.metadataPath)
+    let vaultRef = account.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
         ?? panic("Could not borrow a reference to the vault resolver")
 
     let vaultData = FungibleTokenMetadataViews.getFTVaultData(vaultRef)

transactions/scripts/metadata/get_vault_display.cdc

@@ -1,5 +1,6 @@
 import ExampleToken from "ExampleToken"
 import FungibleTokenMetadataViews from "FungibleTokenMetadataViews"
+import FungibleToken from "FungibleToken"
 import ViewResolver from "ViewResolver"
 
 access(all) fun main(address: Address): FungibleTokenMetadataViews.FTDisplay {
@@ -8,7 +9,7 @@ access(all) fun main(address: Address): FungibleTokenMetadataViews.FTDisplay {
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
         ?? panic("Could not get vault data view for the contract")
 
-    let vaultRef = account.capabilities.borrow<&{ViewResolver.Resolver}>(vaultData.metadataPath)
+    let vaultRef = account.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
         ?? panic("Could not borrow a reference to the vault resolver")
 
     let ftDisplay = FungibleTokenMetadataViews.getFTDisplay(vaultRef)

transactions/scripts/metadata/get_vault_supply_view.cdc

@@ -1,5 +1,6 @@
 import ExampleToken from "ExampleToken"
 import FungibleTokenMetadataViews from "FungibleTokenMetadataViews"
+import FungibleToken from "FungibleToken"
 import ViewResolver from "ViewResolver"
 
 /// Gets the total supply of the vault's token directly from the vault
@@ -10,7 +11,7 @@ access(all) fun main(address: Address): UFix64 {
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
         ?? panic("Could not get vault data view for the contract")
 
-    let vaultRef = account.capabilities.borrow<&{ViewResolver.Resolver}>(vaultData.metadataPath)
+    let vaultRef = account.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
         ?? panic("Could not borrow a reference to the vault resolver")
 
     let ftSupply = vaultRef.resolveView(Type<FungibleTokenMetadataViews.TotalSupply>())!

transactions/scripts/test/example_token_vault_display_strict_equal.cdc

@@ -29,7 +29,7 @@ access(all) fun main(address: Address): Bool {
     let vaultData = ExampleToken.resolveContractView(resourceType: nil, viewType: Type<FungibleTokenMetadataViews.FTVaultData>()) as! FungibleTokenMetadataViews.FTVaultData?
         ?? panic("Could not get vault data view for the contract")
 
-    let vaultRef = account.capabilities.borrow<&{ViewResolver.Resolver}>(vaultData.metadataPath)
+    let vaultRef = account.capabilities.borrow<&{FungibleToken.Balance}>(vaultData.metadataPath)
         ?? panic("Could not borrow a reference to the vault resolver")
 
     let actual = FungibleTokenMetadataViews.getFTDisplay(vaultRef)

transactions/setup_account.cdc

@@ -25,7 +25,7 @@ transaction () {
         signer.storage.save(<-vault, to: vaultData.storagePath)
 
         // Create a public capability to the Vault that exposes the Vault interfaces
-        let vaultCap = signer.capabilities.storage.issue<&ExampleToken.Vault>(
+        let vaultCap = signer.capabilities.storage.issue<&{FungibleToken.Balance}>(
             vaultData.storagePath
         )
         signer.capabilities.publish(vaultCap, at: vaultData.metadataPath)

transactions/switchboard/add_vault_capability.cdc

@@ -26,7 +26,7 @@ transaction {
             signer.capabilities.unpublish(vaultData.metadataPath)
             signer.capabilities.unpublish(vaultData.receiverPath)
             // Issue Vault & Receiver Capabilities
-            let vaultCap = signer.capabilities.storage.issue<&ExampleToken.Vault>(vaultData.storagePath)
+            let vaultCap = signer.capabilities.storage.issue<&{FungibleToken.Balance}>(vaultData.storagePath)
             let receiverCap = signer.capabilities.storage.issue<&{FungibleToken.Receiver}>(vaultData.storagePath)
             // Publish Capabilities
             signer.capabilities.publish(vaultCap, at: vaultData.metadataPath)