[NayNay] Sign takes a verifying key now

src/signing/index.ts

@@ -27,13 +27,15 @@ export interface SigMsgOps {
 
 export interface SigWithAdapptersOps extends SigMsgOps {
   order: string[]
+  signatureVerifyingKey?: string
 }
 
 export interface SigOps {
   sigRequestHash: string
   hash: string
   type?: string
   auxiliaryData?: unknown[]
+  signatureVerifyingKey?: string
 }
 
 /**
@@ -122,6 +124,7 @@ export default class SignatureRequestManager {
   async signWithAdaptersInOrder ({
     msg,
     order,
+    signatureVerifyingKey
   }: SigWithAdapptersOps): Promise<unknown> {
     if (!order) {
       throw new Error(
@@ -142,7 +145,7 @@ export default class SignatureRequestManager {
       }
       return agg
     }, [])
-    // const { sigRequestHash, auxilary_data } = await
+
     const results = await Promise.all(
       adaptersToRun.map((adapter) => {
         return adapter.preSign(this.signer, msg)
@@ -161,6 +164,7 @@ export default class SignatureRequestManager {
       sigRequestHash,
       hash: adaptersToRun[0].HASHING_ALGORITHM,
       auxiliaryData,
+      signatureVerifyingKey,
     })
     return signature
   }
@@ -180,6 +184,7 @@ export default class SignatureRequestManager {
     sigRequestHash,
     hash,
     auxiliaryData,
+    signatureVerifyingKey: signatureVerifyingKeyOverwrite,
   }: SigOps): Promise<Uint8Array> {
     const strippedsigRequestHash = stripHexPrefix(sigRequestHash)
     const validatorsInfo: Array<ValidatorInfo> = await this.pickValidators(
@@ -188,7 +193,7 @@ export default class SignatureRequestManager {
     // TO-DO: this needs to be and accounId ie hex string of the address
     // which means you need a new key ie device key here
 
-    const signatureVerifyingKey = this.verifyingKey
+    const signatureVerifyingKey = signatureVerifyingKeyOverwrite || this.verifyingKey
 
     const txRequests: Array<EncMsg> = await this.formatTxRequests({
       strippedsigRequestHash,

tests/sign.test.ts

@@ -8,6 +8,7 @@ import {
   spinNetworkUp,
   spinNetworkDown,
   charlieStashSeed,
+  charlieSeed,
 } from './testing-utils'
 
 const NETWORK_TYPE = 'two-nodes'
@@ -55,3 +56,56 @@ test('Sign', async (t) => {
 
   t.end()
 })
+
+test('Sign: Inputted Verifying Keys', async (t) => {
+  const run = promiseRunner(t)
+
+  /* Setup Network */
+  await run('network up', spinNetworkUp(NETWORK_TYPE))
+  await sleep(process.env.GITHUB_WORKSPACE ? 30_000 : 5_000)
+  t.teardown(async () => {
+    // this gets called after all tests are run
+    await charlieStashEntropy.close()
+    await charlieEntropy.close()
+    await spinNetworkDown(NETWORK_TYPE).catch((error) =>
+      console.error('Error while spinning network down', error.message)
+    )
+  })
+
+  /* Setup Entropy */
+  await run('wasm', wasmGlobalsReady())
+  const charlieStashKeyring = new Keyring({ seed: charlieStashSeed, debug: true })
+  const charlieKeyring = new Keyring({ seed: charlieSeed, debug: true })
+  const charlieStashEntropy = new Entropy({
+    keyring: charlieStashKeyring,
+    endpoint: 'ws://127.0.0.1:9944',
+  })
+  const charlieEntropy = new Entropy({
+    keyring: charlieKeyring,
+    endpoint: 'ws://127.0.0.1:9944',
+  })
+  await run('charlieStashEntropy ready', charlieStashEntropy.ready)
+  await run('charlieEntropy ready', charlieEntropy.ready)
+  await run('charlie stash register', charlieStashEntropy.register())
+  await run('charlie register', charlieEntropy.register())
+
+
+  /* Sign */
+  const msg = Buffer
+    .from('Hello world: new signature from charlieStashEntropy!')
+    .toString('hex')
+
+  const signature = await run(
+    'sign',
+    charlieStashEntropy.signWithAdaptersInOrder({
+      msg: { msg },
+      order: ['deviceKeyProxy'],
+      signatureVerifyingKey: charlieEntropy.keyring.accounts.deviceKey.verifyingKeys[0]
+    })
+  )
+
+  t.true(signature && signature.length > 32, 'signature has some body!')
+  signature && console.log(signature)
+
+  t.end()
+})