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

Feat 3.5 implementation #196

Merged
merged 33 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
572773d
first-commit
evelinemolnar Aug 21, 2024
729523d
first-commit
evelinemolnar Aug 21, 2024
ba5677f
quick renane
evelinemolnar Aug 21, 2024
5b0fcc4
first-commit
evelinemolnar Aug 21, 2024
76e620e
Merge pull request #193 from multiversx/CII-49-create-common-transaction
dragos-rebegea Aug 22, 2024
0a4312a
Merge pull request #194 from multiversx/CII-50-event-sc-call
dragos-rebegea Aug 22, 2024
0ddb6a1
Merge branch 'feat-3.5-implementation' into CII-51-update-endpoint
dragos-rebegea Aug 22, 2024
f4b38bc
Merge pull request #195 from multiversx/CII-51-update-endpoint
dragos-rebegea Aug 22, 2024
aa16150
99%
evelinemolnar Aug 29, 2024
8dc7429
small-fix
evelinemolnar Aug 29, 2024
4d0776d
.
evelinemolnar Aug 29, 2024
7e924dd
.
evelinemolnar Aug 29, 2024
684183a
.
evelinemolnar Aug 29, 2024
7361cc0
.
evelinemolnar Aug 29, 2024
c20ded0
white-box
evelinemolnar Aug 30, 2024
e9838c5
multi-contract
evelinemolnar Aug 30, 2024
4084fc0
Merge pull request #201 from multiversx/remove-onlyownerv1
evelinemolnar Aug 30, 2024
bfcce64
.
evelinemolnar Aug 30, 2024
a0ebf2a
.
evelinemolnar Sep 2, 2024
6b209f4
change upgrade to init
evelinemolnar Sep 3, 2024
d8d7916
refactor - moved some tests in multitransafer blackbox
evelinemolnar Sep 8, 2024
3f02da5
forgot to include a proxy file
evelinemolnar Sep 9, 2024
0de0579
fix case
evelinemolnar Sep 9, 2024
d814e66
last-updates
evelinemolnar Sep 10, 2024
883ac77
.
evelinemolnar Sep 10, 2024
a96cf44
.
evelinemolnar Sep 10, 2024
715cb14
remove-duplicate-code
evelinemolnar Sep 10, 2024
e5daccb
Merge pull request #198 from multiversx/CII-52
dragos-rebegea Sep 11, 2024
b36d232
clippy fixes
evelinemolnar Sep 11, 2024
2b58348
Merge remote-tracking branch 'origin/feat/v3.5' into feat-3.5-impleme…
dragos-rebegea Sep 11, 2024
e3e6fdc
fix proxy after merge
dragos-rebegea Sep 11, 2024
8b86567
fix clippy
dragos-rebegea Sep 11, 2024
1ca0e7d
fix clippy
dragos-rebegea Sep 11, 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
679 changes: 679 additions & 0 deletions bridge-proxy/src/esdt_safe_proxy.rs

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion common/token-module/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,18 @@ pub trait TokenModule: fee_estimator_module::FeeEstimatorModule {
}
}

#[only_owner]
#[endpoint(setTotalBalances)]
#[label("test-only")]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the merge of feat/v3 setTotalBalances & setMintBalances can be deleted 👍

fn set_total_balances(&self, token_id: &TokenIdentifier, value: BigUint) {
self.total_balances(token_id).set_if_empty(value);
}

#[endpoint(setMintBalances)]
#[label("test-only")]
fn set_mint_balances(&self, token_id: &TokenIdentifier, value: BigUint) {
self.mint_balances(token_id).set_if_empty(value);
}

// storage

#[view(getAllKnownTokens)]
Expand Down
2 changes: 1 addition & 1 deletion common/tx-batch-module/src/batch_status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use multiversx_sc::{api::ManagedTypeApi, types::ManagedVec};
use transaction::{BlockNonce, TxNonce};

#[type_abi]
#[derive(TopEncode, TopDecode)]
#[derive(TopEncode, TopDecode, Debug, PartialEq, Eq)]
pub enum BatchStatus<M: ManagedTypeApi> {
AlreadyProcessed,
Empty,
Expand Down
5 changes: 5 additions & 0 deletions esdt-safe/sc-config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@

[[proxy]]
path = "../bridge-proxy/src/esdt_safe_proxy.rs"

[[proxy]]
path = "src/esdt_safe_proxy_test_only.rs"
add-unlabelled = false
add-labels = ["test-only"]
Loading
Loading