removed requirement to pass dsts[i].is_subaddress via bridge

pull/29/head
Paul Shapiro 6 years ago
parent 4032bc1dec
commit a5fc7efa38

@ -479,8 +479,7 @@ string serial_bridge::create_transaction(const string &args_string)
cryptonote::address_parse_info de_addr_info;
THROW_WALLET_EXCEPTION_IF(!cryptonote::get_account_address_from_str(de_addr_info, nettype, dst_desc.second.get<string>("addr")), error::wallet_internal_error, "Invalid dsts.addr");
de.addr = de_addr_info.address;
de.is_subaddress = dst_desc.second.get<bool>("is_subaddress");
THROW_WALLET_EXCEPTION_IF(de.is_subaddress != de_addr_info.is_subaddress, error::wallet_internal_error, "Expected dsts.is_subaddress = parsed is_subaddress");
de.is_subaddress = de_addr_info.is_subaddress;
de.amount = stoull(dst_desc.second.get<string>("amount"));
//
dsts.push_back(de);

@ -355,14 +355,12 @@ BOOST_AUTO_TEST_CASE(bridged__transfers__create)
boost::property_tree::ptree dst;
dst.put("addr", to_address_string);
dst.put("amount", amount_string);
dst.put("is_subaddress", false);
dsts.push_back(std::make_pair("", dst));
}
{ // 1. change (otherwise we'd have to supply a dummy addr)
boost::property_tree::ptree dst;
dst.put("addr", from_address_string);
dst.put("amount", "112832250000");
dst.put("is_subaddress", false);
dsts.push_back(std::make_pair("", dst));
}
root.add_child("dsts", dsts);

Loading…
Cancel
Save