@dstoken-solana/rwa-rbac 0.2.1 → 0.3.0

package/dist/index.js

@@ -55,98 +55,6 @@ var metadata$1 = {
 	description: "Created with Anchor"
 };
 var instructions$1 = [
-	{
-		name: "add_level_to_identity_account",
-		discriminator: [
-			102,
-			204,
-			64,
-			169,
-			252,
-			177,
-			192,
-			232
-		],
-		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: "identity_account_owner",
-				docs: [
-					"to ensure that it is not an Investor account. If it is an Investor account,",
-					"CPI to IdentityMetadataRegistry should be called."
-				]
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			},
-			{
-				name: "policy_engine_program"
-			},
-			{
-				name: "policy_engine",
-				writable: true
-			},
-			{
-				name: "tracker_account"
-			},
-			{
-				name: "asset_mint"
-			},
-			{
-				name: "event_authority"
-			}
-		],
-		args: [
-			{
-				name: "level",
-				type: "u8"
-			},
-			{
-				name: "expiry",
-				type: "i64"
-			},
-			{
-				name: "enforce_limits",
-				type: "bool"
-			}
-		]
-	},
 	{
 		name: "add_levels",
 		discriminator: [
@@ -1250,6 +1158,12 @@ var instructions$1 = [
 			{
 				name: "identity_registry"
 			},
+			{
+				name: "token_account"
+			},
+			{
+				name: "asset_mint"
+			},
 			{
 				name: "event_authority"
 			}
@@ -1471,63 +1385,6 @@ var instructions$1 = [
 			}
 		]
 	},
-	{
-		name: "refresh_level_to_identity_account",
-		discriminator: [
-			23,
-			68,
-			237,
-			111,
-			144,
-			169,
-			239,
-			91
-		],
-		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
-			}
-		],
-		args: [
-			{
-				name: "cpi_data",
-				type: "bytes"
-			}
-		]
-	},
 	{
 		name: "register_investor",
 		discriminator: [
@@ -1753,90 +1610,6 @@ var instructions$1 = [
 		args: [
 		]
 	},
-	{
-		name: "remove_level_from_identity_account",
-		discriminator: [
-			194,
-			231,
-			187,
-			54,
-			197,
-			136,
-			170,
-			55
-		],
-		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: "identity_account_owner",
-				docs: [
-					"to ensure that it is not an Investor account. If it is an Investor account,",
-					"CPI to IdentityMetadataRegistry should be called."
-				]
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			},
-			{
-				name: "policy_engine_program"
-			},
-			{
-				name: "policy_engine",
-				writable: true
-			},
-			{
-				name: "tracker_account"
-			},
-			{
-				name: "asset_mint"
-			},
-			{
-				name: "event_authority"
-			}
-		],
-		args: [
-			{
-				name: "cpi_data",
-				type: "bytes"
-			}
-		]
-	},
 	{
 		name: "remove_levels",
 		discriminator: [
@@ -3933,16 +3706,6 @@ class AssetController {
                 .instruction();
         });
     }
-    /**
-     * Asynchronously generates instructions to revoke assets.
-     * @param args - {@link VoidTokensArgs}
-     * @returns A Promise that resolves to the instructions to revoke assets.
-     */
-    voidTokenIxns(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.rwaClient.assetController.voidTokenIxns(args);
-        });
-    }
     /**
      * Executes a token transfer.
      * @param args - {@link TransferTokensArgs}
@@ -4013,13 +3776,13 @@ class AssetController {
     /**
      * Asynchronously generates instructions to revoke tokens from a user.
      * @param args - {@link RevokeTokensArgs}
-     * @param payer - Payer public key.
      * @param signer - User signer public key.
      * @param assetAccessController - RBAC AssetAccessController account.
+     * @param investorId - Optional investorId. Required if user is not an investor.
      * @param authorizedUserRole - Optional UserRole account. Required if user is not an admin.
      * @returns A Promise that resolves to the instructions to revoke.
      */
