deployment by chain family

Author: bukata-sa

chains/solana/Makefile

@@ -51,14 +51,6 @@ format:
 go-tests:
 	go test -v ./... -json -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci=true -singlepackage=true -hidepassingtests=false -hidepassinglogs=false
 
-.PHONY: ccip-router-contracts-go-tests
-ccip-router-contracts-go-tests:
-	go test -run TestCCIPRouter -v -failfast ./... -json -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci=true -singlepackage=true -hidepassingtests=false -hidepassinglogs=false
-
-.PHONY: test-token-pool-contracts-go-tests
-test-token-pool-contracts-go-tests:
-	go test -run TestBaseTokenPoolHappyPath -v -failfast ./... -json -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci=true -singlepackage=true -hidepassingtests=false -hidepassinglogs=false
-
 .PHONY: build-contracts
 build-contracts:
 	cd ./contracts && anchor build

chains/solana/contracts/Anchor.toml

@@ -2,22 +2,23 @@
 anchor_version = "0.29.0"
 
 [features]
-resolution = true
+seeds = false
 skip-lint = false
 
-[programs.localnet]
+[programs.devnet]
 firedrill_compound = "Dri11NnBPbx85w8a47ZXBZa3Hi7E2xvHAA9Xpyk7UivQ"
 firedrill_entrypoint = "Dri11c6TXJXELaZUgQtyw3doxbn7bGXQ6z5LRZ8bMPbc"
 firedrill_offramp = "Dri11kiWR5f1oTn5NLm3wmfaDq3cYauR92wrsTxNaudt"
 firedrill_onramp = "Dri11Hs4x2gXThgDwvjYoZ7xEPgfKNa5Ys2MWUqay3Tt"
 firedrill_token = "Dri11r4S1hY8iMpxNh6UoYZ9hsGgmGUUyZ3zxUb2rpc2"
+failing_receiver = "Dri11EwVRViqqkjs7SWV3d3ejcanBGMNrcGhD6HVn756"
 
 [registry]
 url = "https://api.apr.dev"
 
 [provider]
-cluster = "devnet"
-wallet = "~/.config/solana/id.json"
+cluster = "Devnet"
+wallet = "/Users/bukata/.config/solana/id.json"
 
 [scripts]
 test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

chains/solana/contracts/Cargo.lock

@@ -1,2 +1 @@
-pub mod entrypoint;
 pub mod seed;

chains/solana/contracts/crate/shared/src/common/entrypoint.rs

@@ -3,7 +3,5 @@ use anchor_lang::prelude::*;
 pub mod common;
 pub mod ids;
 
-pub use common::entrypoint::FiredrillEntrypoint;
-
 // Root declare_id required by Anchor macros (even if shared crate isn't deployed)
 declare_id!("EjrGAZVbao3cu4VwqpaLJ8ggF3RHBAs8ptpYNCHTfa4z");

chains/solana/contracts/crate/shared/src/common/mod.rs

@@ -0,0 +1,19 @@
+[package]
+name = "failing_receiver"
+version = "0.1.0"
+description = "Created with Anchor"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "failing_receiver"
+
+[features]
+no-entrypoint = []
+no-idl = []
+no-log-ix-name = []
+cpi = ["no-entrypoint"]
+default = []
+
+[dependencies]
+anchor-lang = "0.29.0"

chains/solana/contracts/crate/shared/src/lib.rs

@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []

chains/solana/contracts/programs/failing_receiver/Cargo.toml

@@ -0,0 +1,36 @@
+use anchor_lang::prelude::*;
+
+declare_id!("Dri11EwVRViqqkjs7SWV3d3ejcanBGMNrcGhD6HVn756");
+
+#[program]
+pub mod failing_receiver {
+    use super::*;
+
+    pub fn ccip_receive(_ctx: Context<CcipReceive>, _message: Any2SVMMessage) -> Result<()> {
+        return err!(CustomError::AlwaysErrors);
+    }
+}
+
+#[derive(Accounts, Debug)]
+pub struct CcipReceive {}
+
+#[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize)]
+pub struct Any2SVMMessage {
+    pub message_id: [u8; 32],
+    pub source_chain_selector: u64,
+    pub sender: Vec<u8>,
+    pub data: Vec<u8>,
+    pub token_amounts: Vec<SVMTokenAmount>,
+}
+
+#[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, Default)]
+pub struct SVMTokenAmount {
+    pub token: Pubkey,
+    pub amount: u64, // solana local token amount
+}
+
+#[error_code]
+pub enum CustomError {
+    #[msg("Always errors.")]
+    AlwaysErrors,
+}

chains/solana/contracts/programs/failing_receiver/Xargo.toml

@@ -1,15 +1,21 @@
 use anchor_lang::prelude::*;
 use shared::ids::compound::ID;
-use shared::FiredrillEntrypoint;
 
 #[program]
 pub mod firedrill_compound {
     use super::*;
 
+    pub fn initialize(ctx: Context<Initialize>, token: Pubkey) -> Result<()> {
+        let compound = &mut ctx.accounts.compound;
+        compound.owner = ctx.accounts.owner.key();
+        compound.token = token;
+        Ok(())
+    }
+
     pub fn emit_usd_per_token_updated(ctx: Context<EmitUsdPerToken>) -> Result<()> {
-        let entrypoint = &ctx.accounts.entrypoint;
+        let compound = &ctx.accounts.compound;
 
-        let token = entrypoint.token;
+        let token = compound.token;
         let mut value = [0u8; 28];
         let val = 1u128.to_le_bytes(); // 16 bytes
         value[..16].copy_from_slice(&val);
@@ -25,13 +31,30 @@ pub mod firedrill_compound {
     }
 }
 
+ #[account]
+ pub struct FiredrillCompound {
+     pub owner: Pubkey,
+     pub token: Pubkey,
+ }
+
+ #[derive(Accounts)]
+ pub struct Initialize<'info> {
+     #[account(init, payer = payer, space = 8 + 32 + 32)]
+     pub compound: Account<'info, FiredrillCompound>,
+
+     #[account(mut)]
+     pub payer: Signer<'info>,
+
+     #[account()]
+     pub owner: Signer<'info>,
+
+     pub system_program: Program<'info, System>,
+ }
+
 #[derive(Accounts)]
 pub struct EmitUsdPerToken<'info> {
-    /// CHECK: Only used for event emission context
-    pub compound: AccountInfo<'info>,
-
-    /// Must be passed in to read `.token`
-    pub entrypoint: Account<'info, FiredrillEntrypoint>,
+    #[account(mut)]
+    pub compound: Account<'info, FiredrillCompound>,
 }
 
 #[event]