Update amphtml spec to 2106240350000

[westonruter]

Previously #6303.

• Run ./bin/amphtml-update.sh (lando ssh -c 'bash ./bin/amphtml-update.sh vendor/amphtml').
• Examine diff for changelog.
• Examine upstream diff to ensure nothing was missed.
• Update spec generator as needed based on spec format changes.
• Modify validating sanitizer based on changes to spec, if needed.
• Add tests for key changes.

Changelog

• Add template attribute and container layout to amp-render.
• Add top and bottom values for the sticky attribute on amp-ad.

Details

(
    PREV_VERSION=1d3757a07f;
    THIS_VERSION=2106240350000;
    git checkout $THIS_VERSION;
    git diff $PREV_VERSION...$THIS_VERSION -w -- $( git ls-files | grep '.protoascii' );
    git checkout - > /dev/null
)

diff --git a/extensions/amp-ad/validator-amp-ad.protoascii b/extensions/amp-ad/validator-amp-ad.protoascii
index 3c6f41fd0..c49c96627 100644
--- a/extensions/amp-ad/validator-amp-ad.protoascii
+++ b/extensions/amp-ad/validator-amp-ad.protoascii
@@ -64,7 +64,12 @@ tags: {  # <amp-ad>
   }
   attrs: { name: "template" }
   attrs: { name: "type" mandatory: true }
-  attrs: { name: "sticky" value: "" }
+  attrs: {
+    name: "sticky"
+    value: ""
+    value: "top"
+    value: "bottom"
+  }
   attrs: { name: "always-serve-npa" }
   attrs: { name: "block-rtc" }
   attr_lists: "extended-amp-global"
diff --git a/extensions/amp-cache-url/validator-amp-cache-url.protoascii b/extensions/amp-cache-url/validator-amp-cache-url.protoascii
index 2ac897267..34d3667b7 100644
--- a/extensions/amp-cache-url/validator-amp-cache-url.protoascii
+++ b/extensions/amp-cache-url/validator-amp-cache-url.protoascii
@@ -20,6 +20,7 @@ tags: {  # amp-cache-url
   extension_spec: {
     name: "amp-cache-url"
     version: "0.1"
+    requires_usage: NONE
   }
   attr_lists: "common-extension-attrs"
 }
