Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Contracts upgrade 0.54.0 (2) #125

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0c021f4
0.54 upgrade - fair launch
BiancaIalangi Nov 15, 2024
fee75a0
0.54 upgrade - fractional nfts, liquid locking, lottery esdt, mvx gam…
BiancaIalangi Nov 18, 2024
d2e10a3
0.54 upgrade - nft escrow, nft minter, nft storage prepay, on chain c…
BiancaIalangi Nov 18, 2024
8561a3d
0.54 upgrade - order book, pair mock, price aggregator, proxy deployer
BiancaIalangi Nov 18, 2024
09920ec
0.54 upgrade - price aggregator, multisig whitebox
BiancaIalangi Nov 19, 2024
2684cd2
0.54 upgrade - proxy pause, seed-nft-minter, token-release, wegld swap
BiancaIalangi Nov 20, 2024
c08e4d9
Merge branch 'contracts-upgrade-0.54.0-part1' into contracts-upgrade-…
BiancaIalangi Nov 20, 2024
ed1df18
Merge branch 'contracts-upgrade-0.54.0-part2' into contracts-upgrade-…
BiancaIalangi Nov 20, 2024
9180b34
0.54 upgrade - multisig, paymaster
BiancaIalangi Nov 21, 2024
d5e0165
0.54 upgrade - adder
BiancaIalangi Nov 21, 2024
a8277b0
0.54 upgrade - rewards distribution
BiancaIalangi Nov 21, 2024
96b3ffe
ping-pong - framework alignment
BiancaIalangi Nov 21, 2024
74b44bd
0.54 upgrade - Cargo.lock
BiancaIalangi Nov 21, 2024
a39f5b0
Merge branch 'contracts-upgrade-0.54.0-part3' into ping-pong-changes
BiancaIalangi Nov 21, 2024
4ee4755
Merge pull request #130 from multiversx/ping-pong-changes
BiancaIalangi Nov 21, 2024
96f60c6
clippy fix
BiancaIalangi Nov 21, 2024
68e6b5a
Merge pull request #129 from multiversx/contracts-upgrade-0.54.0-part3
BiancaIalangi Nov 21, 2024
cdb5d40
fix clippy
BiancaIalangi Nov 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ members = [

"contracts/adder",
"contracts/adder/meta",
"contracts/adder/interact",
"contracts/adder/interactor",
"contracts/esdt-transfer-with-fee",
"contracts/esdt-transfer-with-fee/meta",
"contracts/bonding-curve-contract",
Expand Down Expand Up @@ -70,6 +70,7 @@ members = [
"contracts/paymaster/interactor",
"contracts/ping-pong-egld",
"contracts/ping-pong-egld/meta",
"contracts/ping-pong-egld/interactor",
"contracts/proxy-deployer",
"contracts/proxy-deployer/meta",
"contracts/proxy-pause",
Expand All @@ -81,5 +82,5 @@ members = [
"contracts/token-release",
"contracts/token-release/meta",
"contracts/mvx-game-sc",
"contracts/mvx-game-sc/meta"
"contracts/mvx-game-sc/meta",
]
262 changes: 0 additions & 262 deletions contracts/adder/interact/src/basic_interact.rs

This file was deleted.

6 changes: 0 additions & 6 deletions contracts/adder/interact/src/basic_interact_main.rs

This file was deleted.

5 changes: 5 additions & 0 deletions contracts/adder/interactor/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Pem files are used for interactions, but shouldn't be committed
*.pem

# Temporary storage of deployed contract address, so we can preserve the context between executions.
state.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[[bin]]
name = "basic-interact"
path = "src/basic_interact_main.rs"

[package]
name = "basic-interact"
name = "basic-interactor"
version = "0.0.0"
authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
authors = ["MultiversX <contact@multiversx.com>"]
edition = "2021"
publish = false

[lib]
path = "src/basic_interact.rs"
[[bin]]
name = "basic-interactor"
path = "src/basic_interactor_main.rs"

[dependencies]
clap = { version = "4.4.7", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
toml = "0.8.6"
tokio = { version = "1.24" }
[lib]
path = "src/basic_interactor.rs"

[dependencies.adder]
path = ".."

[dependencies.multiversx-sc-snippets]
version = "0.54.3"

[dependencies]
clap = { version = "4.4.7", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
toml = "0.8.6"
tokio = { version = "1.24" }

[features]
chain-simulator-tests = []
Loading
Loading