-    revokeTokenIxn(args, investorId, signer, assetAccessController, authorizedUserRole) {
+    revokeTokenIxn(args, signer, assetAccessController, investorId, authorizedUserRole) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!args.wallet) {
                 throw new Error("Use wallet arg for wallet to revoke tokens from.");
@@ -4028,7 +3791,7 @@ class AssetController {
             args.owner = args.wallet;
             const revokeIx = yield rwaTokenSdk.getRevokeTokensIx(args, this.rwaClient.provider);
             const identityRegistry = rwaTokenSdk.getIdentityRegistryPda(args.assetMint);
-            const investorPda = deriveInvestorPda(investorId, identityRegistry);
+            const investorPda = investorId ? deriveInvestorPda(investorId, identityRegistry) : null;
             const ixData = revokeIx.data;
             const assetController = rwaTokenSdk.getAssetControllerPda(args.assetMint);
             const revokeTokenAccount = splToken.getAssociatedTokenAddressSync(new web3_js.PublicKey(args.assetMint), new web3_js.PublicKey(args.wallet), false, splToken.TOKEN_2022_PROGRAM_ID);
@@ -4044,8 +3807,8 @@ class AssetController {
                 assetController,
                 revokeTokenAccount,
                 identityRegistry,
-                identityAccount: rwaTokenSdk.getIdentityAccountPda(args.assetMint, investorPda.toString()),
-                trackerAccount: rwaTokenSdk.getTrackerAccountPda(args.assetMint, investorPda.toString()),
+                identityAccount: rwaTokenSdk.getIdentityAccountPda(args.assetMint, investorId ? investorPda.toString() : args.owner),
+                trackerAccount: rwaTokenSdk.getTrackerAccountPda(args.assetMint, investorId ? investorPda.toString() : args.owner),
                 policyEngineProgram: rwaTokenSdk.policyEngineProgramId,
                 policyEngine: rwaTokenSdk.getPolicyEnginePda(args.assetMint),
                 walletIdentityAccount: rwaTokenSdk.getWalletIdentityAccountPda(args.assetMint, args.wallet),
@@ -4533,112 +4296,6 @@ class IdentityRegistry {
             return returnIx;
         });
     }
-    /**
-     * Asynchronously update a non-investor user identity account level.
-     * @param args - {@link AddLevelToIdentityAccountArgs}
-     * @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 update user account identity.
-     * */
-    addIdentityLevelToUserAccount(args, assetAccessController, authorizedUserRole) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const identityAccount = rwaTokenSdk.getIdentityAccountPda(args.assetMint, args.owner);
-            const controllerAuthority = deriveControllerAuthorityPda(assetAccessController);
-            return this.rbacProgram.methods
-                .addLevelToIdentityAccount(args.levels[0], args.expiries[0], (_a = args.ignorePolicy) !== null && _a !== void 0 ? _a : false)
-                .accountsStrict({
-                payer: args.payer,
-                user: args.signer,
-                controllerAuthority,
-                assetAccessController,
-                authorizedUserRole: authorizedUserRole || null,
-                identityRegistryProgram: rwaTokenSdk.identityRegistryProgramId,
-                identityRegistry: rwaTokenSdk.getIdentityRegistryPda(args.assetMint),
-                identityAccount,
-                identityAccountOwner: args.owner,
-                systemProgram: web3_js.SystemProgram.programId,
-                policyEngineProgram: rwaTokenSdk.policyEngineProgramId,
-                policyEngine: rwaTokenSdk.getPolicyEnginePda(args.assetMint),
-                trackerAccount: rwaTokenSdk.getTrackerAccountPda(args.assetMint, args.owner),
-                assetMint: args.assetMint,
-                eventAuthority: rwaTokenSdk.getIdentityRegistryEventAuthority(),
-            })
-                .instruction();
-        });
-    }
-    /**
-     * Asynchronously reduces a non-Investor user identity account level.
-     * @param args - {@link RemoveLevelFromIdentityAccount}
-     * @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 reduce the level of a user identity account.
-     */
-    removeIdentityLevelFromUserAccount(args, assetAccessController, authorizedUserRole) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const removeLevelIx = yield rwaTokenSdk.getRemoveLevelFromIdentityAccount(args, this.rwaClient.provider);
-            const ixData = removeLevelIx.data;
-            const controllerAuthority = deriveControllerAuthorityPda(assetAccessController);
-            const identityAccount = rwaTokenSdk.getIdentityAccountPda(args.assetMint, args.owner);
-            return this.rbacProgram.methods
-                .removeLevelFromIdentityAccount(ixData)
-                .accountsStrict({
-                payer: args.payer,
-                user: args.signer,
-                controllerAuthority,
-                assetAccessController,
-                authorizedUserRole: authorizedUserRole || null,
-                identityRegistryProgram: rwaTokenSdk.identityRegistryProgramId,
-                identityRegistry: rwaTokenSdk.getIdentityRegistryPda(args.assetMint),
-                identityAccount,
-                identityAccountOwner: args.owner,
-                systemProgram: web3_js.SystemProgram.programId,
-                policyEngineProgram: rwaTokenSdk.policyEngineProgramId,
-                policyEngine: rwaTokenSdk.getPolicyEnginePda(args.assetMint),
-                trackerAccount: rwaTokenSdk.getTrackerAccountPda(args.assetMint, args.owner),
-                assetMint: args.assetMint,
-                eventAuthority: rwaTokenSdk.getIdentityRegistryEventAuthority(),
-            })
-                .instruction();
-        });
-    }
-    /**
-     * Asynchronously generates instruction to refresh expiry on an Identity Account level.
-     * @param args - {@link RefreshLevelArgs}
-     * @param assetAccessController - RBAC AssetAccessController account.
-     * @param authorizedUserRole - Optional UserRole account. Required if user is not an admin.
-     * @returns A Promise that resolves to refresh expiry on an Identity Account level.
-     * */
-    refreshLevelToIdentityAccountIxn(args, assetAccessController, authorizedUserRole) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const identityProgram = rwaTokenSdk.getIdentityRegistryProgram(this.rwaClient.provider);
-            const identityRegistry = rwaTokenSdk.getIdentityRegistryPda(args.assetMint);
-            const identityAccount = rwaTokenSdk.getIdentityAccountPda(args.assetMint, args.owner);
-            const controllerAuthority = deriveControllerAuthorityPda(assetAccessController);
-            const refreshIx = yield identityProgram.methods
-                .refreshLevelToIdentityAccount(args.level, args.expiry)
-                .accountsStrict({
-                payer: args.payer,
-                signer: controllerAuthority,
-                identityRegistry,
-                identityAccount,
-            })
-                .instruction();
-            return this.rbacProgram.methods
-                .refreshLevelToIdentityAccount(refreshIx.data)
-                .accountsStrict({
-                payer: args.payer,
-                user: args.signer,
-                controllerAuthority,
-                assetAccessController,
-                authorizedUserRole: authorizedUserRole || null,
-                identityRegistryProgram: rwaTokenSdk.identityRegistryProgramId,
-                identityRegistry,
-                identityAccount,
-            })
-                .instruction();
-        });
-    }
     /**
      * Asynchronously generates instruction to attach wallet to identity.
      * @param args - {@link AttachDetachWalletArgs}
@@ -4701,6 +4358,7 @@ class IdentityRegistry {
             const identityRegistry = rwaTokenSdk.getIdentityRegistryPda(args.assetMint);
             const identityAccount = rwaTokenSdk.getIdentityAccountPda(args.assetMint, args.owner);
             const walletIdentity = rwaTokenSdk.getWalletIdentityAccountPda(args.assetMint, args.wallet.toString());
+            const tokenAccount = splToken.getAssociatedTokenAddressSync(new web3_js.PublicKey(args.assetMint), new web3_js.PublicKey(args.wallet), false, splToken.TOKEN_2022_PROGRAM_ID);
             const ix = yield identityProgram.methods
                 .detachWalletFromIdentity()
                 .accountsStrict({
@@ -4711,6 +4369,8 @@ class IdentityRegistry {
                 identityRegistry,
                 eventAuthority: rwaTokenSdk.getIdentityRegistryEventAuthority(),
                 program: rwaTokenSdk.identityRegistryProgramId,
+                tokenAccount: tokenAccount,
+                assetMint: args.assetMint,
             })
                 .instruction();
             return this.rbacProgram.methods
@@ -4726,6 +4386,8 @@ class IdentityRegistry {
                 identityAccount,
                 identityRegistry,
                 eventAuthority: rwaTokenSdk.getIdentityRegistryEventAuthority(),
+                tokenAccount: tokenAccount,
+                assetMint: args.assetMint,
             })
                 .instruction();
         });