diff --git a/extensions/amp-facebook-like/validator-amp-facebook-like.protoascii b/extensions/amp-facebook-like/validator-amp-facebook-like.protoascii
index eee4f29d7..e086d2ae5 100644
--- a/extensions/amp-facebook-like/validator-amp-facebook-like.protoascii
+++ b/extensions/amp-facebook-like/validator-amp-facebook-like.protoascii
@@ -20,6 +20,7 @@ tags: {  # amp-facebook-like
   extension_spec: {
     name: "amp-facebook-like"
     version: "0.1"
+    version: "1.0"
     version: "latest"
   }
   attr_lists: "common-extension-attrs"
diff --git a/extensions/amp-render/validator-amp-render.protoascii b/extensions/amp-render/validator-amp-render.protoascii
index 696e8d93b..1e7214f31 100644
--- a/extensions/amp-render/validator-amp-render.protoascii
+++ b/extensions/amp-render/validator-amp-render.protoascii
@@ -31,7 +31,7 @@ tags: {  # <amp-render>
   attrs: {
     name: "binding"
     value: "always"
-    value: "never"
+    value: "never" # alternative to "no" introduced in https://github.com/ampproject/amphtml/pull/34643
     value: "no"
     value: "refresh"
   }
@@ -51,6 +51,10 @@ tags: {  # <amp-render>
     }
     disallowed_value_regex: "__amp_source_origin"
   }
+  attrs: {
+    name: "template"
+    value_oneof_set: TEMPLATE_IDS
+  }
   attrs: { name: "xssi-prefix" }
   attrs: {
     name: "[src]"
@@ -59,6 +63,7 @@ tags: {  # <amp-render>
   attr_lists: "extended-amp-global"
   spec_url: "https://amp.dev/documentation/components/amp-render/"
   amp_layout: {
+    supported_layouts: CONTAINER
     supported_layouts: FILL
     supported_layouts: FIXED
     supported_layouts: FIXED_HEIGHT
diff --git a/extensions/amp-twitter/validator-amp-twitter.protoascii b/extensions/amp-twitter/validator-amp-twitter.protoascii
index 6a2c3fc48..d58601064 100644
--- a/extensions/amp-twitter/validator-amp-twitter.protoascii
+++ b/extensions/amp-twitter/validator-amp-twitter.protoascii
@@ -14,11 +14,26 @@
 # limitations under the license.
 #
 
-tags: {  # amp-twitter
+tags: {  # amp-twitter 1.0
   html_format: AMP
   tag_name: "SCRIPT"
+  satisfies: "amp-twitter 1.0"
+  excludes: "amp-twitter 0.1"
   extension_spec: {
     name: "amp-twitter"
+    version_name: "v1.0"
+    version: "1.0"
+  }
+  attr_lists: "common-extension-attrs"
+}
+tags: {  # amp-twitter 0.1 and latest
+  html_format: AMP
+  tag_name: "SCRIPT"
+  satisfies: "amp-twitter 0.1"
+  excludes: "amp-twitter 1.0"
+  extension_spec: {
+    name: "amp-twitter"
+    version_name: "v0.1"
     version: "0.1"
     version: "latest"
     requires_usage: EXEMPTED
diff --git a/validator/validator-main.protoascii b/validator/validator-main.protoascii
index 07d0a9362..77637f8e9 100644
--- a/validator/validator-main.protoascii
+++ b/validator/validator-main.protoascii
@@ -5112,100 +5112,101 @@ error_specificity { code: WARNING_EXTENSION_DEPRECATED_VERSION specificity: 17 }
 error_specificity { code: NON_LTS_SCRIPT_AFTER_LTS specificity: 18 }
 error_specificity { code: LTS_SCRIPT_AFTER_NON_LTS specificity: 19 }
 error_specificity { code: INCORRECT_SCRIPT_RELEASE_VERSION specificity: 20 }
-error_specificity { code: DISALLOWED_TAG specificity: 21 }
-error_specificity { code: DISALLOWED_ATTR specificity: 22 }
-error_specificity { code: INVALID_ATTR_VALUE specificity: 23 }
-error_specificity { code: DUPLICATE_ATTRIBUTE specificity: 24 }
-error_specificity { code: ATTR_VALUE_REQUIRED_BY_LAYOUT specificity: 25 }
-error_specificity { code: MANDATORY_ATTR_MISSING specificity: 26 }
-error_specificity { code: MANDATORY_ONEOF_ATTR_MISSING specificity: 27 }
-error_specificity { code: MANDATORY_ANYOF_ATTR_MISSING specificity: 28 }
-error_specificity { code: ATTR_REQUIRED_BUT_MISSING specificity: 29 }
-error_specificity { code: DUPLICATE_UNIQUE_TAG specificity: 30 }
-error_specificity { code: DUPLICATE_UNIQUE_TAG_WARNING specificity: 31 }
-error_specificity { code: STYLESHEET_TOO_LONG specificity: 32 }
-error_specificity { code: STYLESHEET_AND_INLINE_STYLE_TOO_LONG specificity: 33 }
-error_specificity { code: INLINE_STYLE_TOO_LONG specificity: 34 }
-error_specificity { code: INLINE_SCRIPT_TOO_LONG specificity: 35 }
-error_specificity { code: CSS_SYNTAX_INVALID_AT_RULE specificity: 36 }
+error_specificity { code: DISALLOWED_AMP_DOMAIN specificity: 21 }
+error_specificity { code: DISALLOWED_TAG specificity: 22 }
+error_specificity { code: DISALLOWED_ATTR specificity: 23 }
+error_specificity { code: INVALID_ATTR_VALUE specificity: 24 }
+error_specificity { code: DUPLICATE_ATTRIBUTE specificity: 25 }
+error_specificity { code: ATTR_VALUE_REQUIRED_BY_LAYOUT specificity: 26 }
+error_specificity { code: MANDATORY_ATTR_MISSING specificity: 27 }
+error_specificity { code: MANDATORY_ONEOF_ATTR_MISSING specificity: 28 }
+error_specificity { code: MANDATORY_ANYOF_ATTR_MISSING specificity: 29 }
+error_specificity { code: ATTR_REQUIRED_BUT_MISSING specificity: 30 }
+error_specificity { code: DUPLICATE_UNIQUE_TAG specificity: 31 }
+error_specificity { code: DUPLICATE_UNIQUE_TAG_WARNING specificity: 32 }
+error_specificity { code: STYLESHEET_TOO_LONG specificity: 33 }
+error_specificity { code: STYLESHEET_AND_INLINE_STYLE_TOO_LONG specificity: 34 }
+error_specificity { code: INLINE_STYLE_TOO_LONG specificity: 35 }
+error_specificity { code: INLINE_SCRIPT_TOO_LONG specificity: 36 }
+error_specificity { code: CSS_SYNTAX_INVALID_AT_RULE specificity: 37 }
 error_specificity {
-  code: MANDATORY_PROPERTY_MISSING_FROM_ATTR_VALUE specificity: 37
-}
-error_specificity { code: INVALID_PROPERTY_VALUE_IN_ATTR_VALUE specificity: 38 }
-error_specificity { code: DISALLOWED_PROPERTY_IN_ATTR_VALUE specificity: 39 }
-error_specificity { code: MUTUALLY_EXCLUSIVE_ATTRS specificity: 40 }
-error_specificity { code: UNESCAPED_TEMPLATE_IN_ATTR_VALUE specificity: 41 }
-error_specificity { code: TEMPLATE_PARTIAL_IN_ATTR_VALUE specificity: 42 }
-error_specificity { code: TEMPLATE_IN_ATTR_NAME specificity: 43 }
+  code: MANDATORY_PROPERTY_MISSING_FROM_ATTR_VALUE specificity: 38
+}
+error_specificity { code: INVALID_PROPERTY_VALUE_IN_ATTR_VALUE specificity: 39 }
+error_specificity { code: DISALLOWED_PROPERTY_IN_ATTR_VALUE specificity: 40 }
+error_specificity { code: MUTUALLY_EXCLUSIVE_ATTRS specificity: 41 }
+error_specificity { code: UNESCAPED_TEMPLATE_IN_ATTR_VALUE specificity: 42 }
+error_specificity { code: TEMPLATE_PARTIAL_IN_ATTR_VALUE specificity: 43 }
+error_specificity { code: TEMPLATE_IN_ATTR_NAME specificity: 44 }
 error_specificity {
-  code: INCONSISTENT_UNITS_FOR_WIDTH_AND_HEIGHT specificity: 44
-}
-error_specificity { code: MISSING_LAYOUT_ATTRIBUTES specificity: 45 }
-error_specificity { code: IMPLIED_LAYOUT_INVALID specificity: 46 }
-error_specificity { code: SPECIFIED_LAYOUT_INVALID specificity: 47 }
-error_specificity { code: ATTR_DISALLOWED_BY_IMPLIED_LAYOUT specificity: 48 }
-error_specificity { code: ATTR_DISALLOWED_BY_SPECIFIED_LAYOUT specificity: 49 }
-error_specificity { code: DUPLICATE_DIMENSION specificity: 50 }
-error_specificity { code: DISALLOWED_RELATIVE_URL specificity: 51 }
-error_specificity { code: MISSING_URL specificity: 52 }
-error_specificity { code: DISALLOWED_DOMAIN specificity: 53 }
-error_specificity { code: INVALID_URL_PROTOCOL specificity: 54 }
-error_specificity { code: INVALID_URL specificity: 55 }
-error_specificity { code: DISALLOWED_STYLE_ATTR specificity: 56 }
-error_specificity { code: CSS_SYNTAX_STRAY_TRAILING_BACKSLASH specificity: 57 }
-error_specificity { code: CSS_SYNTAX_UNTERMINATED_COMMENT specificity: 58 }
-error_specificity { code: CSS_SYNTAX_UNTERMINATED_STRING specificity: 59 }
-error_specificity { code: CSS_SYNTAX_BAD_URL specificity: 60 }
+  code: INCONSISTENT_UNITS_FOR_WIDTH_AND_HEIGHT specificity: 45
+}
+error_specificity { code: MISSING_LAYOUT_ATTRIBUTES specificity: 46 }
+error_specificity { code: IMPLIED_LAYOUT_INVALID specificity: 47 }
+error_specificity { code: SPECIFIED_LAYOUT_INVALID specificity: 48 }
+error_specificity { code: ATTR_DISALLOWED_BY_IMPLIED_LAYOUT specificity: 49 }
+error_specificity { code: ATTR_DISALLOWED_BY_SPECIFIED_LAYOUT specificity: 50 }
+error_specificity { code: DUPLICATE_DIMENSION specificity: 51 }
+error_specificity { code: DISALLOWED_RELATIVE_URL specificity: 52 }
+error_specificity { code: MISSING_URL specificity: 53 }
+error_specificity { code: DISALLOWED_DOMAIN specificity: 54 }
+error_specificity { code: INVALID_URL_PROTOCOL specificity: 55 }
+error_specificity { code: INVALID_URL specificity: 56 }
+error_specificity { code: DISALLOWED_STYLE_ATTR specificity: 57 }
+error_specificity { code: CSS_SYNTAX_STRAY_TRAILING_BACKSLASH specificity: 58 }
+error_specificity { code: CSS_SYNTAX_UNTERMINATED_COMMENT specificity: 59 }
+error_specificity { code: CSS_SYNTAX_UNTERMINATED_STRING specificity: 60 }
+error_specificity { code: CSS_SYNTAX_BAD_URL specificity: 61 }
 error_specificity {
-  code: CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE specificity: 61
+  code: CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE specificity: 62
 }
-error_specificity { code: CSS_SYNTAX_INVALID_DECLARATION specificity: 62 }
-error_specificity { code: CSS_SYNTAX_INCOMPLETE_DECLARATION specificity: 63 }
-error_specificity { code: CSS_SYNTAX_ERROR_IN_PSEUDO_SELECTOR specificity: 64 }
-error_specificity { code: CSS_SYNTAX_MISSING_SELECTOR specificity: 65 }
-error_specificity { code: CSS_SYNTAX_NOT_A_SELECTOR_START specificity: 66 }
+error_specificity { code: CSS_SYNTAX_INVALID_DECLARATION specificity: 63 }
+error_specificity { code: CSS_SYNTAX_INCOMPLETE_DECLARATION specificity: 64 }
+error_specificity { code: CSS_SYNTAX_ERROR_IN_PSEUDO_SELECTOR specificity: 65 }
+error_specificity { code: CSS_SYNTAX_MISSING_SELECTOR specificity: 66 }
+error_specificity { code: CSS_SYNTAX_NOT_A_SELECTOR_START specificity: 67 }
 error_specificity {
-  code: CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR specificity: 67
-}
-error_specificity { code: CSS_SYNTAX_MISSING_URL specificity: 68 }
-error_specificity { code: CSS_SYNTAX_DISALLOWED_DOMAIN specificity: 69 }
-error_specificity { code: CSS_SYNTAX_INVALID_URL specificity: 70 }
-error_specificity { code: CSS_SYNTAX_INVALID_URL_PROTOCOL specificity: 71 }
-error_specificity { code: CSS_SYNTAX_DISALLOWED_RELATIVE_URL specificity: 72 }
-error_specificity { code: INCORRECT_NUM_CHILD_TAGS specificity: 73 }
-error_specificity { code: DISALLOWED_CHILD_TAG_NAME specificity: 74 }
-error_specificity { code: DISALLOWED_FIRST_CHILD_TAG_NAME specificity: 75 }
-error_specificity { code: CSS_SYNTAX_INVALID_ATTR_SELECTOR specificity: 76 }
+  code: CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR specificity: 68
+}
+error_specificity { code: CSS_SYNTAX_MISSING_URL specificity: 69 }
+error_specificity { code: CSS_SYNTAX_DISALLOWED_DOMAIN specificity: 70 }
+error_specificity { code: CSS_SYNTAX_INVALID_URL specificity: 71 }
+error_specificity { code: CSS_SYNTAX_INVALID_URL_PROTOCOL specificity: 72 }
+error_specificity { code: CSS_SYNTAX_DISALLOWED_RELATIVE_URL specificity: 73 }
+error_specificity { code: INCORRECT_NUM_CHILD_TAGS specificity: 74 }
+error_specificity { code: DISALLOWED_CHILD_TAG_NAME specificity: 75 }
+error_specificity { code: DISALLOWED_FIRST_CHILD_TAG_NAME specificity: 76 }
+error_specificity { code: CSS_SYNTAX_INVALID_ATTR_SELECTOR specificity: 77 }
 error_specificity {
-  code: CHILD_TAG_DOES_NOT_SATISFY_REFERENCE_POINT specificity: 77
+  code: CHILD_TAG_DOES_NOT_SATISFY_REFERENCE_POINT specificity: 78
 }
-error_specificity { code: MANDATORY_REFERENCE_POINT_MISSING specificity: 78 }
-error_specificity { code: DUPLICATE_REFERENCE_POINT specificity: 79 }
-error_specificity { code: TAG_REFERENCE_POINT_CONFLICT specificity: 80 }
+error_specificity { code: MANDATORY_REFERENCE_POINT_MISSING specificity: 79 }
+error_specificity { code: DUPLICATE_REFERENCE_POINT specificity: 80 }
+error_specificity { code: TAG_REFERENCE_POINT_CONFLICT specificity: 81 }
 error_specificity {
   code: CHILD_TAG_DOES_NOT_SATISFY_REFERENCE_POINT_SINGULAR
-  specificity: 81
+  specificity: 82
 }
-error_specificity { code: CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE specificity: 82 }
+error_specificity { code: CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE specificity: 83 }
 error_specificity {
   code: CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE_WITH_HINT
-  specificity: 83
+  specificity: 84
 }
 error_specificity {
   code: CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE
-  specificity: 84
+  specificity: 85
 }
 error_specificity {
   code: CSS_SYNTAX_PROPERTY_DISALLOWED_TOGETHER_WITH
-  specificity: 85
+  specificity: 86
 }
 error_specificity {
   code: CSS_SYNTAX_PROPERTY_REQUIRES_QUALIFICATION
-  specificity: 86
+  specificity: 87
 }
 error_specificity {
   code: BASE_TAG_MUST_PRECEED_ALL_URLS
-  specificity: 87
+  specificity: 88
 }
 error_specificity { code: DISALLOWED_SCRIPT_TAG specificity: 102 }
 error_specificity { code: GENERAL_DISALLOWED_TAG specificity: 103 }
@@ -5339,6 +5340,10 @@ error_formats {
   format: "The script version for '%1' is a %2 version which mismatches "
           "with the first script on the page using the %3 version."
 }
+error_formats {
+  code: DISALLOWED_AMP_DOMAIN
+  format: "The script tag includes an invalid AMP domain in the src attribute."
+}
 error_formats {
   code: NON_LTS_SCRIPT_AFTER_LTS
   format: "'%1' must use the LTS version to correspond with the first script "

[github-actions]

Plugin builds for f0efc7b are ready 🛎️!

• Download development build
• Download production build

[westonruter]

QA Passed

I added a Custom HTML block as follows:

It rendered as a valid AMP page without any validation errors:

I also tried adding an amp-ad with the top and bottom values for sticky:

This resulted in an ad rendering at the top and bottom of the screen.