@dstoken-solana/rwa-rbac 0.1.3 → 0.2.0

package/dist/index.es.js

@@ -1,7 +1,7 @@
 import { PublicKey, SystemProgram } from '@solana/web3.js';
-import { Program, BN } from '@coral-xyz/anchor';
-import { TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID, getAccount } from '@solana/spl-token';
-import { getCreateAssetControllerIx, getAssetControllerPda, assetControllerProgramId, getAssetControllerEventAuthority, getIdentityRegistryPda, getIssueTokensIx, getTrackerAccountPda, getPolicyEnginePda, policyEngineProgramId, getIdentityAccountPda, getWalletIdentityAccountPda, getFreezeTokenIx, getThawTokenIx, getRevokeTokensIx, getCloseMintIx, getUpdateInterestBearingMintRateIx, getSeizeTokensIx, identityRegistryProgramId, getExtraMetasListPda, getPolicyEngineEventAuthority, getRemoveLevelFromIdentityAccount, getIdentityRegistryProgram, getPolicyEngineProgram, RwaClient } from '@dstoken-solana/rwa-token-sdk';
+import { utils, Program, BN } from '@coral-xyz/anchor';
+import { TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { getCreateAssetControllerIx, getAssetControllerPda, assetControllerProgramId, getAssetControllerEventAuthority, getIdentityRegistryPda, getIssueTokensIx, getTrackerAccountPda, getPolicyEnginePda, policyEngineProgramId, getIdentityAccountPda, getWalletIdentityAccountPda, getFreezeTokenIx, getThawTokenIx, getRevokeTokensIx, getCloseMintIx, getUpdateInterestBearingMintRateIx, getSeizeTokensIx, identityRegistryProgramId, getExtraMetasListPda, getPolicyEngineEventAuthority, getIdentityRegistryEventAuthority, getIdentityAccount, getRemoveLevelFromIdentityAccount, getIdentityRegistryProgram, getPolicyEngineProgram, RwaClient } from '@dstoken-solana/rwa-token-sdk';
 
 const IMR_PROGRAM = new PublicKey("D2V7wTBbNCKgYwirgRUnSmc2QyKnHSVmRotWJ4rz8Jp9");
 const RBAC_PROGRAM = new PublicKey("3g6fUgMsJQhjPUYxNjEU5PyzGf8DerbDx8p5Qh4yMnRR");
@@ -41,15 +41,16 @@ const deriveUserRolePda = (id, assetAccessController, programId = RBAC_PROGRAM)
         Buffer.from("UserRole"),
     ], programId)[0];
 };
+const getEventAuthority = (programId) => PublicKey.findProgramAddressSync([Buffer.from("__event_authority")], programId)[0];
 
