From cc92e4938172580bf0bb7093328b05ad5145e6bf Mon Sep 17 00:00:00 2001 From: Charlie Chen Date: Tue, 17 Sep 2024 23:50:24 -0500 Subject: [PATCH] resolved changelog conflict --- changelog.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 8cf6ccfaa5..2c40bda19d 100644 --- a/changelog.md +++ b/changelog.md @@ -27,6 +27,7 @@ * [2867](https://github.com/zeta-chain/node/pull/2867) - skip precompiles test for tss migration * [2833](https://github.com/zeta-chain/node/pull/2833) - add e2e framework for TON blockchain * [2874](https://github.com/zeta-chain/node/pull/2874) - add support for multiple runs for precompile tests +* [2895](https://github.com/zeta-chain/node/pull/2895) - add e2e test for bitcoin deposit and call ### Fixes @@ -66,11 +67,7 @@ ### Tests * [2726](https://github.com/zeta-chain/node/pull/2726) - add e2e tests for deposit and call, deposit and revert -* [2703](https://github.com/zeta-chain/node/pull/2703) - add e2e tests for stateful precompiled contracts -* [2763](https://github.com/zeta-chain/node/pull/2763) - add V2 contracts migration test -* [2830](https://github.com/zeta-chain/node/pull/2830) - extend staking precompile tests * [2821](https://github.com/zeta-chain/node/pull/2821) - V2 protocol contracts migration e2e tests -* [2895](https://github.com/zeta-chain/node/pull/2895) - add e2e test for bitcoin deposit and call ### Fixes