Fix tests

glamsystems · Aug 18, 2024 · c998670 · c998670
1 parent 1d5bc69
commit c998670
Show file tree

Hide file tree

Showing 5 changed files with 256 additions and 132 deletions.
diff --git a/anchor/src/client/base.ts b/anchor/src/client/base.ts
@@ -460,6 +460,7 @@ export class BaseClient {
     fund: any
   ): Promise<[TransactionSignature, PublicKey]> {
     let fundModel = this.enrichFundModelInitialize(fund);
+
     const fundPDA = this.getFundPDA(fundModel);
     const treasury = this.getTreasuryPDA(fundPDA);
     const openfunds = this.getOpenfundsPDA(fundPDA);
@@ -584,12 +585,12 @@ export class BaseClient {
     return fund;
   }
 
-  public async deleteAcls(
+  public async deleteDelegateAcls(
     fundPDA: PublicKey,
     keys: PublicKey[]
   ): Promise<TransactionSignature> {
     let updatedFund = this.getFundModel({
-      acls: keys.map((key) => ({ pubkey: key, permissions: [] })),
+      delegateAcls: keys.map((key) => ({ pubkey: key, permissions: [] })),
     });
     return await this.program.methods
       .updateFund(updatedFund)
@@ -600,11 +601,11 @@ export class BaseClient {
       .rpc();
   }
 
-  public async upsertAcls(
+  public async upsertDelegateAcls(
     fundPDA: PublicKey,
-    acls: any[]
+    delegateAcls: any[]
   ): Promise<TransactionSignature> {
-    let updatedFund = this.getFundModel({ acls });
+    let updatedFund = this.getFundModel({ delegateAcls });
     return await this.program.methods
       .updateFund(updatedFund)
       .accounts({

diff --git a/anchor/src/models.ts b/anchor/src/models.ts
@@ -21,8 +21,8 @@ export const FundModel = class<FundModel> {
       ...partial,
       assets: obj.assets || [],
       assetsWeights: obj.assetsWeights || [],
-      acls: obj.acls || [],
-      integrations: obj.integrations || [],
+      delegateAcls: obj.delegateAcls || [],
+      integrationAcls: obj.integrationAcls || [],
       shareClasses: obj.shareClasses
         ? obj.shareClasses.map(
             (shareClass: any) =>

diff --git a/anchor/target/idl/glam.json b/anchor/target/idl/glam.json
@@ -1761,7 +1761,7 @@
       }
     },
     {
-      "name": "Acl",
+      "name": "DelegateAcl",
       "type": {
         "kind": "struct",
         "fields": [
@@ -1780,6 +1780,28 @@
         ]
       }
     },
+    {
+      "name": "IntegrationAcl",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "name",
+            "type": {
+              "defined": "IntegrationName"
+            }
+          },
+          {
+            "name": "features",
+            "type": {
+              "vec": {
+                "defined": "IntegrationFeature"
+              }
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "FundModel",
       "type": {
@@ -1860,18 +1882,18 @@
             }
           },
           {
-            "name": "acls",
+            "name": "delegateAcls",
             "type": {
               "vec": {
-                "defined": "Acl"
+                "defined": "DelegateAcl"
               }
             }
           },
           {
-            "name": "integrations",
+            "name": "integrationAcls",
             "type": {
               "vec": {
-                "defined": "Integration"
+                "defined": "IntegrationAcl"
               }
             }
           },
@@ -2490,10 +2512,10 @@
             "name": "ShareClassBlocklist"
           },
           {
-            "name": "Acls"
+            "name": "DelegateAcls"
           },
           {
-            "name": "Integrations"
+            "name": "IntegrationAcls"
           }
         ]
       }
@@ -2634,26 +2656,26 @@
             ]
           },
           {
-            "name": "VecAcl",
+            "name": "VecDelegateAcl",
             "fields": [
               {
                 "name": "val",
                 "type": {
                   "vec": {
-                    "defined": "Acl"
+                    "defined": "DelegateAcl"
                   }
                 }
               }
             ]
           },
           {
-            "name": "VecIntegrations",
+            "name": "VecIntegrationAcl",
             "fields": [
               {
                 "name": "val",
                 "type": {
                   "vec": {
-                    "defined": "Integration"
+                    "defined": "IntegrationAcl"
                   }
                 }
               }
@@ -2675,6 +2697,9 @@
     },
     {
       "name": "Permission",
+      "docs": [
+        "* Delegate ACL"
+      ],
       "type": {
         "kind": "enum",
         "variants": [
@@ -2709,58 +2734,72 @@
       }
     },
     {
-      "name": "Action",
+      "name": "IntegrationName",
+      "docs": [
+        "* Integration ACL"
+      ],
       "type": {
         "kind": "enum",
         "variants": [
           {
-            "name": "Subscribe"
+            "name": "Drift"
           },
           {
-            "name": "Redeem"
+            "name": "StakePool"
+          },
+          {
+            "name": "NativeStaking"
+          },
+          {
+            "name": "Marinade"
+          },
+          {
+            "name": "Jupiter"
           }
         ]
       }
     },
     {
-      "name": "PriceDenom",
+      "name": "IntegrationFeature",
       "type": {
         "kind": "enum",
         "variants": [
           {
-            "name": "Asset"
-          },
-          {
-            "name": "SOL"
-          },
+            "name": "All"
+          }
+        ]
+      }
+    },
+    {
+      "name": "Action",
+      "type": {
+        "kind": "enum",
+        "variants": [
           {
-            "name": "USD"
+            "name": "Subscribe"
           },
           {
-            "name": "EUR"
+            "name": "Redeem"
           }
         ]
       }
     },
     {
-      "name": "Integration",
+      "name": "PriceDenom",
       "type": {
         "kind": "enum",
         "variants": [
           {
-            "name": "Drift"
-          },
-          {
-            "name": "StakePool"
+            "name": "Asset"
           },
           {
-            "name": "NativeStaking"
+            "name": "SOL"
           },
           {
-            "name": "Marinade"
+            "name": "USD"
           },
           {
-            "name": "Jupiter"
+            "name": "EUR"
           }
         ]
       }