From bd4881325f3988b0a2de2521a424c80d189fb976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enol=20=C3=81lvarez?= <enol826@gmail.com>
Date: Mon, 10 Feb 2025 17:29:37 +0100
Subject: [PATCH] Upgrade to v0.3.3

---
 solana-common/substreams-v0.3.1.yaml |  2 +-
 solana-common/substreams-v0.3.2.yaml |  2 +-
 solana-common/substreams-v0.3.3.yaml | 61 ++++++++++++++++++++++++++++
 solana-common/substreams.yaml        |  2 +-
 4 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 solana-common/substreams-v0.3.3.yaml

diff --git a/solana-common/substreams-v0.3.1.yaml b/solana-common/substreams-v0.3.1.yaml
index f8cc4d8..64c41bd 100644
--- a/solana-common/substreams-v0.3.1.yaml
+++ b/solana-common/substreams-v0.3.1.yaml
@@ -25,7 +25,7 @@ protobuf:
 binaries:
   default:
     type: wasm/rust-v1
-    file: ./target/wasm32-unknown-unknown/release/substreams.wasm
+    file: ../target/wasm32-unknown-unknown/release/solana_common.wasm
 
 modules:
   - name: blocks_without_votes
diff --git a/solana-common/substreams-v0.3.2.yaml b/solana-common/substreams-v0.3.2.yaml
index 90d1f14..6fa6d4d 100644
--- a/solana-common/substreams-v0.3.2.yaml
+++ b/solana-common/substreams-v0.3.2.yaml
@@ -25,7 +25,7 @@ protobuf:
 binaries:
   default:
     type: wasm/rust-v1
-    file: ./target/wasm32-unknown-unknown/release/substreams.wasm
+    file: ../target/wasm32-unknown-unknown/release/solana_common.wasm
 
 modules:
   - name: blocks_without_votes
diff --git a/solana-common/substreams-v0.3.3.yaml b/solana-common/substreams-v0.3.3.yaml
new file mode 100644
index 0000000..af2ae45
--- /dev/null
+++ b/solana-common/substreams-v0.3.3.yaml
@@ -0,0 +1,61 @@
+specVersion: v0.1.0
+package:
+  name: "solana_common"
+  version: v0.3.3 # based on v0.2.0 to keep the caches on the existing modules
+  image: ./solana.png
+
+network: solana
+
+imports:
+  solana: https://github.com/streamingfast/firehose-solana/releases/download/v0.1.1/solana-v0.1.1.spkg
+  v020: https://spkg.io/streamingfast/solana-common-v0.2.0.spkg
+  v030: https://spkg.io/streamingfast/solana-common-v0.3.0.spkg
+
+protobuf:
+  excludePaths:
+    - sf/substreams/rpc
+    - sf/substreams/v1
+    - sf/substreams/sink
+    - sf/substreams/index
+    - sf/substreams/index/v1
+    - instructions.proto # sol.instructions.v1 from the v0.2.0 spkg
+    - transactions.proto # sol.transactions.v1 from the v0.2.0 spkg
+    - google
+
+binaries:
+  default:
+    type: wasm/rust-v1
+    file: ../target/wasm32-unknown-unknown/release/solana_common.wasm
+
+modules:
+  - name: blocks_without_votes
+    use: v020:blocks_without_votes # unchanged from v0.2.0 to keep the same hashes and caches
+
+  - name: program_ids_without_votes
+    use: v020:program_ids_without_votes # unchanged from v0.2.0 to keep the same hashes and caches
+
+  - name: program_ids_and_accounts_without_votes
+    kind: blockIndex
+    inputs:
+      - map: blocks_without_votes
+    output:
+      type: proto:sf.substreams.index.v1.Keys
+
+  - name: transactions_by_programid_without_votes
+    use: v030:transactions_by_programid_without_votes # unchanged from v0.3.0 to keep the same hashes and caches
+
+  - name: transactions_by_programid_and_account_without_votes
+    kind: map
+    inputs:
+      - params: string
+      - map: blocks_without_votes
+    blockFilter:
+      module: program_ids_and_accounts_without_votes
+      query:
+        params: true
+    output:
+      type: proto:sf.substreams.solana.v1.Transactions
+
+params: # Default parameters for the filter modules. You can override these parameters based on your needs.
+  transactions_by_programid_without_votes: "program:4vMsoUT2BWatFweudnQM1xedRLfJgJ7hswhcpz4xgBTy"
+  transactions_by_programid_and_account_without_votes: "program:4vMsoUT2BWatFweudnQM1xedRLfJgJ7hswhcpz4xgBTy || (account:Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD && program:FsJ3A3u2vn5cTVofAjvy6y5kwABJAqYWpe4975bi2epH)"
diff --git a/solana-common/substreams.yaml b/solana-common/substreams.yaml
index 19d5c16..c87f950 120000
--- a/solana-common/substreams.yaml
+++ b/solana-common/substreams.yaml
@@ -1 +1 @@
-./substreams-v0.3.2.yaml
\ No newline at end of file
+substreams-v0.3.3.yaml
\ No newline at end of file