-var address$2 = "3g6fUgMsJQhjPUYxNjEU5PyzGf8DerbDx8p5Qh4yMnRR";
-var metadata$2 = {
+var address$1 = "3g6fUgMsJQhjPUYxNjEU5PyzGf8DerbDx8p5Qh4yMnRR";
+var metadata$1 = {
 	name: "rwa_rbac",
 	version: "0.1.0",
 	spec: "0.1.0",
 	description: "Created with Anchor"
 };
-var instructions$2 = [
+var instructions$1 = [
 	{
 		name: "add_level_to_identity_account",
 		discriminator: [
@@ -122,6 +123,9 @@ var instructions$2 = [
 			},
 			{
 				name: "asset_mint"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -212,6 +216,12 @@ var instructions$2 = [
 			},
 			{
 				name: "asset_mint"
+			},
+			{
+				name: "event_authority_identity_metadata_registry"
+			},
+			{
+				name: "event_authority_identity_registry"
 			}
 		],
 		args: [
@@ -295,101 +305,6 @@ var instructions$2 = [
 			}
 		]
 	},
-	{
-		name: "add_token_lock",
-		discriminator: [
-			195,
-			26,
-			109,
-			80,
-			46,
-			7,
-			195,
-			55
-		],
-		accounts: [
-			{
-				name: "payer",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "user",
-				signer: true
-			},
-			{
-				name: "controller_authority",
-				writable: true,
-				relations: [
-					"asset_access_controller"
-				]
-			},
-			{
-				name: "asset_access_controller",
-				relations: [
-					"authorized_user_role"
-				]
-			},
-			{
-				name: "authorized_user_role",
-				optional: true
-			},
-			{
-				name: "token_locks_program",
-				address: "9bNt3ZiZpDdHqAt5Q1Wq6twFe5RKmMCwA7MJyK2HgGnU"
-			},
-			{
-				name: "investor_locks",
-				writable: true
-			},
-			{
-				name: "investor"
-			},
-			{
-				name: "wallet_identity_account"
-			},
-			{
-				name: "identity_account"
-			},
-			{
-				name: "asset_mint",
-				writable: true
-			},
-			{
-				name: "unlocked_token_account",
-				writable: true
-			},
-			{
-				name: "locked_token_account",
-				writable: true
-			},
-			{
-				name: "asset_controller"
-			},
-			{
-				name: "identity_registry",
-				writable: true
-			},
-			{
-				name: "asset_controller_program",
-				address: "7tXjmbkZVY3Gmg9kDBebcNXT1yC5pyoxxXVLwdbv9tvP"
-			},
-			{
-				name: "token_program",
-				address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			}
-		],
-		args: [
-			{
-				name: "cpi_data",
-				type: "bytes"
-			}
-		]
-	},
 	{
 		name: "assign_user_role",
 		discriminator: [
@@ -430,6 +345,38 @@ var instructions$2 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority",
+				pda: {
+					seeds: [
+						{
+							kind: "const",
+							value: [
+								95,
+								95,
+								101,
+								118,
+								101,
+								110,
+								116,
+								95,
+								97,
+								117,
+								116,
+								104,
+								111,
+								114,
+								105,
+								116,
+								121
+							]
+						}
+					]
+				}
+			},
+			{
+				name: "program"
 			}
 		],
 		args: [
@@ -490,6 +437,9 @@ var instructions$2 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -558,6 +508,9 @@ var instructions$2 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -616,6 +569,9 @@ var instructions$2 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -674,6 +630,9 @@ var instructions$2 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -752,6 +711,9 @@ var instructions$2 = [
 			},
 			{
 				name: "asset_mint"
+			},
+			{
+				name: "event_authority_identity_registry"
 			}
 		],
 		args: [
@@ -806,6 +768,9 @@ var instructions$2 = [
 			{
 				name: "policy_engine",
 				writable: true
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -860,6 +825,9 @@ var instructions$2 = [
 			{
 				name: "policy_engine",
 				writable: true
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -869,70 +837,6 @@ var instructions$2 = [
 			}
 		]
 	},
-	{
-		name: "close_investor_locks",
-		discriminator: [
-			255,
-			60,
-			220,
-			115,
-			217,
-			104,
-			157,
-			171
-		],
-		accounts: [
-			{
-				name: "payer",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "user",
-				signer: true
-			},
-			{
-				name: "controller_authority",
-				relations: [
-					"asset_access_controller"
-				]
-			},
-			{
-				name: "asset_access_controller",
-				relations: [
-					"authorized_user_role"
-				]
-			},
-			{
-				name: "authorized_user_role",
-				optional: true
-			},
-			{
-				name: "token_locks_program",
-				address: "9bNt3ZiZpDdHqAt5Q1Wq6twFe5RKmMCwA7MJyK2HgGnU"
-			},
-			{
-				name: "investor_locks",
-				writable: true
-			},
-			{
-				name: "investor"
-			},
-			{
-				name: "locked_token_account",
-				writable: true
-			},
-			{
-				name: "token_program"
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			}
-		],
-		args: [
-		]
-	},
 	{
 		name: "close_mint_account",
 		discriminator: [
@@ -1118,6 +1022,9 @@ var instructions$2 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -1128,16 +1035,16 @@ var instructions$2 = [
 		]
 	},
 	{
-		name: "create_investor_locks",
+		name: "create_user_role",
 		discriminator: [
-			223,
-			81,
-			139,
-			162,
-			204,
-			48,
-			24,
-			213
+			13,
+			20,
+			224,
+			42,
+			3,
+			120,
+			67,
+			23
 		],
 		accounts: [
 			{
@@ -1150,13 +1057,12 @@ var instructions$2 = [
 				signer: true
 			},
 			{
-				name: "controller_authority",
-				relations: [
-					"asset_access_controller"
-				]
+				name: "new_user_role",
+				writable: true
 			},
 			{
 				name: "asset_access_controller",
+				writable: true,
 				relations: [
 					"authorized_user_role"
 				]
@@ -1166,123 +1072,45 @@ var instructions$2 = [
 				optional: true
 			},
 			{
-				name: "token_locks_program",
-				address: "9bNt3ZiZpDdHqAt5Q1Wq6twFe5RKmMCwA7MJyK2HgGnU"
-			},
+				name: "system_program",
+				address: "11111111111111111111111111111111"
+			}
+		],
+		args: [
 			{
-				name: "investor_locks",
-				writable: true
+				name: "name",
+				type: "string"
 			},
 			{
-				name: "investor"
+				name: "allowed_admin_ixs",
+				type: "u64"
 			},
 			{
-				name: "identity_account"
-			},
+				name: "allowed_medici_ixs",
+				type: "u64"
+			}
+		]
+	},
+	{
+		name: "delete_user_role",
+		discriminator: [
+			177,
+			139,
+			27,
+			46,
+			113,
+			250,
+			139,
+			225
+		],
+		accounts: [
 			{
-				name: "asset_mint",
+				name: "receiver",
 				writable: true
 			},
 			{
-				name: "locked_token_account",
-				writable: true
-			},
-			{
-				name: "asset_controller"
-			},
-			{
-				name: "asset_controller_program",
-				address: "7tXjmbkZVY3Gmg9kDBebcNXT1yC5pyoxxXVLwdbv9tvP"
-			},
-			{
-				name: "token_program",
-				address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			}
-		],
-		args: [
-		]
-	},
-	{
-		name: "create_user_role",
-		discriminator: [
-			13,
-			20,
-			224,
-			42,
-			3,
-			120,
-			67,
-			23
-		],
-		accounts: [
-			{
-				name: "payer",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "user",
-				signer: true
-			},
-			{
-				name: "new_user_role",
-				writable: true
-			},
-			{
-				name: "asset_access_controller",
-				writable: true,
-				relations: [
-					"authorized_user_role"
-				]
-			},
-			{
-				name: "authorized_user_role",
-				optional: true
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			}
-		],
-		args: [
-			{
-				name: "name",
-				type: "string"
-			},
-			{
-				name: "allowed_admin_ixs",
-				type: "u64"
-			},
-			{
-				name: "allowed_medici_ixs",
-				type: "u64"
-			}
-		]
-	},
-	{
-		name: "delete_user_role",
-		discriminator: [
-			177,
-			139,
-			27,
-			46,
-			113,
-			250,
-			139,
-			225
-		],
-		accounts: [
-			{
-				name: "receiver",
-				writable: true
-			},
-			{
-				name: "user",
-				signer: true
+				name: "user",
+				signer: true
 			},
 			{
 				name: "asset_access_controller",
@@ -1352,6 +1180,9 @@ var instructions$2 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -1414,6 +1245,9 @@ var instructions$2 = [
 			},
 			{
 				name: "identity_registry"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -1573,6 +1407,9 @@ var instructions$2 = [
 			},
 			{
 				name: "wallet_identity_account"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -1748,6 +1585,12 @@ var instructions$2 = [
 				name: "wallet_identity",
 				writable: true
 			},
+			{
+				name: "event_authority_identity_metadata_registry"
+			},
+			{
+				name: "event_authority_identity_registry"
+			},
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
@@ -1760,6 +1603,73 @@ var instructions$2 = [
 			}
 		]
 	},
+	{
+		name: "remove_identity_account",
+		discriminator: [
+			78,
+			35,
+			174,
+			50,
+			72,
+			181,
+			12,
+			42
+		],
+		accounts: [
+			{
+				name: "payer",
+				writable: true,
+				signer: true
+			},
+			{
+				name: "user",
+				signer: true
+			},
+			{
+				name: "controller_authority",
+				relations: [
+					"asset_access_controller"
+				]
+			},
+			{
+				name: "asset_access_controller",
+				relations: [
+					"authorized_user_role"
+				]
+			},
+			{
+				name: "authorized_user_role",
+				optional: true
+			},
+			{
+				name: "identity_registry_program",
+				address: "GZsnjqT3c5zbHqsctrJ4EG4rbEfo7ZXyyUG7aDJNmxfA"
+			},
+			{
+				name: "identity_registry"
+			},
+			{
+				name: "identity_account",
+				writable: true
+			},
+			{
+				name: "wallet_identity",
+				writable: true
+			},
+			{
+				name: "event_authority"
+			},
+			{
+				name: "identity_owner"
+			}
+		],
+		args: [
+			{
+				name: "cpi_data",
+				type: "bytes"
+			}
+		]
+	},
 	{
 		name: "remove_investor",
 		discriminator: [
@@ -1828,6 +1738,12 @@ var instructions$2 = [
 			{
 				name: "tracker_account",
 				writable: true
+			},
+			{
+				name: "event_authority_identity_metadata_registry"
+			},
+			{
+				name: "event_authority_identity_registry"
 			}
 		],
 		args: [
@@ -1905,6 +1821,9 @@ var instructions$2 = [
 			},
 			{
 				name: "asset_mint"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -1987,6 +1906,9 @@ var instructions$2 = [
 			},
 			{
 				name: "asset_mint"
+			},
+			{
+				name: "event_authority_identity_registry"
 			}
 		],
 		args: [
@@ -2070,92 +1992,6 @@ var instructions$2 = [
 			}
 		]
 	},
-	{
-		name: "remove_token_lock",
-		discriminator: [
-			168,
-			128,
-			173,
-			188,
-			172,
-			228,
-			154,
-			90
-		],
-		accounts: [
-			{
-				name: "user",
-				signer: true
-			},
-			{
-				name: "controller_authority",
-				writable: true,
-				relations: [
-					"asset_access_controller"
-				]
-			},
-			{
-				name: "asset_access_controller",
-				relations: [
-					"authorized_user_role"
-				]
-			},
-			{
-				name: "authorized_user_role",
-				optional: true
-			},
-			{
-				name: "token_locks_program",
-				address: "9bNt3ZiZpDdHqAt5Q1Wq6twFe5RKmMCwA7MJyK2HgGnU"
-			},
-			{
-				name: "investor_locks",
-				writable: true
-			},
-			{
-				name: "investor"
-			},
-			{
-				name: "wallet_identity_account"
-			},
-			{
-				name: "identity_account"
-			},
-			{
-				name: "asset_mint",
-				writable: true
-			},
-			{
-				name: "unlocked_token_account",
-				writable: true
-			},
-			{
-				name: "locked_token_account",
-				writable: true
-			},
-			{
-				name: "asset_controller"
-			},
-			{
-				name: "identity_registry",
-				writable: true
-			},
-			{
-				name: "asset_controller_program",
-				address: "7tXjmbkZVY3Gmg9kDBebcNXT1yC5pyoxxXVLwdbv9tvP"
-			},
-			{
-				name: "token_program",
-				address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-			}
-		],
-		args: [
-			{
-				name: "indices",
-				type: "bytes"
-			}
-		]
-	},
 	{
 		name: "remove_user_role",
 		discriminator: [
@@ -2187,6 +2023,38 @@ var instructions$2 = [
 			{
 				name: "authorized_user_role",
 				optional: true
+			},
+			{
+				name: "event_authority",
+				pda: {
+					seeds: [
+						{
+							kind: "const",
+							value: [
+								95,
+								95,
+								101,
+								118,
+								101,
+								110,
+								116,
+								95,
+								97,
+								117,
+								116,
+								104,
+								111,
+								114,
+								105,
+								116,
+								121
+							]
+						}
+					]
+				}
+			},
+			{
+				name: "program"
 			}
 		],
 		args: [
@@ -2278,6 +2146,9 @@ var instructions$2 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -2342,6 +2213,9 @@ var instructions$2 = [
 			{
 				name: "token_program",
 				address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -2396,6 +2270,9 @@ var instructions$2 = [
 			{
 				name: "policy_engine",
 				writable: true
+			},
+			{
+				name: "event_authority"
 			}
 		],
 		args: [
@@ -2672,7 +2549,7 @@ var instructions$2 = [
 		]
 	}
 ];
-var accounts$2 = [
+var accounts$1 = [
 	{
 		name: "AssetAccessController",
 		discriminator: [
@@ -2700,7 +2577,35 @@ var accounts$2 = [
 		]
 	}
 ];
-var errors$2 = [
+var events$1 = [
+	{
+		name: "AssignUserRoleEvent",
+		discriminator: [
+			66,
+			20,
+			203,
+			47,
+			242,
+			72,
+			213,
+			93
+		]
+	},
+	{
+		name: "RemoveUserRoleEvent",
+		discriminator: [
+			213,
+			162,
+			73,
+			7,
+			11,
+			89,
+			226,
+			140
+		]
+	}
+];
+var errors$1 = [
 	{
 		code: 6000,
 		name: "UnknownInstruction",
@@ -2735,9 +2640,14 @@ var errors$2 = [
 		code: 6006,
 		name: "InvalidLevel",
 		msg: "Invalid level"
+	},
+	{
+		code: 6007,
+		name: "IllegalOperation",
+		msg: "Illegal operation"
 	}
 ];
-var types$2 = [
+var types$1 = [
 	{
 		name: "AssetAccessController",
 		type: {
@@ -2781,6 +2691,66 @@ var types$2 = [
 			]
 		}
 	},
+	{
+		name: "AssignUserRoleEvent",
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "addresses",
+					type: {
+						vec: "pubkey"
+					}
+				},
+				{
+					name: "role",
+					type: "string"
+				},
+				{
+					name: "role_id",
+					type: "u64"
+				},
+				{
+					name: "sender",
+					type: "pubkey"
+				},
+				{
+					name: "seed",
+					type: "pubkey"
+				}
+			]
+		}
+	},
+	{
+		name: "RemoveUserRoleEvent",
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "addresses",
+					type: {
+						vec: "pubkey"
+					}
+				},
+				{
+					name: "role",
+					type: "string"
+				},
+				{
+					name: "role_id",
+					type: "u64"
+				},
+				{
+					name: "sender",
+					type: "pubkey"
+				},
+				{
+					name: "seed",
+					type: "pubkey"
+				}
+			]
+		}
+	},
 	{
 		name: "UserRole",
 		type: {
@@ -2835,33 +2805,35 @@ var types$2 = [
 	}
 ];
 var rwa_rbac = {
-	address: address$2,
-	metadata: metadata$2,
-	instructions: instructions$2,
-	accounts: accounts$2,
-	errors: errors$2,
-	types: types$2
+	address: address$1,
+	metadata: metadata$1,
+	instructions: instructions$1,
+	accounts: accounts$1,
+	events: events$1,
+	errors: errors$1,
+	types: types$1
 };
 
 var rbacIDL = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  address: address$2,
-  metadata: metadata$2,
-  instructions: instructions$2,
-  accounts: accounts$2,
-  errors: errors$2,
-  types: types$2,
+  address: address$1,
+  metadata: metadata$1,
+  instructions: instructions$1,
+  accounts: accounts$1,
+  events: events$1,
+  errors: errors$1,
+  types: types$1,
   'default': rwa_rbac
 });
 
-var address$1 = "D2V7wTBbNCKgYwirgRUnSmc2QyKnHSVmRotWJ4rz8Jp9";
-var metadata$1 = {
+var address = "D2V7wTBbNCKgYwirgRUnSmc2QyKnHSVmRotWJ4rz8Jp9";
+var metadata = {
 	name: "rwa_imr",
 	version: "0.1.0",
 	spec: "0.1.0",
 	description: "Created with Anchor"
 };
-var instructions$1 = [
+var instructions = [
 	{
 		name: "add_levels",
 		discriminator: [
@@ -2918,6 +2890,41 @@ var instructions$1 = [
 			},
 			{
 				name: "asset_mint"
+			},
+			{
+				name: "event_authority_identity_registry"
+			},
+			{
+				name: "event_authority",
+				pda: {
+					seeds: [
+						{
+							kind: "const",
+							value: [
+								95,
+								95,
+								101,
+								118,
+								101,
+								110,
+								116,
+								95,
+								97,
+								117,
+								116,
+								104,
+								111,
+								114,
+								105,
+								116,
+								121
+							]
+						}
+					]
+				}
+			},
+			{
+				name: "program"
 			}
 		],
 		args: [
@@ -2998,6 +3005,9 @@ var instructions$1 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority_identity_registry"
 			}
 		],
 		args: [
@@ -3059,6 +3069,9 @@ var instructions$1 = [
 			},
 			{
 				name: "asset_mint"
+			},
+			{
+				name: "event_authority_identity_registry"
 			}
 		],
 		args: [
@@ -3144,6 +3157,41 @@ var instructions$1 = [
 			{
 				name: "system_program",
 				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "event_authority_identity_registry"
+			},
+			{
+				name: "event_authority",
+				pda: {
+					seeds: [
+						{
+							kind: "const",
+							value: [
+								95,
+								95,
+								101,
+								118,
+								101,
+								110,
+								116,
+								95,
+								97,
+								117,
+								116,
+								104,
+								111,
+								114,
+								105,
+								116,
+								121
+							]
+						}
+					]
+				}
+			},
+			{
+				name: "program"
 			}
 		],
 		args: [
@@ -3224,6 +3272,41 @@ var instructions$1 = [
 			{
 				name: "tracker_account",
 				writable: true
+			},
+			{
+				name: "event_authority_identity_registry"
+			},
+			{
+				name: "event_authority",
+				pda: {
+					seeds: [
+						{
+							kind: "const",
+							value: [
+								95,
+								95,
+								101,
+								118,
+								101,
+								110,
+								116,
+								95,
+								97,
+								117,
+								116,
+								104,
+								111,
+								114,
+								105,
+								116,
+								121
+							]
+						}
+					]
+				}
+			},
+			{
+				name: "program"
 			}
 		],
 		args: [
@@ -3285,6 +3368,9 @@ var instructions$1 = [
 			},
 			{
 				name: "asset_mint"
+			},
+			{
+				name: "event_authority_identity_registry"
 			}
 		],
 		args: [
@@ -3299,7 +3385,7 @@ var instructions$1 = [
 		]
 	}
 ];
-var accounts$1 = [
+var accounts = [
 	{
 		name: "Investor",
 		discriminator: [
@@ -3314,7 +3400,61 @@ var accounts$1 = [
 		]
 	}
 ];
-var errors$1 = [
+var events = [
+	{
+		name: "AddLevelsEvent",
+		discriminator: [
+			90,
+			156,
+			44,
+			28,
+			242,
+			1,
+			130,
+			61
+		]
+	},
+	{
+		name: "RegisterInvestorEvent",
+		discriminator: [
+			137,
+			181,
+			142,
+			164,
+			140,
+			196,
+			246,
+			182
+		]
+	},
+	{
+		name: "RemoveInvestorEvent",
+		discriminator: [
+			221,
+			84,
+			243,
+			216,
+			215,
+			253,
+			246,
+			253
+		]
+	},
+	{
+		name: "RemoveLevelsEvent",
+		discriminator: [
+			145,
+			158,
+			97,
+			146,
+			126,
+			14,
+			2,
+			225
+		]
+	}
+];
+var errors = [
 	{
 		code: 6000,
 		name: "UnknownInstruction",
@@ -3351,598 +3491,39 @@ var errors$1 = [
 		msg: "Unknown level"
 	}
 ];
-var types$1 = [
+var types = [
 	{
-		name: "Investor",
+		name: "AddLevelsEvent",
 		type: {
 			kind: "struct",
 			fields: [
 				{
-					name: "authority",
-					docs: [
-						"Authority keypair allowed to write this account, will match authority or delegate of IdentityRegistry",
-						"at time of creation of IdentityAccount."
-					],
-					type: "pubkey"
+					name: "investor_id",
+					type: "string"
 				},
 				{
-					name: "identity_account",
-					docs: [
-						"IdentityAccount associated with this investor."
-					],
+					name: "sender",
 					type: "pubkey"
 				},
 				{
-					name: "identity_registry",
-					docs: [
-						"IdentityRegistryAccount associated with this investor."
-					],
-					type: "pubkey"
-				},
-				{
-					name: "bump",
-					docs: [
-						"PDA Seed Bump"
-					],
-					type: "u8"
-				},
-				{
-					name: "investor_id",
-					docs: [
-						"Unique ID for Investor, generated off-chain."
-					],
-					type: "string"
-				},
-				{
-					name: "collision_hash",
-					docs: [
-						"Metadata for investor, generated off-chain."
-					],
-					type: "string"
-				},
-				{
-					name: "last_updated_by",
-					docs: [
-						"User that last modified this investor. Read from payer of instruction."
-					],
-					type: "pubkey"
-				},
-				{
-					name: "levels",
-					docs: [
-						"Levels assigned to investor."
-					],
-					type: {
-						vec: {
-							defined: {
-								name: "LevelData"
-							}
-						}
-					}
-				},
-				{
-					name: "country",
-					type: "u8"
-				}
-			]
-		}
-	},
-	{
-		name: "LevelData",
-		type: {
-			kind: "struct",
-			fields: [
-				{
-					name: "level",
-					docs: [
-						"Maps to IdentityAccount level used in RWA Token."
-					],
-					type: "u8"
-				},
-				{
-					name: "proof_hash",
-					docs: [
-						"Hash generated off-chain."
-					],
-					type: "string"
-				}
-			]
-		}
-	}
-];
-var rwa_imr = {
-	address: address$1,
-	metadata: metadata$1,
-	instructions: instructions$1,
-	accounts: accounts$1,
-	errors: errors$1,
-	types: types$1
-};
-
-var imrIDL = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  address: address$1,
-  metadata: metadata$1,
-  instructions: instructions$1,
-  accounts: accounts$1,
-  errors: errors$1,
-  types: types$1,
-  'default': rwa_imr
-});
-
-var address = "9bNt3ZiZpDdHqAt5Q1Wq6twFe5RKmMCwA7MJyK2HgGnU";
-var metadata = {
-	name: "token_locks",
-	version: "0.1.0",
-	spec: "0.1.0",
-	description: "Created with Anchor"
-};
-var instructions = [
-	{
-		name: "add_token_lock",
-		discriminator: [
-			195,
-			26,
-			109,
-			80,
-			46,
-			7,
-			195,
-			55
-		],
-		accounts: [
-			{
-				name: "payer",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "authority",
-				docs: [
-					"Authority of AssetController (required to execute seize CPI)."
-				],
-				writable: true,
-				signer: true,
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "investor_locks",
-				writable: true
-			},
-			{
-				name: "investor",
-				relations: [
-					"investor_locks"
-				]
-			},
-			{
-				name: "wallet_identity_account"
-			},
-			{
-				name: "identity_account",
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "asset_mint",
-				writable: true
-			},
-			{
-				name: "unlocked_token_account",
-				writable: true
-			},
-			{
-				name: "locked_token_account",
-				writable: true,
-				relations: [
-					"investor_locks"
-				]
-			},
-			{
-				name: "asset_controller"
-			},
-			{
-				name: "identity_registry",
-				writable: true,
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "asset_controller_program",
-				address: "7tXjmbkZVY3Gmg9kDBebcNXT1yC5pyoxxXVLwdbv9tvP"
-			},
-			{
-				name: "token_program",
-				address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			}
-		],
-		args: [
-			{
-				name: "value",
-				type: "u64"
-			},
-			{
-				name: "release_time",
-				type: "i64"
-			},
-			{
-				name: "reason_code",
-				type: "u64"
-			},
-			{
-				name: "reason_string",
-				type: "string"
-			}
-		]
-	},
-	{
-		name: "close_investor_locks",
-		discriminator: [
-			255,
-			60,
-			220,
-			115,
-			217,
-			104,
-			157,
-			171
-		],
-		accounts: [
-			{
-				name: "payer",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "authority",
-				signer: true,
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "investor_locks",
-				writable: true
-			},
-			{
-				name: "investor",
-				relations: [
-					"investor_locks"
-				]
-			},
-			{
-				name: "locked_token_account",
-				writable: true,
-				relations: [
-					"investor_locks"
-				]
-			},
-			{
-				name: "token_program",
-				address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			}
-		],
-		args: [
-		]
-	},
-	{
-		name: "create_investor_locks",
-		discriminator: [
-			223,
-			81,
-			139,
-			162,
-			204,
-			48,
-			24,
-			213
-		],
-		accounts: [
-			{
-				name: "payer",
-				writable: true,
-				signer: true
-			},
-			{
-				name: "authority",
-				signer: true,
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "investor_locks",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "investor.investor_id",
-							account: "Investor"
-						},
-						{
-							kind: "account",
-							path: "investor.identity_registry",
-							account: "Investor"
-						},
-						{
-							kind: "const",
-							value: [
-								73,
-								110,
-								118,
-								101,
-								115,
-								116,
-								111,
-								114,
-								76,
-								111,
-								99,
-								107,
-								115
-							]
-						}
-					]
-				}
-			},
-			{
-				name: "investor"
-			},
-			{
-				name: "identity_account",
-				docs: [
-					"CHECKED: Matches known address."
-				],
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "asset_mint",
-				writable: true
-			},
-			{
-				name: "locked_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "investor.investor_id",
-							account: "Investor"
-						},
-						{
-							kind: "account",
-							path: "investor.identity_registry",
-							account: "Investor"
-						},
-						{
-							kind: "const",
-							value: [
-								76,
-								111,
-								99,
-								107,
-								101,
-								100,
-								84,
-								111,
-								107,
-								101,
-								110,
-								65,
-								99,
-								99,
-								111,
-								117,
-								110,
-								116
-							]
-						}
-					]
+					name: "levels",
+					type: "bytes"
+				},
+				{
+					name: "expiries",
+					type: {
+						vec: "i64"
+					}
+				},
+				{
+					name: "proof_hashes",
+					type: {
+						vec: "string"
+					}
 				}
-			},
-			{
-				name: "asset_controller"
-			},
-			{
-				name: "asset_controller_program",
-				address: "7tXjmbkZVY3Gmg9kDBebcNXT1yC5pyoxxXVLwdbv9tvP"
-			},
-			{
-				name: "token_program",
-				address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			}
-		],
-		args: [
-		]
-	},
-	{
-		name: "remove_token_lock",
-		discriminator: [
-			168,
-			128,
-			173,
-			188,
-			172,
-			228,
-			154,
-			90
-		],
-		accounts: [
-			{
-				name: "user",
-				signer: true
-			},
-			{
-				name: "authority",
-				docs: [
-					"Authority of AssetController (required to execute seize CPI)."
-				],
-				writable: true,
-				signer: true,
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "investor_locks",
-				writable: true
-			},
-			{
-				name: "investor",
-				relations: [
-					"investor_locks"
-				]
-			},
-			{
-				name: "wallet_identity_account"
-			},
-			{
-				name: "identity_account",
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "asset_mint",
-				writable: true
-			},
-			{
-				name: "unlocked_token_account",
-				writable: true
-			},
-			{
-				name: "locked_token_account",
-				writable: true,
-				relations: [
-					"investor_locks"
-				]
-			},
-			{
-				name: "asset_controller"
-			},
-			{
-				name: "identity_registry",
-				writable: true,
-				relations: [
-					"investor"
-				]
-			},
-			{
-				name: "asset_controller_program",
-				address: "7tXjmbkZVY3Gmg9kDBebcNXT1yC5pyoxxXVLwdbv9tvP"
-			},
-			{
-				name: "token_program",
-				address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-			}
-		],
-		args: [
-			{
-				name: "is_user_authorized",
-				type: "bool"
-			},
-			{
-				name: "indices",
-				type: "bytes"
-			}
-		]
-	}
-];
-var accounts = [
-	{
-		name: "Investor",
-		discriminator: [
-			174,
-			129,
-			17,
-			83,
-			36,
-			116,
-			26,
-			196
-		]
-	},
-	{
-		name: "InvestorLocks",
-		discriminator: [
-			199,
-			60,
-			219,
-			46,
-			221,
-			205,
-			1,
-			7
-		]
-	}
-];
-var errors = [
-	{
-		code: 6000,
-		name: "UnknownInstruction",
-		msg: "Unknown program instruction from CPI data"
-	},
-	{
-		code: 6001,
-		name: "UnknownAccount",
-		msg: "Unknown account discriminator"
-	},
-	{
-		code: 6002,
-		name: "FailedDeserialization",
-		msg: "Invalid account on deserialization"
-	},
-	{
-		code: 6003,
-		name: "InvalidReleaseTime",
-		msg: "Invalid release time"
-	},
-	{
-		code: 6004,
-		name: "InvalidReasonString",
-		msg: "Invalid reason string"
-	},
-	{
-		code: 6005,
-		name: "InvalidLockValue",
-		msg: "Invalid lock value"
-	},
-	{
-		code: 6006,
-		name: "UnauthorizedUser",
-		msg: "User initiating instruction is not authorized by RBAC"
-	},
-	{
-		code: 6007,
-		name: "InvalidTokenAccountState",
-		msg: "Invalid token account state"
+			]
+		}
 	},
-	{
-		code: 6008,
-		name: "LockNotFound",
-		msg: "Lock not found"
-	}
-];
-var types = [
 	{
 		name: "Investor",
 		type: {
@@ -4019,117 +3600,116 @@ var types = [
 		}
 	},
 	{
-		name: "InvestorLocks",
+		name: "LevelData",
 		type: {
 			kind: "struct",
 			fields: [
 				{
-					name: "investor",
+					name: "level",
 					docs: [
-						"Address of Investor account."
+						"Maps to IdentityAccount level used in RWA Token."
 					],
-					type: "pubkey"
+					type: "u8"
 				},
 				{
-					name: "locked_token_account",
+					name: "proof_hash",
 					docs: [
-						"Account storing locked tokens for wallet. Will be frozen upon initialization of",
-						"InvestorLocks."
+						"Hash generated off-chain."
 					],
-					type: "pubkey"
-				},
-				{
-					name: "locks",
-					type: {
-						vec: {
-							defined: {
-								name: "Lock"
-							}
-						}
-					}
+					type: "string"
 				}
 			]
 		}
 	},
 	{
-		name: "LevelData",
+		name: "RegisterInvestorEvent",
 		type: {
 			kind: "struct",
 			fields: [
+				{
+					name: "investor_id",
+					type: "string"
+				},
 				{
 					name: "level",
-					docs: [
-						"Maps to IdentityAccount level used in RWA Token."
-					],
 					type: "u8"
 				},
 				{
-					name: "proof_hash",
-					docs: [
-						"Hash generated off-chain."
-					],
+					name: "expiry",
+					type: "i64"
+				},
+				{
+					name: "collision_hash",
+					type: "string"
+				},
+				{
+					name: "sender",
+					type: "pubkey"
+				},
+				{
+					name: "country",
+					type: "u8"
+				}
+			]
+		}
+	},
+	{
+		name: "RemoveInvestorEvent",
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "investor_id",
 					type: "string"
+				},
+				{
+					name: "sender",
+					type: "pubkey"
 				}
 			]
 		}
 	},
 	{
-		name: "Lock",
+		name: "RemoveLevelsEvent",
 		type: {
 			kind: "struct",
 			fields: [
 				{
-					name: "value",
-					docs: [
-						"Amount of tokens to lock."
-					],
-					type: "u64"
-				},
-				{
-					name: "release_time",
-					docs: [
-						"Timestamp from which the lock will be inactive. If value is 0, the lock",
-						"will remain active until removed."
-					],
-					type: "i64"
+					name: "investor_id",
+					type: "string"
 				},
 				{
-					name: "reason_code",
-					docs: [
-						"Reason code for locking."
-					],
-					type: "u64"
+					name: "sender",
+					type: "pubkey"
 				},
 				{
-					name: "reason_string",
-					docs: [
-						"Detailed reason for the lock. Since string has no length limit, we calculate",
-						"total space needed dynamically at time of resizing."
-					],
-					type: "string"
+					name: "levels",
+					type: "bytes"
 				}
 			]
 		}
 	}
 ];
-var token_locks = {
+var rwa_imr = {
 	address: address,
 	metadata: metadata,
 	instructions: instructions,
 	accounts: accounts,
+	events: events,
 	errors: errors,
 	types: types
 };
 
-var tokenLocksIdl = /*#__PURE__*/Object.freeze({
+var imrIDL = /*#__PURE__*/Object.freeze({
   __proto__: null,
   address: address,
   metadata: metadata,
   instructions: instructions,
   accounts: accounts,
+  events: events,
   errors: errors,
   types: types,
-  'default': token_locks
+  'default': rwa_imr
 });
 
 var AdminFlags;
@@ -4174,7 +3754,8 @@ var MediciFlags;
     MediciFlags[MediciFlags["CHANGE_COUNTRY"] = 134217728] = "CHANGE_COUNTRY";
     MediciFlags[MediciFlags["CHANGE_MAPPING"] = 268435456] = "CHANGE_MAPPING";
     MediciFlags[MediciFlags["CHANGE_ISSUANCE_POLICIES"] = 536870912] = "CHANGE_ISSUANCE_POLICIES";
-    MediciFlags[MediciFlags["ALL"] = 1073741823] = "ALL";
+    MediciFlags[MediciFlags["REMOVE_IDENTITY_ACCOUNT"] = 1073741824] = "REMOVE_IDENTITY_ACCOUNT";
+    MediciFlags[MediciFlags["ALL"] = 2147483647] = "ALL";
 })(MediciFlags || (MediciFlags = {}));
 
 /******************************************************************************
@@ -4300,6 +3881,7 @@ class AssetController {
                 associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
                 systemProgram: SystemProgram.programId,
                 walletIdentityAccount: getWalletIdentityAccountPda(args.assetMint, args.wallet),
+                eventAuthority: getAssetControllerEventAuthority(),
             })
                 .instruction();
         });
@@ -4423,6 +4005,7 @@ class AssetController {
                 tokenProgram: TOKEN_2022_PROGRAM_ID,
                 associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getAssetControllerEventAuthority(),
             })
                 .instruction();
         });
@@ -4506,6 +4089,7 @@ class AssetController {
                 sourceTokenAccount: getAssociatedTokenAddressSync(new PublicKey(args.assetMint), new PublicKey(args.from), false, TOKEN_2022_PROGRAM_ID),
                 destinationTokenAccount: getAssociatedTokenAddressSync(new PublicKey(args.assetMint), new PublicKey(args.to), true, TOKEN_2022_PROGRAM_ID),
                 tokenProgram: TOKEN_2022_PROGRAM_ID,
+                eventAuthority: getAssetControllerEventAuthority(),
             })
                 .remainingAccounts([
                 {
@@ -4600,6 +4184,7 @@ class PolicyEngine {
                 policyEngineProgram: policyEngineProgramId,
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getPolicyEngineEventAuthority(),
             })
                 .instruction();
         });
@@ -4627,6 +4212,7 @@ class PolicyEngine {
                 policyEngineProgram: policyEngineProgramId,
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getPolicyEngineEventAuthority(),
             })
                 .instruction();
         });
@@ -4654,6 +4240,7 @@ class PolicyEngine {
                 policyEngineProgram: policyEngineProgramId,
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getPolicyEngineEventAuthority(),
             })
                 .instruction();
         });
@@ -4680,6 +4267,7 @@ class PolicyEngine {
                 authorizedUserRole: authorizedUserRole || null,
                 policyEngineProgram: policyEngineProgramId,
                 policyEngine: getPolicyEnginePda(args.assetMint),
+                eventAuthority: getPolicyEngineEventAuthority(),
             })
                 .instruction();
         });
@@ -4707,6 +4295,7 @@ class PolicyEngine {
                 policyEngineProgram: policyEngineProgramId,
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getPolicyEngineEventAuthority(),
             })
                 .instruction();
         });
@@ -4732,6 +4321,7 @@ class PolicyEngine {
                 authorizedUserRole: authorizedUserRole || null,
                 policyEngineProgram: policyEngineProgramId,
                 policyEngine: getPolicyEnginePda(args.assetMint),
+                eventAuthority: getPolicyEngineEventAuthority(),
             })
                 .instruction();
         });
@@ -4757,6 +4347,7 @@ class PolicyEngine {
                 authorizedUserRole: authorizedUserRole || null,
                 policyEngineProgram: policyEngineProgramId,
                 policyEngine: getPolicyEnginePda(args.assetMint),
+                eventAuthority: getPolicyEngineEventAuthority(),
             })
                 .instruction();
         });
@@ -4850,6 +4441,7 @@ class IdentityRegistry {
                 identityAccount,
                 walletIdentity: getWalletIdentityAccountPda(args.assetMint, args.owner),
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getIdentityRegistryEventAuthority(),
             })
                 .instruction());
             returnIxs.push(trackerAccountIx);
@@ -4859,6 +4451,41 @@ class IdentityRegistry {
             };
         });
     }
+    /**
+     * Asynchronously generates instructions to remove a non-investor user with an identity account.
+     * @param args - {@link SetupUserArgs}
+     * @param authority - RBAC AssetAccessController ControllerAuthority.
+     * @param assetAccessController - RBAC AssetAccessController account.
+     * @param authorizedUserRole - Optional UserRole account. Required if user is not an admin.
+     * @returns A Promise that resolves to the instructions to setup a user.
+     *
+     * It is required for at least a single user to be setup before issuing tokens.
+     */
+    removeUserIxn(args, assetAccessController, authorizedUserRole) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ix = yield this.rwaClient.identityRegistry.revokeIdentityAccount(args);
+            const identityAccountAddress = getIdentityAccountPda(args.assetMint, args.owner);
+            const identityAccount = yield getIdentityAccount(identityAccountAddress, this.rwaClient.provider);
+            const controllerAuthority = deriveControllerAuthorityPda(assetAccessController);
+            const returnIx = yield this.rbacProgram.methods
+                .removeIdentityAccount(ix.data)
+                .accountsStrict({
+                payer: args.payer,
+                user: args.signer,
+                controllerAuthority,
+                assetAccessController,
+                authorizedUserRole: authorizedUserRole || null,
+                identityRegistryProgram: identityRegistryProgramId,
+                identityRegistry: getIdentityRegistryPda(args.assetMint),
+                identityAccount: identityAccountAddress,
+                walletIdentity: getWalletIdentityAccountPda(args.assetMint, args.owner),
+                eventAuthority: getIdentityRegistryEventAuthority(),
+                identityOwner: identityAccount.owner,
+            })
+                .instruction();
+            return returnIx;
+        });
+    }
     /**
      * Asynchronously update a non-investor user identity account level.
      * @param args - {@link AddLevelToIdentityAccountArgs}
@@ -4888,6 +4515,7 @@ class IdentityRegistry {
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 trackerAccount: getTrackerAccountPda(args.assetMint, args.owner),
                 assetMint: args.assetMint,
+                eventAuthority: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
         });
@@ -4922,6 +4550,7 @@ class IdentityRegistry {
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 trackerAccount: getTrackerAccountPda(args.assetMint, args.owner),
                 assetMint: args.assetMint,
+                eventAuthority: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
         });
@@ -4988,6 +4617,8 @@ class IdentityRegistry {
                 assetMint: args.assetMint,
                 walletIdentity,
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getIdentityRegistryEventAuthority(),
+                program: identityRegistryProgramId,
             })
                 .instruction();
             return this.rbacProgram.methods
@@ -5004,6 +4635,7 @@ class IdentityRegistry {
                 assetMint: args.assetMint,
                 walletIdentity,
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
         });
@@ -5030,6 +4662,8 @@ class IdentityRegistry {
                 walletIdentity,
                 identityAccount,
                 identityRegistry,
+                eventAuthority: getIdentityRegistryEventAuthority(),
+                program: identityRegistryProgramId,
             })
                 .instruction();
             return this.rbacProgram.methods
@@ -5044,6 +4678,7 @@ class IdentityRegistry {
                 walletIdentity,
                 identityAccount,
                 identityRegistry,
+                eventAuthority: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
         });
@@ -5059,6 +4694,27 @@ class IdentityMetadataRegistry {
         this.rbacProgram = rbacProgram;
         this.imrProgram = imrProgram;
     }
+    /**
+     * Parses inner instructions data field for array of events emitted by program using CPI Events.
+     * @param ixs - Array of CompiledInstruction from a transaction inner instructions.
+     * @returns Array of Events
+     * */
+    parseEvents(ixs) {
+        const eventCoder = this.imrProgram.coder.events;
+        const events = ixs
+            .map(({ data }) => {
+            try {
+                const buffer = Buffer.from(utils.bytes.bs58.decode(data));
+                const event = eventCoder.decode(utils.bytes.base64.encode(buffer.slice(8)));
+                return event;
+            }
+            catch (err) {
+                console.error("Error decoding events", err);
+            }
+        })
+            .filter((v) => v != null);
+        return events;
+    }
     /**
      * Asynchronously generates instructions to setup an investor.
      * @param args - {@link SetupInvestorArgs}
@@ -5090,6 +4746,9 @@ class IdentityMetadataRegistry {
                 walletIdentity: getWalletIdentityAccountPda(args.assetMint, investor.toString() // Investor is owner of IdentityAccount
                 ),
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getEventAuthority(IMR_PROGRAM),
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
+                program: identityRegistryProgramId,
             })
                 .instruction();
             returnIxs.push(yield this.rbacProgram.methods
@@ -5107,6 +4766,8 @@ class IdentityMetadataRegistry {
                 identityAccount,
                 walletIdentity: getWalletIdentityAccountPda(args.assetMint, investor.toString()),
                 systemProgram: SystemProgram.programId,
+                eventAuthorityIdentityMetadataRegistry: getEventAuthority(IMR_PROGRAM),
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
             })
                 .instruction());
             const policyProgram = getPolicyEngineProgram(this.imrProgram.provider);
@@ -5171,6 +4832,9 @@ class IdentityMetadataRegistry {
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 trackerAccount,
                 assetMint: args.assetMint,
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
+                eventAuthority: getEventAuthority(IMR_PROGRAM),
+                program: IMR_PROGRAM,
             })
                 .instruction();
             return this.rbacProgram.methods
@@ -5191,6 +4855,8 @@ class IdentityMetadataRegistry {
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 trackerAccount,
                 assetMint: args.assetMint,
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
+                eventAuthorityIdentityMetadataRegistry: getEventAuthority(IMR_PROGRAM),
             })
                 .instruction();
         });
@@ -5223,6 +4889,7 @@ class IdentityMetadataRegistry {
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 trackerAccount,
                 assetMint: args.assetMint,
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
             return this.rbacProgram.methods
@@ -5242,6 +4909,7 @@ class IdentityMetadataRegistry {
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 trackerAccount,
                 assetMint: args.assetMint,
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
         });
@@ -5275,6 +4943,7 @@ class IdentityMetadataRegistry {
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 trackerAccount,
                 assetMint: args.assetMint,
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
             return this.rbacProgram.methods
@@ -5295,6 +4964,7 @@ class IdentityMetadataRegistry {
                 policyEngine: getPolicyEnginePda(args.assetMint),
                 trackerAccount,
                 assetMint: args.assetMint,
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
         });
@@ -5328,6 +4998,8 @@ class IdentityMetadataRegistry {
                 walletIdentity: getWalletIdentityAccountPda(args.assetMint, investor.toString()),
                 policyEngineProgram: policyEngineProgramId,
                 trackerAccount: getTrackerAccountPda(args.assetMint, investor.toString()),
+                eventAuthorityIdentityMetadataRegistry: getEventAuthority(IMR_PROGRAM),
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
         });
@@ -5354,266 +5026,13 @@ class IdentityMetadataRegistry {
                 identityRegistry,
                 assetMint: args.assetMint,
                 systemProgram: SystemProgram.programId,
+                eventAuthorityIdentityRegistry: getIdentityRegistryEventAuthority(),
             })
                 .instruction();
         });
     }
 }
 
-/**
- * Role-based access client for accessing Token Locks
- */
-class TokenLocks {
-    constructor(rwaClient, rbacProgram, tokenLocksProgram) {
-        this.rwaClient = rwaClient;
-        this.rbacProgram = rbacProgram;
-        this.tokenLocksProgram = tokenLocksProgram;
-    }
-    /**
-     * Asynchronously create InvestorLocks account for a wallet.
-     * @param args - {@link CreateOrCloseInvestorLocksArgs}
-     * @param assetAccessController - RBAC AssetAccessController account.
-     * @param authorizedUserRole - Optional UserRole account. Required if user is not an admin.
-     * @returns A Promise that resolves to a transaction instruction.
-     * */
-    createInvestorLocks(args, assetAccessController, authorizedUserRole) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const identityRegistry = getIdentityRegistryPda(args.assetMint);
-            const investor = deriveInvestorPda(args.investorId, identityRegistry);
-            return this.rbacProgram.methods
-                .createInvestorLocks()
-                .accountsStrict({
-                payer: args.payer,
-                user: args.signer,
-                controllerAuthority: deriveControllerAuthorityPda(assetAccessController),
-                assetAccessController,
-                authorizedUserRole: authorizedUserRole || null,
-                tokenLocksProgram: TL_PROGRAM,
-                investorLocks: deriveInvestorLocks(args.investorId, identityRegistry),
-                investor,
-                identityAccount: getIdentityAccountPda(args.assetMint, investor.toString()),
-                assetMint: args.assetMint,
-                lockedTokenAccount: deriveLockedTokenAccount(args.investorId, identityRegistry),
-                assetController: getAssetControllerPda(args.assetMint),
-                assetControllerProgram: assetControllerProgramId,
-                tokenProgram: TOKEN_2022_PROGRAM_ID,
-                systemProgram: SystemProgram.programId,
-            })
-                .instruction();
-        });
-    }
-    /**
-     * Asynchronously close InvestorLocks account for a wallet.
-     * @param args - {@link CreateOrCloseInvestorLocksArgs}
-     * @param assetAccessController - RBAC AssetAccessController account.
-     * @param authorizedUserRole - Optional UserRole account. Required if user is not an admin.
-     * @returns A Promise that resolves to a transaction instruction.
-     * */
-    closeInvestorLocks(args, assetAccessController, authorizedUserRole) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const controllerAuthority = deriveControllerAuthorityPda(assetAccessController);
-            const identityRegistry = getIdentityRegistryPda(args.assetMint);
-            return this.rbacProgram.methods
-                .closeInvestorLocks()
-                .accountsStrict({
-                payer: args.payer,
-                user: args.signer,
-                controllerAuthority,
-                assetAccessController,
-                authorizedUserRole: authorizedUserRole || null,
-                tokenLocksProgram: TL_PROGRAM,
-                investorLocks: deriveInvestorLocks(args.investorId, identityRegistry),
-                investor: deriveInvestorPda(args.investorId, identityRegistry),
-                systemProgram: SystemProgram.programId,
-                tokenProgram: TOKEN_2022_PROGRAM_ID,
-                lockedTokenAccount: deriveLockedTokenAccount(args.investorId, identityRegistry),
-            })
-                .instruction();
-        });
-    }
-    /**
-     * Asynchronously add a lock to InvestorLocks.
-     * @param args - {@link AddTokenLockArgs}
-     * @param assetAccessController - RBAC AssetAccessController account.
-     * @param authorizedUserRole - Optional UserRole account. Required if user is not an admin.
-     * @returns A Promise that resolves to a transaction instruction.
-     * */
-    addTokenLock(args, assetAccessController, authorizedUserRole) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const assetController = getAssetControllerPda(args.assetMint);
-            const identityRegistry = getIdentityRegistryPda(args.assetMint);
-            const investorLocks = deriveInvestorLocks(args.investorId, identityRegistry);
-            const investor = deriveInvestorPda(args.investorId, identityRegistry);
-            const unlockedTokenAccount = getAssociatedTokenAddressSync(new PublicKey(args.assetMint), args.wallet, false, TOKEN_2022_PROGRAM_ID);
-            const controllerAuthority = deriveControllerAuthorityPda(assetAccessController);
-            const ix = yield this.tokenLocksProgram.methods
-                .addTokenLock(args.value, args.releaseTime, args.reasonCode, args.reasonString)
-                .accountsStrict({
-                payer: args.payer,
-                authority: controllerAuthority,
-                investorLocks,
-                investor,
-                assetMint: args.assetMint,
-                identityAccount: getIdentityAccountPda(args.assetMint, investor.toString()),
-                unlockedTokenAccount,
-                lockedTokenAccount: deriveLockedTokenAccount(args.investorId, identityRegistry),
-                assetController,
-                assetControllerProgram: assetControllerProgramId,
-                tokenProgram: TOKEN_2022_PROGRAM_ID,
-                identityRegistry: getIdentityRegistryPda(args.assetMint),
-                systemProgram: SystemProgram.programId,
-                walletIdentityAccount: getWalletIdentityAccountPda(args.assetMint, args.wallet.toString()),
-            })
-                .instruction();
-            return this.rbacProgram.methods
-                .addTokenLock(ix.data)
-                .accountsStrict({
-                payer: args.payer,
-                user: args.signer,
-                controllerAuthority,
-                assetAccessController,
-                authorizedUserRole: authorizedUserRole || null,
-                tokenLocksProgram: TL_PROGRAM,
-                investorLocks,
-                investor,
-                assetMint: args.assetMint,
-                unlockedTokenAccount,
-                lockedTokenAccount: deriveLockedTokenAccount(args.investorId, identityRegistry),
-                assetController,
-                identityRegistry: getIdentityRegistryPda(args.assetMint),
-                assetControllerProgram: assetControllerProgramId,
-                tokenProgram: TOKEN_2022_PROGRAM_ID,
-                systemProgram: SystemProgram.programId,
-                identityAccount: getIdentityAccountPda(args.assetMint, investor.toString()),
-                walletIdentityAccount: getWalletIdentityAccountPda(args.assetMint, args.wallet.toString()),
-            })
-                .remainingAccounts([
-                {
-                    pubkey: getPolicyEnginePda(args.assetMint),
-                    isWritable: true,
-                    isSigner: false,
-                },
-                {
-                    pubkey: identityRegistryProgramId,
-                    isWritable: false,
-                    isSigner: false,
-                },
-                {
-                    pubkey: policyEngineProgramId,
-                    isWritable: false,
-                    isSigner: false,
-                },
-                {
-                    pubkey: getIdentityRegistryPda(args.assetMint),
-                    isWritable: false,
-                    isSigner: false,
-                },
-                {
-                    pubkey: getTrackerAccountPda(args.assetMint, investor.toString()),
-                    isWritable: true,
-                    isSigner: false,
-                },
-                {
-                    pubkey: getExtraMetasListPda(args.assetMint),
-                    isWritable: false,
-                    isSigner: false,
-                },
-                {
-                    pubkey: getWalletIdentityAccountPda(args.assetMint, investor.toString()),
-                    isWritable: false,
-                    isSigner: false,
-                },
-            ])
-                .instruction();
-        });
-    }
-    /**
-     * Asynchronously remove a lock from InvestorLocks using RBAC authority.
-     * @param args - {@link RemoveTokenLockArgs}
-     * @param assetAccessController - RBAC AssetAccessController account.
-     * @param authorizedUserRole - Optional UserRole account. Required if user is not an admin.
-     * @returns A Promise that resolves to a transaction instruction.
-     * */
-    removeTokenLock(args, assetAccessController, authorizedUserRole) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const assetController = getAssetControllerPda(args.assetMint);
-            const identityRegistry = getIdentityRegistryPda(args.assetMint);
-            const investorLocks = deriveInvestorLocks(args.investorId, identityRegistry);
-            const investor = deriveInvestorPda(args.investorId, identityRegistry);
-            const unlockedTokenAccount = getAssociatedTokenAddressSync(new PublicKey(args.assetMint), args.wallet, false, TOKEN_2022_PROGRAM_ID);
-            const controllerAuthority = deriveControllerAuthorityPda(assetAccessController);
-            return this.rbacProgram.methods
-                .removeTokenLock(Buffer.from(args.indices))
-                .accountsStrict({
-                user: args.signer,
-                controllerAuthority,
-                assetAccessController,
-                authorizedUserRole: authorizedUserRole || null,
-                tokenLocksProgram: TL_PROGRAM,
-                investorLocks,
-                investor,
-                identityAccount: getIdentityAccountPda(args.assetMint, investor.toString()),
-                walletIdentityAccount: getWalletIdentityAccountPda(args.assetMint, args.wallet.toString()),
-                assetMint: args.assetMint,
-                unlockedTokenAccount,
-                lockedTokenAccount: deriveLockedTokenAccount(args.investorId, identityRegistry),
-                assetController,
-                identityRegistry: getIdentityRegistryPda(args.assetMint),
-                assetControllerProgram: assetControllerProgramId,
-                tokenProgram: TOKEN_2022_PROGRAM_ID,
-            })
-                .remainingAccounts([
-                {
-                    pubkey: getPolicyEnginePda(args.assetMint),
-                    isWritable: true,
-                    isSigner: false,
-                },
-                {
-                    pubkey: identityRegistryProgramId,
-                    isWritable: false,
-                    isSigner: false,
-                },
-                {
-                    pubkey: policyEngineProgramId,
-                    isWritable: false,
-                    isSigner: false,
-                },
-                {
-                    pubkey: getIdentityRegistryPda(args.assetMint),
-                    isWritable: false,
-                    isSigner: false,
-                },
-                {
-                    pubkey: getTrackerAccountPda(args.assetMint, investor.toString()),
-                    isWritable: true,
-                    isSigner: false,
-                },
-                {
-                    pubkey: getExtraMetasListPda(args.assetMint),
-                    isWritable: false,
-                    isSigner: false,
-                },
-                {
-                    pubkey: getWalletIdentityAccountPda(args.assetMint, investor.toString()),
-                    isWritable: false,
-                    isSigner: false,
-                },
-            ])
-                .instruction();
-        });
-    }
-    /**
-     * Asynchronously fetches a token account.
-     * @param account - Account to load.
-     * @returns A Promise that resolves to a token account.
-     * */
-    fetchTokenAccount(account_1) {
-        return __awaiter(this, arguments, void 0, function* (account, commitment = "processed") {
-            return getAccount(this.rwaClient.provider.connection, account, commitment, TOKEN_2022_PROGRAM_ID);
-        });
-    }
-}
-
 class RwaRbacClient {
     constructor(config, provider) {
         this.rwaClient = new RwaClient(config, provider);
@@ -5623,7 +5042,27 @@ class RwaRbacClient {
         this.policyEngine = new PolicyEngine(this.rwaClient, this.rbacProgram);
         this.identityRegistry = new IdentityRegistry(this.rwaClient, this.rbacProgram);
         this.identityMetadataRegistry = new IdentityMetadataRegistry(this.rwaClient, this.rbacProgram, new Program(imrIDL, this.provider));
-        this.tokenLocks = new TokenLocks(this.rwaClient, this.rbacProgram, new Program(tokenLocksIdl, this.provider));
+    }
+    /**
+     * Parses inner instructions data field for array of events emitted by program using CPI Events.
+     * @param ixs - Array of CompiledInstruction from a transaction inner instructions.
+     * @returns Array of Events
+     * */
+    parseEvents(ixs) {
+        const eventCoder = this.rbacProgram.coder.events;
+        const events = ixs
+            .map(({ data }) => {
+            try {
+                const buffer = Buffer.from(utils.bytes.bs58.decode(data));
+                const event = eventCoder.decode(utils.bytes.base64.encode(buffer.slice(8)));
+                return event;
+            }
+            catch (err) {
+                console.error("Error decoding events", err);
+            }
+        })
+            .filter((v) => v != null);
+        return events;
     }
     /**
      * Asynchronously generates instruction to create AssetAccessController for an organization.
@@ -5734,6 +5173,8 @@ class RwaRbacClient {
                 authorizedUserRole: args.authorizedUserRole || null,
                 assetAccessController: args.assetAccessController,
                 systemProgram: SystemProgram.programId,
+                eventAuthority: getEventAuthority(RBAC_PROGRAM),
+                program: RBAC_PROGRAM,
             })
                 .instruction();
         });
@@ -5752,6 +5193,8 @@ class RwaRbacClient {
                 userRole: args.userRole,
                 authorizedUserRole: args.authorizedUserRole || null,
                 assetAccessController: args.assetAccessController,
+                eventAuthority: getEventAuthority(RBAC_PROGRAM),
+                program: RBAC_PROGRAM,
             })
                 .instruction();
         });
@@ -5785,4 +5228,4 @@ const computeFlags = (...flags) => {
     return flags.reduce((accumulator, flag) => accumulator | flag, 0);
 };
 
-export { AdminFlags, AssetController, IMR_PROGRAM, IdentityMetadataRegistry, IdentityRegistry, MediciFlags, PolicyEngine, RBAC_PROGRAM, rwa_imr as RwaImrIdl, RwaRbacClient, rwa_rbac as RwaRbacIdl, TL_PROGRAM, TokenLocks, token_locks as TokenLocksIdl, computeFlags, deriveAssetAccessControllerPda, deriveControllerAuthorityPda, deriveInvestorLocks, deriveInvestorPda, deriveLockedTokenAccount, deriveUserRolePda };
+export { AdminFlags, AssetController, IMR_PROGRAM, IdentityMetadataRegistry, IdentityRegistry, MediciFlags, PolicyEngine, RBAC_PROGRAM, rwa_imr as RwaImrIdl, RwaRbacClient, rwa_rbac as RwaRbacIdl, TL_PROGRAM, computeFlags, deriveAssetAccessControllerPda, deriveControllerAuthorityPda, deriveInvestorLocks, deriveInvestorPda, deriveLockedTokenAccount, deriveUserRolePda, getEventAuthority };