omnipin 1.5.0 → 1.5.2

package/dist/cli.js

@@ -8075,6 +8075,50 @@ function format(value, decimals = 0) {
 function formatGwei(wei, unit = "wei") {
   return format(wei, exponents.gwei - exponents[unit]);
 }
+function from6(value, decimals = 0) {
+  if (!/^(-?)([0-9]*)\.?([0-9]*)$/.test(value))
+    throw new InvalidDecimalNumberError({ value });
+  let [integer2 = "", fraction = "0"] = value.split(".");
+  const negative = integer2.startsWith("-");
+  if (negative)
+    integer2 = integer2.slice(1);
+  fraction = fraction.replace(/(0+)$/, "");
+  if (decimals === 0) {
+    if (Math.round(Number(`.${fraction}`)) === 1)
+      integer2 = `${BigInt(integer2) + 1n}`;
+    fraction = "";
+  } else if (fraction.length > decimals) {
+    const [left, unit, right] = [
+      fraction.slice(0, decimals - 1),
+      fraction.slice(decimals - 1, decimals),
+      fraction.slice(decimals)
+    ];
+    const rounded = Math.round(Number(`${unit}.${right}`));
+    if (rounded > 9)
+      fraction = `${BigInt(left) + BigInt(1)}0`.padStart(left.length + 1, "0");
+    else
+      fraction = `${left}${rounded}`;
+    if (fraction.length > decimals) {
+      fraction = fraction.slice(1);
+      integer2 = `${BigInt(integer2) + 1n}`;
+    }
+    fraction = fraction.slice(0, decimals);
+  } else {
+    fraction = fraction.padEnd(decimals, "0");
+  }
+  return BigInt(`${negative ? "-" : ""}${integer2}${fraction}`);
+}
+class InvalidDecimalNumberError extends BaseError {
+  constructor({ value }) {
+    super(`Value \`${value}\` is not a valid decimal number.`);
+    Object.defineProperty(this, "name", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: "Value.InvalidDecimalNumberError"
+    });
+  }
+}
 var BITS_PER_BYTE = 8;
 var FRS_PER_QUAD = 4;
 var LEAFS_PER_QUAD = BigInt(FRS_PER_QUAD);
@@ -8089,7 +8133,7 @@ var FR_RATIO = IN_BITS_FR / OUT_BITS_FR;
 var NODE_SIZE = OUT_BYTES_PER_QUAD / FRS_PER_QUAD;
 var EXPANDED_BYTES_PER_NODE = BigInt(NODE_SIZE);
 var MIN_PAYLOAD_SIZE = 2 * NODE_SIZE + 1;
