refactor: reorganise logic for solana program (#94)

Author: kingpinXD

.clippy.toml

@@ -0,0 +1 @@
+too-many-arguments-threshold = 10

Anchor.toml

@@ -26,3 +26,6 @@ wallet = "~/.config/solana/id.json"
 
 [scripts]
 test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
+build-gateway-dev = "cargo build-sbf --features dev --manifest-path programs/gateway/Cargo.toml"
+build-gateway = "cargo build-sbf --manifest-path programs/gateway/Cargo.toml"
+build-upgrade-dev = "cargo build-sbf --features dev --manifest-path programs/examples/gateway_upgrade/Cargo.toml"

Makefile

@@ -15,6 +15,3 @@ generate:
 	    (cd go-idl && go fmt $$output_file); \
 	done
 
-
-build-gateway-upgrade:
-	cargo build-sbf --features dev --manifest-path programs/examples/gateway_upgrade/Cargo.toml

go-idl/generated/gateway.go

@@ -8,7 +8,7 @@ declare_id!("4xEw862A2SEwMjofPkUyd4NEekmVJKJsdHkK3UkAtDrc");
 pub mod connected {
     use super::*;
 
-    pub fn initialize(ctx: Context<Initialize>) -> Result<()> {
+    pub fn initialize(_ctx: Context<Initialize>) -> Result<()> {
         Ok(())
     }
 

programs/examples/connected/src/lib.rs

@@ -9,7 +9,7 @@ declare_id!("8iUjRRhUCn8BjrvsWPfj8mguTe9L81ES4oAUApiF8JFC");
 pub mod connected_spl {
     use super::*;
 
-    pub fn initialize(ctx: Context<Initialize>) -> Result<()> {
+    pub fn initialize(_ctx: Context<Initialize>) -> Result<()> {
         Ok(())
     }
 

programs/examples/connectedSPL/src/lib.rs

@@ -51,6 +51,9 @@ declare_id!("94U5AHQMKkV5txNJ17QPXWoh474PheGou6cNP2FEuL1d");
 #[cfg(not(feature = "dev"))]
 declare_id!("ZETAjseVjuFsxdRxo6MmTCvqFwb3ZHUx56Co3vCmGis");
 
+/// Prefix used for outbounds message hashes.
+pub const ZETACHAIN_PREFIX: &[u8] = b"ZETACHAIN";
+
 #[repr(C)]
 #[derive(Clone, Debug, PartialEq)]
 pub enum CallableInstruction {
@@ -716,7 +719,7 @@ pub mod gateway {
     }
 
     /// Returns true to indicate program has been upgraded
-    pub fn upgraded(ctx: Context<Upgrade>) -> Result<bool> {
+    pub fn upgraded(_ctx: Context<Upgrade>) -> Result<bool> {
         msg!("Program has been upgraded!");
         Ok(true)
     }
@@ -951,12 +954,10 @@ fn prepare_account_metas(
         // Gateway pda can be added as not writable
         if *account_key == pda.key() {
             account_metas.push(AccountMeta::new_readonly(*account_key, false));
+        } else if account_info.is_writable {
+            account_metas.push(AccountMeta::new(*account_key, false));
         } else {
-            if account_info.is_writable {
-                account_metas.push(AccountMeta::new(*account_key, false));
-            } else {
-                account_metas.push(AccountMeta::new_readonly(*account_key, false));
-            }
+            account_metas.push(AccountMeta::new_readonly(*account_key, false));
         }
     }