@layerzerolabs/onesig-core 0.0.2 → 0.0.3

package/dist/index.d.ts

@@ -1,14 +1,13 @@
 import { BigNumber } from 'ethers';
 import { MerkleTree } from 'merkletreejs';
+export { MerkleTree } from 'merkletreejs';
 import { TypedDataSigner } from '@ethersproject/abstract-signer';
 
-interface BaseLeafData<Target = string, Call = {
-    [key: string]: any;
-}> {
-    nonce: number;
-    chainId: number;
-    target: Target;
-    calls: Call[];
+interface BaseLeafData<TargetAddressType = unknown, CallData = unknown> {
+    nonce: bigint;
+    chainId: bigint;
+    targetOneSigAddress: TargetAddressType;
+    calls: CallData[];
 }
 type SigningOptions = {
     seed: string | Uint8Array;
@@ -19,7 +18,8 @@ interface GenerateLeafsResult<Leaf extends BaseLeafData> {
     leafs: Leaf[];
 }
 declare function makeOneSigTree(input: GenerateLeafsResult<any>[]): MerkleTree;
+declare function compareAddresses(a: string, b: string): number;
 declare function mergeOneSigSignatures(signatures: string[]): Promise<string>;
 declare function signOneSigTree(tree: MerkleTree, _signers: TypedDataSigner[] | TypedDataSigner, { seed, expiry }: SigningOptions): Promise<string>;
 
-export { type BaseLeafData, type GenerateLeafsResult, type SigningOptions, makeOneSigTree, mergeOneSigSignatures, signOneSigTree };
+export { type BaseLeafData, type GenerateLeafsResult, type SigningOptions, compareAddresses, makeOneSigTree, mergeOneSigSignatures, signOneSigTree };

package/dist/index.js

@@ -15459,6 +15459,8 @@ var require_dist = __commonJS({
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  MerkleTree: () => import_merkletreejs.MerkleTree,
+  compareAddresses: () => compareAddresses,
   makeOneSigTree: () => makeOneSigTree,
   mergeOneSigSignatures: () => mergeOneSigSignatures,
   signOneSigTree: () => signOneSigTree
@@ -33944,12 +33946,6 @@ var Reader2 = class _Reader {
   }
 };
 
-// ../../node_modules/.pnpm/@ethersproject+keccak256@5.7.0/node_modules/@ethersproject/keccak256/lib.esm/index.js
-var import_js_sha32 = __toESM(require_sha3());
-function keccak2562(data) {
-  return "0x" + import_js_sha32.default.keccak_256(arrayify2(data));
-}
-
 // ../../node_modules/.pnpm/@ethersproject+rlp@5.7.0/node_modules/@ethersproject/rlp/lib.esm/index.js
 var lib_exports4 = {};
 __export(lib_exports4, {
@@ -34085,7 +34081,7 @@ function getChecksumAddress2(address) {
   for (let i = 0; i < 40; i++) {
     expanded[i] = chars[i].charCodeAt(0);
   }
-  const hashed = arrayify2(keccak2562(expanded));
+  const hashed = arrayify2(keccak256(expanded));
   for (let i = 0; i < 40; i += 2) {
     if (hashed[i >> 1] >> 4 >= 8) {
       chars[i] = chars[i].toUpperCase();
@@ -34177,7 +34173,7 @@ function getContractAddress2(transaction) {
     logger54.throwArgumentError("missing from address", "transaction", transaction);
   }
   const nonce = stripZeros2(arrayify2(BigNumber2.from(transaction.nonce).toHexString()));
-  return getAddress2(hexDataSlice2(keccak2562(encode4([from, nonce])), 12));
+  return getAddress2(hexDataSlice2(keccak256(encode4([from, nonce])), 12));
 }
 function getCreate2Address(from, salt, initCodeHash) {
   if (hexDataLength2(salt) !== 32) {
@@ -34186,7 +34182,7 @@ function getCreate2Address(from, salt, initCodeHash) {
   if (hexDataLength2(initCodeHash) !== 32) {
     logger54.throwArgumentError("initCodeHash must be 32 bytes", "initCodeHash", initCodeHash);
   }
-  return getAddress2(hexDataSlice2(keccak2562(concat2(["0xff", getAddress2(from), salt, initCodeHash])), 12));
+  return getAddress2(hexDataSlice2(keccak256(concat2(["0xff", getAddress2(from), salt, initCodeHash])), 12));
 }
 
 // ../../node_modules/.pnpm/@ethersproject+abi@5.7.0/node_modules/@ethersproject/abi/lib.esm/coders/address.js
@@ -35427,7 +35423,7 @@ var Interface2 = class {
       if (param.type === "string") {
         return id2(value);
       } else if (param.type === "bytes") {
-        return keccak2562(hexlify2(value));
+        return keccak256(hexlify2(value));
       }
       if (param.type === "bool" && typeof value === "boolean") {
         value = value ? "0x01" : "0x00";
@@ -35482,7 +35478,7 @@ var Interface2 = class {
         if (param.type === "string") {
           topics.push(id2(value));
         } else if (param.type === "bytes") {
-          topics.push(keccak2562(value));
+          topics.push(keccak256(value));
         } else if (param.baseType === "tuple" || param.baseType === "array") {
           throw new Error("not implemented");
         } else {
@@ -36064,6 +36060,12 @@ function getJsonWalletAddress2(json) {
   return null;
 }
 
+// ../../node_modules/.pnpm/@ethersproject+keccak256@5.7.0/node_modules/@ethersproject/keccak256/lib.esm/index.js
+var import_js_sha32 = __toESM(require_sha3());
+function keccak2562(data) {
+  return "0x" + import_js_sha32.default.keccak_256(arrayify2(data));
+}
+
 // ../../node_modules/.pnpm/@ethersproject+sha2@5.7.0/node_modules/@ethersproject/sha2/lib.esm/sha2.js
 var import_hash10 = __toESM(require_hash());
 
@@ -36177,7 +36179,7 @@ function pack3(types, values) {
   return hexlify2(concat2(tight));
 }
 function keccak2563(types, values) {
-  return keccak2562(pack3(types, values));
+  return keccak256(pack3(types, values));
 }
 function sha2563(types, values) {
   return sha2562(pack3(types, values));
@@ -38233,7 +38235,7 @@ var allowedTransactionKeys6 = {
 };
 function computeAddress2(key3) {
   const publicKey = computePublicKey2(key3);
-  return getAddress2(hexDataSlice2(keccak2562(hexDataSlice2(publicKey, 1)), 12));
+  return getAddress2(hexDataSlice2(keccak256(hexDataSlice2(publicKey, 1)), 12));
 }
 function recoverAddress2(digest, signature3) {
   return computeAddress2(recoverPublicKey2(arrayify2(digest), signature3));
@@ -38419,7 +38421,7 @@ function _parseEipSignature2(tx, fields, serialize4) {
   tx.r = hexZeroPad2(fields[1], 32);
   tx.s = hexZeroPad2(fields[2], 32);
   try {
-    const digest = keccak2562(serialize4(tx));
+    const digest = keccak256(serialize4(tx));
     tx.from = recoverAddress2(digest, { r: tx.r, s: tx.s, recoveryParam: tx.v });
   } catch (error) {
   }
@@ -38447,7 +38449,7 @@ function _parseEip15592(payload) {
   if (transaction.length === 9) {
     return tx;
   }
-  tx.hash = keccak2562(payload);
+  tx.hash = keccak256(payload);
   _parseEipSignature2(tx, transaction.slice(9), _serializeEip15592);
   return tx;
 }
@@ -38470,7 +38472,7 @@ function _parseEip29302(payload) {
   if (transaction.length === 8) {
     return tx;
   }
-  tx.hash = keccak2562(payload);
+  tx.hash = keccak256(payload);
   _parseEipSignature2(tx, transaction.slice(8), _serializeEip29302);
   return tx;
 }
@@ -38514,12 +38516,12 @@ function _parse2(rawTransaction) {
       raw.push("0x");
       recoveryParam -= tx.chainId * 2 + 8;
     }
-    const digest = keccak2562(encode4(raw));
+    const digest = keccak256(encode4(raw));
     try {
       tx.from = recoverAddress2(digest, { r: hexlify2(tx.r), s: hexlify2(tx.s), recoveryParam });
     } catch (error) {
     }
-    tx.hash = keccak2562(rawTransaction);
+    tx.hash = keccak256(rawTransaction);
   }
   tx.type = null;
   return tx;
@@ -39117,6 +39119,17 @@ function makeOneSigTree(input) {
   const tree = new import_merkletreejs.MerkleTree(leaves, ethers_exports.utils.keccak256, { sortPairs: true });
   return tree;
 }
+function compareAddresses(a, b) {
+  const aNumeric = BigInt(a);
+  const bNumeric = BigInt(b);
+  if (aNumeric === bNumeric) {
+    return 0;
+  } else if (aNumeric < bNumeric) {
+    return -1;
+  } else {
+    return 1;
+  }
+}
 async function mergeOneSigSignatures(signatures) {
   const signaturesWithoutStart = signatures.map(function(signature3) {
     return signature3.replace("0x", "");
@@ -39160,6 +39173,8 @@ async function signOneSigTree(tree, _signers, { seed, expiry }) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  MerkleTree,
+  compareAddresses,
   makeOneSigTree,
   mergeOneSigSignatures,
   signOneSigTree

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/onesig-core",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": "MIT",
   "exports": {
     ".": {