Skip to content

Commit

Permalink
Fix rebranding issues on legacy contract
Browse files Browse the repository at this point in the history
  • Loading branch information
CostinCarabas committed Jun 14, 2024
1 parent 46edce9 commit 33fde01
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion legacy-contracts/farm-staking-proxy-v1.3/meta/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fn main() {
elrond_wasm_debug::meta::perform::<farm_staking::AbiProvider>();
multiversx_sc_meta::cli_main::<farm_staking::AbiProvider>();
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
elrond_wasm::imports!();
elrond_wasm::derive_imports!();
multiversx_sc::imports!();
multiversx_sc::derive_imports!();

use common_structs_old::Nonce;
use config::MAX_PERCENT;

pub const BLOCKS_IN_YEAR: u64 = 31_536_000 / 6; // seconds_in_year / 6_seconds_per_block

#[elrond_wasm::module]
#[multiversx_sc::module]
pub trait CustomRewardsModule:
config::ConfigModule + token_send::TokenSendModule + farm_token::FarmTokenModule
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
elrond_wasm::imports!();
elrond_wasm::derive_imports!();
multiversx_sc::imports!();
multiversx_sc::derive_imports!();

use token_merge_old::ValueWeight;

Expand All @@ -26,7 +26,7 @@ pub struct StakingFarmToken<M: ManagedTypeApi> {
pub attributes: StakingFarmTokenAttributes<M>,
}

#[elrond_wasm::module]
#[multiversx_sc::module]
pub trait FarmTokenMergeModule:
token_send::TokenSendModule
+ farm_token::FarmTokenModule
Expand Down
6 changes: 3 additions & 3 deletions legacy-contracts/farm-staking-proxy-v1.3/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ pub mod whitelist;
use common_structs_old::Nonce;
use config::State;

elrond_wasm::imports!();
elrond_wasm::derive_imports!();
multiversx_sc::imports!();
multiversx_sc::derive_imports!();

use crate::farm_token_merge::StakingFarmTokenAttributes;
use config::{
Expand All @@ -31,7 +31,7 @@ pub struct UnbondSftAttributes {
pub unlock_epoch: u64,
}

#[elrond_wasm::contract]
#[multiversx_sc::contract]
pub trait Farm:
custom_rewards::CustomRewardsModule
+ config::ConfigModule
Expand Down
4 changes: 2 additions & 2 deletions legacy-contracts/farm-staking-proxy-v1.3/src/whitelist.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
elrond_wasm::imports!();
multiversx_sc::imports!();

use common_errors_old::ERROR_PERMISSIONS;

#[elrond_wasm::module]
#[multiversx_sc::module]
pub trait WhitelistModule {
#[only_owner]
#[endpoint(addAddressToWhitelist)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use elrond_wasm::types::{Address, EsdtLocalRole};
use elrond_wasm_debug::tx_mock::{TxContextStack, TxInputESDT};
use elrond_wasm_debug::{
use multiversx_sc::tx_mock::{TxContextStack, TxInputESDT};
use multiversx_sc::types::{Address, EsdtLocalRole};
use multiversx_sc::{
managed_biguint, managed_token_id, rust_biguint, testing_framework::*, DebugApi,
};

Expand Down
2 changes: 1 addition & 1 deletion legacy-contracts/farm-staking-proxy-v1.3/wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#![no_std]

elrond_wasm_node::wasm_endpoints! {
multiversx_sc_wasm_adapter::endpoints! {
farm_staking
(
callBack
Expand Down

0 comments on commit 33fde01

Please sign in to comment.