[WIP] Program Upgradability

console/network/src/lib.rs

@@ -194,6 +194,7 @@ pub trait Network:
     const MAX_OUTPUTS: usize = 16;
 
     /// The maximum program depth.
+    /// Note. This is unused.
     const MAX_PROGRAM_DEPTH: usize = 64;
     /// The maximum number of imports.
     const MAX_IMPORTS: usize = 64;

console/program/src/owner/bytes.rs

@@ -21,29 +21,59 @@ impl<N: Network> FromBytes for ProgramOwner<N> {
         // Read the version.
         let version = u8::read_le(&mut reader)?;
         // Ensure the version is valid.
-        if version != 1 {
-            return Err(error("Invalid program owner version"));
-        }
+        match version {
+            1 => {
+                // Read the address.
+                let address = Address::read_le(&mut reader)?;
+                // Read the signature.
+                let signature = Signature::read_le(&mut reader)?;
 
-        // Read the address.
-        let address = Address::read_le(&mut reader)?;
-        // Read the signature.
-        let signature = Signature::read_le(&mut reader)?;
+                // Return the program owner.
+                Ok(Self::V1(ProgramOwnerV1::from(address, signature)))
+            }
+            2 => {
+                // Read the address.
+                let address = Address::read_le(&mut reader)?;
+                // Read the authority.
+                let authority = Address::read_le(&mut reader)?;
+                // Read the edition.
+                let edition = U16::read_le(&mut reader)?;
+                // Read the signature.
+                let signature = Signature::read_le(&mut reader)?;
 
-        // Return the program owner.
-        Ok(Self::from(address, signature))
+                // Return the program owner.
+                Ok(Self::V2(ProgramOwnerV2::from(address, authority, edition, signature)))
+            }
+            _ => Err(error("Invalid program owner version")),
+        }
     }
 }
 
 impl<N: Network> ToBytes for ProgramOwner<N> {
     /// Writes the program owner to a buffer.
     fn write_le<W: Write>(&self, mut writer: W) -> IoResult<()> {
-        // Write the version.
-        1u8.write_le(&mut writer)?;
-        // Write the address.
-        self.address.write_le(&mut writer)?;
-        // Write the signature.
-        self.signature.write_le(&mut writer)
+        match &self {
+            Self::V1(owner) => {
+                // Write the version.
+                1u8.write_le(&mut writer)?;
+                // Write the address.
+                owner.address.write_le(&mut writer)?;
+                // Write the signature.
+                owner.signature.write_le(&mut writer)
+            }
+            Self::V2(owner) => {
+                // Write the version.
+                2u8.write_le(&mut writer)?;
+                // Write the address.
+                owner.address.write_le(&mut writer)?;
+                // Write the authority.
+                owner.authority.write_le(&mut writer)?;
+                // Write the edition.
+                owner.edition.write_le(&mut writer)?;
+                // Write the signature.
+                owner.signature.write_le(&mut writer)
+            }
+        }
     }
 }
 
@@ -55,9 +85,21 @@ mod tests {
     type CurrentNetwork = MainnetV0;
 
     #[test]
-    fn test_bytes() -> Result<()> {
+    fn test_bytes_v1() -> Result<()> {
+        // Construct a new program owner.
+        let expected = test_helpers::sample_program_owner_v1();
+
+        // Check the byte representation.
+        let expected_bytes = expected.to_bytes_le()?;
+        assert_eq!(expected, ProgramOwner::read_le(&expected_bytes[..])?);
+        assert!(ProgramOwner::<CurrentNetwork>::read_le(&expected_bytes[1..]).is_err());
+        Ok(())
+    }
+
+    #[test]
+    fn test_bytes_v2() -> Result<()> {
         // Construct a new program owner.
-        let expected = test_helpers::sample_program_owner();
+        let expected = test_helpers::sample_program_owner_v2();
 
         // Check the byte representation.
         let expected_bytes = expected.to_bytes_le()?;