feature: Update for rcnet-v2-phase-2

Author: dhedey

core-rust/Cargo.lock

@@ -21,17 +21,17 @@ members = [
 #   $ git push origin "release_name-BLAH"
 # * Then use tag="release_name-BLAH" in the below dependencies.
 # 
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e", features = ["serde"] }
-transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e" }
-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e" }
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e", features = ["serde"] }
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e" }
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e" }
-radix-engine-constants = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e" }
-radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e" }
-radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e" }
-radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e" }
-utils = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-638673d16e", features = ["serde"] }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267", features = ["serde"] }
+transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267" }
+transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267" }
+radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267", features = ["serde"] }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267" }
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267" }
+radix-engine-constants = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267" }
+radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267" }
+radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267" }
+radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267" }
+utils = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v2-phase-2-bc272a1267", features = ["serde"] }
 
 jni = { version = "0.19.0" }
 tracing = { version = "0.1" }

core-rust/Cargo.toml

@@ -6567,10 +6567,9 @@ components:
     StatePackageResponse:
       type: object
       required:
-        - royalty
         - owner_role
       properties:
-        royalty:
-          $ref: "#/components/schemas/Substate"
         owner_role:
           $ref: "#/components/schemas/Substate"
+        royalty:
+          $ref: "#/components/schemas/Substate"

core-rust/core-api-server/core-api-schema.yaml

@@ -7,14 +7,15 @@ use radix_engine_queries::typed_substate_layout::*;
 
 pub fn to_api_access_controller_substate(
     context: &MappingContext,
-    substate: &AccessControllerSubstate,
+    substate: &FieldSubstate<AccessControllerSubstate>,
 ) -> Result<models::Substate, MappingError> {
-    let data = scrypto_encode(substate).unwrap();
-
     Ok(field_substate!(
         substate,
         AccessControllerFieldState,
-        {
+        substate => {
+            let data = scrypto_encode(substate).unwrap();
+        },
+        Value {
             data_struct: Box::new(to_api_data_struct_from_bytes(context, &data)?),
         }
     ))

core-rust/core-api-server/src/core_api/conversions/substates/access_controller.rs

@@ -7,13 +7,13 @@ use radix_engine_queries::typed_substate_layout::*;
 
 pub fn to_api_owner_role_substate(
     context: &MappingContext,
-    substate: &OwnerRoleSubstate,
+    substate: &FieldSubstate<OwnerRoleSubstate>,
 ) -> Result<models::Substate, MappingError> {
-    let OwnerRoleSubstate { owner_role_entry } = substate;
     Ok(field_substate!(
         substate,
         AccessRulesModuleFieldOwnerRole,
-        {
+        OwnerRoleSubstate { owner_role_entry },
+        Value {
             owner_role: Some(models::OwnerRole {
                 rule: Some(to_api_access_rule(context, &owner_role_entry.rule)?),
                 updater: match owner_role_entry.updater {

core-rust/core-api-server/src/core_api/conversions/substates/access_rules_module.rs

@@ -8,19 +8,20 @@ use radix_engine_queries::typed_substate_layout::*;
 
 pub fn to_api_account_state_substate(
     _context: &MappingContext,
-    substate: &AccountSubstate,
+    substate: &FieldSubstate<AccountSubstate>,
 ) -> Result<models::Substate, MappingError> {
-    let AccountSubstate {
-        default_deposit_rule,
-    } = substate;
     Ok(field_substate!(
         substate,
         AccountFieldState,
-        {
+        AccountSubstate {
+            default_deposit_rule,
+        },
+        Value {
             default_deposit_rule: match default_deposit_rule {
                 AccountDefaultDepositRule::Accept => models::DefaultDepositRule::Accept,
                 AccountDefaultDepositRule::Reject => models::DefaultDepositRule::Reject,
-                AccountDefaultDepositRule::AllowExisting => models::DefaultDepositRule::AllowExisting,
+                AccountDefaultDepositRule::AllowExisting =>
+                    models::DefaultDepositRule::AllowExisting,
             },
         }
     ))