Add all serialization / deserialization PSBT test cases from BIPs

Author: bbrtj

lib/Bitcoin/Crypto/PSBT.pm

@@ -169,33 +169,21 @@ sub _check_integrity
 	my ($self) = @_;
 	my $version = $self->version;
 
-	my $check_field = sub {
-		my ($name, $index) = @_;
-
-		my @values = $self->get_field($name, $index);
-		Bitcoin::Crypto::Exception::PSBT->raise(
-			"PSBT field $name is required in version $version"
-		) unless @values == 1;
-	};
-
 	my $required_fields = Bitcoin::Crypto::PSBT::FieldType->get_fields_required_in_version($version);
-	foreach my $field (@{$required_fields}) {
-
-		# NOTE: no required fields need keydata
+	foreach my $map (@{$self->maps}) {
+		foreach my $field_type (@{$required_fields}) {
+			next unless $field_type->map_type eq $map->type;
 
-		my $field_type = $field->get_map_type;
-		if ($field_type eq Bitcoin::Crypto::Constants::psbt_global_map) {
-			$check_field->($field->name);
+			my @values = $map->find($field_type);
+			Bitcoin::Crypto::Exception::PSBT->raise(
+				"PSBT field " . $field_type->name . " is required in version $version"
+			) unless @values == 1;
 		}
-		elsif ($field_type eq Bitcoin::Crypto::Constants::psbt_input_map) {
-			for my $input_index (0 .. $self->input_count - 1) {
-				$check_field->($field->name, $input_index);
-			}
-		}
-		elsif ($field_type eq Bitcoin::Crypto::Constants::psbt_output_map) {
-			for my $output_index (0 .. $self->output_count - 1) {
-				$check_field->($field->name, $output_index);
-			}
+
+		foreach my $field (@{$map->fields}) {
+			Bitcoin::Crypto::Exception::PSBT->raise(
+				"PSBT field " . $field->type->name . " is not available in version $version"
+			) unless $field->type->available_in_version($version);
 		}
 	}
 }
@@ -250,7 +238,7 @@ sub get_all_fields
 {
 	my ($self, $type, $index) = @_;
 
-	my $map = $self->_get_map($type->get_map_type, index => $index);
+	my $map = $self->_get_map($type->map_type, index => $index);
 	return () unless $map;
 	return $map->find($type);
 }

lib/Bitcoin/Crypto/PSBT/Field.pm

@@ -154,6 +154,7 @@ sub set_map
 {
 	my ($self, $map) = @_;
 
+	$self->validate;
 	$self->_set_map($map);
 	$map->_check_integrity($self);
 	return;

lib/Bitcoin/Crypto/PSBT/FieldType.pm

@@ -32,6 +32,16 @@ has param 'code' => (
 	isa => PositiveOrZeroInt,
 );
 
+has param 'map_type' => (
+	isa => PSBTMapType,
+	lazy => sub {
+		my $self = shift;
+		my $name = $self->name;
+		die unless $name =~ /^PSBT_([A-Z]+)_/;
+		return lc $1;
+	}
+);
+
 has param 'serializer' => (
 	isa => CodeRef,
 	default => sub {
@@ -424,6 +434,11 @@ my %types = (
 		key_data => undef,
 		value_data => "<32-bit little endian uint locktime>",
 		%uint_32bitLE_serializers,
+		validator => sub {
+			my ($value) = @_;
+			die 'must be greather than or equal to 500000000'
+				if $value < 500000000;
+		},
 		version_status => {
 			2 => AVAILABLE,
 		},
@@ -433,6 +448,11 @@ my %types = (
 		key_data => undef,
 		value_data => "<32-bit uint locktime>",
 		%uint_32bitLE_serializers,
+		validator => sub {
+			my ($value) = @_;
+			die 'must be less than 500000000'
+				unless $value < 500000000;
+		},
 		version_status => {
 			2 => AVAILABLE,
 		},
@@ -619,7 +639,7 @@ my %types = (
 %types = map { $_, __PACKAGE__->new(name => $_, %{$types{$_}}) } keys %types;
 my %types_reverse;
 foreach my $type (values %types) {
-	$types_reverse{$type->get_map_type}{$type->code} = $type->name;
+	$types_reverse{$type->map_type}{$type->code} = $type->name;
 }
 
 signature_for get_field_by_code => (
@@ -631,11 +651,20 @@ sub get_field_by_code
 {
 	my ($self, $map_type, $code) = @_;
 
-	Bitcoin::Crypto::Exception::PSBT->raise(
-		"unknown field type code $code in map $map_type"
-	) unless exists $types_reverse{$map_type}{$code};
+	return $types{$types_reverse{$map_type}{$code}}
+		if exists $types_reverse{$map_type}{$code};
 
-	return $types{$types_reverse{$map_type}{$code}};
+	return $self->new(
+		name => 'UNKNOWN',
+		map_type => $map_type,
+		code => $code,
+		key_data => 'unknown',
+		value_data => 'unknown',
+		version_status => {
+			0 => AVAILABLE,
+			2 => AVAILABLE,
+		},
+	);
 }
 
 signature_for get_field_by_name => (
@@ -706,22 +735,5 @@ sub required_in_version
 	return ($self->version_status->{$version} // '') eq REQUIRED;
 }
 
-signature_for get_map_type => (
-	method => Object,
-	positional => [],
-);
-
-sub get_map_type
-{
-	my ($self) = @_;
-	my $name = $self->name;
-
-	# module programming error has occured if those die
-	die unless $name =~ /^PSBT_([A-Z]+)_/;
-	my $namespace = lc $1;
-
-	return $namespace;
-}
-
 1;
 

lib/Bitcoin/Crypto/PSBT/Map.pm

@@ -86,7 +86,6 @@ sub add
 		'This field is already used in another map'
 	) if $field->map;
 
-	$field->validate;
 	$field->set_map($self);
 	push @{$self->fields}, $field;