omnipin 2.2.2 → 2.2.3

package/dist/index.js

@@ -10112,11 +10112,14 @@ let filecoinMainnet = {
         storage: {
             address: '0x8408502033C418E1bbC97cE9ac48E5528F371A9f'
         },
+        pdpVerifier: {
+            address: '0xBADd0B92C1c71d02E7d520f64c0876538fa2557F'
+        },
         providerRegistry: {
             address: '0xf55dDbf63F1b55c3F1D4FA7e339a68AB7b64A5eB'
         },
         storageView: {
-            address: '0x638a4986332bF9B889E5D7435B966C5ecdE077Fa'
+            address: '0xB1B3A3d979c1f233c1021EF98dff9c0932FF1bb9'
         }
     },
     blockExplorer: 'https://filecoin.blockscout.com'
@@ -10136,11 +10139,14 @@ let filecoinMainnet = {
         storage: {
             address: '0x02925630df557F957f70E112bA06e50965417CA0'
         },
+        pdpVerifier: {
+            address: '0x85e366Cf9DD2c0aE37E963d9556F5f4718d6417C'
+        },
         providerRegistry: {
             address: '0x839e5c9988e4e9977d40708d0094103c0839Ac9D'
         },
         storageView: {
-            address: '0x53d235D474585EC102ccaB7e0cdcE951dD00f716'
+            address: '0x537320bd004a7FDd3c1932ca64BD88268301322A'
         }
     },
     blockExplorer: 'https://filecoin-testnet.blockscout.com'
@@ -10576,6 +10582,140 @@ let getClientDatasets_abi = {
         ]
     });
     return AbiFunction_decodeResult(getAccountInfo_abi, result);
+}, getAvailableFunds = async ({ address, chain })=>{
+    let [funds, lockupCurrent, lockupRate, lockupLastSettledAt] = await getAccountInfo({
+        address,
+        chain
+    }), currentEpoch = BigInt(await constants_filProvider[chain.id].request({
+        method: 'eth_blockNumber'
+    })), epochsSinceSettlement = currentEpoch > lockupLastSettledAt ? currentEpoch - lockupLastSettledAt : 0n, settledLockupCurrent = lockupCurrent + epochsSinceSettlement * lockupRate;
+    return {
+        funds,
+        lockupCurrent,
+        lockupRate,
+        lockupLastSettledAt,
+        currentEpoch,
+        epochsSinceSettlement,
+        settledLockupCurrent,
+        availableFunds: funds > settledLockupCurrent ? funds - settledLockupCurrent : 0n
+    };
+}, DEFAULT_LOCKUP_PERIOD = 30n * 2880n, serviceAbi = [
+    {
+        type: 'function',
+        name: 'getServicePrice',
+        inputs: [],
+        outputs: [
+            {
+                name: 'pricing',
+                internalType: 'struct FilecoinWarmStorageService.ServicePricing',
+                type: 'tuple',
+                components: [
+                    {
+                        name: 'pricePerTiBPerMonthNoCDN',
+                        internalType: 'uint256',
+                        type: 'uint256'
+                    },
+                    {
+                        name: 'pricePerTiBCdnEgress',
+                        internalType: 'uint256',
+                        type: 'uint256'
+                    },
+                    {
+                        name: 'pricePerTiBCacheMissEgress',
+                        internalType: 'uint256',
+                        type: 'uint256'
+                    },
+                    {
+                        name: 'tokenAddress',
+                        internalType: 'contract IERC20',
+                        type: 'address'
+                    },
+                    {
+                        name: 'epochsPerMonth',
+                        internalType: 'uint256',
+                        type: 'uint256'
+                    },
+                    {
+                        name: 'minimumPricePerMonth',
+                        internalType: 'uint256',
+                        type: 'uint256'
+                    }
+                ]
+            }
+        ],
+        stateMutability: 'view'
+    },
+    {
+        type: 'function',
+        name: 'pdpVerifierAddress',
+        inputs: [],
+        outputs: [
+            {
+                name: '',
+                internalType: 'address',
+                type: 'address'
+            }
+        ],
+        stateMutability: 'view'
+    }
+], pdpVerifierAbi = {
+    type: 'function',
+    name: 'USDFC_SYBIL_FEE',
+    inputs: [],
+    outputs: [
+        {
+            name: '',
+            internalType: 'uint256',
+            type: 'uint256'
+        }
+    ],
+    stateMutability: 'view'
+}, getDataSetCreationRequirements = async ({ chain })=>{
+    let provider = constants_filProvider[chain.id], [servicePriceResult, pdpVerifierResult] = await Promise.all([
+        provider.request({
+            method: 'eth_call',
+            params: [
+                {
+                    to: chain.contracts.storage.address,
+                    data: AbiFunction_encodeData(serviceAbi[0])
+                },
+                'latest'
+            ]
+        }),
+        provider.request({
+            method: 'eth_call',
+            params: [
+                {
+                    to: chain.contracts.storage.address,
+                    data: AbiFunction_encodeData(serviceAbi[1])
+                },
+                'latest'
+            ]
+        })
+    ]), { minimumPricePerMonth } = AbiFunction_decodeResult(serviceAbi[0], servicePriceResult), pdpVerifierAddress = AbiFunction_decodeResult(serviceAbi[1], pdpVerifierResult), verifierAddress = '0x0000000000000000000000000000000000000000' === pdpVerifierAddress ? chain.contracts.pdpVerifier.address : pdpVerifierAddress, sybilFeeResult = await provider.request({
+        method: 'eth_call',
+        params: [
+            {
+                to: verifierAddress,
+                data: AbiFunction_encodeData(pdpVerifierAbi)
+            },
+            'latest'
+        ]
+    }), sybilFee = AbiFunction_decodeResult(pdpVerifierAbi, sybilFeeResult), requirements = (({ minimumPricePerMonth, sybilFee })=>({
+            defaultLockupPeriod: DEFAULT_LOCKUP_PERIOD,
+            epochsPerMonth: DEFAULT_LOCKUP_PERIOD,
+            minimumLockupRequired: minimumPricePerMonth,
+            creationRequirement: minimumPricePerMonth + sybilFee
+        }))({
+        minimumPricePerMonth,
+        sybilFee
+    });
+    return {
+        minimumPricePerMonth,
+        pdpVerifierAddress: verifierAddress,
+        sybilFee,
+        ...requirements
+    };
 }, getServicePrice_abi = {
     type: 'function',
     inputs: [],
@@ -11968,7 +12108,7 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
         address,
         chain
     });
