feat: photon v0.26.0 (#844)

* Switch to Photon v0.26.0 * Format + update autogenerated photon-api types * Update TokenData field types to i64 * Enable skipped tests for compressed token RPC Three previously skipped end-to-end tests for compressed token RPCs have been enabled. The tests cover the functionality of getCompressedTokenAccountsByOwner, getCompressedTokenAccountBalance, and getCompressedTokenBalancesByOwner functions.
Lightprotocol · Jun 20, 2024 · 6f10474 · 6f10474
1 parent 221f274
commit 6f10474
Show file tree

Hide file tree

Showing 103 changed files with 132 additions and 152 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/utils/constants.ts b/cli/src/utils/constants.ts
@@ -21,7 +21,7 @@ export const LIGHT_PROVER_PROCESS_NAME = "light-prover";
 export const INDEXER_PROCESS_NAME = "photon";
 export const FORESTER_PROCESS_NAME = "forester";
 
-export const PHOTON_VERSION = "0.25.0";
+export const PHOTON_VERSION = "0.26.0";
 
 export const LIGHT_PROTOCOL_PROGRAMS_DIR_ENV = "LIGHT_PROTOCOL_PROGRAMS_DIR";
 export const BASE_PATH = "../../bin/";
diff --git a/forester/src/nullifier/nullify.rs b/forester/src/nullifier/nullify.rs
@@ -190,7 +190,7 @@ async fn fetch_queue_data<T: Indexer, R: RpcConnection>(
             ForesterError::NoProofsFound
         })?;
 
