#[type_abi] for structs and proxy regen

multiversx · Apr 22, 2024 · 4be479b · 4be479b
1 parent dbf0e2b
commit 4be479b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/contracts/core/price-aggregator/src/events.rs b/contracts/core/price-aggregator/src/events.rs
@@ -3,7 +3,8 @@ multiversx_sc::derive_imports!();
 
 use crate::price_aggregator_data::{TimestampedPrice, TokenPair};
 
-#[derive(TypeAbi, TopEncode)]
+#[type_abi]
+#[derive(TopEncode)]
 pub struct NewRoundEvent<M: ManagedTypeApi> {
     price: BigUint<M>,
     timestamp: u64,

diff --git a/contracts/core/price-aggregator/src/price_aggregator_data.rs b/contracts/core/price-aggregator/src/price_aggregator_data.rs
@@ -1,13 +1,15 @@
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi, Clone)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Clone)]
 pub struct TokenPair<M: ManagedTypeApi> {
     pub from: ManagedBuffer<M>,
     pub to: ManagedBuffer<M>,
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct PriceFeed<M: ManagedTypeApi> {
     pub round_id: u32,
     pub from: ManagedBuffer<M>,
@@ -17,14 +19,16 @@ pub struct PriceFeed<M: ManagedTypeApi> {
     pub decimals: u8,
 }
 
-#[derive(TopEncode, TopDecode, TypeAbi, Debug, PartialEq, Eq)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, Debug, PartialEq, Eq)]
 pub struct TimestampedPrice<M: ManagedTypeApi> {
     pub price: BigUint<M>,
     pub timestamp: u64,
     pub decimals: u8,
 }
 
-#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi, Debug, PartialEq, Eq)]
+#[type_abi]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, Debug, PartialEq, Eq)]
 pub struct OracleStatus {
     pub accepted_submissions: u64,
     pub total_submissions: u64,

diff --git a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
@@ -340,7 +340,7 @@ where
     }
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct PriceFeed<Api>
 where
     Api: ManagedTypeApi,
@@ -353,7 +353,7 @@ where
     pub decimals: u8,
 }
 
-#[derive(TopEncode, TopDecode)]
+#[derive(TopEncode)]
 pub struct NewRoundEvent<Api>
 where
     Api: ManagedTypeApi,