diff --git a/crates/transaction/manifests/src/manifests_security_shield/manifests_securify_shield_unsecurified_entity.rs b/crates/transaction/manifests/src/manifests_security_shield/manifests_securify_shield_unsecurified_entity.rs index 966cfde15..59d37b592 100644 --- a/crates/transaction/manifests/src/manifests_security_shield/manifests_securify_shield_unsecurified_entity.rs +++ b/crates/transaction/manifests/src/manifests_security_shield/manifests_securify_shield_unsecurified_entity.rs @@ -56,6 +56,8 @@ impl TransactionManifestSecurifyUnsecurifiedEntity for TransactionManifest { &entity_address, ); + builder = builder.drop_auth_zone_proofs(); + // Create an access controller for the entity. builder = { let access_controller_reservation_identifier = diff --git a/fixtures/models/interaction/wallet_interaction_batch_of_transactions.json b/fixtures/models/interaction/wallet_interaction_batch_of_transactions.json index 4556b001d..091a9922f 100644 --- a/fixtures/models/interaction/wallet_interaction_batch_of_transactions.json +++ b/fixtures/models/interaction/wallet_interaction_batch_of_transactions.json @@ -1,11 +1,11 @@ { "transactions": [ { - "transactionManifest": "CALL_METHOD\n Address(\"account_rdx128mh2ae9dsrwa0t8l37ayjrxxf0p84e6qm227ytxtcu447f5uw5m8w\")\n \"securify\"\n;\nTAKE_FROM_WORKTOP\n Address(\"resource_rdx1nfxxxxxxxxxxaccwnrxxxxxxxxx006664022062xxxxxxxxxaccwnr\")\n Decimal(\"1\")\n Bucket(\"bucket1\")\n;\nCREATE_PROOF_FROM_BUCKET_OF_ALL\n Bucket(\"bucket1\")\n Proof(\"proof1\")\n;\nPUSH_TO_AUTH_ZONE\n Proof(\"proof1\")\n;\nSET_METADATA\n Address(\"account_rdx128mh2ae9dsrwa0t8l37ayjrxxf0p84e6qm227ytxtcu447f5uw5m8w\")\n \"owner_keys\"\n Enum<143u8>(\n Array(\n Enum<1u8>(\n Bytes(\"8e7da995687de79d87a51e4acadccbeea15df2b165800247930298bc16\")\n )\n )\n )\n;\nALLOCATE_GLOBAL_ADDRESS\n Address(\"package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr\")\n \"AccessController\"\n AddressReservation(\"reservation1\")\n NamedAddress(\"address1\")\n;\nCREATE_ACCESS_CONTROLLER\n Bucket(\"bucket1\")\n Tuple(\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0e8695a4117774464ca04bb6d10ce0b11aede12bd797dcdee811067094]\")\n )\n )\n )\n )\n )\n )\n ),\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0e8695a4117774464ca04bb6d10ce0b11aede12bd797dcdee811067094]\")\n )\n )\n )\n )\n )\n )\n ),\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0e8695a4117774464ca04bb6d10ce0b11aede12bd797dcdee811067094]\")\n )\n )\n )\n )\n )\n )\n )\n )\n Enum<1u8>(\n 20160u32\n )\n Enum<1u8>(\n AddressReservation(\"reservation1\")\n )\n;\n", + "transactionManifest": "CALL_METHOD\n Address(\"account_rdx128mh2ae9dsrwa0t8l37ayjrxxf0p84e6qm227ytxtcu447f5uw5m8w\")\n \"securify\"\n;\nTAKE_FROM_WORKTOP\n Address(\"resource_rdx1nfxxxxxxxxxxaccwnrxxxxxxxxx006664022062xxxxxxxxxaccwnr\")\n Decimal(\"1\")\n Bucket(\"bucket1\")\n;\nCREATE_PROOF_FROM_BUCKET_OF_ALL\n Bucket(\"bucket1\")\n Proof(\"proof1\")\n;\nPUSH_TO_AUTH_ZONE\n Proof(\"proof1\")\n;\nSET_METADATA\n Address(\"account_rdx128mh2ae9dsrwa0t8l37ayjrxxf0p84e6qm227ytxtcu447f5uw5m8w\")\n \"owner_keys\"\n Enum<143u8>(\n Array(\n Enum<1u8>(\n Bytes(\"8e7da995687de79d87a51e4acadccbeea15df2b165800247930298bc16\")\n )\n )\n )\n;\nDROP_AUTH_ZONE_PROOFS;\nALLOCATE_GLOBAL_ADDRESS\n Address(\"package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr\")\n \"AccessController\"\n AddressReservation(\"reservation1\")\n NamedAddress(\"address1\")\n;\nCREATE_ACCESS_CONTROLLER\n Bucket(\"bucket1\")\n Tuple(\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0e8695a4117774464ca04bb6d10ce0b11aede12bd797dcdee811067094]\")\n )\n )\n )\n )\n )\n )\n ),\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0e8695a4117774464ca04bb6d10ce0b11aede12bd797dcdee811067094]\")\n )\n )\n )\n )\n )\n )\n ),\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0e8695a4117774464ca04bb6d10ce0b11aede12bd797dcdee811067094]\")\n )\n )\n )\n )\n )\n )\n )\n )\n Enum<1u8>(\n 20160u32\n )\n Enum<1u8>(\n AddressReservation(\"reservation1\")\n )\n;\n", "blobs": [] }, { - "transactionManifest": "CALL_METHOD\n Address(\"identity_rdx122kkqj7pc04gwsgcwsxmfmknlsg4qpz52rrs6vj72cujks4ukw993v\")\n \"securify\"\n;\nTAKE_FROM_WORKTOP\n Address(\"resource_rdx1nfxxxxxxxxxxdntwnrxxxxxxxxx002876444928xxxxxxxxxdntwnr\")\n Decimal(\"1\")\n Bucket(\"bucket1\")\n;\nCREATE_PROOF_FROM_BUCKET_OF_ALL\n Bucket(\"bucket1\")\n Proof(\"proof1\")\n;\nPUSH_TO_AUTH_ZONE\n Proof(\"proof1\")\n;\nSET_METADATA\n Address(\"identity_rdx122kkqj7pc04gwsgcwsxmfmknlsg4qpz52rrs6vj72cujks4ukw993v\")\n \"owner_keys\"\n Enum<143u8>(\n Array(\n Enum<1u8>(\n Bytes(\"a9a3197f2553f4cfe4603e77fd1802f14490862e11a33d81c98c430e31\")\n )\n )\n )\n;\nALLOCATE_GLOBAL_ADDRESS\n Address(\"package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr\")\n \"AccessController\"\n AddressReservation(\"reservation1\")\n NamedAddress(\"address1\")\n;\nCREATE_ACCESS_CONTROLLER\n Bucket(\"bucket1\")\n Tuple(\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0b5896b1b5a1de8573b3a90216e7b14b42aa11746ad2e0bcb0741c216d]\")\n )\n )\n )\n )\n )\n )\n ),\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0b5896b1b5a1de8573b3a90216e7b14b42aa11746ad2e0bcb0741c216d]\")\n )\n )\n )\n )\n )\n )\n ),\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0b5896b1b5a1de8573b3a90216e7b14b42aa11746ad2e0bcb0741c216d]\")\n )\n )\n )\n )\n )\n )\n )\n )\n Enum<1u8>(\n 20160u32\n )\n Enum<1u8>(\n AddressReservation(\"reservation1\")\n )\n;\n", + "transactionManifest": "CALL_METHOD\n Address(\"identity_rdx122kkqj7pc04gwsgcwsxmfmknlsg4qpz52rrs6vj72cujks4ukw993v\")\n \"securify\"\n;\nTAKE_FROM_WORKTOP\n Address(\"resource_rdx1nfxxxxxxxxxxdntwnrxxxxxxxxx002876444928xxxxxxxxxdntwnr\")\n Decimal(\"1\")\n Bucket(\"bucket1\")\n;\nCREATE_PROOF_FROM_BUCKET_OF_ALL\n Bucket(\"bucket1\")\n Proof(\"proof1\")\n;\nPUSH_TO_AUTH_ZONE\n Proof(\"proof1\")\n;\nSET_METADATA\n Address(\"identity_rdx122kkqj7pc04gwsgcwsxmfmknlsg4qpz52rrs6vj72cujks4ukw993v\")\n \"owner_keys\"\n Enum<143u8>(\n Array(\n Enum<1u8>(\n Bytes(\"a9a3197f2553f4cfe4603e77fd1802f14490862e11a33d81c98c430e31\")\n )\n )\n )\n;\nDROP_AUTH_ZONE_PROOFS;\nALLOCATE_GLOBAL_ADDRESS\n Address(\"package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr\")\n \"AccessController\"\n AddressReservation(\"reservation1\")\n NamedAddress(\"address1\")\n;\nCREATE_ACCESS_CONTROLLER\n Bucket(\"bucket1\")\n Tuple(\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0b5896b1b5a1de8573b3a90216e7b14b42aa11746ad2e0bcb0741c216d]\")\n )\n )\n )\n )\n )\n )\n ),\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0b5896b1b5a1de8573b3a90216e7b14b42aa11746ad2e0bcb0741c216d]\")\n )\n )\n )\n )\n )\n )\n ),\n Enum<2u8>(\n Enum<1u8>(\n Array(\n Enum<0u8>(\n Enum<2u8>(\n 0u8,\n Array()\n )\n ),\n Enum<0u8>(\n Enum<4u8>(\n Array(\n Enum<0u8>(\n NonFungibleGlobalId(\"resource_rdx1nfxxxxxxxxxxed25sgxxxxxxxxx002236757237xxxxxxxxxed25sg:[0b5896b1b5a1de8573b3a90216e7b14b42aa11746ad2e0bcb0741c216d]\")\n )\n )\n )\n )\n )\n )\n )\n )\n Enum<1u8>(\n 20160u32\n )\n Enum<1u8>(\n AddressReservation(\"reservation1\")\n )\n;\n", "blobs": [] }, { diff --git a/fixtures/transaction/create_access_controller_for_account.rtm b/fixtures/transaction/create_access_controller_for_account.rtm index 16dae512c..67293cb93 100644 --- a/fixtures/transaction/create_access_controller_for_account.rtm +++ b/fixtures/transaction/create_access_controller_for_account.rtm @@ -25,6 +25,7 @@ SET_METADATA ) ) ; +DROP_AUTH_ZONE_PROOFS; ALLOCATE_GLOBAL_ADDRESS Address("package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr") "AccessController" diff --git a/fixtures/transaction/create_access_controller_for_account_with_ac_xrd_vault_top_up_by_securified_account_amount_42.rtm b/fixtures/transaction/create_access_controller_for_account_with_ac_xrd_vault_top_up_by_securified_account_amount_42.rtm index fa97303e7..f388094b1 100644 --- a/fixtures/transaction/create_access_controller_for_account_with_ac_xrd_vault_top_up_by_securified_account_amount_42.rtm +++ b/fixtures/transaction/create_access_controller_for_account_with_ac_xrd_vault_top_up_by_securified_account_amount_42.rtm @@ -25,6 +25,7 @@ SET_METADATA ) ) ; +DROP_AUTH_ZONE_PROOFS; ALLOCATE_GLOBAL_ADDRESS Address("package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr") "AccessController" diff --git a/fixtures/transaction/create_access_controller_for_account_with_ac_xrd_vault_top_up_by_unsecurified_account.rtm b/fixtures/transaction/create_access_controller_for_account_with_ac_xrd_vault_top_up_by_unsecurified_account.rtm index 17636afeb..a92608589 100644 --- a/fixtures/transaction/create_access_controller_for_account_with_ac_xrd_vault_top_up_by_unsecurified_account.rtm +++ b/fixtures/transaction/create_access_controller_for_account_with_ac_xrd_vault_top_up_by_unsecurified_account.rtm @@ -25,6 +25,7 @@ SET_METADATA ) ) ; +DROP_AUTH_ZONE_PROOFS; ALLOCATE_GLOBAL_ADDRESS Address("package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr") "AccessController" diff --git a/fixtures/transaction/create_access_controller_for_persona.rtm b/fixtures/transaction/create_access_controller_for_persona.rtm index 25f6694e1..4a8f310ea 100644 --- a/fixtures/transaction/create_access_controller_for_persona.rtm +++ b/fixtures/transaction/create_access_controller_for_persona.rtm @@ -25,6 +25,7 @@ SET_METADATA ) ) ; +DROP_AUTH_ZONE_PROOFS; ALLOCATE_GLOBAL_ADDRESS Address("package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr") "AccessController" diff --git a/fixtures/transaction/create_access_controller_for_persona_with_ac_xrd_vault_top_up_by_securified_account_amount_42.rtm b/fixtures/transaction/create_access_controller_for_persona_with_ac_xrd_vault_top_up_by_securified_account_amount_42.rtm index 43c22da3b..32edf20e5 100644 --- a/fixtures/transaction/create_access_controller_for_persona_with_ac_xrd_vault_top_up_by_securified_account_amount_42.rtm +++ b/fixtures/transaction/create_access_controller_for_persona_with_ac_xrd_vault_top_up_by_securified_account_amount_42.rtm @@ -25,6 +25,7 @@ SET_METADATA ) ) ; +DROP_AUTH_ZONE_PROOFS; ALLOCATE_GLOBAL_ADDRESS Address("package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr") "AccessController" diff --git a/fixtures/transaction/create_access_controller_for_persona_with_ac_xrd_vault_top_up_by_unsecurified_account.rtm b/fixtures/transaction/create_access_controller_for_persona_with_ac_xrd_vault_top_up_by_unsecurified_account.rtm index 1c874a8f1..425e158da 100644 --- a/fixtures/transaction/create_access_controller_for_persona_with_ac_xrd_vault_top_up_by_unsecurified_account.rtm +++ b/fixtures/transaction/create_access_controller_for_persona_with_ac_xrd_vault_top_up_by_unsecurified_account.rtm @@ -25,6 +25,7 @@ SET_METADATA ) ) ; +DROP_AUTH_ZONE_PROOFS; ALLOCATE_GLOBAL_ADDRESS Address("package_rdx1pkgxxxxxxxxxcntrlrxxxxxxxxx000648572295xxxxxxxxxcntrlr") "AccessController"