degrade borsh version for compatibility

Nagaprasadvr · Nagaprasadvr · commit 63485d6f2d12 · 2024-12-23T12:36:45.000+05:30
diff --git a/packages/renderers-rust/e2e/anchor/Cargo.toml b/packages/renderers-rust/e2e/anchor/Cargo.toml
@@ -11,8 +11,7 @@ test-sbf = []
 
 [dependencies]
 anchor-lang = { version = "0.30.0", optional = true }
-borsh = "^1.5.3"
-borsh-derive = "^1.5.3"
+borsh = "^0.10"
 kaigan = "0.2.5"
 num-derive = "^0.3"
 num-traits = "^0.2"
diff --git a/packages/renderers-rust/e2e/dummy/Cargo.lock b/packages/renderers-rust/e2e/dummy/Cargo.lock
diff --git a/packages/renderers-rust/e2e/dummy/Cargo.toml b/packages/renderers-rust/e2e/dummy/Cargo.toml
@@ -11,8 +11,7 @@ test-sbf = []
 
 [dependencies]
 anchor-lang = { version = "0.30.0", optional = true }
-borsh = "^1.5.3"
-borsh-derive = "^1.5.3"
+borsh = "^0.10"
 kaigan = "0.2.5"
 num-derive = "^0.3"
 num-traits = "^0.2"
diff --git a/packages/renderers-rust/e2e/memo/Cargo.lock b/packages/renderers-rust/e2e/memo/Cargo.lock
diff --git a/packages/renderers-rust/e2e/memo/Cargo.toml b/packages/renderers-rust/e2e/memo/Cargo.toml
@@ -11,8 +11,7 @@ test-sbf = []
 
 [dependencies]
 anchor-lang = { version = "0.30.0", optional = true }
-borsh = "^1.5.3"
-borsh-derive = "^1.5.3"
+borsh = "^0.10"
 kaigan = "0.2.5"
 num-derive = "^0.3"
 num-traits = "^0.2"
diff --git a/packages/renderers-rust/e2e/system/Cargo.lock b/packages/renderers-rust/e2e/system/Cargo.lock
diff --git a/packages/renderers-rust/e2e/system/Cargo.toml b/packages/renderers-rust/e2e/system/Cargo.toml
@@ -11,8 +11,7 @@ test-sbf = []
 
 [dependencies]
 anchor-lang = { version = "0.30.0", optional = true }
-borsh = "^1.5.3"
-borsh-derive = "^1.5.3"
+borsh = "^0.10"
 num-derive = "^0.3"
 num-traits = "^0.2"
 serde = { version = "^1.0", features = ["derive"], optional = true }