-    verbose && (logger.info(`Payer address: ${address}`), logger.info(`Filecoin chain: ${chain.name}`), logger.info(`USDfc balance: ${Value_format(balance, 18)}`), logger.info('Looking up existing data sets'));
+    verbose && (logger.info(`Payer address: ${address}`), logger.info(`Filecoin chain: ${chain.name}`), logger.info(`Wallet USDfc balance: ${Value_format(balance, 18)}`), logger.info('Looking up existing data sets'));
     let providerId = await pickProvider({
         chain,
         ...providerAddress ? {
@@ -12053,16 +12193,16 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
     }(bytes))), providerActiveDataSets = (await getClientDataSets({
         chain,
         address
-    })).filter((ds)=>ds.providerId === providerId && 0n === ds.pdpEndEpoch), isNewDataSet = 0 === providerActiveDataSets.length || filecoinForceNewDataset, sybilFee = isNewDataSet ? 100000000000000000n : 0n, totalRequired = perMonth + sybilFee;
-    verbose && (logger.info(`Required lockup: ${Value_format(perMonth, 18)} USDFC`), isNewDataSet && logger.info(`Sybil fee: ${Value_format(sybilFee, 18)} USDFC`), logger.info(`Total required: ${Value_format(totalRequired, 18)} USDFC`));
-    let [funds, lockupCurrent, lockupRate, lockupLastSettledAt] = await getAccountInfo({
+    })).filter((ds)=>ds.providerId === providerId && 0n === ds.pdpEndEpoch), isNewDataSet = 0 === providerActiveDataSets.length || filecoinForceNewDataset, creationRequirement = isNewDataSet ? (await getDataSetCreationRequirements({
+        chain
+    })).creationRequirement : 0n, requiredAmount = isNewDataSet && creationRequirement > perMonth ? creationRequirement : perMonth;
+    verbose && (logger.info(`Storage price: ${Value_format(perMonth, 18)} USDFC/month`), isNewDataSet && logger.info(`Creation requirement: ${Value_format(creationRequirement, 18)} USDFC`), logger.info(`Required funds: ${Value_format(requiredAmount, 18)} USDFC`));
+    let { funds, availableFunds } = await getAvailableFunds({
         address,
         chain
-    }), actualLockup = lockupCurrent + (BigInt(await constants_filProvider[chain.id].request({
-        method: 'eth_blockNumber'
-    })) - lockupLastSettledAt) * lockupRate, availableFunds = funds > actualLockup ? funds - actualLockup : 0n;
-    logger.info(`Available funds: ${Value_format(availableFunds, 18)} USDFC`);
-    let depositNeeded = totalRequired > availableFunds ? totalRequired - availableFunds : 0n;
+    });
+    verbose && logger.info(`Filecoin Pay deposited funds: ${Value_format(funds, 18)} USDFC`), logger.info(`Filecoin Pay available funds: ${Value_format(availableFunds, 18)} USDFC`);
+    let depositNeeded = requiredAmount > availableFunds ? requiredAmount - availableFunds : 0n;
     if (depositNeeded > 0n) {
         verbose && logger.info(`Depositing ${Value_format(depositNeeded, 18)} USDFC`);
         let params = await depositAndApproveOperatorWriteParameters({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnipin",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "author": "v1rtl <hi@v1rtl.site>",
   "repository": {
     "type": "git",
@@ -10,7 +10,7 @@
     "@biomejs/biome": "^2.4.7",
     "@ipld/car": "^5.4.2",
     "@ipld/dag-ucan": "^3.4.5",
-    "@omnipin/foc": "npm:@jsr/omnipin__foc@0.0.11",
+    "@omnipin/foc": "npm:@jsr/omnipin__foc@0.0.12",
     "@rslib/core": "^0.20.0",
     "@size-limit/file": "^12.0.1",
     "@stauro/filebase-upload": "npm:@jsr/stauro__filebase-upload",