solana: various fixes to tbtc and gateway programs

Co-authored-by: gator-boi <gator-boi@users.noreply.github.com>

cross-chain/solana/.gitignore

@@ -1,5 +1,6 @@
 
 .anchor
+.prettierrc.json
 .DS_Store
 target
 **/*.rs.bk

cross-chain/solana/Anchor.toml

@@ -11,7 +11,7 @@ members = [
 
 [programs.localnet]
 tbtc = "HksEtDgsXJV1BqcuhzbLRTmXp5gHgHJktieJCtQd3pG"
-wormhole-gateway = "8H9F5JGbEMyERycwaGuzLS5MQnV7dn2wm2h6egJ3Leiu"
+wormhole_gateway = "8H9F5JGbEMyERycwaGuzLS5MQnV7dn2wm2h6egJ3Leiu"
 
 [registry]
 url = "https://api.apr.dev"
@@ -61,10 +61,10 @@ filename = "tests/accounts/ethereum_token_bridge.json"
 address = "DapiQYH3BGonhN8cngWcXQ6SrqSm3cwysoznoHr6Sbsx"
 filename = "tests/accounts/token_bridge_config.json"
 
-### Core Bridge -- Bridge
-[[test.validator.clone]]
+### Core Bridge -- Bridge Data
+[[test.validator.account]]
 address = "2yVjuQwpsvdsrywzsJJVs9Ueh4zayyo5DYJbBNc3DDpn"
-filename = "tests/accounts/core_bridge.json"
+filename = "tests/accounts/core_bridge_data.json"
 
 ### Core Bridge -- Emitter Sequence (Token Bridge's)
 [[test.validator.account]]

cross-chain/solana/Makefile

@@ -1,8 +1,7 @@
-
 out_solana-devnet=artifacts-testnet
 out_mainnet=artifacts-mainnet
 
-.PHONY: all clean build test
+.PHONY: all clean build test lint
 
 all: test
 
@@ -24,3 +23,9 @@ endif
 
 test: node_modules
 	anchor test --arch sbf
+
+lint:
+	cargo fmt --check
+	cargo check --features "mainnet" --no-default-features
+	cargo check --features "solana-devnet" --no-default-features
+	cargo clippy --no-deps --all-targets -- -D warnings

cross-chain/solana/programs/tbtc/Cargo.toml

@@ -18,6 +18,9 @@ no-log-ix-name = []
 cpi = ["no-entrypoint"]
 
 [dependencies]
-anchor-lang = { version = "=0.28.0", features = ["derive", "init-if-needed"] }
-anchor-spl = "=0.28.0"
-solana-program = "=1.14.20"
+anchor-lang = { version = "0.28.0", features = ["derive", "init-if-needed"] }
+anchor-spl = { version = "0.28.0", features = ["metadata"] }
+
+solana-program = "=1.14"
+
+mpl-token-metadata = "1.13.1"

cross-chain/solana/programs/tbtc/src/error.rs

@@ -2,9 +2,36 @@ use anchor_lang::prelude::error_code;
 
 #[error_code]
 pub enum TbtcError {
-    IsPaused,
-    IsNotPaused,
-    IsNotAuthority,
-    IsNotPendingAuthority,
-    NoPendingAuthorityChange,
+    #[msg("Not valid authority to perform this action")]
+    IsNotAuthority = 0x20,
+
+    #[msg("Not valid pending authority to take authority")]
+    IsNotPendingAuthority = 0x22,
+
+    #[msg("No pending authority")]
+    NoPendingAuthorityChange = 0x24,
+
+    #[msg("This address is already a guardian")]
+    GuardianAlreadyExists = 0x30,
+
+    #[msg("This address is not a guardian")]
+    GuardianNonexistent = 0x32,
+
+    #[msg("Caller is not a guardian")]
+    SignerNotGuardian = 0x34,
+
+    #[msg("This address is already a minter")]
+    MinterAlreadyExists = 0x40,
+
+    #[msg("This address is not a minter")]
+    MinterNonexistent = 0x42,
+
+    #[msg("Caller is not a minter")]
+    SignerNotMinter = 0x44,
+
+    #[msg("Program is paused")]
+    IsPaused = 0x50,
+
+    #[msg("Program is not paused")]
+    IsNotPaused = 0x52,
 }

cross-chain/solana/programs/tbtc/src/event.rs

@@ -18,4 +18,4 @@ pub struct GuardianAdded {
 #[event]
 pub struct GuardianRemoved {
     pub guardian: Pubkey,
-}
+}