fix: rebase issues

motorina0 · motorina0 · commit d10716146dc6 · 2022-01-12T15:17:13.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/taproot.js b/src/taproot.js
@@ -144,5 +144,5 @@ function serializeScript(s) {
 }
 // todo: do not use ecc
 function pointAddScalar(P, h) {
-  return ecc.pointAddScalar(P, h);
+  return buffer_1.Buffer.from(ecc.pointAddScalar(P, h));
 }
diff --git a/ts_src/taproot.ts b/ts_src/taproot.ts
@@ -181,5 +181,5 @@ function serializeScript(s: Buffer): Buffer {
 
 // todo: do not use ecc
 function pointAddScalar(P: Buffer, h: Buffer): Buffer {
-  return ecc.pointAddScalar(P, h);
+  return NBuffer.from(ecc.pointAddScalar(P, h));
 }

Original file line number	Diff line number	Diff line change
`@@ -144,5 +144,5 @@ function serializeScript(s) {`
`144`	`144`	`}`
`145`	`145`	`// todo: do not use ecc`
`146`	`146`	`function pointAddScalar(P, h) {`
`147`		`- return ecc.pointAddScalar(P, h);`
	`147`	`+ return buffer_1.Buffer.from(ecc.pointAddScalar(P, h));`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,5 +181,5 @@ function serializeScript(s: Buffer): Buffer {`
`181`	`181`
`182`	`182`	`// todo: do not use ecc`
`183`	`183`	`function pointAddScalar(P: Buffer, h: Buffer): Buffer {`
`184`		`- return ecc.pointAddScalar(P, h);`
	`184`	`+ return NBuffer.from(ecc.pointAddScalar(P, h));`
`185`	`185`	`}`