From 93a066f9139757047ca74640c6f92a4c7554c20e Mon Sep 17 00:00:00 2001 From: Jeremy Rubin Date: Sun, 21 Jan 2024 12:40:35 -0500 Subject: [PATCH 1/4] Remove uneccessary allocations in Inscription Script Creation PushBytes was not doing anything over good ol' push_slice --- src/inscriptions/inscription.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inscriptions/inscription.rs b/src/inscriptions/inscription.rs index 271fa75efd..bccedd8cb9 100644 --- a/src/inscriptions/inscription.rs +++ b/src/inscriptions/inscription.rs @@ -4,7 +4,7 @@ use { bitcoin::{ blockdata::{ opcodes, - script::{self, PushBytesBuf}, + script::{self}, }, ScriptBuf, }, @@ -141,7 +141,7 @@ impl Inscription { if let Some(body) = &self.body { builder = builder.push_slice(envelope::BODY_TAG); for chunk in body.chunks(MAX_SCRIPT_ELEMENT_SIZE) { - builder = builder.push_slice(PushBytesBuf::try_from(chunk.to_vec()).unwrap()); + builder = builder.push_slice(chunk).unwrap()); } } From 1f7abbb1eedff226c43eec5ca8036a945b5693fd Mon Sep 17 00:00:00 2001 From: Jeremy Rubin Date: Sun, 21 Jan 2024 12:42:42 -0500 Subject: [PATCH 2/4] fix accident :( --- src/inscriptions/inscription.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inscriptions/inscription.rs b/src/inscriptions/inscription.rs index bccedd8cb9..4a354716bc 100644 --- a/src/inscriptions/inscription.rs +++ b/src/inscriptions/inscription.rs @@ -141,7 +141,7 @@ impl Inscription { if let Some(body) = &self.body { builder = builder.push_slice(envelope::BODY_TAG); for chunk in body.chunks(MAX_SCRIPT_ELEMENT_SIZE) { - builder = builder.push_slice(chunk).unwrap()); + builder = builder.push_slice(chunk); } } From 39ce2f90b9c15a7a1c6faa8957a44383a89681e2 Mon Sep 17 00:00:00 2001 From: raphjaph Date: Mon, 22 Jan 2024 14:52:47 -0800 Subject: [PATCH 3/4] Use PushBytes instead of PushBytesBuf --- src/inscriptions/inscription.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inscriptions/inscription.rs b/src/inscriptions/inscription.rs index 4a354716bc..d52ef00fe0 100644 --- a/src/inscriptions/inscription.rs +++ b/src/inscriptions/inscription.rs @@ -4,7 +4,7 @@ use { bitcoin::{ blockdata::{ opcodes, - script::{self}, + script::{self, PushBytes}, }, ScriptBuf, }, @@ -141,7 +141,7 @@ impl Inscription { if let Some(body) = &self.body { builder = builder.push_slice(envelope::BODY_TAG); for chunk in body.chunks(MAX_SCRIPT_ELEMENT_SIZE) { - builder = builder.push_slice(chunk); + builder = builder.push_slice::<&script::PushBytes>(chunk.try_into().unwrap()); } } From 27bcf762fd6c49d7c1ff17b236942d7cb5cd061c Mon Sep 17 00:00:00 2001 From: raphjaph Date: Mon, 22 Jan 2024 14:54:41 -0800 Subject: [PATCH 4/4] Placate clippy --- src/inscriptions/inscription.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/inscriptions/inscription.rs b/src/inscriptions/inscription.rs index d52ef00fe0..057f34f76e 100644 --- a/src/inscriptions/inscription.rs +++ b/src/inscriptions/inscription.rs @@ -2,10 +2,7 @@ use { super::*, anyhow::ensure, bitcoin::{ - blockdata::{ - opcodes, - script::{self, PushBytes}, - }, + blockdata::{opcodes, script}, ScriptBuf, }, brotli::enc::{writer::CompressorWriter, BrotliEncoderParams},