Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions backend/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@ import { register, METRICS_CONTENT_TYPE } from "./metrics/registry.js";
import { healthPayload } from "./health.js";
import { startWebhookDispatcher } from "./services/webhookDispatcher.js";
import { checkContentLength } from "./middleware/contentLength.js";
import { createCorsOptions } from "./middleware/corsConfig.js";
import { corsOriginsFromEnvironment, createCorsOptions } from "./middleware/corsConfig.js";

export function createApp(): Express {
export function createApp(allowedOrigins?: string[]): Express {
startWebhookDispatcher();
const app: Express = express();
app.set('json replacer', (_key: string, value: unknown) => typeof value === 'bigint' ? value.toString() : value);

const allowedOrigins = (process.env.CORS_ORIGINS ?? "http://localhost:5173")
.split(",")
.map((o) => o.trim());
const resolvedOrigins = allowedOrigins ?? corsOriginsFromEnvironment();

app.use(helmet());
app.use(cors(createCorsOptions(allowedOrigins)));
app.use(cors(createCorsOptions(resolvedOrigins)));
app.use(requestId);

// GET /metrics is mounted before logging and rate limiting so scrapes are never
Expand Down
18 changes: 13 additions & 5 deletions backend/src/contracts/lineproofClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,26 +91,34 @@ export const submitEnrollment = (
};

export const submitEscrowDeposit = (
amount: number,
caller: string,
queueId: string,
amount: bigint,
asset: string,
): Promise<string> => {
const sdk = requireWriter();
return submit(() =>
sdk.escrow.deposit(sdk.contractIds.escrow!, amount, asset),
sdk.escrow.deposit(sdk.contractIds.escrow!, caller, queueId, amount, asset),
);
};

export const submitQueueAdvance = (
queueContractId: string,
admin: string,
batchSize: number,
): Promise<number[]> => {
const sdk = requireWriter();
return submit(() => sdk.queue(queueContractId).advance(batchSize));
return submit(() =>
sdk.queue(queueContractId).advance(admin, batchSize),
);
};

export const submitQueueClose = (queueContractId: string): Promise<string> => {
export const submitQueueClose = (
queueContractId: string,
admin: string,
): Promise<string> => {
const sdk = requireWriter();
return submit(() => sdk.queue(queueContractId).close());
return submit(() => sdk.queue(queueContractId).close(admin));
};

export async function readEnrollmentOnChain(
Expand Down
5 changes: 5 additions & 0 deletions contracts/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[build]
target-dir = "target"

[target.wasm32-unknown-unknown]
rustflags = ["-C", "target-feature=+reference-types"]
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ pub(crate) fn get_wasmi_config(budget: &Budget) -> Result<wasmi::Config, HostErr
.wasm_sign_extension(true)
.wasm_saturating_float_to_int(false)
.wasm_multi_value(false)
.wasm_reference_types(false)
.wasm_reference_types(true)
.wasm_tail_call(false)
.wasm_extended_const(false)
.floats(false)
Expand Down
2 changes: 2 additions & 0 deletions contracts/lineproof-enrollment/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![cfg_attr(not(test), no_std)]

use soroban_sdk::{contract, contractimpl, contracttype, xdr::ToXdr, Address, BytesN, Env, Symbol, Vec};

/// TTL threshold: renew if remaining TTL is below this many ledgers (~13.8 hours at 5s/ledger)
Expand Down
21 changes: 0 additions & 21 deletions contracts/lineproof-enrollment/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@ fn test_is_enrolled_returns_correct_state() {
let contract_id = env.register(EnrollmentImpl, ());
let client = EnrollmentImplClient::new(&env, &contract_id);
let queue_id = Symbol::new(&env, "visa");
assert!(!EnrollmentImpl::is_enrolled(
env.clone(),
caller.clone(),
queue_id.clone()
));
EnrollmentImpl::enroll(env.clone(), caller.clone(), queue_id.clone());
assert!(EnrollmentImpl::is_enrolled(env, caller, queue_id));
assert!(!client.is_enrolled(&caller, &queue_id));
client.enroll(&caller, &queue_id, &None);
assert!(client.is_enrolled(&caller, &queue_id));
Expand Down Expand Up @@ -102,11 +95,6 @@ fn test_set_duplicate_behavior() {
#[test]
fn test_finalize_enrollment() {
let (env, admin) = setup();
let user = Address::generate(&env);
let queue_id = Symbol::new(&env, "fin-q");
EnrollmentImpl::enroll(env.clone(), user.clone(), queue_id.clone());
EnrollmentImpl::finalize_enrollment(env.clone(), admin.clone(), user.clone(), queue_id.clone());
let record = EnrollmentImpl::enrollment_record(env, user, queue_id).unwrap();
let contract_id = env.register(EnrollmentImpl, ());
let client = EnrollmentImplClient::new(&env, &contract_id);
let user = Address::generate(&env);
Expand Down Expand Up @@ -143,11 +131,6 @@ fn test_enrollment_record_returns_none_when_missing() {
#[test]
fn test_proof_hash_is_distinct_for_different_inputs() {
let (env, _) = setup();
let u1 = Address::generate(&env);
let u2 = Address::generate(&env);
let queue_id = Symbol::new(&env, "q-hash");
let proof1 = EnrollmentImpl::enroll(env.clone(), u1.clone(), queue_id.clone());
let proof2 = EnrollmentImpl::enroll(env.clone(), u2.clone(), queue_id.clone());
let contract_id = env.register(EnrollmentImpl, ());
let client = EnrollmentImplClient::new(&env, &contract_id);
let u1 = Address::generate(&env);
Expand All @@ -173,10 +156,6 @@ fn test_cancel_emits_original_hash() {

let topics = cancel_event.1;
// topic[0] is lineproof_enrollment, topic[1] is Cancelled, topic[2] is queue_id
assert_eq!(
topics.get(1).unwrap(),
soroban_sdk::IntoVal::into_val(&Symbol::new(&env, "Cancelled"), &env)
);
assert_eq!(
Symbol::try_from_val(&env, &topics.get(1).unwrap()).unwrap(),
Symbol::new(&env, "Cancelled")
Expand Down
4 changes: 2 additions & 2 deletions contracts/lineproof-escrow/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#![cfg_attr(not(test), no_std)]

use soroban_sdk::{contract, contractimpl, contracttype, Address, Env, Symbol};

/// TTL threshold: renew if remaining TTL is below this many ledgers (~13.8 hours at 5s/ledger)
const TTL_THRESHOLD: u32 = 10_000;
/// TTL extension target: extend to this many ledgers (~1 year at 5s/ledger)
const TTL_EXTEND_TO: u32 = 6_307_200;
/// Additional TTL buffer for escrow records beyond hold_period_days (in ledgers)
const ESCROW_TTL_BUFFER: u32 = 86_400; // ~5 days at 5s/ledger

#[contracttype]
#[derive(Clone, Debug, Eq, PartialEq)]
Expand Down
Loading