chore(utxo-coredao): apply changes

TICKET: BTC-1578

Author: davidkaplanbitgo

modules/utxo-coredao/src/opReturn.ts

@@ -56,8 +56,6 @@ export function createCoreDaoOpReturnOutputScript({
    *
    * The OP_RETURN output should contain all staking information in order, and be composed in the following format:
    *
-   * OP_RETURN: identifier 0x6a
-   * LENGTH: which represents the total byte length after the OP_RETURN opcode. Note that all data has to be pushed with its appropriate size byte(s). [1]
    * Satoshi Plus Identifier: (SAT+) 4 bytes
    * Version: (0x01) 1 byte
    * Chain ID: (0x045b (1115) for Core Testnet and 0x045c (1116) for Core Mainnet) 2 bytes
@@ -67,13 +65,12 @@ export function createCoreDaoOpReturnOutputScript({
    * (Optional) RedeemScript
    * (Optional) Timelock: 4 bytes
    *
-   * [1] Any bytes bigger than or equal to 0x4c is pushed by using 0x4c (ie. OP_PUSHDATA)
-   * followed by the length followed by the data (byte[80] -> OP_PUSHDATA + 80 + byte[80])
-   *
    * Either RedeemScript or Timelock must be available, the purpose is to allow relayer to
    * obtain the RedeemScript and submit transactions on Core. If a RedeemScript is provided,
    * relayer will use it directly. Otherwise, relayer will construct the redeem script based
    * on the timelock and the information in the transaction inputs.
+   *
+   * Note that any length > 80 bytes wont be relayed by nodes and therefore we will throw an error.
    */
   if (version < 0 || version > 255) {
     throw new Error('Invalid version - out of range');
@@ -197,18 +194,3 @@ export function parseCoreDaoOpReturnOutputScript(script: Buffer): OpReturnParams
     return { ...baseParams, redeemScript: Buffer.from(dataBuffer.subarray(offset)) };
   }
 }
-
-/**
- * Check that the params are valid and that they make the given script
- * @param script
- * @param params
- */
-export function verifyCoreDaoOpReturnOutputScript(script: Buffer, params: OpReturnParams): boolean {
-  try {
-    parseCoreDaoOpReturnOutputScript(script);
-    const inferredScript = createCoreDaoOpReturnOutputScript(params);
-    return inferredScript.equals(script);
-  } catch (e) {
-    return false;
-  }
-}

modules/utxo-coredao/test/unit/opReturn.ts

@@ -2,12 +2,10 @@ import * as assert from 'assert';
 import {
   CORE_DAO_MAINNET_CHAIN_ID,
   CORE_DAO_SATOSHI_PLUS_IDENTIFIER,
-  CORE_DAO_TESTNET_CHAIN_ID,
   createCoreDaoOpReturnOutputScript,
   decodeTimelock,
   encodeTimelock,
   parseCoreDaoOpReturnOutputScript,
-  verifyCoreDaoOpReturnOutputScript,
 } from '../../src';
 import { testutil } from '@bitgo/utxo-lib';
 
@@ -268,61 +266,4 @@ describe('OP_RETURN', function () {
       assert.throws(() => parseCoreDaoOpReturnOutputScript(Buffer.from(script, 'hex')));
     });
   });
-
-  describe('verifyCoreDaoOpReturnOutputScript', function () {
-    it('should return true for a valid script with a redeem script', function () {
-      const params = {
-        version: validVersion,
-        chainId: validChainId,
-        delegator: validDelegator,
-        validator: validValidator,
-        fee: validFee,
-        redeemScript: validRedeemScript,
-      };
-      const script = createCoreDaoOpReturnOutputScript(params);
-      assert.strictEqual(verifyCoreDaoOpReturnOutputScript(script, params), true);
-    });
-
-    it('should return true for a valid script with a timelock', function () {
-      const params = {
-        version: validVersion,
-        chainId: validChainId,
-        delegator: validDelegator,
-        validator: validValidator,
-        fee: validFee,
-        timelock: validTimelock,
-      };
-      const script = createCoreDaoOpReturnOutputScript(params);
-      assert.strictEqual(verifyCoreDaoOpReturnOutputScript(script, params), true);
-    });
-
-    it('should return false when they are not equivalent', function () {
-      const params = {
-        version: validVersion,
-        chainId: validChainId,
-        delegator: validDelegator,
-        validator: validValidator,
-        fee: validFee,
-        redeemScript: validRedeemScript,
-      };
-      const script = createCoreDaoOpReturnOutputScript(params);
-      // Change the version
-      params.version = 3;
-      assert.strictEqual(verifyCoreDaoOpReturnOutputScript(script, params), false);
-    });
-
-    it('should fail if they one is mainnet and one is testnet', function () {
-      const params = {
-        version: validVersion,
-        chainId: CORE_DAO_MAINNET_CHAIN_ID,
-        delegator: validDelegator,
-        validator: validValidator,
-        fee: validFee,
-        timelock: validTimelock,
-      };
-      const script = createCoreDaoOpReturnOutputScript(params);
-      params.chainId = CORE_DAO_TESTNET_CHAIN_ID;
-      assert.strictEqual(verifyCoreDaoOpReturnOutputScript(script, params), false);
-    });
-  });
 });