-var from6 = (bytes2) => {
+var from7 = (bytes2) => {
   if (bytes2 instanceof Uint8Array) {
     if (bytes2.length > NODE_SIZE) {
       return bytes2.subarray(0, NODE_SIZE);
@@ -8102,7 +8146,7 @@ var from6 = (bytes2) => {
   return node;
 };
 var empty = () => EMPTY;
-var EMPTY = from6(new Uint8Array(NODE_SIZE).fill(0));
+var EMPTY = from7(new Uint8Array(NODE_SIZE).fill(0));
 Object.freeze(EMPTY.buffer);
 var exports_bytes2 = {};
 __export(exports_bytes2, {
@@ -9781,12 +9825,12 @@ class Codec {
     return this.decoder.decode(input2);
   }
 }
-function from7({ name: name22, prefix: prefix2, encode: encode210, decode: decode22 }) {
+function from8({ name: name22, prefix: prefix2, encode: encode210, decode: decode22 }) {
   return new Codec(name22, prefix2, encode210, decode22);
 }
 function baseX({ name: name22, prefix: prefix2, alphabet: alphabet2 }) {
   const { encode: encode210, decode: decode22 } = base_x_default(alphabet2, name22);
-  return from7({
+  return from8({
     prefix: prefix2,
     name: name22,
     encode: encode210,
@@ -9852,7 +9896,7 @@ function createAlphabetIdx(alphabet2) {
 }
 function rfc4648({ name: name22, prefix: prefix2, bitsPerChar, alphabet: alphabet2 }) {
   const alphabetIdx = createAlphabetIdx(alphabet2);
-  return from7({
+  return from8({
     prefix: prefix2,
     name: name22,
     encode(input2) {
@@ -10536,7 +10580,7 @@ var toQauds = (size42) => {
 var fromHeight2 = (height2) => fromWidth(2n ** BigInt(height2));
 var fromWidth = (width) => width * EXPANDED_BYTES_PER_NODE;
 var DEFAULT_MIN_DIGEST_LENGTH = 20;
-function from8({ name: name32, code: code42, encode: encode52, minDigestLength, maxDigestLength }) {
+function from9({ name: name32, code: code42, encode: encode52, minDigestLength, maxDigestLength }) {
   return new Hasher(name32, code42, encode52, minDigestLength, maxDigestLength);
 }
 class Hasher {
@@ -11531,7 +11575,7 @@ Object.defineProperty(AtomicityNotSupportedError, "code", {
   writable: true,
   value: 5760
 });
-function from9(provider, _options = {}) {
+function from10(provider, _options = {}) {
   if (!provider)
     throw new IsUndefinedError();
   return {
@@ -11635,7 +11679,7 @@ function createStore(options = {}) {
   let id = options.id ?? 0;
   return {
     prepare(options2) {
-      return from10({
+      return from11({
         id: id++,
         ...options2
       });
@@ -11645,7 +11689,7 @@ function createStore(options = {}) {
     }
   };
 }
-function from10(options) {
+function from11(options) {
   return {
     ...options,
     jsonrpc: "2.0"
@@ -11794,8 +11838,8 @@ var filecoinCalibration = {
   blockExplorer: "https://filecoin-testnet.blockscout.com"
 };
 var filProvider = {
-  [filecoinMainnet.id]: from9(fromHttp("https://api.node.glif.io/rpc/v1")),
-  [filecoinCalibration.id]: from9(fromHttp("https://api.calibration.node.glif.io/rpc/v1"))
+  [filecoinMainnet.id]: from10(fromHttp("https://api.node.glif.io/rpc/v1")),
+  [filecoinCalibration.id]: from10(fromHttp("https://api.calibration.node.glif.io/rpc/v1"))
 };
 var chains = {
   [filecoinMainnet.id]: filecoinMainnet,
@@ -12644,7 +12688,7 @@ function getAmbiguousTypes(sourceParameters, targetParameters, args) {
   }
   return;
 }
-function from11(abiItem, options = {}) {
+function from12(abiItem, options = {}) {
   const { prepare: prepare3 = true } = options;
   const item = (() => {
     if (Array.isArray(abiItem))
@@ -13506,7 +13550,7 @@ function encodePacked(types2, values2) {
   }
   encodePacked2.encode = encode82;
 })(encodePacked || (encodePacked = {}));
-function from12(parameters) {
+function from13(parameters) {
   if (Array.isArray(parameters) && typeof parameters[0] === "string")
     return parseAbiParameters(parameters);
   if (typeof parameters === "string")
@@ -13620,8 +13664,8 @@ function decode9(...parameters) {
   }
   return values2;
 }
-function from13(abiError, options = {}) {
-  return from11(abiError, options);
+function from14(abiError, options = {}) {
+  return from12(abiError, options);
 }
 function fromAbi2(abi12, name62, options) {
   if (name62 === "Error")
@@ -13640,7 +13684,7 @@ function fromAbi2(abi12, name62, options) {
     throw new NotFoundError({ name: name62, type: "error" });
   return item;
 }
-var solidityError = /* @__PURE__ */ from13({
+var solidityError = /* @__PURE__ */ from14({
   inputs: [
     {
       name: "message",
@@ -13651,7 +13695,7 @@ var solidityError = /* @__PURE__ */ from13({
   type: "error"
 });
 var solidityErrorSelector = "0x08c379a0";
-var solidityPanic = /* @__PURE__ */ from13({
+var solidityPanic = /* @__PURE__ */ from14({
   inputs: [
     {
       name: "reason",
@@ -13997,7 +14041,7 @@ function readList(cursor, length22, to2) {
     value.push(decodeRlpCursor(cursor, to2));
   return value;
 }
-function from14(value, options) {
+function from15(value, options) {
   const { as } = options;
   const encodable = getEncodable(value);
   const cursor = create5(new Uint8Array(encodable.length));
@@ -14008,7 +14052,7 @@ function from14(value, options) {
 }
 function fromHex5(hex, options = {}) {
   const { as = "Hex" } = options;
-  return from14(hex, { as });
+  return from15(hex, { as });
 }
 function getEncodable(bytes2) {
   if (Array.isArray(bytes2))
@@ -14211,7 +14255,7 @@ function deserialize(serialized) {
   assert7(transaction);
   return transaction;
 }
-function from15(envelope, options = {}) {
+function from16(envelope, options = {}) {
   const { signature } = options;
   const envelope_ = typeof envelope === "string" ? deserialize(envelope) : envelope;
   assert7(envelope_);
@@ -14295,7 +14339,7 @@ var simulateTransaction = async ({
   provider,
   to: to2,
   data,
-  from: from162
+  from: from172
 }) => {
   return provider.request({
     method: "eth_call",
@@ -14303,7 +14347,7 @@ var simulateTransaction = async ({
       {
         to: to2,
         data,
-        from: from162
+        from: from172
       },
       "latest"
     ]
@@ -14315,7 +14359,7 @@ var sendTransaction = async ({
   privateKey,
   to: to2,
   data,
-  from: from162
+  from: from172
 }) => {
   const feeHistory = await provider.request({
     method: "eth_feeHistory",
@@ -14325,7 +14369,7 @@ var sendTransaction = async ({
     method: "eth_estimateGas",
     params: [
       {
-        from: from162,
+        from: from172,
         to: to2,
         data,
         value: "0x0"
@@ -14336,7 +14380,7 @@ var sendTransaction = async ({
   logger.info(`Estimated gas: ${estimatedGas}`);
   const nonce = toBigInt(await provider.request({
     method: "eth_getTransactionCount",
-    params: [from162, "latest"]
+    params: [from172, "latest"]
   }));
   const baseFeePerGas = BigInt(feeHistory.baseFeePerGas.slice(-1)[0]);
   if (!feeHistory.reward)
@@ -14344,8 +14388,8 @@ var sendTransaction = async ({
   const priorityFeePerGas = BigInt(feeHistory.reward.slice(-1)[0][1]);
   const maxPriorityFeePerGas = priorityFeePerGas;
   const maxFeePerGas = baseFeePerGas * 2n + maxPriorityFeePerGas;
-  const envelope = from15({
-    from: from162,
+  const envelope = from16({
+    from: from172,
     chainId,
     maxFeePerGas,
     maxPriorityFeePerGas,
@@ -14706,6 +14750,7 @@ var abi4 = ["address", "uint256", "string[]", "string[]", "bytes"];
 var metadata = [{ key: "withIPFSIndexing", value: "" }];
 var keys = metadata.map((item) => item.key);
 var values = metadata.map((item) => item.value);
+var priceBuffer = from6("0.5", 18);
 var createDataSet = async ({
   providerURL,
   privateKey,
@@ -14717,12 +14762,14 @@ var createDataSet = async ({
 }) => {
   const provider = filProvider[chain.id];
   const [funds] = await getAccountInfo({ address: payer, chain });
-  if (funds < perMonth) {
+  logger.info(`Deposited funds: ${format(funds, 18)}`);
+  if (funds <= perMonth + priceBuffer) {
+    const depositAmount = perMonth - funds + priceBuffer;
     logger.warn("Not enough USDfc deposited to Filecoin Pay");
-    logger.info(`Depositing ${format(perMonth - funds, 18)} USDfc to Filecoin Pay`);
+    logger.info(`Depositing ${format(depositAmount, 18)} USDfc to Filecoin Pay`);
     const hash3 = await depositAndApproveOperator({
       privateKey,
-      amount: perMonth - funds,
+      amount: depositAmount,
       address: payer,
       chain
     });
@@ -14760,7 +14807,7 @@ var createDataSet = async ({
     }
   });
   const signature = toHex3(sign({ payload, privateKey }));
-  const extraData = encode7(from12(abi4), [
+  const extraData = encode7(from13(abi4), [
     payer,
     clientDataSetId,
     keys,
@@ -15195,7 +15242,7 @@ var uploadPieceToDataSet = async ({
   const signature = toHex3(sign({ payload, privateKey }));
   const keys2 = [metadata2.map((m) => m.key)];
   const values2 = [metadata2.map((m) => m.value)];
-  const extraData = encode7(from12(abi11), [
+  const extraData = encode7(from13(abi11), [
     nonce,
     keys2,
     values2,
@@ -15244,7 +15291,7 @@ var uploadPieceToDataSet = async ({
         cause: text2
       });
     }
-    throw new Error("Failed to create a dataset", { cause: text2 });
+    throw new Error("Failed to upload to a data set", { cause: text2 });
   }
   const location = res.headers.get("Location");
   const hash2 = location?.split("/").pop();
@@ -15256,6 +15303,24 @@ var uploadPieceToDataSet = async ({
     statusUrl: new URL(location, providerURL).toString()
   };
 };
+var waitForDatasetReady = async (statusUrl) => {
+  while (true) {
+    const res = await fetch(statusUrl, { redirect: "follow" });
+    const json = await res.json().catch(() => null);
+    if (!json || !json.txStatus) {
+      throw new Error(`Invalid dataset status response:
+${await res.text()}`);
+    }
+    if (!json.dataSetCreated) {
+      await new Promise((resolve) => setTimeout(resolve, 3e3));
+      continue;
+    }
+    if (json.txStatus === "confirmed" && json.dataSetCreated) {
+      return json;
+    }
+    throw new Error(`Dataset creation failed: txStatus="${json.txStatus}"`);
+  }
+};
 var providerName4 = "Filecoin";
 var uploadToFilecoin = async ({
   providerAddress,
@@ -15282,8 +15347,6 @@ var uploadToFilecoin = async ({
   logger.info(`USDfc balance: ${format(balance, 18)}`);
   if (balance === 0n)
     throw new DeployError(providerName4, "No USDfc on account");
-  logger.info(`Filecoin SP address: ${providerAddress}`);
-  logger.info(`Filecoin SP URL: ${providerURL}`);
   const providerId = await getProviderIdByAddress({
     providerAddress,
     chain
@@ -15317,6 +15380,8 @@ var uploadToFilecoin = async ({
     logger.info(`Pending data set creation: ${statusUrl2}`);
     logger.info(`Pending transaction: ${chain.blockExplorer}/tx/${hash3}`);
     await waitForTransaction(filProvider[chainId], hash3);
+    await waitForDatasetReady(statusUrl2);
+    logger.success("Data set registered");
   } else {
     logger.info(`Using existing dataset: ${providerDataSets[0].dataSetId}`);
     datasetId = providerDataSets[0].dataSetId;
@@ -15513,7 +15578,7 @@ __export(exports_ed25519, {
   or: () => or5,
   name: () => name7,
   generate: () => generate,
-  from: () => from17,
+  from: () => from18,
   format: () => format6,
   encode: () => encode13,
   derive: () => derive,
@@ -15531,7 +15596,7 @@ __export(exports_signer, {
   or: () => or5,
   name: () => name7,
   generate: () => generate,
-  from: () => from17,
+  from: () => from18,
   format: () => format6,
   encode: () => encode13,
   derive: () => derive,
@@ -16362,7 +16427,7 @@ var parse3 = (did2) => {
   }
 };
 var format3 = (id) => id.did();
-var from16 = (principal2) => {
+var from17 = (principal2) => {
   if (principal2 instanceof DID) {
     return principal2;
   } else if (principal2 instanceof Uint8Array) {
@@ -16731,7 +16796,7 @@ class Importer {
   }
 }
 var create7 = (importers) => {
-  const from172 = (archive3) => {
+  const from182 = (archive3) => {
     if (archive3.id.startsWith("did:key:")) {
       return importWith(archive3, importers);
     } else {
@@ -16746,7 +16811,7 @@ var create7 = (importers) => {
       throw new Error(`Archive ${archive3.id} contains no keys`);
     }
   };
-  return from172;
+  return from182;
 };
 var importWith = (archive3, importers) => {
   for (const importer2 of importers) {
@@ -16817,7 +16882,7 @@ var derive = async (secret) => {
   signer.set(publicKey, PRIVATE_TAG_SIZE + KEY_SIZE + PUBLIC_TAG_SIZE2);
   return signer;
 };
-var from17 = ({ id, keys: keys2 }) => {
+var from18 = ({ id, keys: keys2 }) => {
   if (id.startsWith("did:key:")) {
     const key = keys2[id];
     if (key instanceof Uint8Array) {
@@ -16826,7 +16891,7 @@ var from17 = ({ id, keys: keys2 }) => {
   }
   throw new TypeError(`Unsupported archive format`);
 };
-var or5 = (other) => or4({ from: from17 }, other);
+var or5 = (other) => or4({ from: from18 }, other);
 var decode14 = (bytes2) => {
   if (bytes2.byteLength !== SIZE2) {
     throw new Error(`Expected Uint8Array with byteLength of ${SIZE2} instead not ${bytes2.byteLength}`);
@@ -17675,10 +17740,10 @@ class View {
     return this.model.v;
   }
   get issuer() {
-    return from16(this.model.iss);
+    return from17(this.model.iss);
   }
   get audience() {
-    return from16(this.model.aud);
+    return from17(this.model.aud);
   }
   get capabilities() {
     return this.model.att;
@@ -17754,7 +17819,7 @@ class View {
   }
 }
 var code10 = code3;
-var from18 = (model) => new CBORView(model);
+var from19 = (model) => new CBORView(model);
 var encode17 = (model) => {
   const { fct, nnc, nbf, ...payload } = readPayload(model);
   return encode4({
@@ -17840,12 +17905,12 @@ __export(exports_sha2, {
   sha512: () => sha512,
   sha256: () => sha2563
 });
-var sha2563 = from8({
+var sha2563 = from9({
   name: "sha2-256",
   code: 18,
   encode: (input2) => coerce(crypto5.createHash("sha256").update(input2).digest())
 });
-var sha512 = from8({
+var sha512 = from9({
   name: "sha2-512",
   code: 19,
   encode: (input2) => coerce(crypto5.createHash("sha512").update(input2).digest())
@@ -17891,7 +17956,7 @@ var issue = async ({
     nnc: nonce
   });
   const payload = encodeSignaturePayload(data, v, issuer.signatureAlgorithm);
-  return from18({
+  return from19({
     ...data,
     v,
     s: await issuer.sign(payload)
@@ -18681,7 +18746,7 @@ __export(exports_uri, {
   uri: () => uri,
   read: () => read2,
   match: () => match,
-  from: () => from20
+  from: () => from21
 });
 var ok = (value) => {
   if (value == null) {
@@ -19469,7 +19534,7 @@ var schema = new URISchema({});
 var uri = () => schema;
 var read2 = (input2) => schema.read(input2);
 var match = (options) => new URISchema(options);
-var from20 = (input2) => schema.from(input2);
+var from21 = (input2) => schema.from(input2);
 var exports_link2 = {};
 __export(exports_link2, {
   schema: () => schema2,
@@ -19522,7 +19587,7 @@ __export(exports_principal, {
   read: () => read4,
   principal: () => principal,
   match: () => match3,
-  from: () => from21
+  from: () => from22
 });
 class PrincipalSchema extends API {
   readWith(source, method) {
@@ -19546,7 +19611,7 @@ var schema3 = new PrincipalSchema();
 var principal = () => schema3;
 var read4 = (input2) => schema3.read(input2);
 var match3 = (options = {}) => new PrincipalSchema(options.method);
-var from21 = (input2) => match3({}).from(input2);
+var from22 = (input2) => match3({}).from(input2);
 var exports_did2 = {};
 __export(exports_did2, {
   readBytes: () => readBytes2,
@@ -19554,7 +19619,7 @@ __export(exports_did2, {
   matchBytes: () => matchBytes,
   match: () => match4,
   fromBytes: () => fromBytes6,
-  from: () => from22,
+  from: () => from23,
   didBytes: () => didBytes,
   did: () => did
 });
@@ -19572,7 +19637,7 @@ var schema4 = string().refine(new DIDSchema());
 var did = () => schema4;
 var read5 = (input2) => schema4.read(input2);
 var match4 = (options = {}) => string().refine(new DIDSchema(options.method));
-var from22 = (input2) => match4({}).from(input2);
+var from23 = (input2) => match4({}).from(input2);
 class DIDBytesSchema extends API {
   readWith(source, method) {
     if (!(source instanceof Uint8Array)) {
@@ -20913,7 +20978,7 @@ function decode25(str) {
   }
   return new Uint8Array(byts);
 }
-var base256emoji = from7({
+var base256emoji = from8({
   prefix: "\u{1F680}",
   name: "base256emoji",
   encode: encode23,
@@ -20933,7 +20998,7 @@ var exports_identity2 = {};
 __export(exports_identity2, {
   identity: () => identity2
 });
-var identity2 = from7({
+var identity2 = from8({
   prefix: "\0",
   name: "identity",
   encode: (buf2) => toString2(buf2),
@@ -21914,7 +21979,7 @@ var capability = ({
 var defaultNBSchema = exports_schema3.struct({});
 var or7 = (left, right) => new Or(left, right);
 var and2 = (...selectors) => new And(selectors);
-var derive2 = ({ from: from232, to: to2, derives }) => new Derive(from232, to2, derives);
+var derive2 = ({ from: from242, to: to2, derives }) => new Derive(from242, to2, derives);
 class View2 {
   match(source) {
     return { error: new UnknownCapability(source.capability) };
@@ -22063,9 +22128,9 @@ class And extends View2 {
   }
 }
 class Derive extends Unit {
-  constructor(from232, to2, derives) {
+  constructor(from242, to2, derives) {
     super();
-    this.from = from232;
+    this.from = from242;
     this.to = to2;
     this.derives = derives;
   }
@@ -22152,9 +22217,9 @@ class Match2 {
   }
 }
 class DerivedMatch {
-  constructor(selected, from232, derives) {
+  constructor(selected, from242, derives) {
     this.selected = selected;
-    this.from = from232;
+    this.from = from242;
     this.derives = derives;
   }
   get can() {
@@ -22179,10 +22244,10 @@ class DerivedMatch {
     return selected ? new DerivedMatch(selected, this.from, this.derives) : null;
   }
   select(capabilities) {
-    const { derives, selected, from: from232 } = this;
+    const { derives, selected, from: from242 } = this;
     const { value } = selected;
     const direct = selected.select(capabilities);
-    const derived = from232.select(capabilities);
+    const derived = from242.select(capabilities);
     const matches = [];
     const errors = [];
     for (const match6 of derived.matches) {
@@ -22201,7 +22266,7 @@ class DerivedMatch {
         ...derived.errors.map((error3) => new DelegationError([error3], this))
       ],
       matches: [
-        ...direct.matches.map((match6) => new DerivedMatch(match6, from232, derives)),
+        ...direct.matches.map((match6) => new DerivedMatch(match6, from242, derives)),
         ...matches
       ]
     };
@@ -22442,8 +22507,8 @@ var filecoinOffer = capability({
     content: exports_schema3.link(),
     piece: PieceLink
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.content, from232.nb.content, "nb.content")) || and3(checkLink(claim.nb.piece, from232.nb.piece, "nb.piece")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.content, from242.nb.content, "nb.content")) || and3(checkLink(claim.nb.piece, from242.nb.piece, "nb.piece")) || ok({});
   }
 });
 var filecoinSubmit = capability({
@@ -22453,8 +22518,8 @@ var filecoinSubmit = capability({
     content: exports_schema3.link(),
     piece: PieceLink
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.content, from232.nb.content, "nb.content")) || and3(checkLink(claim.nb.piece, from232.nb.piece, "nb.piece")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.content, from242.nb.content, "nb.content")) || and3(checkLink(claim.nb.piece, from242.nb.piece, "nb.piece")) || ok({});
   }
 });
 var filecoinAccept = capability({
@@ -22464,8 +22529,8 @@ var filecoinAccept = capability({
     content: exports_schema3.link(),
     piece: PieceLink
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.content, from232.nb.content, "nb.content")) || and3(checkLink(claim.nb.piece, from232.nb.piece, "nb.piece")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.content, from242.nb.content, "nb.content")) || and3(checkLink(claim.nb.piece, from242.nb.piece, "nb.piece")) || ok({});
   }
 });
 var filecoinInfo = capability({
@@ -22474,8 +22539,8 @@ var filecoinInfo = capability({
   nb: exports_schema3.struct({
     piece: PieceLink
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.piece, from232.nb.piece, "nb.piece")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.piece, from242.nb.piece, "nb.piece")) || ok({});
   }
 });
 var services = {
@@ -22569,8 +22634,8 @@ var pieceOffer = capability({
     piece: PieceLink,
     group: exports_schema3.text()
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.piece, from232.nb.piece, "nb.piece")) || and3(equal(claim.nb.group, from232.nb.group, "nb.group")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.piece, from242.nb.piece, "nb.piece")) || and3(equal(claim.nb.group, from242.nb.group, "nb.group")) || ok({});
   }
 });
 var pieceAccept = capability({
@@ -22580,8 +22645,8 @@ var pieceAccept = capability({
     piece: PieceLink,
     group: exports_schema3.text()
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.piece, from232.nb.piece, "nb.piece")) || and3(equal(claim.nb.group, from232.nb.group, "nb.group")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.piece, from242.nb.piece, "nb.piece")) || and3(equal(claim.nb.group, from242.nb.group, "nb.group")) || ok({});
   }
 });
 var connection4 = connect({
@@ -22599,8 +22664,8 @@ var aggregateOffer = capability({
     aggregate: PieceLink,
     pieces: exports_schema3.link({ version: 1 })
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.aggregate, from232.nb.aggregate, "nb.aggregate")) || and3(checkLink(claim.nb.pieces, from232.nb.pieces, "nb.pieces")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.aggregate, from242.nb.aggregate, "nb.aggregate")) || and3(checkLink(claim.nb.pieces, from242.nb.pieces, "nb.pieces")) || ok({});
   }
 });
 var aggregateAccept = capability({
@@ -22610,8 +22675,8 @@ var aggregateAccept = capability({
     aggregate: PieceLink,
     pieces: exports_schema3.link()
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.aggregate, from232.nb.aggregate, "nb.aggregate")) || and3(checkLink(claim.nb.pieces, from232.nb.pieces, "nb.pieces")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.aggregate, from242.nb.aggregate, "nb.aggregate")) || and3(checkLink(claim.nb.pieces, from242.nb.pieces, "nb.pieces")) || ok({});
   }
 });
 var connection5 = connect({
@@ -22628,8 +22693,8 @@ var dealInfo = capability({
   nb: exports_schema3.struct({
     piece: PieceLink
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.piece, from232.nb.piece, "nb.piece")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.piece, from242.nb.piece, "nb.piece")) || ok({});
   }
 });
 var connection6 = connect({
@@ -22817,8 +22882,8 @@ var put = capability({
     url: exports_schema3.string().or(Await),
     headers: exports_schema3.dictionary({ value: exports_schema3.string() }).or(Await)
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(equalBody(claim, from232)) || and3(equal(claim.nb.url, from232.nb, "url")) || and3(equal(claim.nb.headers, from232.nb, "headers")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(equalBody(claim, from242)) || and3(equal(claim.nb.url, from242.nb, "url")) || and3(equal(claim.nb.headers, from242.nb, "headers")) || ok({});
   }
 });
 var UCANLink = exports_schema3.link({ version: 1 });
@@ -22834,7 +22899,7 @@ var revoke = capability({
     ucan: UCANLink,
     proof: UCANLink.array().optional()
   }),
-  derives: (claim, from232) => and3(equalWith(claim, from232)) ?? and3(checkLink(claim.nb.ucan, from232.nb.ucan, "nb.ucan")) ?? equal((claim.nb.proof ?? []).join("/"), (from232.nb.proof ?? []).join("/"), "nb.proof")
+  derives: (claim, from242) => and3(equalWith(claim, from242)) ?? and3(checkLink(claim.nb.ucan, from242.nb.ucan, "nb.ucan")) ?? equal((claim.nb.proof ?? []).join("/"), (from242.nb.proof ?? []).join("/"), "nb.proof")
 });
 var conclude = capability({
   can: "ucan/conclude",
@@ -22842,7 +22907,7 @@ var conclude = capability({
   nb: exports_schema3.struct({
     receipt: exports_schema3.link()
   }),
-  derives: (claim, from232) => and3(equalWith(claim, from232)) || and3(checkLink(claim.nb.receipt, from232.nb.receipt, "nb.receipt")) || ok({})
+  derives: (claim, from242) => and3(equalWith(claim, from242)) || and3(checkLink(claim.nb.receipt, from242.nb.receipt, "nb.receipt")) || ok({})
 });
 var attest = capability({
   can: "ucan/attest",
@@ -22850,7 +22915,7 @@ var attest = capability({
   nb: exports_schema3.struct({
     proof: exports_schema3.link({ version: 1 })
   }),
-  derives: (claim, from232) => and3(equalWith(claim, from232)) ?? checkLink(claim.nb.proof, from232.nb.proof, "nb.proof")
+  derives: (claim, from242) => and3(equalWith(claim, from242)) ?? checkLink(claim.nb.proof, from242.nb.proof, "nb.proof")
 });
 var blob3 = capability({
   can: "web3.storage/blob/*",
@@ -22865,8 +22930,8 @@ var allocate2 = capability({
     cause: exports_link2,
     space: SpaceDID
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(equalBlob(claim, from232)) || and3(checkLink(claim.nb.cause, from232.nb.cause, "cause")) || and3(equal(claim.nb.space, from232.nb.space, "space")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(equalBlob(claim, from242)) || and3(checkLink(claim.nb.cause, from242.nb.cause, "cause")) || and3(equal(claim.nb.space, from242.nb.space, "space")) || ok({});
   }
 });
 var accept2 = capability({
@@ -22878,8 +22943,8 @@ var accept2 = capability({
     space: SpaceDID,
     _put: Await
   }),
-  derives: (claim, from232) => {
-    return and3(equalWith(claim, from232)) || and3(equalBlob(claim, from232)) || and3(equal(claim.nb.ttl, from232.nb.ttl, "ttl")) || and3(equal(claim.nb.space, from232.nb.space, "space")) || ok({});
+  derives: (claim, from242) => {
+    return and3(equalWith(claim, from242)) || and3(equalBlob(claim, from242)) || and3(equal(claim.nb.ttl, from242.nb.ttl, "ttl")) || and3(equal(claim.nb.space, from242.nb.space, "space")) || ok({});
   }
 });
 var exports_rsa = {};
@@ -22889,7 +22954,7 @@ __export(exports_rsa, {
   or: () => or8,
   name: () => name10,
   generate: () => generate2,
-  from: () => from23,
+  from: () => from24,
   decode: () => decode32,
   code: () => code12,
   Verifier: () => RSAVerifier
@@ -23164,7 +23229,7 @@ var generate2 = async ({
     });
   }
 };
-var from23 = ({ id, keys: keys2 }) => {
+var from24 = ({ id, keys: keys2 }) => {
   if (id.startsWith("did:key:")) {
     const did2 = id;
     const key = keys2[did2];
@@ -23180,7 +23245,7 @@ var from23 = ({ id, keys: keys2 }) => {
     throw new TypeError(`RSA can not import from ${id} archive, try generic Signer instead`);
   }
 };
-var or8 = (other) => or4({ from: from23 }, other);
+var or8 = (other) => or4({ from: from24 }, other);
 var decode32 = (bytes2) => {
   const rsa = decode31(untagWith(code12, bytes2));
   const publicBytes = tagWith(verifierCode, encode28(rsa));
@@ -24145,8 +24210,8 @@ var add5 = capability({
     root: exports_link2,
     shards: CARLink.array().optional()
   }),
-  derives: (self2, from24) => {
-    return and3(equalWith(self2, from24)) || and3(equal(self2.nb.root, from24.nb.root, "root")) || and3(equal(self2.nb.shards, from24.nb.shards, "shards")) || ok({});
+  derives: (self2, from25) => {
+    return and3(equalWith(self2, from25)) || and3(equal(self2.nb.root, from25.nb.root, "root")) || and3(equal(self2.nb.shards, from25.nb.shards, "shards")) || ok({});
   }
 });
 var get4 = capability({
@@ -24155,15 +24220,15 @@ var get4 = capability({
   nb: exports_schema3.struct({
     root: exports_link2.optional()
   }),
-  derives: (self2, from24) => {
-    const res = equalWith(self2, from24);
+  derives: (self2, from25) => {
+    const res = equalWith(self2, from25);
     if (res.error) {
       return res;
     }
-    if (!from24.nb.root) {
+    if (!from25.nb.root) {
       return res;
     }
-    return equal(self2.nb.root, from24.nb.root, "root");
+    return equal(self2.nb.root, from25.nb.root, "root");
   }
 });
 var remove2 = capability({
@@ -24172,8 +24237,8 @@ var remove2 = capability({
   nb: exports_schema3.struct({
     root: exports_link2
   }),
-  derives: (self2, from24) => {
-    return and3(equalWith(self2, from24)) || and3(equal(self2.nb.root, from24.nb.root, "root")) || ok({});
+  derives: (self2, from25) => {
+    return and3(equalWith(self2, from25)) || and3(equal(self2.nb.root, from25.nb.root, "root")) || ok({});
   }
 });
 var list2 = capability({
@@ -27407,17 +27472,17 @@ function fromNumberTo32BitBuf(number2) {
   }
   return new Uint8Array(bytes2);
 }
-var murmur332 = from8({
+var murmur332 = from9({
   name: "murmur3-32",
   code: 35,
   encode: (input2) => fromNumberTo32BitBuf(import_murmurhash3js_revisited.default.x86.hash32(input2))
 });
-var murmur3128 = from8({
+var murmur3128 = from9({
   name: "murmur3-128",
   code: 34,
   encode: (input2) => exports_bytes2.fromHex(import_murmurhash3js_revisited.default.x64.hash128(input2))
 });
-var murmur364 = from8({
+var murmur364 = from9({
   name: "murmur3-x64-64",
   code: 34,
   encode: (input2) => exports_bytes2.fromHex(import_murmurhash3js_revisited.default.x64.hash128(input2)).subarray(0, 8)
@@ -29392,7 +29457,7 @@ var execTransactionWithRole = async ({
   resolverAddress,
   data: txData,
   rolesModAddress,
-  from: from24,
+  from: from25,
   privateKey,
   chainId,
   explorerUrl
@@ -29409,14 +29474,14 @@ var execTransactionWithRole = async ({
     provider,
     to: rolesModAddress,
     data,
-    from: from24
+    from: from25
   });
   if (success) {
     const hash2 = await sendTransaction({
       privateKey,
       to: rolesModAddress,
       data,
-      from: from24,
+      from: from25,
       provider,
       chainId
     });
@@ -29447,7 +29512,7 @@ var ensAction = async ({
     throw new MissingCLIArgsError(["domain"]);
   const chain = chains2[chainName];
   const transport = fromHttp(rpcUrl ?? chainToRpcUrl(chainName));
-  const provider = from9(transport);
+  const provider = from10(transport);
   const pk = process.env.OMNIPIN_PK;
   if (!pk)
     throw new MissingKeyError("PK");
@@ -29472,7 +29537,7 @@ var ensAction = async ({
   }
   const address = fromPublicKey(getPublicKey({ privateKey: pk }));
   logger.info(`Validating transaction for wallet ${address}`);
-  const from24 = safeAddress ? getEip3770Address({ fullAddress: safeAddress, chainId: chain.id }).address : address;
+  const from25 = safeAddress ? getEip3770Address({ fullAddress: safeAddress, chainId: chain.id }).address : address;
   const data = encodeData2(setContentHash, [node, `0x${contentHash}`]);
   if (options.verbose)
     console.log("Transaction encoded data:", data);
@@ -29559,7 +29624,7 @@ Open in a browser: ${isTTY ? styleText2("underline", safeLink) : safeLink}`);
       provider,
       to: to2,
       data,
-      from: from24
+      from: from25
     });
     const hash2 = await sendTransaction({
       privateKey: pk,
@@ -29567,7 +29632,7 @@ Open in a browser: ${isTTY ? styleText2("underline", safeLink) : safeLink}`);
       chainId: chain.id,
       to: to2,
       data,
-      from: from24
+      from: from25
     });
     logger.info(`Transaction pending: ${chain.blockExplorers.default.url}/tx/${hash2}`);
     try {

package/package.json

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