From 9e0787abdfdb8475a82b7131bf13bb9feef1bd08 Mon Sep 17 00:00:00 2001 From: Denis Carriere Date: Sun, 12 May 2019 12:44:30 -0400 Subject: [PATCH] Validate expire datetime Fixed https://github.com/EOS-Nation/escrow.bos/issues/10 --- escrow.wasm | Bin 44503 -> 44653 bytes include/escrow.hpp | 4 ---- src/escrow.cpp | 7 +++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/escrow.wasm b/escrow.wasm index 686d5f4be544fc108a8cc83aa143706b10bebdb0..cf6efd77debad6fde990c5dd2116af74ef4aee8f 100755 GIT binary patch delta 12310 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 b1vq|Q|Llap&~BHtEmT#50T}t!a7p?f8MvH+ delta 11985 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 current_time_point(), "expires must be a value in the future."); - // time_point_sec max_expires = current_time_point() + SIX_MONTHS_IN_SECONDS; - // check(expires <= max_expires, "expires must be within 6 months from now."); + check(expires > current_time_point(), "expires must be a value in the future."); + time_point_sec max_expires = current_time_point() + time_point_sec(SIX_MONTHS_IN_SECONDS); + check(expires <= max_expires, "expires must be within 6 months from now."); // Ensure sender is BOS Executive check(