Merge PR #866 from 'nodech/covenant-methods'

handshake-org · Oct 20, 2023 · 7bd2078 · 7bd2078
2 parents 0690c6f + 0f4767f
commit 7bd2078
Show file tree

Hide file tree

Showing 19 changed files with 399 additions and 233 deletions.
diff --git a/lib/covenants/rules.js b/lib/covenants/rules.js
@@ -144,7 +144,7 @@ rules.MAX_COVENANT_SIZE = (0
 /**
  * Hash a domain name.
  * @param {String|Buffer} name
- * @returns {Buffer}
+ * @returns {Hash}
  */
 
 rules.hashName = function hashName(name) {
@@ -156,7 +156,7 @@ rules.hashName = function hashName(name) {
 /**
  * Hash a domain name.
  * @param {String} name
- * @returns {Buffer}
+ * @returns {Hash}
  */
 
 rules.hashString = function hashString(name) {

diff --git a/lib/mempool/mempoolentry.js b/lib/mempool/mempoolentry.js
@@ -142,7 +142,7 @@ class MempoolEntry extends bio.Struct {
 
   /**
    * Calculate reverse transaction hash.
-   * @returns {Hash}
+   * @returns {HexHash}
    */
 
   txid() {

diff --git a/lib/mining/template.js b/lib/mining/template.js
@@ -294,13 +294,14 @@ class BlockTemplate {
 
       output.value = claim.value - claim.fee;
       output.address = claim.address;
-      output.covenant.type = rules.types.CLAIM;
-      output.covenant.pushHash(claim.nameHash);
-      output.covenant.pushU32(this.height);
-      output.covenant.push(claim.name);
-      output.covenant.pushU8(flags);
-      output.covenant.pushHash(claim.commitHash);
-      output.covenant.pushU32(claim.commitHeight);
+      output.covenant.setClaim(
+        claim.nameHash,
+        this.height,
+        claim.name,
+        flags,
+        claim.commitHash,
+        claim.commitHeight
+      );
 
       cb.outputs.push(output);
     }

diff --git a/lib/primitives/address.js b/lib/primitives/address.js
@@ -541,9 +541,8 @@ class Address extends bio.Struct {
     if (!data)
       throw new Error('Object is not an address.');
 
-    if (Buffer.isBuffer(data)) {
+    if (Buffer.isBuffer(data))
       return data;
-    }
 
     if (data instanceof Address)
       return data.hash;

diff --git a/lib/primitives/claim.js b/lib/primitives/claim.js
@@ -17,7 +17,6 @@ const InvItem = require('./invitem');
 const TX = require('./tx');
 const Input = require('./input');
 const Output = require('./output');
-const {types} = rules;
 const {OwnershipProof} = Ownership;
 
 /*
@@ -170,13 +169,14 @@ class Claim extends bio.Struct {
     if (data.weak)
       flags |= 1;
 
-    output.covenant.type = types.CLAIM;
-    output.covenant.pushHash(rules.hashName(data.name));
-    output.covenant.pushU32(height);
-    output.covenant.pushString(data.name);
-    output.covenant.pushU8(flags);
-    output.covenant.pushHash(data.commitHash);
-    output.covenant.pushU32(data.commitHeight);
+    output.covenant.setClaim(
+      rules.hashName(data.name),
+      height,
+      Buffer.from(data.name, 'binary'),
+      flags,
+      data.commitHash,
+      data.commitHeight,
+    );
 
     tx.inputs.push(input);
     tx.outputs.push(output);

diff --git a/lib/primitives/coin.js b/lib/primitives/coin.js
@@ -173,7 +173,7 @@ class Coin extends Output {
 
   /**
    * Get little-endian hash.
-   * @returns {Hash}
+   * @returns {HexHash?}
    */
 
   txid() {