Skip to content

Commit 5387e3f

Browse files
proxy update, cleanup
1 parent 6065398 commit 5387e3f

File tree

3 files changed

+174
-3
lines changed

3 files changed

+174
-3
lines changed

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ members = [
116116
"contracts/feature-tests/abi-tester/meta",
117117
"contracts/feature-tests/alloc-features",
118118
"contracts/feature-tests/alloc-features/meta",
119-
# "contracts/feature-tests/barnard-features",
120-
# "contracts/feature-tests/barnard-features/meta",
121-
# "contracts/feature-tests/barnard-features/interactor",
122119
"contracts/feature-tests/basic-features",
123120
"contracts/feature-tests/basic-features/meta",
124121
"contracts/feature-tests/basic-features/interact",

contracts/feature-tests/composability/forwarder-interactor/src/proxy.rs

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,93 @@ where
809809
.original_result()
810810
}
811811

812+
pub fn sync_call_fallible<
813+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
814+
Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
815+
Arg2: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
816+
>(
817+
self,
818+
to: Arg0,
819+
endpoint_name: Arg1,
820+
args: Arg2,
821+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
822+
self.wrapped_tx
823+
.payment(NotPayable)
824+
.raw_call("sync_call_fallible")
825+
.argument(&to)
826+
.argument(&endpoint_name)
827+
.argument(&args)
828+
.original_result()
829+
}
830+
831+
pub fn forward_sync_fallible_accept_funds_multi_transfer<
832+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
833+
Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
834+
>(
835+
self,
836+
to: Arg0,
837+
payment_args: Arg1,
838+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
839+
self.wrapped_tx
840+
.payment(NotPayable)
841+
.raw_call("forward_sync_fallible_accept_funds_multi_transfer")
842+
.argument(&to)
843+
.argument(&payment_args)
844+
.original_result()
845+
}
846+
847+
pub fn forward_sync_reject_funds_multi_transfer<
848+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
849+
Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
850+
>(
851+
self,
852+
to: Arg0,
853+
payment_args: Arg1,
854+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
855+
self.wrapped_tx
856+
.payment(NotPayable)
857+
.raw_call("forward_sync_reject_funds_multi_transfer")
858+
.argument(&to)
859+
.argument(&payment_args)
860+
.original_result()
861+
}
862+
863+
pub fn transfer_fallible<
864+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
865+
Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
866+
>(
867+
self,
868+
to: Arg0,
869+
payments: Arg1,
870+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
871+
self.wrapped_tx
872+
.payment(NotPayable)
873+
.raw_call("transfer_fallible")
874+
.argument(&to)
875+
.argument(&payments)
876+
.original_result()
877+
}
878+
879+
/// Receiver needs to be an endpoint with no arguments, for simplicity.
880+
pub fn transfer_execute_fallible<
881+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
882+
Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
883+
Arg2: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
884+
>(
885+
self,
886+
to: Arg0,
887+
endpoint_name: Arg1,
888+
payments: Arg2,
889+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
890+
self.wrapped_tx
891+
.payment(NotPayable)
892+
.raw_call("transfer_execute_fallible")
893+
.argument(&to)
894+
.argument(&endpoint_name)
895+
.argument(&payments)
896+
.original_result()
897+
}
898+
812899
pub fn sft_issue<
813900
Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
814901
Arg1: ProxyArg<ManagedBuffer<Env::Api>>,

contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,93 @@ where
809809
.original_result()
810810
}
811811

812+
pub fn sync_call_fallible<
813+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
814+
Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
815+
Arg2: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
816+
>(
817+
self,
818+
to: Arg0,
819+
endpoint_name: Arg1,
820+
args: Arg2,
821+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
822+
self.wrapped_tx
823+
.payment(NotPayable)
824+
.raw_call("sync_call_fallible")
825+
.argument(&to)
826+
.argument(&endpoint_name)
827+
.argument(&args)
828+
.original_result()
829+
}
830+
831+
pub fn forward_sync_fallible_accept_funds_multi_transfer<
832+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
833+
Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
834+
>(
835+
self,
836+
to: Arg0,
837+
payment_args: Arg1,
838+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
839+
self.wrapped_tx
840+
.payment(NotPayable)
841+
.raw_call("forward_sync_fallible_accept_funds_multi_transfer")
842+
.argument(&to)
843+
.argument(&payment_args)
844+
.original_result()
845+
}
846+
847+
pub fn forward_sync_reject_funds_multi_transfer<
848+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
849+
Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
850+
>(
851+
self,
852+
to: Arg0,
853+
payment_args: Arg1,
854+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
855+
self.wrapped_tx
856+
.payment(NotPayable)
857+
.raw_call("forward_sync_reject_funds_multi_transfer")
858+
.argument(&to)
859+
.argument(&payment_args)
860+
.original_result()
861+
}
862+
863+
pub fn transfer_fallible<
864+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
865+
Arg1: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
866+
>(
867+
self,
868+
to: Arg0,
869+
payments: Arg1,
870+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
871+
self.wrapped_tx
872+
.payment(NotPayable)
873+
.raw_call("transfer_fallible")
874+
.argument(&to)
875+
.argument(&payments)
876+
.original_result()
877+
}
878+
879+
/// Receiver needs to be an endpoint with no arguments, for simplicity.
880+
pub fn transfer_execute_fallible<
881+
Arg0: ProxyArg<ManagedAddress<Env::Api>>,
882+
Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
883+
Arg2: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<EgldOrEsdtTokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
884+
>(
885+
self,
886+
to: Arg0,
887+
endpoint_name: Arg1,
888+
payments: Arg2,
889+
) -> TxTypedCall<Env, From, To, NotPayable, Gas, bool> {
890+
self.wrapped_tx
891+
.payment(NotPayable)
892+
.raw_call("transfer_execute_fallible")
893+
.argument(&to)
894+
.argument(&endpoint_name)
895+
.argument(&payments)
896+
.original_result()
897+
}
898+
812899
pub fn sft_issue<
813900
Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
814901
Arg1: ProxyArg<ManagedBuffer<Env::Api>>,

0 commit comments

Comments
 (0)