Merge #30: Fix activation heights

tcharding · tcharding · commit 9fc4daccbdf8 · 2022-06-06T11:23:55.000+10:00
4fe4d1f fix bip16 activation height (Riccardo Casatta) adf6c75 Fix off-by-one error on activation heights (Riccardo Casatta) Pull request description: ACKs for top commit: tcharding: ACK 4fe4d1f Tree-SHA512: faff07c9af822bc73d209debe0d2fb98eb4bdc20b57bb43b687b812673b6b948cb0aa2e1c5490c0765827f224c9f3c81338c42657a7a482cdfdde77837599a5e
diff --git a/src/lib.rs b/src/lib.rs
@@ -72,19 +72,19 @@ extern "C" {
 pub fn height_to_flags(height: u32) -> u32 {
     let mut flag = VERIFY_NONE;
 
-    if height > 170059 {
+    if height >= 173805 {
         flag |= VERIFY_P2SH;
     }
-    if height > 363724 {
+    if height >= 363725 {
         flag |= VERIFY_DERSIG;
     }
-    if height > 388381 {
+    if height >= 388381 {
         flag |= VERIFY_CHECKLOCKTIMEVERIFY;
     }
-    if height > 419328 {
+    if height >= 419328 {
         flag |= VERIFY_CHECKSEQUENCEVERIFY;
     }
-    if height > 481824 {
+    if height >= 481824 {
         flag |= VERIFY_NULLDUMMY | VERIFY_WITNESS
     }
 

Original file line number	Diff line number	Diff line change
`@@ -72,19 +72,19 @@ extern "C" {`
`72`	`72`	`pub fn height_to_flags(height: u32) -> u32 {`
`73`	`73`	`let mut flag = VERIFY_NONE;`
`74`	`74`
`75`		`- if height > 170059 {`
	`75`	`+ if height >= 173805 {`
`76`	`76`	`flag \|= VERIFY_P2SH;`
`77`	`77`	`}`
`78`		`- if height > 363724 {`
	`78`	`+ if height >= 363725 {`
`79`	`79`	`flag \|= VERIFY_DERSIG;`
`80`	`80`	`}`
`81`		`- if height > 388381 {`
	`81`	`+ if height >= 388381 {`
`82`	`82`	`flag \|= VERIFY_CHECKLOCKTIMEVERIFY;`
`83`	`83`	`}`
`84`		`- if height > 419328 {`
	`84`	`+ if height >= 419328 {`
`85`	`85`	`flag \|= VERIFY_CHECKSEQUENCEVERIFY;`
`86`	`86`	`}`
`87`		`- if height > 481824 {`
	`87`	`+ if height >= 481824 {`
`88`	`88`	`flag \|= VERIFY_NULLDUMMY \| VERIFY_WITNESS`
`89`	`89`	`}`
`90`	`90`