some improvement for signing process

minotaur-ergo · Apr 3, 2024 · 6422882 · 6422882
1 parent 6282f7e
commit 6422882
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/action/multi-sig/commitment.ts b/src/action/multi-sig/commitment.ts
@@ -86,7 +86,7 @@ const generateCommitments = async (
 const hintBagToArray = async (
   wallet: StateWallet,
   signerWallet: StateWallet,
-  tx: wasm.UnsignedTransaction,
+  tx: wasm.UnsignedTransaction | wasm.Transaction,
   boxes: Array<wasm.ErgoBox>,
   commitment: wasm.TransactionHintsBag,
   password?: string,

diff --git a/src/action/multi-sig/signing.ts b/src/action/multi-sig/signing.ts
@@ -174,18 +174,8 @@ const extractAndAddSignedHints = async (
   partial?: wasm.Transaction,
   boxes: Array<wasm.ErgoBox> = [],
 ) => {
-  const simulatedPropositions = new wasm.Propositions();
-  simulated.forEach((item) => {
-    simulatedPropositions.add_proposition_from_byte(
-      Uint8Array.from(Buffer.from('cd' + item, 'hex')),
-    );
-  });
-  const realPropositions = new wasm.Propositions();
-  signed.forEach((item) => {
-    realPropositions.add_proposition_from_byte(
-      Uint8Array.from(Buffer.from('cd' + item, 'hex')),
-    );
-  });
+  const simulatedPropositions = arrayToProposition(simulated);
+  const realPropositions = arrayToProposition(signed);
   const context = await getChain(wallet.networkType).fakeContext();
   if (partial) {
     const ergoBoxes = wasm.ErgoBoxes.empty();
@@ -337,3 +327,9 @@ export const sign = async (
     currentTime,
   };
 };
+
+export const arrayToProposition = (input: Array<string>): wasm.Propositions => {
+  const output = new wasm.Propositions()
+  input.forEach(pk => Uint8Array.from(Buffer.from('cd' + pk, 'hex')),)
+  return output
+}
diff --git a/src/action/multi-sig/wallet-keys.ts b/src/action/multi-sig/wallet-keys.ts
@@ -58,7 +58,7 @@ const getMultiSigWalletMyPublicKeys = async (
 const getInputPks = async (
   wallet: StateWallet,
   signerWallet: StateWallet,
-  tx: wasm.UnsignedTransaction,
+  tx: wasm.UnsignedTransaction | wasm.Transaction,
   boxes: Array<wasm.ErgoBox>,
 ): Promise<Array<Array<string>>> => {
   const pks = await getMultiSigWalletPublicKeys(wallet, signerWallet);