omnipin 1.5.2 → 1.6.1

package/dist/cli.js

@@ -4151,6 +4151,12 @@ class MissingCLIArgsError extends Error {
     super(`Missing CLI arguments: ${args.join(", ")}`);
   }
 }
+class InvalidLabelhashError extends Error {
+  name = "InvalidLabelhashError";
+  constructor({ labelhash: labelhash2, details }) {
+    super(`${labelhash2}: ${details}`);
+  }
+}
 var responseStatus = (status) => {
   if (status < 300)
     return styleText("bgGreen", status.toString());
@@ -12702,10 +12708,10 @@ function from12(abiItem, options = {}) {
     ...prepare3 ? { hash: getSignatureHash(item) } : {}
   };
 }
-function fromAbi(abi12, name62, options) {
+function fromAbi(abi14, name62, options) {
   const { args = [], prepare: prepare3 = true } = options ?? {};
   const isSelector = validate(name62, { strict: false });
-  const abiItems = abi12.filter((abiItem2) => {
+  const abiItems = abi14.filter((abiItem2) => {
     if (isSelector) {
       if (abiItem2.type === "function" || abiItem2.type === "error")
         return getSelector(abiItem2) === slice(name62, 0, 4);
@@ -12777,8 +12783,8 @@ function fromAbi(abi12, name62, options) {
 function getSelector(...parameters) {
   const abiItem = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi12, name62] = parameters;
-      return fromAbi(abi12, name62);
+      const [abi14, name62] = parameters;
+      return fromAbi(abi14, name62);
     }
     return parameters[0];
   })();
@@ -12787,8 +12793,8 @@ function getSelector(...parameters) {
 function getSignature(...parameters) {
   const abiItem = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi12, name62] = parameters;
-      return fromAbi(abi12, name62);
+      const [abi14, name62] = parameters;
+      return fromAbi(abi14, name62);
     }
     return parameters[0];
   })();
@@ -12802,8 +12808,8 @@ function getSignature(...parameters) {
 function getSignatureHash(...parameters) {
   const abiItem = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi12, name62] = parameters;
-      return fromAbi(abi12, name62);
+      const [abi14, name62] = parameters;
+      return fromAbi(abi14, name62);
     }
     return parameters[0];
   })();
@@ -13647,8 +13653,8 @@ class InvalidTypeError extends BaseError {
 function decode9(...parameters) {
   const [abiError, data, options = {}] = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi12, name62, data2, options2] = parameters;
-      return [fromAbi2(abi12, name62), data2, options2];
+      const [abi14, name62, data2, options2] = parameters;
+      return [fromAbi2(abi14, name62), data2, options2];
     }
     return parameters;
   })();
