Escrow proxy #191

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

Open

pityjllk wants to merge 331 commits into main from feat/bus-proxy

.cargo/audit.toml

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    # cargo-audit configuration
+    # https://docs.rs/cargo-audit/latest/cargo_audit/config/
+    [advisories]
+    # Ignore the lru unsound advisory - it comes from near-vm-runner which is
+    # locked to lru ^0.12.3 and cannot be updated to the fixed 0.16.3 version.
+    # The advisory relates to IterMut's Stacked Borrows violation, which does
+    # not affect our usage as we don't use IterMut directly.
+    # Tracked: https://github.com/near/nearcore/issues/XXXXX (upstream)
+    ignore = ["RUSTSEC-2026-0002"]

.github/workflows/ci.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -162,7 +162,8 @@ jobs: @@
             with:
               cache: false
           - name: Install cargo-audit
-            run: cargo install cargo-audit --version "^0.21" --locked
+            # Require 0.22+ for CVSS 4.0 support (advisory-db now contains CVSS 4.0 entries)
+            run: cargo install cargo-audit --version "^0.22" --locked
           - uses: rustsec/[email protected]
             with:
               token: ${{ secrets.GITHUB_TOKEN }}
@@ Expand Down @@

Cargo.lock

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

Cargo.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ members = [ @@
         "defuse",
         "erc191",
         "escrow-swap",
+        "escrow-proxy",
         "fees",
         "io-utils",
         "map-utils",
@@ Expand All / @@ -33,6 +34,7 @@ members = [ @@
         "tip191",
         "token-id",
         "ton-connect",
+        "oneshot-condvar",
         "wnear",
     ]
     default-members = ["defuse"]
@@ Expand All / @@ -56,6 +58,7 @@ defuse-deadline.path = "deadline" @@
     defuse-decimal.path = "decimal"
     defuse-erc191.path = "erc191"
     defuse-escrow-swap.path = "escrow-swap"
+    defuse-escrow-proxy.path = "escrow-proxy"
     defuse-fees.path = "fees"
     defuse-io-utils.path = "io-utils"
     defuse-map-utils.path = "map-utils"
@@ Expand All / @@ -70,6 +73,7 @@ defuse-poa-token.path = "poa-token" @@
     defuse-sandbox.path = "sandbox"
     defuse-sep53.path = "sep53"
     defuse-serde-utils.path = "serde-utils"
+    defuse-oneshot-condvar.path = "oneshot-condvar"
     defuse-tip191.path = "tip191"
     defuse-token-id = { path = "token-id", default-features = false }
     defuse-ton-connect = { path = "ton-connect", default-features = false, features = [
@@ Expand All / @@ -82,8 +86,9 @@ defuse-test-utils.path = "test-utils" @@
     cargo-near-build = "0.9.0"
     near-account-id = "2.4.0"
-    near-api = "0.8.2"
-    near-api-types = "0.8.2"
+    near-api = "0.8.3"
+    near-api-types = "0.8.3"
+    near-openapi-client = "0.7"
     near-openapi-types = "0.6.0"
     near-contract-standards = "5.24"
     near-crypto = "0.34.1"
@@ Expand Down @@

Makefile.toml

-Original file line number
+Diff line change
@@ Expand Up @@
     MT_RECEIVER_STUB_DIR = "${TARGET_DIR}/multi-token-receiver-stub"
     MT_RECEIVER_STUB_WASM = "${MT_RECEIVER_STUB_DIR}/multi_token_receiver_stub.wasm"
+    ESCROW_PROXY_DIR = "${TARGET_DIR}/"
+    ESCROW_PROXY_WASM = "${ESCROW_PROXY_DIR}/defuse_escrow_proxy.wasm"
+    ONESHOT_CONDVAR_DIR = "${TARGET_DIR}/"
+    ONESHOT_CONDVAR_WASM = "${ONESHOT_CONDVAR_DIR}/defuse_oneshot_condvar.wasm"
     [tasks.default]
     alias = "build"
@@ Expand All / @@ -25,6 +31,8 @@ dependencies = [ @@
         "build-escrow-swap",
         "build-poa-factory",
         "build-poa-token-no-registration",
+        "build-escrow-proxy",
+        "build-oneshot-condvar",
         "contract-stats",
         "build-multi-token-receiver-stub",
     ]
@@ Expand Down Expand Up / @@ -114,6 +122,40 @@ args = [ @@
         "--no-embed-abi",
     ]
+    [tasks.build-escrow-proxy]
+    dependencies = ["add-cache-dir-tag"]
+    command = "cargo"
+    args = [
+        "near",
+        "build",
+        "non-reproducible-wasm",
+        "--locked",
+        "--manifest-path",
+        "./escrow-proxy/Cargo.toml",
+        "--features",
+        "abi,contract,escrow-swap",
+        "--out-dir",
+        "${ESCROW_PROXY_DIR}",
+        "--no-embed-abi",
+    ]
+    [tasks.build-oneshot-condvar]
+    dependencies = ["add-cache-dir-tag"]
+    command = "cargo"
+    args = [
+        "near",
+        "build",
+        "non-reproducible-wasm",
+        "--locked",
+        "--manifest-path",
+        "./oneshot-condvar/Cargo.toml",
+        "--features",
+        "abi,contract,auth-call",
+        "--out-dir",
+        "${ONESHOT_CONDVAR_DIR}",
+        "--no-abi",
+    ]
     # ============================================================================
     # Build reproducible tasks
     # ============================================================================
@@ Expand Down @@

defuse/Cargo.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -69,6 +69,7 @@ contract = [ @@
     sandbox = [
         "arbitrary",
+        "contract",
         "dep:defuse-sandbox",
         "dep:defuse-test-utils",
     ]
@@ Expand Down @@

defuse/src/contract/tokens/mod.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,7 +4,7 @@ mod nep245;
  
    use super::Contract;

    use defuse_core::{DefuseError, Result, token_id::TokenId};

    use defuse_near_utils::{Lock, UnwrapOrPanic};

    use defuse_near_utils::{Lock, MaxJsonLength, UnwrapOrPanic};

    use defuse_nep245::{MtBurnEvent, MtEvent, MtMintEvent};

    use itertools::{Either, Itertools};

    use near_sdk::{AccountId, AccountIdRef, Gas, env, json_types::U128, serde_json};

    @@ -152,7 +152,7 @@ impl Contract {
  
            let tokens_count = tokens_iter.len();

            let requested_refunds =

                env::promise_result_checked(0, Self::mt_on_transfer_max_result_len(tokens_count))

                env::promise_result_checked(0, Vec::<U128>::max_json_length(tokens_count))

                    .ok()

                    .and_then(|value| serde_json::from_slice::<Vec<U128>>(&value).ok())

                    .filter(|refunds| refunds.len() == tokens_count);

    @@ -211,16 +211,6 @@ impl Contract {
  
                MtEvent::MtBurn([burn_event].as_slice().into()).emit();

            }

        }

        const fn mt_on_transfer_max_result_len(amounts_count: usize) -> usize {

            // we allow at most one newline char and up to 8 spaces/tabs if the JSON was prettified

            const MAX_LEN_PER_AMOUNT: usize =

                "        \"+340282366920938463463374607431768211455\",\n".len(); // u128::MAX

            amounts_count

                .saturating_mul(MAX_LEN_PER_AMOUNT)

                .saturating_add("[\n]".len())

        }

    }

    const MAX_TOKEN_ID_LEN: usize = 127;

defuse/src/contract/tokens/nep141/withdraw.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ use defuse_core::{ @@
         DefuseError, Result, engine::StateView, intents::tokens::FtWithdraw,
         token_id::nep141::Nep141TokenId,
     };
-    use defuse_near_utils::UnwrapOrPanic;
+    use defuse_near_utils::{MaxJsonLength, UnwrapOrPanic};
     use defuse_wnear::{NEAR_WITHDRAW_GAS, ext_wnear};
     use near_contract_standards::{
         fungible_token::core::ext_ft_core, storage_management::ext_storage_management,
@@ Expand Down Expand Up / @@ -156,9 +156,7 @@ impl FungibleTokenWithdrawResolver for Contract { @@
             amount: U128,
             is_call: bool,
         ) -> U128 {
-            const MAX_RESULT_LENGTH: usize = "\"+340282366920938463463374607431768211455\"".len(); // u128::MAX
-            let used = env::promise_result_checked(0, MAX_RESULT_LENGTH).map_or(
+            let used = env::promise_result_checked(0, U128::max_json_length(())).map_or(
                 if is_call {
                     // do not refund on failed `ft_transfer_call` due to
                     // NEP-141 vulnerability: `ft_resolve_transfer` fails to
@@ Expand Down @@

defuse/src/contract/tokens/nep245/resolver.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    use std::borrow::Cow;

    use defuse_near_utils::{Lock, UnwrapOrPanic, UnwrapOrPanicError};

    use defuse_near_utils::{Lock, MaxJsonLength, UnwrapOrPanic, UnwrapOrPanicError};

    use defuse_nep245::{

        ClearedApproval, MtEventEmit, MtTransferEvent, TokenId, resolver::MultiTokenResolver,

    };

    @@ -28,7 +28,7 @@ impl MultiTokenResolver for Contract {
  
            );

            let mut refunds =

                env::promise_result_checked(0, Self::mt_on_transfer_max_result_len(amounts.len()))

                env::promise_result_checked(0, Vec::<U128>::max_json_length(amounts.len()))

                    .ok()

                    .and_then(|value| serde_json::from_slice::<Vec<U128>>(&value).ok())

                    .filter(|refund| refund.len() == amounts.len())

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Escrow proxy #191

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Escrow proxy #191

Are you sure you want to change the base?

Uh oh!

Escrow proxy #191

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!