getcofund 0.1.0 → 0.2.0

package/dist/requests.js

@@ -1,11 +1,9 @@
-import { sha256 } from "@noble/hashes/sha2";
-import { bytesToHex } from "@noble/hashes/utils";
 import { ethers } from "ethers";
-import { btcPolicyActivationMessage, } from "./btc-policy-activation.js";
+import { btcPolicyActivationMessage } from "./btc-policy-activation.js";
 import { pinnedDomain, sameDomain } from "./chains.js";
-import { inviteUserTypes, transactionPolicyActivationTypes, transactionTypes, transferPolicyActivationTypes, transferTypes, WRAPPER_ENTRYPOINT, } from "./eip712.js";
+import { inviteUserTypes, transactionTypes, transferTypes, WRAPPER_ENTRYPOINT, } from "./eip712.js";
 import { inviteWindowProblem } from "./invite.js";
-import { btcCofundLeafKey } from "./keys.js";
+import { btcPolicyActivation, evmPolicyActivation, } from "./policies.js";
 import { decodeStockSwap, encodeV4SwapInstructions, STOCK_POOLS, STOCK_SWAP_WRAPPER_MAINNET, swapLegs, } from "./stocks/index.js";
 const sameAddress = (a, b) => a.toLowerCase() === b.toLowerCase();
 /**
@@ -83,60 +81,17 @@ export function decodeRequest(request) {
             };
     }
 }
-const byCodepoint = (a, b) => (a < b ? -1 : Number(a > b));
-/**
- * The activation the policy's fields commit to: a transaction policy names its
- * wrapper and `entry`; a transfer policy its token, cap and allowlist.
- */
-function policyActivation(company, request) {
-    const common = {
-        company,
-        policyId: request.id,
-        title: request.name,
-        policyType: request.type,
-        signerIds: request.signers.map((s) => s.onchainId).sort(byCodepoint),
-        threshold: String(request.threshold),
-        authId: request.id,
-    };
-    if (request.wrapper) {
-        return {
-            types: transactionPolicyActivationTypes(),
-            message: {
-                ...common,
-                wrapper: request.wrapper,
-                func: WRAPPER_ENTRYPOINT,
-            },
-        };
-    }
+/** What a policy request's activation commits to, from its own fields. */
+function activationFields(request) {
     return {
-        types: transferPolicyActivationTypes(),
-        message: {
-            ...common,
-            token: request.token?.address ?? ethers.ZeroAddress,
-            maxAmount: request.maxAmount ?? "0",
-            recipients: request.recipients,
-        },
-    };
-}
-/** The BTC activation the fields commit to; signer keys are derived here from their xpubs. */
-function btcPolicyActivation(company, request) {
-    const isTransaction = request.wrapper !== null;
-    return {
-        clientId: bytesToHex(sha256(new TextEncoder().encode(company))),
-        policyId: request.id,
-        authId: request.id,
-        policyType: request.type,
-        policyTitle: request.name,
-        policySignerKeys: request.signers
-            .map((s) => btcCofundLeafKey(s.key))
-            .sort(byCodepoint),
-        policyThreshold: request.threshold,
-        txWrapper: request.wrapper ?? "",
-        txFunc: isTransaction ? WRAPPER_ENTRYPOINT : "",
-        isTransaction,
-        maxAmount: isTransaction ? "0" : (request.maxAmount ?? "0"),
-        tokenIdentifier: isTransaction ? "" : (request.token?.address ?? ""),
-        recipients: isTransaction ? [] : [...request.recipients].sort(byCodepoint),
+        id: request.id,
+        name: request.name,
+        type: request.type,
+        threshold: request.threshold,
+        token: request.token?.address ?? null,
+        maxAmount: request.maxAmount,
+        recipients: request.recipients,
+        wrapper: request.wrapper,
     };
 }
 /**
@@ -211,7 +166,10 @@ function rebuildTypedData(request, company, now) {
                 }),
             };
         case "policy":
-            return policyActivation(company, request);
+            return evmPolicyActivation(company, {
+                ...activationFields(request),
+                signerIds: request.signers.map((s) => s.onchainId),
+            });
         default:
             return {
                 types: inviteUserTypes(),
@@ -252,7 +210,10 @@ export async function checkRequest(request, expected, pins) {
  * a request for another cofund hashes differently.
  */
 async function checkBtcPolicy(request, expected) {
-    const rebuilt = btcPolicyActivationMessage(btcPolicyActivation(expected.company, request));
+    const rebuilt = btcPolicyActivationMessage(btcPolicyActivation(expected.company, {
+        ...activationFields(request),
+        signerXpubs: request.signers.map((s) => s.key),
+    }));
     if (rebuilt !== request.message) {
         throw new Error(DIFFERS);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getcofund",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Cofund API client, local signers and the `cofund` CLI. Keys are generated and used locally; Cofund never sees them.",
   "license": "MIT",
   "repository": {