@@ -13667,7 +13673,7 @@ function decode9(...parameters) {
 function from14(abiError, options = {}) {
   return from12(abiError, options);
 }
-function fromAbi2(abi12, name62, options) {
+function fromAbi2(abi14, name62, options) {
   if (name62 === "Error")
     return solidityError;
   if (name62 === "Panic")
@@ -13679,7 +13685,7 @@ function fromAbi2(abi12, name62, options) {
     if (selector === solidityPanicSelector)
       return solidityPanic;
   }
-  const item = fromAbi(abi12, name62, options);
+  const item = fromAbi(abi14, name62, options);
   if (item.type !== "error")
     throw new NotFoundError({ name: name62, type: "error" });
   return item;
@@ -14432,8 +14438,8 @@ var waitForTransaction = async (provider, hash2) => {
 function decodeResult(...parameters) {
   const [abiFunction, data, options = {}] = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi12, name62, data2, options2] = parameters;
-      return [fromAbi3(abi12, name62), data2, options2];
+      const [abi14, name62, data2, options2] = parameters;
+      return [fromAbi3(abi14, name62), data2, options2];
     }
     return parameters;
   })();
@@ -14450,8 +14456,8 @@ function decodeResult(...parameters) {
 function encodeData2(...parameters) {
   const [abiFunction, args = []] = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi12, name62, args3] = parameters;
-      return [fromAbi3(abi12, name62, { args: args3 }), args3];
+      const [abi14, name62, args3] = parameters;
+      return [fromAbi3(abi14, name62, { args: args3 }), args3];
     }
     const [abiFunction2, args2] = parameters;
     return [abiFunction2, args2];
@@ -14464,8 +14470,8 @@ function encodeData2(...parameters) {
   const data = args.length > 0 ? encode7(item.inputs, args) : void 0;
   return data ? concat(selector, data) : selector;
 }
-function fromAbi3(abi12, name62, options) {
-  const item = fromAbi(abi12, name62, options);
+function fromAbi3(abi14, name62, options) {
+  const item = fromAbi(abi14, name62, options);
   if (item.type !== "function")
     throw new NotFoundError({ name: name62, type: "function" });
   return item;
@@ -15203,7 +15209,8 @@ var uploadPieceToDataSet = async ({
     const dataSet = await getDataSet({ dataSetId: datasetId, chain });
     clientDataSetId = dataSet.clientDataSetId;
   }
-  logger.info(`Client data set ID: ${clientDataSetId}`);
+  if (verbose)
+    logger.info(`Client data set ID: ${clientDataSetId}`);
   const payload = getSignPayload({
     types: {
       AddPieces: [
@@ -15351,18 +15358,22 @@ var uploadToFilecoin = async ({
     providerAddress,
     chain
   });
-  logger.info(`Filecoin SP ID: ${providerId}`);
+  if (verbose)
+    logger.info(`Filecoin SP ID: ${providerId}`);
   const payee = await getProviderPayee({ id: providerId, chain });
-  logger.info(`Filecoin SP Payee: ${payee}`);
+  if (verbose)
+    logger.info(`Filecoin SP Payee: ${payee}`);
   const { perMonth } = await getServicePrice({ size: size42, chain });
   logger.info(`Price for storage: ${format(perMonth, 18)} USDfc/month`);
-  logger.info("Looking up existing datasets");
+  if (verbose)
+    logger.info("Looking up existing datasets");
   const dataSets = await getClientDataSets({ address, chain });
   let datasetId;
   let clientDataSetId;
   const providerDataSets = dataSets.filter((set) => set.providerId === providerId);
   if (providerDataSets.length === 0) {
-    logger.info("No dataset found. Creating.");
+    if (verbose)
+      logger.info("No dataset found. Creating.");
     const {
       clientDataSetId: clientId,
       hash: hash3,
@@ -24300,10 +24311,8 @@ var uploadCAR = async (conf, car) => {
   const piece = fromDigest(multihashDigest).link;
   const content2 = create2(code6, digest4);
   const offer = await exports_storefront.filecoinOffer({
-    issuer: conf.issuer,
-    audience: uploadServicePrincipal,
-    with: conf.issuer.did(),
-    proofs: conf.proofs
+    ...conf,
+    audience: uploadServicePrincipal
   }, content2, piece, {});
   if (offer.out?.error) {
     throw new Error("failed to offer piece for aggregation into filecoin deal", {
@@ -29130,6 +29139,12 @@ function unwrapLabelhash(label) {
     return null;
   return hash2;
 }
+function labelhash(label) {
+  const result2 = new Uint8Array(32).fill(0);
+  if (!label)
+    return fromBytes(result2);
+  return unwrapLabelhash(label) || keccak256(fromString(label));
+}
 function namehash(name12) {
   let result2 = new Uint8Array(32).fill(0);
   if (!name12)
@@ -29145,6 +29160,151 @@ function namehash(name12) {
 function normalize(name12) {
   return ens_normalize(name12);
 }
+var abi12 = {
+  constant: true,
+  inputs: [
+    {
+      name: "node",
+      type: "bytes32"
+    }
+  ],
+  name: "addr",
+  outputs: [
+    {
+      name: "addr",
+      type: "address"
+    }
+  ],
+  payable: false,
+  stateMutability: "view",
+  type: "function"
+};
+var encodeEnsAddressRecordRequest = (name12) => encodeData2(abi12, [namehash(name12)]);
+var abi13 = {
+  inputs: [
+    {
+      name: "name",
+      type: "bytes"
+    },
+    {
+      name: "data",
+      type: "bytes"
+    }
+  ],
+  name: "resolve",
+  outputs: [
+    {
+      name: "data",
+      type: "bytes"
+    },
+    {
+      name: "resolver",
+      type: "address"
+    }
+  ],
+  stateMutability: "view",
+  type: "function"
+};
+function encodeLabelhash(hash2) {
+  if (!hash2.startsWith("0x"))
+    throw new InvalidLabelhashError({
+      labelhash: hash2,
+      details: "Expected labelhash to start with 0x"
+    });
+  if (hash2.length !== 66)
+    throw new InvalidLabelhashError({
+      labelhash: hash2,
+      details: "Expected labelhash to have a length of 66"
+    });
+  return `[${hash2.slice(2)}]`;
+}
+function packetToBytes(packet) {
+  const value = packet.replace(/^\.|\.$/gm, "");
+  if (value.length === 0)
+    return new Uint8Array(1);
+  const bytes2 = new Uint8Array(fromString2(value).byteLength + 2);
+  let offset = 0;
+  const list3 = value.split(".");
+  for (let i = 0; i < list3.length; i += 1) {
+    let encoded = fromString2(list3[i]);
+    if (encoded.byteLength > 255)
+      encoded = fromString2(encodeLabelhash(labelhash(list3[i])));
+    bytes2[offset] = encoded.length;
+    bytes2.set(encoded, offset + 1);
+    offset += encoded.length + 1;
+  }
+  if (bytes2.byteLength !== offset + 1)
+    return bytes2.slice(0, offset + 1);
+  return bytes2;
+}
+var resolveEnsName = async ({
+  provider,
+  name: name12
+}) => {
+  const result2 = await provider.request({
+    method: "eth_call",
+    params: [
+      {
+        data: encodeData2(abi13, [
+          toHex(packetToBytes(name12)),
+          encodeEnsAddressRecordRequest(name12)
+        ]),
+        to: "0xeEeEEEeE14D718C2B47D9923Deab1335E144EeEe"
+      },
+      "latest"
+    ]
+  });
+  return `0x${decodeResult(abi13, result2)[0].slice(-40)}`;
+};
+function parseEip3770Address(fullAddress) {
+  const parts = fullAddress.split(":");
+  const address = checksum2(parts.length > 1 ? parts[1] : parts[0]);
+  const prefix2 = parts.length > 1 ? parts[0] : "";
+  return { prefix: prefix2, address };
+}
+function validateEthereumAddress(address) {
+  if (!validate4(address))
+    throw new Error(`Invalid Ethereum address ${address}`);
+}
+var isValidEip3770NetworkPrefix = (prefix2) => networks.some(({ shortName }) => shortName === prefix2);
+function getEip3770NetworkPrefixFromChainId(chainId) {
+  const network = networks.find((network2) => chainId === network2.chainId);
+  if (!network)
+    throw new Error("No network prefix supported for the current chainId");
+  return network.shortName;
+}
+function validateEip3770NetworkPrefix(prefix2, currentChainId) {
+  const isCurrentNetworkPrefix = prefix2 === getEip3770NetworkPrefixFromChainId(currentChainId);
+  if (!isValidEip3770NetworkPrefix(prefix2) || !isCurrentNetworkPrefix) {
+    throw new Error("The network prefix must match the current network");
+  }
+}
+function getEip3770Address({
+  fullAddress,
+  chainId
+}) {
+  const { address, prefix: prefix2 } = parseEip3770Address(fullAddress);
+  validateEthereumAddress(address);
+  if (prefix2)
+    validateEip3770NetworkPrefix(prefix2, chainId);
+  return { address, prefix: prefix2 };
+}
+var networks = [
+  { chainId: 1, shortName: "eth" },
+  { chainId: 11155111, shortName: "sep" }
+];
+var getExactAddress = async ({
+  addressOrEns,
+  provider,
+  chain
+}) => {
+  if (addressOrEns.endsWith(".eth"))
+    return await resolveEnsName({ name: addressOrEns, provider });
+  return getEip3770Address({
+    fullAddress: addressOrEns,
+    chainId: chain.id
+  }).address;
+};
 var varint6 = __toESM(require_varint(), 1);
 var IFPS_CODEC = 227;
 var SWARM_CODEC = 228;
@@ -29265,43 +29425,6 @@ var getNonce = {
     }
   ]
 };
-function parseEip3770Address(fullAddress) {
-  const parts = fullAddress.split(":");
-  const address = checksum2(parts.length > 1 ? parts[1] : parts[0]);
-  const prefix2 = parts.length > 1 ? parts[0] : "";
-  return { prefix: prefix2, address };
-}
-function validateEthereumAddress(address) {
-  if (!validate4(address))
-    throw new Error(`Invalid Ethereum address ${address}`);
-}
-var isValidEip3770NetworkPrefix = (prefix2) => networks.some(({ shortName }) => shortName === prefix2);
-function getEip3770NetworkPrefixFromChainId(chainId) {
-  const network = networks.find((network2) => chainId === network2.chainId);
-  if (!network)
-    throw new Error("No network prefix supported for the current chainId");
-  return network.shortName;
-}
-function validateEip3770NetworkPrefix(prefix2, currentChainId) {
-  const isCurrentNetworkPrefix = prefix2 === getEip3770NetworkPrefixFromChainId(currentChainId);
-  if (!isValidEip3770NetworkPrefix(prefix2) || !isCurrentNetworkPrefix) {
-    throw new Error("The network prefix must match the current network");
-  }
-}
-function getEip3770Address({
-  fullAddress,
-  chainId
-}) {
-  const { address, prefix: prefix2 } = parseEip3770Address(fullAddress);
-  validateEthereumAddress(address);
-  if (prefix2)
-    validateEip3770NetworkPrefix(prefix2, chainId);
-  return { address, prefix: prefix2 };
-}
-var networks = [
-  { chainId: 1, shortName: "eth" },
-  { chainId: 11155111, shortName: "sep" }
-];
 var chainToSafeApiUrl = (chainName) => `https://safe-transaction-${chainName}.safe.global`;
 var zeroAddress = "0x0000000000000000000000000000000000000000";
 var prepareSafeTransactionData = async ({
@@ -29344,11 +29467,6 @@ var generateSafeTransactionSignature = async ({
   chainId,
   privateKey
 }) => {
-  const { address: safeAddressWithoutPrefix } = getEip3770Address({
-    fullAddress: safeAddress,
-    chainId
-  });
-  const { address: to2 } = getEip3770Address({ fullAddress: txData.to, chainId });
   const payload = getSignPayload({
     types: {
       EIP712Domain: [
@@ -29377,10 +29495,10 @@ var generateSafeTransactionSignature = async ({
     primaryType: "SafeTx",
     domain: {
       chainId: BigInt(chainId),
-      verifyingContract: safeAddressWithoutPrefix
+      verifyingContract: safeAddress
     },
     message: {
-      to: to2,
+      to: txData.to,
       value: 0n,
       data: txData.data ?? "0x",
       operation: txData.operation,
@@ -29400,19 +29518,14 @@ var proposeTransaction = async ({
   chainName,
   address,
   safeTxHash,
-  senderSignature,
-  chainId
+  senderSignature
 }) => {
   Object.defineProperty(BigInt.prototype, "toJSON", {
     get() {
       return () => String(this);
     }
   });
-  const { address: safe } = getEip3770Address({
-    fullAddress: safeAddress,
-    chainId
-  });
-  const res = await fetch(`${chainToSafeApiUrl(chainName)}/api/v1/safes/${safe}/multisig-transactions/`, {
+  const res = await fetch(`${chainToSafeApiUrl(chainName)}/api/v1/safes/${safeAddress}/multisig-transactions/`, {
     method: "POST",
     body: JSON.stringify({
       ...txData,
@@ -29503,7 +29616,7 @@ var ensAction = async ({
     chain: chainName = "mainnet",
     safe: safeAddress,
     "rpc-url": rpcUrl,
-    "resolver-address": resolverAddress,
+    "resolver-address": _resolverAddress,
     "roles-mod-address": rolesModAddress,
     "dry-run": dryRun
   } = options;
@@ -29536,18 +29649,19 @@ var ensAction = async ({
     return;
   }
   const address = fromPublicKey(getPublicKey({ privateKey: pk }));
-  logger.info(`Validating transaction for wallet ${address}`);
-  const from25 = safeAddress ? getEip3770Address({ fullAddress: safeAddress, chainId: chain.id }).address : address;
+  if (options.verbose)
+    logger.info(`Validating transaction for wallet ${address}`);
+  const from25 = safeAddress ? await getExactAddress({ chain, addressOrEns: safeAddress, provider }) : address;
   const data = encodeData2(setContentHash, [node, `0x${contentHash}`]);
   if (options.verbose)
     console.log("Transaction encoded data:", data);
-  const to2 = resolverAddress || chains2[chainName].contracts.publicResolver.address;
-  if (to2 === chains2[chainName].contracts.publicResolver.address && !domain.endsWith(".eth"))
+  const resolverAddress = _resolverAddress || chains2[chainName].contracts.publicResolver.address;
+  if (resolverAddress === chains2[chainName].contracts.publicResolver.address && !domain.endsWith(".eth"))
     throw new Error("Domain must end with .eth");
   if (safeAddress) {
     logger.info(`Preparing a transaction for Safe ${safeAddress} on ${chainName}`);
     const { address: safe } = getEip3770Address({
-      fullAddress: safeAddress,
+      fullAddress: from25,
       chainId: chain.id
     });
     const nonce = toBigInt(await provider.request({
@@ -29565,7 +29679,7 @@ var ensAction = async ({
     const txData = {
       nonce,
       operation: 0,
-      to: to2,
+      to: resolverAddress,
       data,
       value: 0n
     };
@@ -29577,7 +29691,7 @@ var ensAction = async ({
       await execTransactionWithRole({
         provider,
         data,
-        resolverAddress: to2,
+        resolverAddress,
         rolesModAddress,
         from: address,
         privateKey: pk,
@@ -29587,23 +29701,24 @@ var ensAction = async ({
     } else {
       const { safeTxHash } = await prepareSafeTransactionData({
         txData,
-        safeAddress,
+        safeAddress: from25,
         chainId: chain.id,
         provider
       });
       logger.info(`Signing a Safe transaction with a hash ${safeTxHash}`);
       const senderSignature = await generateSafeTransactionSignature({
-        safeAddress,
+        safeAddress: from25,
         txData,
         chainId: chain.id,
         privateKey: pk
       });
       if (!dryRun) {
-        logger.info("Proposing a Safe transaction");
+        if (options.verbose)
+          logger.info("Proposing a Safe transaction");
         try {
           await proposeTransaction({
             txData,
-            safeAddress,
+            safeAddress: from25,
             safeTxHash,
             senderSignature: toHex3(senderSignature),
             chainId: chain.id,
@@ -29622,7 +29737,7 @@ Open in a browser: ${isTTY ? styleText2("underline", safeLink) : safeLink}`);
   } else {
     await simulateTransaction({
       provider,
-      to: to2,
+      to: resolverAddress,
       data,
       from: from25
     });
@@ -29630,7 +29745,7 @@ Open in a browser: ${isTTY ? styleText2("underline", safeLink) : safeLink}`);
       privateKey: pk,
       provider,
       chainId: chain.id,
-      to: to2,
+      to: resolverAddress,
       data,
       from: from25
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnipin",
-  "version": "1.5.2",
+  "version": "1.6.1",
   "author": "v1rtl <hi@v1rtl.site>",
   "repository": {
     "type": "git",