Skip to content

Commit

Permalink
Merge pull request #2 from multiversx/framework-update
Browse files Browse the repository at this point in the history
framework update to 0.52.3
  • Loading branch information
alyn509 authored Aug 26, 2024
2 parents 08d4635 + a8bada8 commit 5bd293a
Show file tree
Hide file tree
Showing 93 changed files with 65 additions and 983 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:

permissions:
checks: write
contents: read
pull-requests: write

jobs:
contracts:
name: Contracts
uses: ElrondNetwork/elrond-actions/.github/workflows/contracts.yml@v1
uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.2.0
with:
rust-toolchain: nightly-2022-03-01
vmtools-version: v1.4.43
extra-build-args: --ignore-eei-checks
rust-toolchain: stable
enable-contracts-size-report: false
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
10 changes: 7 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ Cargo.lock

# VSCode specific files
.vscode/*
elrond.workspace.json

# Elrond IDE
# MultiversX IDE
**/node_modules
**/output/**
**/testnet/**
**/erdpy.data-storage.json
**/mxpy.data-storage.json
**/*.interaction.json

# Zip output with example wasm binaries
examples-wasm.zip

tags

# Python scripts
**/__pycache__/**
4 changes: 0 additions & 4 deletions erdjs-snippets/.gitignore

This file was deleted.

55 changes: 0 additions & 55 deletions erdjs-snippets/adder/adder.spec.ts

This file was deleted.

35 changes: 0 additions & 35 deletions erdjs-snippets/adder/adderInteractor.ts

This file was deleted.

4 changes: 0 additions & 4 deletions erdjs-snippets/devnet.session.json

This file was deleted.

4 changes: 0 additions & 4 deletions erdjs-snippets/localnet.session.json

This file was deleted.

29 changes: 0 additions & 29 deletions erdjs-snippets/package.json

This file was deleted.

30 changes: 0 additions & 30 deletions erdjs-snippets/tsconfig.json

This file was deleted.

12 changes: 6 additions & 6 deletions neversea/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "neversea"
version = "0.0.0"
authors = [ "you",]
edition = "2018"
authors = ["you"]
edition = "2021"
publish = false

[lib]
path = "src/neversea.rs"

[dependencies.elrond-wasm]
version = "0.36.0"
[dependencies.multiversx-sc]
version = "0.52.3"

[dev-dependencies.elrond-wasm-debug]
version = "0.36.0"
[dev-dependencies.multiversx-sc-scenario]
version = "0.52.3"
29 changes: 0 additions & 29 deletions neversea/README.md

This file was deleted.

8 changes: 4 additions & 4 deletions neversea/meta/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "neversea-meta"
version = "0.0.0"
edition = "2018"
edition = "2021"
publish = false
authors = [ "you",]
authors = ["you"]

[dev-dependencies]

[dependencies.neversea]
path = ".."

[dependencies.elrond-wasm-debug]
version = "0.36.0"
[dependencies.multiversx-sc-meta-lib]
version = "0.52.3"
2 changes: 1 addition & 1 deletion neversea/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::<neversea::AbiProvider>();
multiversx_sc_meta_lib::cli_main::<neversea::AbiProvider>();
}
File renamed without changes.
15 changes: 8 additions & 7 deletions neversea/src/neversea.rs
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
#![no_std]

elrond_wasm::imports!();
use multiversx_sc::imports::*;

#[elrond_wasm::derive::contract]
#[multiversx_sc::contract]
pub trait Neversea {
#[init]
fn init(&self, initial_registration_fee: BigUint) {
self.registration_fee().set(BigUint::from(initial_registration_fee));
self.registration_fee().set(initial_registration_fee);
}

/// Add desired amount to the storage variable.
#[endpoint]
fn register(&self) {
let caller = self.blockchain().get_caller();
let payment_amount = self.call_value().egld_value();
require!(payment_amount == BigUint::from(self.registration_fee().get()), "Registration fee is incorrect; please check and try again");
let payment_amount = self.call_value().egld_value().clone_value();
require!(
payment_amount == self.registration_fee().get(),
"Registration fee is incorrect; please check and try again"
);
self.participants().insert(caller);
}

Expand All @@ -25,6 +28,4 @@ pub trait Neversea {
#[view(getRegistrationFee)]
#[storage_mapper("registration_fee")]
fn registration_fee(&self) -> SingleValueMapper<BigUint>;


}
4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey00.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey01.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey02.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey03.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey04.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey05.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey06.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey07.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey08.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey09.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey10.pem

This file was deleted.

4 changes: 0 additions & 4 deletions neversea/wallets/observers/observerKey11.pem

This file was deleted.

Loading

0 comments on commit 5bd293a

Please sign in to comment.