diff --git a/bin/hushlist-send-file b/bin/hushlist-send-file index 4cd869c..6ddef90 100755 --- a/bin/hushlist-send-file +++ b/bin/hushlist-send-file @@ -26,16 +26,14 @@ my $rpc = Hush::RPC->new; #my $hex_memo = unpack("H*",$memo); # backend wants hex-encoded memo-field #print "Hex memos length=" . length($hex_memo) . "\n"; -if(0){ unless ( is_valid_zaddr($from) or is_valid_taddr($from) ) { die "From address must be a valid taddr or zaddr!"; } die "Invalid zaddr!" unless is_valid_zaddr($to); -} -my @hex_memos = unpack("(H512)*", $memo); +my @hex_memos = unpack("(H1024)*", $memo); # hexify doubles the length -my $num_memos = int(@hex_memos / 2) + (@hex_memos % 2); +my $num_memos = int(@hex_memos); #die Dumper ['array=', @hex_memos, "string=$hex_memo" ]; print "This file will be stored in $num_memos memo fields\n"; @@ -49,7 +47,7 @@ for my $memo (@hex_memos) { memo => $memo, }; } -#die Dumper [ $recipients ]; +die Dumper [ $recipients ]; my $opid = $rpc->z_sendmany($from,$recipients); print "z_sendmany complete\n"; diff --git a/lib/Hush/Util.pm b/lib/Hush/Util.pm index 579edc0..960d952 100644 --- a/lib/Hush/Util.pm +++ b/lib/Hush/Util.pm @@ -37,7 +37,7 @@ sub is_valid_taddr { my ($t) = @_; # TODO: only base58 is valid - if ($t =~ m/^t1[a-z0-9]{35}$/i) { + if ($t =~ m/^t1[a-z0-9]{33}$/i) { return 1; } else { return 0;