omnipin 1.6.2 → 1.7.1

package/README.md

@@ -4,7 +4,7 @@
 <h1>Omnipin</h1>
 
 [![GitHub Workflow
-Status][gh-actions-img]][github-actions] ![npm](https://img.shields.io/npm/dt/omnipin?style=for-the-badge&logo=npm&color=%232B4AD4&label)
+Status][gh-actions-img]][github-actions] ![npm](https://img.shields.io/npm/dt/omnipin?style=for-the-badge&logo=npm&color=%232B4AD4&label) <a href="https://www.drips.network/app/projects/github/omnipin/omnipin" target="_blank"><img src="https://www.drips.network/api/embed/project/https%3A%2F%2Fgithub.com%2Fomnipin%2Fomnipin/support.png?background=blue&style=drips&text=project&stat=none" alt="Support omnipin on drips.network" height="32"></a>
 
 <sub>The ultimate decentralized website deployment toolkit</sub>
 </div>

package/dist/cli.js

@@ -4843,6 +4843,15 @@ function toNumber(hex, options = {}) {
     return Number(hex);
   return Number(toBigInt(hex, options));
 }
+function toString(hex, options = {}) {
+  const { size: size32 } = options;
+  let bytes2 = fromHex(hex);
+  if (size32) {
+    assertSize(bytes2, size32);
+    bytes2 = trimRight(bytes2);
+  }
+  return new TextDecoder().decode(bytes2);
+}
 function validate(value, options = {}) {
   const { strict = false } = options;
   try {
@@ -5047,7 +5056,7 @@ function toNumber2(bytes2, options = {}) {
   const hex = fromBytes(bytes2, options);
   return toNumber(hex, options);
 }
-function toString(bytes2, options = {}) {
+function toString2(bytes2, options = {}) {
   const { size: size32 } = options;
   let bytes_ = bytes2;
   if (typeof size32 !== "undefined") {
@@ -8160,7 +8169,7 @@ var EMPTY = from7(new Uint8Array(NODE_SIZE).fill(0));
 Object.freeze(EMPTY.buffer);
 var exports_bytes2 = {};
 __export(exports_bytes2, {
-  toString: () => toString2,
+  toString: () => toString3,
   toHex: () => toHex4,
   isBinary: () => isBinary,
   fromString: () => fromString3,
@@ -8209,7 +8218,7 @@ function isBinary(o) {
 function fromString3(str) {
   return new TextEncoder().encode(str);
 }
-function toString2(b) {
+function toString3(b) {
   return new TextDecoder().decode(b);
 }
 var exports_sha256 = {};
@@ -8371,7 +8380,7 @@ function asU8A(buf2) {
   }
   return isBuffer2(buf2) ? new Uint8Array(buf2.buffer, buf2.byteOffset, buf2.byteLength) : buf2;
 }
-var toString3 = useBuffer ? (bytes2, start, end) => {
+var toString4 = useBuffer ? (bytes2, start, end) => {
   return end - start > 64 ? globalThis.Buffer.from(bytes2.subarray(start, end)).toString("utf8") : utf8Slice(bytes2, start, end);
 } : (bytes2, start, end) => {
   return end - start > 64 ? textDecoder.decode(bytes2.subarray(start, end)) : utf8Slice(bytes2, start, end);
@@ -8814,7 +8823,7 @@ function compareBytes(b1, b2) {
 function toToken2(data, pos, prefix2, length3, options) {
   const totLength = prefix2 + length3;
   assertEnoughData(data, pos, totLength);
-  const tok = new Token(Type.string, toString3(data, pos + prefix2, pos + totLength), totLength);
+  const tok = new Token(Type.string, toString4(data, pos + prefix2, pos + totLength), totLength);
   if (options.retainStringBytes === true) {
     tok.byteValue = slice3(data, pos + prefix2, pos + totLength);
   }
@@ -12712,10 +12721,10 @@ function from12(abiItem, options = {}) {
     ...prepare3 ? { hash: getSignatureHash(item) } : {}
   };
 }
-function fromAbi(abi14, name62, options) {
+function fromAbi(abi16, name62, options) {
   const { args = [], prepare: prepare3 = true } = options ?? {};
   const isSelector = validate(name62, { strict: false });
-  const abiItems = abi14.filter((abiItem2) => {
+  const abiItems = abi16.filter((abiItem2) => {
     if (isSelector) {
       if (abiItem2.type === "function" || abiItem2.type === "error")
         return getSelector(abiItem2) === slice(name62, 0, 4);
@@ -12787,8 +12796,8 @@ function fromAbi(abi14, name62, options) {
 function getSelector(...parameters) {
   const abiItem = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi14, name62] = parameters;
-      return fromAbi(abi14, name62);
+      const [abi16, name62] = parameters;
+      return fromAbi(abi16, name62);
     }
     return parameters[0];
   })();
@@ -12797,8 +12806,8 @@ function getSelector(...parameters) {
 function getSignature(...parameters) {
   const abiItem = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi14, name62] = parameters;
-      return fromAbi(abi14, name62);
+      const [abi16, name62] = parameters;
+      return fromAbi(abi16, name62);
     }
     return parameters[0];
   })();
@@ -12812,8 +12821,8 @@ function getSignature(...parameters) {
 function getSignatureHash(...parameters) {
   const abiItem = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi14, name62] = parameters;
-      return fromAbi(abi14, name62);
+      const [abi16, name62] = parameters;
+      return fromAbi(abi16, name62);
     }
     return parameters[0];
   })();
@@ -13022,7 +13031,7 @@ function decodeString(cursor, { staticPosition }) {
     return ["", 32];
   }
   const data = cursor.readBytes(length22, 32);
-  const value = toString(trimLeft2(data));
+  const value = toString2(trimLeft2(data));
   cursor.setPosition(staticPosition + 32);
   return [value, 32];
 }
@@ -13657,8 +13666,8 @@ class InvalidTypeError extends BaseError {
 function decode9(...parameters) {
   const [abiError, data, options = {}] = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi14, name62, data2, options2] = parameters;
-      return [fromAbi2(abi14, name62), data2, options2];
+      const [abi16, name62, data2, options2] = parameters;
+      return [fromAbi2(abi16, name62), data2, options2];
     }
     return parameters;
   })();
@@ -13677,7 +13686,7 @@ function decode9(...parameters) {
 function from14(abiError, options = {}) {
   return from12(abiError, options);
 }
-function fromAbi2(abi14, name62, options) {
+function fromAbi2(abi16, name62, options) {
   if (name62 === "Error")
     return solidityError;
   if (name62 === "Panic")
@@ -13689,7 +13698,7 @@ function fromAbi2(abi14, name62, options) {
     if (selector === solidityPanicSelector)
       return solidityPanic;
   }
-  const item = fromAbi(abi14, name62, options);
+  const item = fromAbi(abi16, name62, options);
   if (item.type !== "error")
     throw new NotFoundError({ name: name62, type: "error" });
   return item;
@@ -14442,8 +14451,8 @@ var waitForTransaction = async (provider, hash2) => {
 function decodeResult(...parameters) {
   const [abiFunction, data, options = {}] = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi14, name62, data2, options2] = parameters;
-      return [fromAbi3(abi14, name62), data2, options2];
+      const [abi16, name62, data2, options2] = parameters;
+      return [fromAbi3(abi16, name62), data2, options2];
     }
     return parameters;
   })();
@@ -14460,8 +14469,8 @@ function decodeResult(...parameters) {
 function encodeData2(...parameters) {
   const [abiFunction, args = []] = (() => {
     if (Array.isArray(parameters[0])) {
-      const [abi14, name62, args3] = parameters;
-      return [fromAbi3(abi14, name62, { args: args3 }), args3];
+      const [abi16, name62, args3] = parameters;
+      return [fromAbi3(abi16, name62, { args: args3 }), args3];
     }
     const [abiFunction2, args2] = parameters;
     return [abiFunction2, args2];
@@ -14474,8 +14483,8 @@ function encodeData2(...parameters) {
   const data = args.length > 0 ? encode7(item.inputs, args) : void 0;
   return data ? concat(selector, data) : selector;
 }
-function fromAbi3(abi14, name62, options) {
-  const item = fromAbi(abi14, name62, options);
+function fromAbi3(abi16, name62, options) {
+  const item = fromAbi(abi16, name62, options);
   if (item.type !== "function")
     throw new NotFoundError({ name: name62, type: "function" });
   return item;
@@ -15007,6 +15016,88 @@ var getProviderIdByAddress = async ({
   return decodeResult(abi6, result);
 };
 var abi7 = {
+  type: "function",
+  inputs: [
+    { name: "providerId", internalType: "uint256", type: "uint256" },
+    {
+      name: "productType",
+      internalType: "enum ServiceProviderRegistryStorage.ProductType",
+      type: "uint8"
+    }
+  ],
+  name: "getProviderWithProduct",
+  outputs: [
+    {
+      name: "",
+      internalType: "struct ServiceProviderRegistryStorage.ProviderWithProduct",
+      type: "tuple",
+      components: [
+        { name: "providerId", internalType: "uint256", type: "uint256" },
+        {
+          name: "providerInfo",
+          internalType: "struct ServiceProviderRegistryStorage.ServiceProviderInfo",
+          type: "tuple",
+          components: [
+            {
+              name: "serviceProvider",
+              internalType: "address",
+              type: "address"
+            },
+            { name: "payee", internalType: "address", type: "address" },
+            { name: "name", internalType: "string", type: "string" },
+            { name: "description", internalType: "string", type: "string" },
+            { name: "isActive", internalType: "bool", type: "bool" }
+          ]
+        },
+        {
+          name: "product",
+          internalType: "struct ServiceProviderRegistryStorage.ServiceProduct",
+          type: "tuple",
+          components: [
+            {
+              name: "productType",
+              internalType: "enum ServiceProviderRegistryStorage.ProductType",
+              type: "uint8"
+            },
+            {
+              name: "capabilityKeys",
+              internalType: "string[]",
+              type: "string[]"
+            },
+            { name: "isActive", internalType: "bool", type: "bool" }
+          ]
+        },
+        {
+          name: "productCapabilityValues",
+          internalType: "bytes[]",
+          type: "bytes[]"
+        }
+      ]
+    }
+  ],
+  stateMutability: "view"
+};
+var getProviderMetadata = async ({
+  chain,
+  providerId
+}) => {
+  const provider = filProvider[chain.id];
+  const result = await provider.request({
+    method: "eth_call",
+    params: [
+      {
+        data: encodeData2(abi7, [providerId, 0]),
+        to: chain.contracts.providerRegistry.address
+      },
+      "latest"
+    ]
+  });
+  const { providerInfo, productCapabilityValues, product } = decodeResult(abi7, result);
+  const { capabilityKeys } = product;
+  const serviceURL = toString(productCapabilityValues[capabilityKeys.indexOf("serviceURL")]);
+  return { address: providerInfo.payee, serviceURL };
+};
+var abi8 = {
   type: "function",
   name: "getProviderPayee",
   stateMutability: "view",
@@ -15032,15 +15123,57 @@ var getProviderPayee = async ({
     method: "eth_call",
     params: [
       {
-        data: encodeData2(abi7, [id]),
+        data: encodeData2(abi8, [id]),
         to: chain.contracts.providerRegistry.address
       },
       "latest"
     ]
   });
-  return checksum2(decodeResult(abi7, result));
+  return checksum2(decodeResult(abi8, result));
 };
-var abi8 = {
+var abi9 = {
+  inputs: [
+    {
+      internalType: "uint256",
+      name: "offset",
+      type: "uint256"
+    },
+    {
+      internalType: "uint256",
+      name: "limit",
+      type: "uint256"
+    }
+  ],
+  name: "getApprovedProviders",
+  outputs: [
+    {
+      internalType: "uint256[]",
+      name: "providerIds",
+      type: "uint256[]"
+    }
+  ],
+  stateMutability: "view",
+  type: "function"
+};
+var getRandomProviderId = async ({
+  chain
+}) => {
+  const provider = filProvider[chain.id];
+  const result = await provider.request({
+    method: "eth_call",
+    params: [
+      {
+        data: encodeData2(abi9, [0n, 100n]),
+        to: chain.contracts.storageView.address
+      },
+      "latest"
+    ]
+  });
+  const ids = decodeResult(abi9, result);
+  const randomIndex = Math.floor(Math.random() * ids.length);
+  return ids[randomIndex];
+};
+var abi10 = {
   constant: true,
   inputs: [
     {
@@ -15068,15 +15201,15 @@ var getUSDfcBalance = async ({
     method: "eth_call",
     params: [
       {
-        data: encodeData2(abi8, [address]),
+        data: encodeData2(abi10, [address]),
         to: chain.contracts.usdfc.address
       },
       "latest"
     ]
   });
-  return decodeResult(abi8, result);
+  return decodeResult(abi10, result);
 };
-var abi9 = {
+var abi11 = {
   type: "function",
   inputs: [],
   name: "getServicePrice",
@@ -15128,12 +15261,12 @@ var getServicePrice = async ({
     params: [
       {
         to: chain.contracts.storage.address,
-        data: encodeData2(abi9)
+        data: encodeData2(abi11)
       },
       "latest"
     ]
   });
-  const { minimumPricePerMonth, pricePerTiBPerMonthNoCDN, epochsPerMonth } = decodeResult(abi9, result);
+  const { minimumPricePerMonth, pricePerTiBPerMonthNoCDN, epochsPerMonth } = decodeResult(abi11, result);
   const linearCost = BigInt(sizeInBytes) * pricePerTiBPerMonthNoCDN / TiB;
   const actualCost = linearCost > minimumPricePerMonth ? linearCost : minimumPricePerMonth;
   const costWithBuffer = actualCost * 110n / 100n;
@@ -15145,7 +15278,7 @@ var getServicePrice = async ({
     linearCost
   };
 };
-var abi10 = {
+var abi12 = {
   type: "function",
   inputs: [{ name: "dataSetId", internalType: "uint256", type: "uint256" }],
   name: "getDataSet",
@@ -15180,16 +15313,16 @@ var getDataSet = async ({
     method: "eth_call",
     params: [
       {
-        data: encodeData2(abi10, [dataSetId]),
+        data: encodeData2(abi12, [dataSetId]),
         to: chain.contracts.storageView.address
       },
       "latest"
     ]
   });
-  return decodeResult(abi10, result);
+  return decodeResult(abi12, result);
 };
 var metadata2 = [{ key: "withIPFSIndexing", value: "" }];
-var abi11 = [
+var abi13 = [
   { type: "uint256" },
   { type: "string[][]" },
   { type: "string[][]" },
@@ -15253,7 +15386,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(from13(abi11), [
+  const extraData = encode7(from13(abi13), [
     nonce,
     keys2,
     values2,
@@ -15344,9 +15477,9 @@ var uploadToFilecoin = async ({
   filecoinChain = "mainnet",
   size: size42
 }) => {
-  if (!providerURL)
+  if (!providerURL && providerAddress)
     throw new MissingKeyError("FILECOIN_SP_URL");
-  if (!providerAddress)
+  if (!providerAddress && providerURL)
     throw new MissingKeyError("FILECOIN_SP_ADDRESS");
   const publicKey = getPublicKey({ privateKey });
   const address = fromPublicKey(publicKey);
@@ -15358,20 +15491,36 @@ var uploadToFilecoin = async ({
   logger.info(`USDfc balance: ${format(balance, 18)}`);
   if (balance === 0n)
     throw new DeployError(providerName4, "No USDfc on account");
-  const providerId = await getProviderIdByAddress({
-    providerAddress,
-    chain
-  });
+  if (verbose)
+    logger.info("Looking up existing data sets");
+  const dataSets = await getClientDataSets({ address, chain });
+  let providerId;
+  if (dataSets.length > 0) {
+    const lastProvider = dataSets.at(-1);
+    providerId = lastProvider.providerId;
+  } else if (providerAddress) {
+    providerId = await getProviderIdByAddress({
+      providerAddress,
+      chain
+    });
+  } else {
+    providerId = await getRandomProviderId({ chain });
+  }
   if (verbose)
     logger.info(`Filecoin SP ID: ${providerId}`);
+  if (!providerURL) {
+    const { serviceURL, address: address2 } = await getProviderMetadata({
+      chain,
+      providerId
+    });
+    providerURL = serviceURL;
+    providerAddress = address2;
+  }
   const payee = await getProviderPayee({ id: providerId, chain });
   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`);
-  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);
@@ -18719,7 +18868,7 @@ __export(exports_schema3, {
   uint64: () => uint64,
   typeError: () => typeError,
   tuple: () => tuple,
-  toString: () => toString4,
+  toString: () => toString5,
   text: () => match5,
   struct: () => struct,
   string: () => string,
@@ -19297,7 +19446,7 @@ class Literal extends API {
     return super.default(value);
   }
   toString() {
-    return `literal(${toString4(this.value)})`;
+    return `literal(${toString5(this.value)})`;
   }
 }
 var literal = (value) => new Literal(value);
@@ -19422,11 +19571,11 @@ class TypeError2 extends SchemaError {
     return "TypeError";
   }
   describe() {
-    return `Expected value of type ${this.expect} instead got ${toString4(this.actual)}`;
+    return `Expected value of type ${this.expect} instead got ${toString5(this.actual)}`;
   }
 }
 var typeError = (data) => ({ error: new TypeError2(data) });
-var toString4 = (value) => {
+var toString5 = (value) => {
   const type4 = typeof value;
   switch (type4) {
     case "boolean":
@@ -19454,7 +19603,7 @@ class LiteralError extends SchemaError {
     return "LiteralError";
   }
   describe() {
-    return `Expected literal ${toString4(this.expect)} instead got ${toString4(this.actual)}`;
+    return `Expected literal ${toString5(this.expect)} instead got ${toString5(this.actual)}`;
   }
 }
 class ElementError extends SchemaError {
@@ -21018,7 +21167,7 @@ __export(exports_identity2, {
 var identity2 = from8({
   prefix: "\0",
   name: "identity",
-  encode: (buf2) => toString2(buf2),
+  encode: (buf2) => toString3(buf2),
   decode: (str) => fromString3(str)
 });
 var textEncoder2 = new TextEncoder();
@@ -29166,7 +29315,7 @@ function namehash(name12) {
 function normalize(name12) {
   return ens_normalize(name12);
 }
-var abi12 = {
+var abi14 = {
   constant: true,
   inputs: [
     {
@@ -29185,8 +29334,8 @@ var abi12 = {
   stateMutability: "view",
   type: "function"
 };
-var encodeEnsAddressRecordRequest = (name12) => encodeData2(abi12, [namehash(name12)]);
-var abi13 = {
+var encodeEnsAddressRecordRequest = (name12) => encodeData2(abi14, [namehash(name12)]);
+var abi15 = {
   inputs: [
     {
       name: "name",
@@ -29251,7 +29400,7 @@ var resolveEnsName = async ({
     method: "eth_call",
     params: [
       {
-        data: encodeData2(abi13, [
+        data: encodeData2(abi15, [
           toHex(packetToBytes(name12)),
           encodeEnsAddressRecordRequest(name12)
         ]),
@@ -29260,7 +29409,7 @@ var resolveEnsName = async ({
       "latest"
     ]
   });
-  return `0x${decodeResult(abi13, result2)[0].slice(-40)}`;
+  return `0x${decodeResult(abi15, result2)[0].slice(-40)}`;
 };
 function parseEip3770Address(fullAddress) {
   const parts = fullAddress.split(":");
@@ -29713,7 +29862,7 @@ var ensAction = async ({
       });
       logger.info(`Signing a Safe transaction with a hash ${safeTxHash}`);
       const senderSignature = await generateSafeTransactionSignature({
-        safeAddress: from25,
+        safeAddress: checksum2(from25),
         txData,
         chainId: chain.id,
         privateKey: pk
@@ -29724,14 +29873,15 @@ var ensAction = async ({
         try {
           await proposeTransaction({
             txData,
-            safeAddress: from25,
+            safeAddress: checksum2(from25),
             safeTxHash,
             senderSignature: toHex3(senderSignature),
             chainId: chain.id,
             chainName,
             address
           });
-          const safeLink = `https://app.safe.global/transactions/queue?safe=${safeAddress}`;
+          const safe2 = safeAddress.endsWith(".eth") ? await resolveEnsName({ name: safeAddress, provider }) : safeAddress;
+          const safeLink = `https://app.safe.global/transactions/queue?safe=${safe2}`;
           logger.success(`Transaction proposed to a Safe wallet.
 Open in a browser: ${isTTY ? styleText2("underline", safeLink) : safeLink}`);
         } catch (e) {

package/package.json

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