diff --git a/consensus/src/script.rs b/consensus/src/script.rs index df9f568a..4d0df4f5 100644 --- a/consensus/src/script.rs +++ b/consensus/src/script.rs @@ -21,7 +21,6 @@ use amplify::confinement; use amplify::confinement::Confined; -use amplify::hex::{FromHex, ToHex}; use crate::opcodes::*; use crate::{VarInt, VarIntArray, LIB_NAME_BITCOIN}; @@ -370,6 +369,7 @@ impl ScriptBytes { #[cfg(feature = "serde")] mod _serde { + use amplify::hex::{FromHex, ToHex}; use serde::{Deserialize, Serialize}; use serde_crate::de::Error; use serde_crate::{Deserializer, Serializer}; diff --git a/consensus/src/stl.rs b/consensus/src/stl.rs index c5a9f94d..5eb8e71e 100644 --- a/consensus/src/stl.rs +++ b/consensus/src/stl.rs @@ -33,11 +33,11 @@ use crate::{ #[deprecated(since = "0.10.8", note = "use LIB_ID_BP_TX instead")] pub const LIB_ID_BITCOIN: &str = - "urn:ubideco:stl:6GgF7biXPVNcus2FfQj2pQuRzau11rXApMQLfCZhojgi#money-pardon-parody"; + "urn:ubideco:stl:HX2UBak8vPsTokug1DGMDvTpzns3xUdwZ7QJdyt4qBA9#speed-atlanta-trilogy"; pub const LIB_ID_BP_TX: &str = - "urn:ubideco:stl:6GgF7biXPVNcus2FfQj2pQuRzau11rXApMQLfCZhojgi#money-pardon-parody"; + "urn:ubideco:stl:HX2UBak8vPsTokug1DGMDvTpzns3xUdwZ7QJdyt4qBA9#speed-atlanta-trilogy"; pub const LIB_ID_BP_CONSENSUS: &str = - "urn:ubideco:stl:4AXTqXq8jUDs244XbhvErdsG82Y8r9PiaPBPAmD5y9fQ#cheese-provide-morph"; + "urn:ubideco:stl:8nFxDqDPmHD15hQf1npGQbDfpRX4Y9hXoo7VfarMJX11#urgent-viva-ninja"; #[deprecated(since = "0.10.8", note = "use _bp_tx_stl instead")] fn _bitcoin_stl() -> Result { _bp_tx_stl() } diff --git a/src/stl.rs b/src/stl.rs index 005f26b9..ecac5b89 100644 --- a/src/stl.rs +++ b/src/stl.rs @@ -30,7 +30,7 @@ use strict_types::{CompileError, LibBuilder, TypeLib}; /// Strict types id for the library providing data types from [`dbc`] and /// [`seals`] crates. pub const LIB_ID_BPCORE: &str = - "urn:ubideco:stl:2YsxMW6xygK2FxFSbbBLqmzaUSytmLHHNF9DRio5zNr2#sultan-data-copy"; + "urn:ubideco:stl:8RW9jc3Za592QYvum2jiPDtXjpjVdBzT8J2nurNmKX2o#change-mango-survive"; fn _bp_core_stl() -> Result { LibBuilder::new(libname!(LIB_NAME_BPCORE), tiny_bset! { diff --git a/stl/BPCore@0.1.0.sta b/stl/BPCore@0.1.0.sta index 95cb1ff1..edfad14d 100644 --- a/stl/BPCore@0.1.0.sta +++ b/stl/BPCore@0.1.0.sta @@ -1,14 +1,14 @@ -----BEGIN STRICT TYPE LIB----- -Id: urn:ubideco:stl:2YsxMW6xygK2FxFSbbBLqmzaUSytmLHHNF9DRio5zNr2 +Id: urn:ubideco:stl:8RW9jc3Za592QYvum2jiPDtXjpjVdBzT8J2nurNmKX2o Name: BPCore Dependencies: urn:ubideco:stl:ZtHaBzu9ojbDahaGKEXe5v9DfSDxLERbLkEB23R6Q6V, - urn:ubideco:stl:6GgF7biXPVNcus2FfQj2pQuRzau11rXApMQLfCZhojgi, - urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ + urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ, + urn:ubideco:stl:HX2UBak8vPsTokug1DGMDvTpzns3xUdwZ7QJdyt4qBA9 BkJQQ29yZQMIbJMpP1Zo7NnfnUB1CNehMyMWREFWAosurAm/5d+NQgxDb21taXRW -ZXJpZnlOToT0cBbJ5dJifL/D9Day3WzU0bmwRFv/Xu+CdnJ3VwdCaXRjb2lue4SA -PJ764hElp3wsObxw0v3o+UOuDf2c9OaC7cdmynADU3RkAwdCaXRjb2luBwAh4z5D +ZXJpZnl7hIA8nvriESWnfCw5vHDS/ej5Q64N/Zz05oLtx2bKcANTdGT1bBNiI/Y5 +p0oJk9xHRsn5iqu4g1hdtdkWPxh+xCgaCgdCaXRjb2luAwdCaXRjb2luBwAh4z5D xapc8iknU6M4wWftO2OcTdnOvamPNGkXuslDdQRWb3V0Jav1uRIUF7qjOdRfexV1 p3FL4Xp1GF3QMTV61Mkt6YYLU2NyaXB0Qnl0ZXMxu67ohIl3xbAHMXIxzZL2MLYp Lc2Jf9y63sW6xOl/2QtUYXBOb2RlSGFzaF+s2W3lP07FFNmxjWeA2gqr6y0mC/03 @@ -23,52 +23,52 @@ JOikmWBR05SCQ/GU9/GRVyPp5gpNZXJrbGVOb2RlxKN7LSxSbrVJWtXZihWIvHNJ 7AFaxfUJdqdV7py7D1QLTWVya2xlQmxvY2vLhaeLEqU3TP/7I/XLv5m2ZEsplYZ9 cReJIjVZ/HuLVwpNZXJrbGVUcmVlA1N0ZAEAIuTglum9fVyG9eHfXXcBav45xzzZ NIVQlECJjKijeV4CVTUQAAhBbmNob3JJZAUBAAcAAEAgABFBbmNob3JNZXJrbGVC -bG9jawYDBHR4aWQCTk6E9HAWyeXSYny/w/Q2st1s1NG5sERb/17vgnZyd1ejgkLz +bG9jawYDBHR4aWQC9WwTYiP2OadKCZPcR0bJ+YqruINYXbXZFj8YfsQoGgqjgkLz y9fR0KES2o3hYC9W1PhvDsTEdsXAaFlMSwRlVghtcGNQcm9vZgIIbJMpP1Zo7Nnf nUB1CNehMyMWREFWAosurAm/5d+NQsSjey0sUm61SVrV2YoViLxzSewBWsX1CXan Ve6cuw9UCGRiY1Byb29mAapKxGjifpS21gMqlp26VvtdZYFcCXpQBHAl7YizA5S/ -EUFuY2hvck1lcmtsZVByb29mBgMEdHhpZAJOToT0cBbJ5dJifL/D9Day3WzU0bmw -RFv/Xu+CdnJ3V6OCQvPL19HQoRLajeFgL1bU+G8OxMR2xcBoWUxLBGVWCG1wY1By +EUFuY2hvck1lcmtsZVByb29mBgMEdHhpZAL1bBNiI/Y5p0oJk9xHRsn5iqu4g1hd +tdkWPxh+xCgaCqOCQvPL19HQoRLajeFgL1bU+G8OxMR2xcBoWUxLBGVWCG1wY1By b29mAghskyk/Vmjs2d+dQHUI16EzIxZEQVYCiy6sCb/l341CL+7PHkTSoSm5ihQ4 R0s5cZUrKByiAZLVEyb4sjZgXmcIZGJjUHJvb2YBqkrEaOJ+lLbWAyqWnbpW+11l -gVwJelAEcCXtiLMDlL8QQW5jaG9yTWVya2xlVHJlZQYDBHR4aWQCTk6E9HAWyeXS -Yny/w/Q2st1s1NG5sERb/17vgnZyd1ejgkLzy9fR0KES2o3hYC9W1PhvDsTEdsXA +gVwJelAEcCXtiLMDlL8QQW5jaG9yTWVya2xlVHJlZQYDBHR4aWQC9WwTYiP2OadK +CZPcR0bJ+YqruINYXbXZFj8YfsQoGgqjgkLzy9fR0KES2o3hYC9W1PhvDsTEdsXA aFlMSwRlVghtcGNQcm9vZgIIbJMpP1Zo7NnfnUB1CNehMyMWREFWAosurAm/5d+N QsuFp4sSpTdM//sj9cu/mbZkSymVhn1xF4kiNVn8e4tXCGRiY1Byb29mAapKxGji fpS21gMqlp26VvtdZYFcCXpQBHAl7YizA5S/DkJsaW5kU2VhbFR4UHRyBgQGbWV0 aG9kAdJSMHx9cZA19zB+6Cgl7BuBK6GH3Z2YSYtKjRb6btVDBHR4aWQBseU4ORQK -OL7wbxrPvhxgpW/h4fR9eAgoeb/R+tMQId0Edm91dAJOToT0cBbJ5dJifL/D9Day -3WzU0bmwRFv/Xu+CdnJ3VyHjPkPFqlzyKSdTozjBZ+07Y5xN2c69qY80aRe6yUN1 +OL7wbxrPvhxgpW/h4fR9eAgoeb/R+tMQId0Edm91dAL1bBNiI/Y5p0oJk9xHRsn5 +iqu4g1hdtdkWPxh+xCgaCiHjPkPFqlzyKSdTozjBZ+07Y5xN2c69qY80aRe6yUN1 CGJsaW5kaW5nAAAIDUJsaW5kU2VhbFR4aWQGBAZtZXRob2QB0lIwfH1xkDX3MH7o -KCXsG4EroYfdnZhJi0qNFvpu1UMEdHhpZAJOToT0cBbJ5dJifL/D9Day3WzU0bmw -RFv/Xu+CdnJ3V6OCQvPL19HQoRLajeFgL1bU+G8OxMR2xcBoWUxLBGVWBHZvdXQC -Tk6E9HAWyeXSYny/w/Q2st1s1NG5sERb/17vgnZyd1ch4z5Dxapc8iknU6M4wWft +KCXsG4EroYfdnZhJi0qNFvpu1UMEdHhpZAL1bBNiI/Y5p0oJk9xHRsn5iqu4g1hd +tdkWPxh+xCgaCqOCQvPL19HQoRLajeFgL1bU+G8OxMR2xcBoWUxLBGVWBHZvdXQC +9WwTYiP2OadKCZPcR0bJ+YqruINYXbXZFj8YfsQoGgoh4z5Dxapc8iknU6M4wWft O2OcTdnOvamPNGkXuslDdQhibGluZGluZwAACAtDbG9zZU1ldGhvZAMCCm9wcmV0 Rmlyc3QAC3RhcHJldEZpcnN0ARFFeHBsaWNpdFNlYWxUeFB0cgYDBm1ldGhvZAHS UjB8fXGQNfcwfugoJewbgSuhh92dmEmLSo0W+m7VQwR0eGlkAbHlODkUCji+8G8a -z74cYKVv4eH0fXgIKHm/0frTECHdBHZvdXQCTk6E9HAWyeXSYny/w/Q2st1s1NG5 -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 BGVW -----END STRICT TYPE LIB----- diff --git a/stl/BPCore@0.1.0.stl b/stl/BPCore@0.1.0.stl index 87e68e23..34f37f4f 100644 Binary files a/stl/BPCore@0.1.0.stl and b/stl/BPCore@0.1.0.stl differ diff --git a/stl/BPCore@0.1.0.sty b/stl/BPCore@0.1.0.sty index 7f2a7d87..1faca3b7 100644 --- a/stl/BPCore@0.1.0.sty +++ b/stl/BPCore@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: urn:ubideco:stl:2YsxMW6xygK2FxFSbbBLqmzaUSytmLHHNF9DRio5zNr2#sultan-data-copy + Id: urn:ubideco:stl:8RW9jc3Za592QYvum2jiPDtXjpjVdBzT8J2nurNmKX2o#change-mango-survive Name: BPCore Version: 0.1.0 Description: Bitcoin client-side-validation library @@ -20,7 +20,11 @@ import urn:ubideco:stl:ZtHaBzu9ojbDahaGKEXe5v9DfSDxLERbLkEB23R6Q6V#rhino-cover-f -- MerkleBlock := urn:ubideco:semid:EEbVZBjaYQWCQA7uRBe8hFkxV6U1uvpH2dT4PafmJ1ko#proxy-catalog-byte -- MerkleTree := urn:ubideco:semid:EhTy77DCCxuuKR1ixPLPRna1yc8LjDREYyxCcfdkQGo8#puzzle-quick-madrid -import urn:ubideco:stl:6GgF7biXPVNcus2FfQj2pQuRzau11rXApMQLfCZhojgi#money-pardon-parody as Bitcoin +import urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ#justice-rocket-type as Std +-- Imports: +-- U5 := urn:ubideco:semid:3MDHMYsJt8d1gUiyx5vGCWcNLQ7biek6UTjHg3ksW4Bf#ground-volume-singer + +import urn:ubideco:stl:HX2UBak8vPsTokug1DGMDvTpzns3xUdwZ7QJdyt4qBA9#speed-atlanta-trilogy as Bitcoin -- Imports: -- Vout := urn:ubideco:semid:3HHRtSJW5fnGkdVW1EVDH7B97Y79WhwvKyyfsaBkuQkk#chrome-robin-gallop -- ScriptBytes := urn:ubideco:semid:3Y4AgjkFbDusgo3YqRDWv9BznDeAJEUDEPeEq1mpSkAR#maestro-source-jackson @@ -30,10 +34,6 @@ import urn:ubideco:stl:6GgF7biXPVNcus2FfQj2pQuRzau11rXApMQLfCZhojgi#money-pardon -- LeafVer := urn:ubideco:semid:DGELfUvcU62GNQRo7HaMbKDzYQwdYRMW3b91JHd4d3WY#tunnel-lagoon-cowboy -- InternalPk := urn:ubideco:semid:G5HFVaWwWNYSzqk548JgGZ8WKy6dQ2ftVgkJvHjgRudZ#horse-major-vienna -import urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ#justice-rocket-type as Std --- Imports: --- U5 := urn:ubideco:semid:3MDHMYsJt8d1gUiyx5vGCWcNLQ7biek6UTjHg3ksW4Bf#ground-volume-singer - -- urn:ubideco:semid:HXreMRXsXhE6goE2JsF8g9jy4rZ7p7AEeYmxYgfPF2tN#dinner-single-alarm diff --git a/stl/Bitcoin@0.1.0.sta b/stl/Bitcoin@0.1.0.sta index 6b4649f8..92549b6d 100644 --- a/stl/Bitcoin@0.1.0.sta +++ b/stl/Bitcoin@0.1.0.sta @@ -1,5 +1,5 @@ -----BEGIN STRICT TYPE LIB----- -Id: urn:ubideco:stl:4AXTqXq8jUDs244XbhvErdsG82Y8r9PiaPBPAmD5y9fQ +Id: urn:ubideco:stl:8nFxDqDPmHD15hQf1npGQbDfpRX4Y9hXoo7VfarMJX11 Name: Bitcoin Dependencies: urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ @@ -47,25 +47,25 @@ cm5qC1RhcExlYWZIYXNoBQEABwAAQCAADVRhcE1lcmtsZVBhdGgFAQAIAa/rxZ3Y b2RlSGFzaAUBAAcAAEAgAAlUYXBTY3JpcHQFAQElq/W5EhQXuqM51F97FXWncUvh enUYXdAxNXrUyS3phhBUaW1lTG9ja0ludGVydmFsBAIABmhlaWdodAAFAQAAAgEE dGltZQAFAQAAAgJUeAYEB3ZlcnNpb24BqHzGeWRn5VfXROXJYjrgDMuV2RoNLwPf -dMB1Ek++x54GaW5wdXRzAAgBGUctF9hiB6cPITGpWKFopW4q1lM/nGZMGXfaXPn+ -YoYAAAAAAAAAAP////8AAAAAB291dHB1dHMACAGQO2RweYSPGyZTKuTOxqaJRKBT +dMB1Ek++x54GaW5wdXRzAAgBChmQ11PyCpVmHxM79SNKJY/+S8jdCSekG+QEvY6i +RqoAAAAAAAAAAP////8AAAAAB291dHB1dHMACAGQO2RweYSPGyZTKuTOxqaJRKBT WLjwgcsms7v4LZ478wAAAAAAAAAA/////wAAAAAIbG9ja1RpbWUBNdodFTkgbrvd 3KTDPYcx6vKbp9p03z3IgiAcTha1uRwEVHhJbgYECnByZXZPdXRwdXQB6GpAzVwl +b3ihP9ppREyp0ErIVW9DlYSwb/jhJVgxQYJc2lnU2NyaXB0ATh1BLFLfA5GbUee F0d9JHQkf/gDZOw9S6r3OiD3QXRrCHNlcXVlbmNlAQEZbYUpyPbaRE0VTo2cjL2e -D42JAlo7sJEhxj1SsB6HB3dpdG5lc3MBc3dDcDaTIEnNKJUIqnF844KdskUuVehO -1PwuPM0uAJ0FVHhPdXQGAgV2YWx1ZQGX9dcGQq4qM5IlO6hOHc7Ek+O/PtNxsYdz +D42JAlo7sJEhxj1SsB6HB3dpdG5lc3MBnVWTrLr5zeCbOEb4gwlx0zjJL251vHzj +IEWeqzgZph4FVHhPdXQGAgV2YWx1ZQGX9dcGQq4qM5IlO6hOHc7Ek+O/PtNxsYdz hjVOzIiCawxzY3JpcHRQdWJrZXkBvvwe/GalGf1kUmo6E4dA5/EQLQu+/zrBRk7z 90B2dFwFVHhWZXIFAQAARARUeGlkBQEABwAAQCAADlVuY29tcHJlc3NlZFBrBQEA BwAAQEEABlZCeXRlcwUBAAAEBlZhckludAUBAAAIBFZvdXQFAQAABAtXUHVia2V5 SGFzaAUBAAcAAEAUAAtXU2NyaXB0SGFzaAUBAAcAAEAgAAtXZWlnaHRVbml0cwUB -AAAEB1dpdG5lc3MFAQAIAAgAAEAAAAAAAAAAAP////8AAAAAAAAAAAAAAAD///// -AAAAAA5XaXRuZXNzUHJvZ3JhbQYCB3ZlcnNpb24B0ezadmfkQu1NEmmmZwM25f70 -N69ezitprroMRlbE+q0HcHJvZ3JhbQAIAABAAgAAAAAAAAAoAAAAAAAAAA1XaXRu -ZXNzU2NyaXB0BQEBJav1uRIUF7qjOdRfexV1p3FL4Xp1GF3QMTV61Mkt6YYKV2l0 -bmVzc1ZlcgMRAnYwAAJ2MVECdjJSAnYzUwJ2NFQCdjVVAnY2VgJ2N1cCdjhYAnY5 -WQN2MTBaA3YxMVsDdjEyXAN2MTNdA3YxNF4DdjE1XwN2MTZgBVd0eGlkBQEABwAA -QCAAB1hPbmx5UGsFAQAHAABAIAA= +AAAEB1dpdG5lc3MFAQAIAcRya4+PKNF6wZfIHY4NoZtiRJzm0GRd/sfpeDy1h/Gj +AAAAAAAAAAD/////AAAAAA5XaXRuZXNzUHJvZ3JhbQYCB3ZlcnNpb24B0ezadmfk +Qu1NEmmmZwM25f70N69ezitprroMRlbE+q0HcHJvZ3JhbQAIAABAAgAAAAAAAAAo +AAAAAAAAAA1XaXRuZXNzU2NyaXB0BQEBJav1uRIUF7qjOdRfexV1p3FL4Xp1GF3Q +MTV61Mkt6YYKV2l0bmVzc1ZlcgMRAnYwAAJ2MVECdjJSAnYzUwJ2NFQCdjVVAnY2 +VgJ2N1cCdjhYAnY5WQN2MTBaA3YxMVsDdjEyXAN2MTNdA3YxNF4DdjE1XwN2MTZg +BVd0eGlkBQEABwAAQCAAB1hPbmx5UGsFAQAHAABAIAA= -----END STRICT TYPE LIB----- diff --git a/stl/Bitcoin@0.1.0.stl b/stl/Bitcoin@0.1.0.stl index 939ab1b3..7347bd21 100644 Binary files a/stl/Bitcoin@0.1.0.stl and b/stl/Bitcoin@0.1.0.stl differ diff --git a/stl/Bitcoin@0.1.0.sty b/stl/Bitcoin@0.1.0.sty index 2d93bf01..6e788f27 100644 --- a/stl/Bitcoin@0.1.0.sty +++ b/stl/Bitcoin@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: urn:ubideco:stl:4AXTqXq8jUDs244XbhvErdsG82Y8r9PiaPBPAmD5y9fQ#cheese-provide-morph + Id: urn:ubideco:stl:8nFxDqDPmHD15hQf1npGQbDfpRX4Y9hXoo7VfarMJX11#urgent-viva-ninja Name: Bitcoin Version: 0.1.0 Description: Consensus library for bitcoin protocol @@ -139,8 +139,8 @@ data WPubkeyHash :: [Byte ^ 20] data WScriptHash :: [Byte ^ 32] -- urn:ubideco:semid:EcY6NU6BVRVkgCFwfWmSkbVKpLmWWVfDwBRRiSr6FJUC#bridge-version-voyage data WeightUnits :: U32 --- urn:ubideco:semid:8mjN2CZj3Nhn2HjnKqTmEcN5vmyb3UJK8HSFW1uE3W2p#warning-saddle-period -data Witness :: [[Byte ^ ..0xffffffff] ^ ..0xffffffff] +-- urn:ubideco:semid:Gg9XBkAqDafziCYdzoJYMrjP6ziSxQckFaEBmbPLLgPD#sonata-local-slow +data Witness :: [ByteStr ^ ..0xffffffff] -- urn:ubideco:semid:FK7h8D8X6BTAuh8q4NdkdAGgF9vwAZRyYcUpFzR3fcDG#scholar-juice-titanic data WitnessProgram :: version WitnessVer, program [Byte ^ 2..0x28] -- urn:ubideco:semid:Bd2bXQc2D6YmMFpupKnFGvjBiZNcGKrhaxS9omUUedcS#boris-harbor-equal diff --git a/stl/Tx@0.1.0.sta b/stl/Tx@0.1.0.sta index 167f7b48..065d4c15 100644 --- a/stl/Tx@0.1.0.sta +++ b/stl/Tx@0.1.0.sta @@ -1,26 +1,26 @@ -----BEGIN STRICT TYPE LIB----- -Id: urn:ubideco:stl:5PUqZnqASPU3zKASh2pTHYmfcV4pZfvt4UU8FxPsRt6S +Id: urn:ubideco:stl:9zw1koriNSQRJBdHbXnTqjCdShzASm915rWgnCBgnKJ4 Name: Tx Dependencies: ~ -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 -----END STRICT TYPE LIB----- diff --git a/stl/Tx@0.1.0.stl b/stl/Tx@0.1.0.stl index 79ac39a8..7ce7a4f4 100644 Binary files a/stl/Tx@0.1.0.stl and b/stl/Tx@0.1.0.stl differ diff --git a/stl/Tx@0.1.0.sty b/stl/Tx@0.1.0.sty index b5859e11..e58fd0c4 100644 --- a/stl/Tx@0.1.0.sty +++ b/stl/Tx@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: urn:ubideco:stl:5PUqZnqASPU3zKASh2pTHYmfcV4pZfvt4UU8FxPsRt6S#winter-horizon-binary + Id: urn:ubideco:stl:9zw1koriNSQRJBdHbXnTqjCdShzASm915rWgnCBgnKJ4#delphi-magnum-flame Name: Tx Version: 0.1.0 Description: Bitcoin transaction library @@ -12,6 +12,8 @@ typelib Tx -- no dependencies +-- urn:ubideco:semid:EDr6wurh4X1tMNGqA7mRkyrAY6ngPGyRSEufTGSUtySJ#kinetic-avenue-escort +data ByteStr :: [Byte ^ ..0xffffffff] -- urn:ubideco:semid:4dDWWU4afiPN3q4AgCMuFRFhL4UDta2u5SrqrBzPvjby#tokyo-inch-program data LockTime :: U32 -- urn:ubideco:semid:FWt2MSo8A4nsYgYbuBqMRNLiKgtzvLBgUn774iKzTcuf#pocket-pegasus-frank @@ -44,6 +46,6 @@ data TxVer :: I32 data Txid :: [Byte ^ 32] -- urn:ubideco:semid:3HHRtSJW5fnGkdVW1EVDH7B97Y79WhwvKyyfsaBkuQkk#chrome-robin-gallop data Vout :: U32 --- urn:ubideco:semid:8mjN2CZj3Nhn2HjnKqTmEcN5vmyb3UJK8HSFW1uE3W2p#warning-saddle-period -data Witness :: [[Byte ^ ..0xffffffff] ^ ..0xffffffff] +-- urn:ubideco:semid:Gg9XBkAqDafziCYdzoJYMrjP6ziSxQckFaEBmbPLLgPD#sonata-local-slow +data Witness :: [ByteStr ^ ..0xffffffff]