From 31a3dcefe4889bf1fb48b4d08434f704ef3e4c4a Mon Sep 17 00:00:00 2001
From: Joe Monem <66594578+joemonem@users.noreply.github.com>
Date: Tue, 19 Nov 2024 16:37:27 +0200
Subject: [PATCH] fix: move msg validation to after ADOContract init (#641)

---
 Cargo.lock                                          |  2 +-
 contracts/finance/andromeda-vesting/Cargo.toml      |  2 +-
 contracts/finance/andromeda-vesting/src/contract.rs | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d22146e3e..78d4dae75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -947,7 +947,7 @@ dependencies = [
 
 [[package]]
 name = "andromeda-vesting"
-version = "3.0.3-beta"
+version = "3.0.4-beta"
 dependencies = [
  "andromeda-app",
  "andromeda-finance",
diff --git a/contracts/finance/andromeda-vesting/Cargo.toml b/contracts/finance/andromeda-vesting/Cargo.toml
index 6047a2070..ae33453eb 100644
--- a/contracts/finance/andromeda-vesting/Cargo.toml
+++ b/contracts/finance/andromeda-vesting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "andromeda-vesting"
-version = "3.0.3-beta"
+version = "3.0.4-beta"
 edition = "2021"
 rust-version = "1.75.0"
 
diff --git a/contracts/finance/andromeda-vesting/src/contract.rs b/contracts/finance/andromeda-vesting/src/contract.rs
index 2a98c8079..16f8a5a1a 100644
--- a/contracts/finance/andromeda-vesting/src/contract.rs
+++ b/contracts/finance/andromeda-vesting/src/contract.rs
@@ -35,10 +35,9 @@ pub fn instantiate(
     info: MessageInfo,
     msg: InstantiateMsg,
 ) -> Result<Response, ContractError> {
-    msg.validate(&deps)?;
     let config = Config {
-        recipient: msg.recipient,
-        denom: msg.denom,
+        recipient: msg.recipient.clone(),
+        denom: msg.denom.clone(),
     };
 
     CONFIG.save(deps.storage, &config)?;
@@ -52,11 +51,13 @@ pub fn instantiate(
         BaseInstantiateMsg {
             ado_type: CONTRACT_NAME.to_string(),
             ado_version: CONTRACT_VERSION.to_string(),
-            kernel_address: msg.kernel_address,
-            owner: msg.owner,
+            kernel_address: msg.kernel_address.clone(),
+            owner: msg.owner.clone(),
         },
     )?;
 
+    msg.validate(&deps)?;
+
     Ok(inst_resp)
 }