From cea9f7e75488e1fd2aa684d6ee3a2feb65429656 Mon Sep 17 00:00:00 2001
From: Connor Barr <crnbarr@gmail.com>
Date: Thu, 28 Nov 2024 10:22:28 +0000
Subject: [PATCH] Release 3 Changelog and Backport tags (#676)

---
 .github/mergify.yml                                 |  8 ++++++++
 CHANGELOG.md                                        | 13 ++++++++++---
 Cargo.lock                                          |  4 ++--
 .../finance/andromeda-validator-staking/Cargo.toml  |  4 ++--
 contracts/finance/andromeda-vesting/Cargo.toml      |  2 +-
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 6c845f972..960a92ce1 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -13,3 +13,11 @@ pull_request_rules:
       backport:
         branches:
           - v1.1.x
+  - name: backport to release/3 branch
+    conditions:
+      - base=development
+      - label=backport/release/3
+    actions:
+      backport:
+        branches:
+          - release/3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d017bfd9..69bf5162a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added Curve ADO [(#515)](https://github.com/andromedaprotocol/andromeda-core/pull/515)
+### Changed
+
+### Fixed
+
+## Release 3
+
+### Added
+
 - Added IBC Registry ADO [(#566)](https://github.com/andromedaprotocol/andromeda-core/pull/566)
 - Added Denom Validation in IBC Registry ADO [(#571)](https://github.com/andromedaprotocol/andromeda-core/pull/571)
 - Added Kernel ICS20 Transfer with Optional ExecuteMsg [(#577)](https://github.com/andromedaprotocol/andromeda-core/pull/577)
@@ -17,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added deployment script/CI workflow for OS [(#616)](https://github.com/andromedaprotocol/andromeda-core/pull/616)
 - Added deployable interfaces to all ADOs [(#620)](https://github.com/andromedaprotocol/andromeda-core/pull/620)
 - Added MultiSig ADO [(#619)](https://github.com/andromedaprotocol/andromeda-core/pull/619)
+- Added Validator Staking ADO [(#330)](https://github.com/andromedaprotocol/andromeda-core/pull/330)
+- Added Restake and Redelegate to Validator Staking [(#622)](https://github.com/andromedaprotocol/andromeda-core/pull/622)
 
 ### Changed
 
@@ -35,7 +44,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added Validator Staking ADO [(#330)](https://github.com/andromedaprotocol/andromeda-core/pull/330)
 - Added `Asset` enum [(#415)](https://github.com/andromedaprotocol/andromeda-core/pull/415)
 - Added `ADOBaseVersion` query to all ADOs [(#416)](https://github.com/andromedaprotocol/andromeda-core/pull/416)
 - Staking: Added ability to remove/replace reward token [(#418)](https://github.com/andromedaprotocol/andromeda-core/pull/418)
@@ -54,7 +62,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added BuyNow option for Auction [(#533)](https://github.com/andromedaprotocol/andromeda-core/pull/533)
 - Include ADOBase Version in Schema [(#574)](https://github.com/andromedaprotocol/andromeda-core/pull/574)
 - Added multi-hop support for IBC [(#604)](https://github.com/andromedaprotocol/andromeda-core/pull/604)
-- Added Restake and Redelegate to Validator Staking [(#622)](https://github.com/andromedaprotocol/andromeda-core/pull/622)
 
 ### Changed
 
diff --git a/Cargo.lock b/Cargo.lock
index e7a11fd32..48e0acd2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -926,7 +926,7 @@ dependencies = [
 
 [[package]]
 name = "andromeda-validator-staking"
-version = "0.3.0-b.1"
+version = "0.3.0"
 dependencies = [
  "andromeda-finance",
  "andromeda-std",
@@ -958,7 +958,7 @@ dependencies = [
 
 [[package]]
 name = "andromeda-vesting"
-version = "3.0.4-b.2"
+version = "3.0.4"
 dependencies = [
  "andromeda-app",
  "andromeda-finance",
diff --git a/contracts/finance/andromeda-validator-staking/Cargo.toml b/contracts/finance/andromeda-validator-staking/Cargo.toml
index 7688331a7..bcd89b381 100644
--- a/contracts/finance/andromeda-validator-staking/Cargo.toml
+++ b/contracts/finance/andromeda-validator-staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "andromeda-validator-staking"
-version = "0.3.0-b.1"
+version = "0.3.0"
 edition = "2021"
 rust-version = "1.75.0"
 
@@ -30,4 +30,4 @@ chrono = "0.3"
 cw-multi-test = { workspace = true, optional = true }
 andromeda-testing = { workspace = true }
 cw-orch = { workspace = true }
-cw-orch-daemon = "0.24.2"
\ No newline at end of file
+cw-orch-daemon = "0.24.2"
diff --git a/contracts/finance/andromeda-vesting/Cargo.toml b/contracts/finance/andromeda-vesting/Cargo.toml
index 1e1326ca3..11e6b2839 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.4-b.2"
+version = "3.0.4"
 edition = "2021"
 rust-version = "1.75.0"