-    let compressed_account_proofs: HashMap<String, (Vec<[u8; 32]>, u64, i64)> = proofs
+    let compressed_account_proofs: HashMap<String, (Vec<[u8; 32]>, u64, u64)> = proofs
         .into_iter()
         .map(|proof| {
             (

diff --git a/forester/src/nullifier/queue_data.rs b/forester/src/nullifier/queue_data.rs
@@ -5,7 +5,7 @@ pub struct StateQueueData {
     pub change_log_index: usize,
     pub sequence_number: usize,
     pub compressed_accounts_to_nullify: Vec<Account>,
-    pub compressed_account_proofs: HashMap<String, (Vec<[u8; 32]>, u64, i64)>,
+    pub compressed_account_proofs: HashMap<String, (Vec<[u8; 32]>, u64, u64)>,
 }
 
 #[derive(Clone, Copy, Debug)]

diff --git a/js/compressed-token/package.json b/js/compressed-token/package.json
@@ -105,13 +105,13 @@
         "vitest": "^1.6.0"
     },
     "nx": {
-    "targets": {
-      "build": {
-        "inputs": [
-          "{workspaceRoot}/target/idl",
-          "{workspaceRoot}/target/types"
-        ]
-      }
+        "targets": {
+            "build": {
+                "inputs": [
+                    "{workspaceRoot}/target/idl",
+                    "{workspaceRoot}/target/types"
+                ]
+            }
+        }
     }
-  }
 }
diff --git a/js/compressed-token/tests/e2e/rpc-token-interop.test.ts b/js/compressed-token/tests/e2e/rpc-token-interop.test.ts
@@ -49,7 +49,7 @@ describe('rpc-interop token', () => {
         await transfer(testRpc, payer, mint, bn(700), bob, charlie.publicKey);
     });
 
-    it.skip('getCompressedTokenAccountsByOwner should match', async () => {
+    it('getCompressedTokenAccountsByOwner should match', async () => {
         const senderAccounts = await rpc.getCompressedTokenAccountsByOwner(
             bob.publicKey,
             { mint },
@@ -97,7 +97,7 @@ describe('rpc-interop token', () => {
         });
     });
 
-    it.skip('getCompressedTokenAccountBalance should match ', async () => {
+    it('getCompressedTokenAccountBalance should match ', async () => {
         const senderAccounts = await rpc.getCompressedTokenAccountsByOwner(
             bob.publicKey,
             { mint },
@@ -114,7 +114,7 @@ describe('rpc-interop token', () => {
         assert.isNotNull(balanceTest.amount);
     });
 
-    it.skip('getCompressedTokenBalancesByOwner should match', async () => {
+    it('getCompressedTokenBalancesByOwner should match', async () => {
         const balances = await rpc.getCompressedTokenBalancesByOwner(
             bob.publicKey,
             { mint },

diff --git a/js/stateless.js/package.json b/js/stateless.js/package.json
@@ -96,13 +96,13 @@
         "lint": "eslint ."
     },
     "nx": {
-    "targets": {
-      "build": {
-        "inputs": [
-          "{workspaceRoot}/target/idl",
-          "{workspaceRoot}/target/types"
-        ]
-      }
+        "targets": {
+            "build": {
+                "inputs": [
+                    "{workspaceRoot}/target/idl",
+                    "{workspaceRoot}/target/types"
+                ]
+            }
+        }
     }
-  }
 }
diff --git a/photon-api/Cargo.toml b/photon-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "photon-api"
-version = "0.25.0"
+version = "0.26.0"
 authors = ["OpenAPI Generator team and contributors"]
 description = "Solana indexer for general compression"
 license = "Apache-2.0"

diff --git a/photon-api/README.md b/photon-api/README.md
@@ -7,8 +7,8 @@ Solana indexer for general compression
 
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://openapis.org) from a remote server, you can easily generate an API client.
 
-- API version: 0.25.0
-- Package version: 0.25.0
+- API version: 0.26.0
+- Package version: 0.26.0
 - Generator version: 7.5.0
 - Build package: `org.openapitools.codegen.languages.RustClientCodegen`
 

diff --git a/photon-api/docs/TokenData.md b/photon-api/docs/TokenData.md
@@ -6,7 +6,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **amount** | **i32** |  | [default to 100]
 **delegate** | Option<**String**> | A Solana public key represented as a base58 string. | [optional][default to 11111112D1oxKts8YPdTJRG5FzxTNpMtWmq8hkVx3]
-**delegated_amount** | **i32** |  | [default to 100]
 **is_native** | Option<**i32**> |  | [optional][default to 100]
 **mint** | **String** | A Solana public key represented as a base58 string. | [default to 11111112D1oxKts8YPdTJRG5FzxTNpMtWmq8hkVx3]
 **owner** | **String** | A Solana public key represented as a base58 string. | [default to 11111112D1oxKts8YPdTJRG5FzxTNpMtWmq8hkVx3]

diff --git a/photon-api/src/apis/configuration.rs b/photon-api/src/apis/configuration.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */
@@ -38,7 +38,7 @@ impl Default for Configuration {
     fn default() -> Self {
         Configuration {
             base_path: "http://127.0.0.1".to_owned(),
-            user_agent: Some("OpenAPI-Generator/0.25.0/rust".to_owned()),
+            user_agent: Some("OpenAPI-Generator/0.26.0/rust".to_owned()),
             client: reqwest::Client::new(),
             basic_auth: None,
             oauth_access_token: None,

diff --git a/photon-api/src/apis/default_api.rs b/photon-api/src/apis/default_api.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_post_200_response.rs b/photon-api/src/models/_get_compressed_account_post_200_response.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_post_200_response_error.rs b/photon-api/src/models/_get_compressed_account_post_200_response_error.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_post_200_response_result.rs b/photon-api/src/models/_get_compressed_account_post_200_response_result.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_post_429_response.rs b/photon-api/src/models/_get_compressed_account_post_429_response.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_post_request.rs b/photon-api/src/models/_get_compressed_account_post_request.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_post_request_params.rs b/photon-api/src/models/_get_compressed_account_post_request_params.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_proof_post_200_response.rs b/photon-api/src/models/_get_compressed_account_proof_post_200_response.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_proof_post_200_response_result.rs b/photon-api/src/models/_get_compressed_account_proof_post_200_response_result.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_proof_post_request.rs b/photon-api/src/models/_get_compressed_account_proof_post_request.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_account_proof_post_request_params.rs b/photon-api/src/models/_get_compressed_account_proof_post_request_params.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response.rs b/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response_result.rs b/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response_result.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_accounts_by_owner_post_request.rs b/photon-api/src/models/_get_compressed_accounts_by_owner_post_request.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_accounts_by_owner_post_request_params.rs b/photon-api/src/models/_get_compressed_accounts_by_owner_post_request_params.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_balance_by_owner_post_request.rs b/photon-api/src/models/_get_compressed_balance_by_owner_post_request.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_balance_by_owner_post_request_params.rs b/photon-api/src/models/_get_compressed_balance_by_owner_post_request_params.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_balance_post_200_response.rs b/photon-api/src/models/_get_compressed_balance_post_200_response.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_balance_post_200_response_result.rs b/photon-api/src/models/_get_compressed_balance_post_200_response_result.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_balance_post_request.rs b/photon-api/src/models/_get_compressed_balance_post_request.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_token_account_balance_post_200_response.rs b/photon-api/src/models/_get_compressed_token_account_balance_post_200_response.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_token_account_balance_post_200_response_result.rs b/photon-api/src/models/_get_compressed_token_account_balance_post_200_response_result.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_token_account_balance_post_request.rs b/photon-api/src/models/_get_compressed_token_account_balance_post_request.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response.rs b/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response_result.rs b/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response_result.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request.rs b/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */

diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request_params.rs b/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request_params.rs
@@ -3,7 +3,7 @@
  *
  * Solana indexer for general compression
  *
- * The version of the OpenAPI document: 0.25.0
+ * The version of the OpenAPI document: 0.26.0
  *
  * Generated by: https://openapi-generator.tech
  */