From e2de9d27c483e4ef12550fca340e93a6abb5a6d6 Mon Sep 17 00:00:00 2001
From: h3rt <94856309+SecretSaturn@users.noreply.github.com>
Date: Mon, 5 Aug 2024 01:53:03 +0200
Subject: [PATCH] Contract improvements

---
 .../programs/solana-gateway/src/lib.rs               | 12 ++++++------
 TNLS-Relayers/sol_interface.py                       |  6 +++---
 config.yml                                           |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/TNLS-Gateways/solana-gateway/programs/solana-gateway/src/lib.rs b/TNLS-Gateways/solana-gateway/programs/solana-gateway/src/lib.rs
index 3998fb9..4e594dc 100644
--- a/TNLS-Gateways/solana-gateway/programs/solana-gateway/src/lib.rs
+++ b/TNLS-Gateways/solana-gateway/programs/solana-gateway/src/lib.rs
@@ -36,7 +36,7 @@ security_txt! {
 // Constants
 
 const TASK_DESTINATION_NETWORK: &str = "pulsar-3";
-const CHAIN_ID: &str = "SolDV";
+const CHAIN_ID: &str = "SolDN";
 const SECRET_GATEWAY_PUBKEY: &str =
     "0x04f0c3e600c7f7b3c483debe8f98a839c2d93230d8f857b3c298dc8763c208afcd62dcb34c9306302bf790d8c669674a57defa44c6a95b183d94f2e645526ffe5e";
 const GATEWAY_SEED: &[u8] = b"gateway_state";
@@ -566,10 +566,10 @@ pub struct ExecutionInfo {
     pub routing_code_hash: String,
     pub task_destination_network: String,
     pub handle: String,
-    pub nonce: Vec<u8>,
+    pub nonce: [u8; 12],
     pub callback_gas_limit: u32,
     pub payload: Vec<u8>,
-    pub payload_signature: Vec<u8>,
+    pub payload_signature: [u8; 64],
 }
 
 #[derive(Clone, AnchorSerialize, AnchorDeserialize)]
@@ -577,7 +577,7 @@ pub struct PostExecutionInfo {
     pub packet_hash: [u8; 32],
     pub callback_address: Vec<u8>,
     pub callback_selector: Vec<u8>,
-    pub callback_gas_limit: Vec<u8>,
+    pub callback_gas_limit: [u8; 4],
     pub packet_signature: [u8; 65],
     pub result: Vec<u8>,
 }
@@ -605,8 +605,8 @@ pub struct LogNewTask {
     pub routing_code_hash: String,
     pub task_destination_network: String,
     pub handle: String,
-    pub nonce: Vec<u8>,
+    pub nonce: [u8; 12],
     pub callback_gas_limit: u32,
     pub payload: Vec<u8>,
-    pub payload_signature: Vec<u8>,
+    pub payload_signature: [u8; 64],
 }
diff --git a/TNLS-Relayers/sol_interface.py b/TNLS-Relayers/sol_interface.py
index c729c81..7e3cf5e 100644
--- a/TNLS-Relayers/sol_interface.py
+++ b/TNLS-Relayers/sol_interface.py
@@ -30,10 +30,10 @@ class LogNewTask:
         "routing_code_hash" / String,
         "task_destination_network" / String,
         "handle" / String,
-        "nonce" / Bytes,
+        "nonce" / U8[12],
         "callback_gas_limit" / U32,
         "payload" / Bytes,
-        "payload_signature" / Bytes
+        "payload_signature" / U8[64]
     )
 
 
@@ -46,7 +46,7 @@ class PostExecution:
             "packet_hash" / U8[32],
             "callback_address" / Bytes,
             "callback_selector" / Bytes,
-            "callback_gas_limit" / Bytes,
+            "callback_gas_limit" / U8[4],
             "packet_signature" / U8[65],
             "result" / Bytes,
         )
diff --git a/config.yml b/config.yml
index 7998876..b3d4f4a 100644
--- a/config.yml
+++ b/config.yml
@@ -363,10 +363,10 @@
 
 
 
-"SolDV": #Solana DevNet
+"SolDN": #Solana DevNet
   active: true
   type: "solana"
-  chain_id: "SolDV"
+  chain_id: "SolDN"
   api_endpoint: https://api.devnet.solana.com
   program_id: "DKDX8XbTnCgEk8o1RNnCUokiCmadG1Ch5HLxaz7CnhcD"
   timeout: 2