diff --git a/packages/renderers-rust/e2e/test.sh b/packages/renderers-rust/e2e/test.sh
@@ -2,7 +2,7 @@
 set -eux
 
 function test_project() {
-    ./e2e/generate.cjs $1
+    ./e2e/generate.cjs $1 $2
     cd e2e/$1
     cargo check
     cd ../..
diff --git a/packages/renderers-vixen-parser/e2e/anchor_parser/Cargo.toml b/packages/renderers-vixen-parser/e2e/anchor_parser/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 yellowstone-vixen-core = { git = "https://github.com/rpcpool/yellowstone-vixen", branch = "main" }
 solana-program = "^2.1.6"
 codama-renderers-rust-e2e-anchor = { path = "../../../renderers-rust/e2e/anchor" }
-borsh = "^1.5.3"
+borsh = "^0.10"
diff --git a/packages/renderers-vixen-parser/e2e/dummy_parser/Cargo.toml b/packages/renderers-vixen-parser/e2e/dummy_parser/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 yellowstone-vixen-core = { git = "https://github.com/rpcpool/yellowstone-vixen", branch = "main" }
 codama-renderers-rust-e2e-dummy = { path = "../../../renderers-rust/e2e/dummy" }
 solana-program = "^2.1.6"
-borsh = "^1.5.3"
+borsh = "^0.10"
diff --git a/packages/renderers-vixen-parser/e2e/memo_parser/Cargo.lock b/packages/renderers-vixen-parser/e2e/memo_parser/Cargo.lock
diff --git a/packages/renderers-vixen-parser/e2e/memo_parser/Cargo.toml b/packages/renderers-vixen-parser/e2e/memo_parser/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 yellowstone-vixen-core = { git = "https://github.com/rpcpool/yellowstone-vixen", branch = "main" }
 codama-renderers-rust-e2e-memo = { path = "../../../renderers-rust/e2e/memo" }
 solana-program = "^2.1.6"
-borsh = "^1.5.3"
+borsh = "^0.10"
diff --git a/packages/renderers-vixen-parser/e2e/memo_parser/src/generated/instructions_parser.rs b/packages/renderers-vixen-parser/e2e/memo_parser/src/generated/instructions_parser.rs
@@ -59,9 +59,8 @@ impl InstructionParser {
         ix: &yellowstone_vixen_core::instruction::InstructionUpdate,
     ) -> yellowstone_vixen_core::ParseResult<MemoProgramIx> {
         let accounts_len = ix.accounts.len();
-        let ix_discriminator: [u8; 1] = ix.data[0..1].try_into()?;
-        let mut ix_data = &ix.data[1..];
         check_min_accounts_req(accounts_len, 0)?;
+        let mut ix_data = &ix.data[..];
         let de_ix_data: AddMemoIxData = BorshDeserialize::deserialize(&mut ix_data)?;
         let ix_accounts = AddMemoIxAccounts {};
         Ok(MemoProgramIx::AddMemo(ix_accounts, de_ix_data))
diff --git a/packages/renderers-vixen-parser/e2e/system_parser/Cargo.lock b/packages/renderers-vixen-parser/e2e/system_parser/Cargo.lock
diff --git a/packages/renderers-vixen-parser/e2e/system_parser/Cargo.toml b/packages/renderers-vixen-parser/e2e/system_parser/Cargo.toml
@@ -8,5 +8,4 @@ edition = "2021"
 yellowstone-vixen-core = { git = "https://github.com/rpcpool/yellowstone-vixen", branch = "main" }
 codama-renderers-rust-e2e-system = { path = "../../../renderers-rust/e2e/system" }
 solana-program = "^2.1.6"
-borsh = "^1.5.3"
-borsh-derive = "^1.5.3"
+borsh = "^0.10"
diff --git a/packages/renderers-vixen-parser/public/templates/instructionsParserPage.njk b/packages/renderers-vixen-parser/public/templates/instructionsParserPage.njk
@@ -54,9 +54,9 @@ impl yellowstone_vixen_core::ProgramParser for InstructionParser {
 impl InstructionParser {
     pub(crate) fn parse_impl(ix:&yellowstone_vixen_core::instruction::InstructionUpdate) -> yellowstone_vixen_core::ParseResult<{{ programName  | pascalCase }}ProgramIx> {
         let accounts_len = ix.accounts.len();
+        {% if hasDiscriminator %}
         let ix_discriminator:[u8; {{ IX_DATA_OFFSET }}] = ix.data[0..{{ IX_DATA_OFFSET }}].try_into()?;
         let mut ix_data = &ix.data[{{ IX_DATA_OFFSET }}..];
-        {% if hasDiscriminator %}
             match ix_discriminator {
                 {% for instruction in instructions %}
                     {% if instruction.discriminator != null %}
@@ -80,6 +80,7 @@ impl InstructionParser {
             }
         {% else %}
             check_min_accounts_req(accounts_len, {{ instructions[0].accounts | length }})?;
+            let mut ix_data = &ix.data[..];
             let de_ix_data:{{ instructions[0].name | pascalCase }}IxData = BorshDeserialize::deserialize(&mut ix_data)?;
             let ix_accounts = {{ instructions[0].name | pascalCase }}IxAccounts{
                 {% for account in instructions[0].accounts %}
