From 8f8c2a1a7c92db5bb9c7812e4343a37755696a2d Mon Sep 17 00:00:00 2001 From: Gauthier Mayer <41857236+gauthiermyr@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:25:10 +0200 Subject: [PATCH] feat: use bytes for addresses ids (#32) --- package.json | 3 +- schema.graphql | 43 ++- src/Cub.mapping.ts | 4 +- src/ERC1155.mapping.ts | 31 ++- src/ERC20.mapping.ts | 67 +++-- src/IntegrationRouter.mapping.ts | 4 +- src/MerkleVault.mapping.ts | 6 +- src/Nexus.mapping.ts | 82 +++--- src/PluggableHatcher.mapping.ts | 24 +- src/ProxyFactory.mapping.ts | 18 +- src/TUPProxy.mapping.ts | 18 +- src/utils/utils.ts | 75 +++--- src/vCoverageRecipient.mapping.ts | 16 +- src/vExecLayerRecipient.mapping.ts | 4 +- src/vExitQueue.mapping.ts | 20 +- src/vFactory.mapping.ts | 39 +-- src/vNFT.mapping.ts | 38 +-- src/vOracleAggregator.mapping.ts | 20 +- src/vPool.mapping.ts | 63 ++--- src/vTreasury.mapping.ts | 10 +- yarn.lock | 403 +++++++++++++++++------------ 21 files changed, 532 insertions(+), 456 deletions(-) diff --git a/package.json b/package.json index 8501349..6206e90 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "format": "prettier --config .prettierrc 'abis_ts/**/*.ts' 'src/**/*.ts' --write" }, "dependencies": { - "@graphprotocol/graph-cli": "0.51.2", + "@graphprotocol/cost-model": "^0.1.16", + "@graphprotocol/graph-cli": "0.60.0", "@graphprotocol/graph-ts": "0.31.0", "@graphprotocol/indexer-cli": "^0.20.17", "prettier": "2.8.1" diff --git a/schema.graphql b/schema.graphql index ef694f4..1e1d594 100644 --- a/schema.graphql +++ b/schema.graphql @@ -12,7 +12,7 @@ type MetaContract @entity { # type PluggableHatcher @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! @@ -36,7 +36,7 @@ type PluggableHatcher @entity { } type Cub @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! @@ -70,7 +70,7 @@ type Fix @entity { } type PluggableHatcherImplementation @entity { - id: String! + id: Bytes! address: Bytes! pluggableHatcher: PluggableHatcher! @@ -82,8 +82,9 @@ type PluggableHatcherImplementation @entity { } type TUPProxy @entity { - id: String! + id: Bytes! + address: Bytes! freezeTime: BigInt! admin: Bytes! pauser: Bytes! @@ -118,7 +119,7 @@ type TUPProxyUpgrade @entity { # type Nexus @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! proxy: TUPProxy! @@ -158,7 +159,7 @@ type Nexus @entity { # type vFactory @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! @@ -325,7 +326,7 @@ type FactoryDepositor @entity { # type vTreasury @entity { - id: String! + id: Bytes! address: Bytes! cub: Cub! @@ -393,7 +394,7 @@ type TreasuryFeeVote @entity { # type vPool @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! @@ -690,7 +691,7 @@ type PoolDepositor @entity { # ▀▀ type vExitQueue @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! @@ -799,7 +800,7 @@ type Cask @entity { # type vExecLayerRecipient @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! @@ -836,7 +837,7 @@ type ExecLayerSuppliedEther @entity { # type vCoverageRecipient @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! @@ -906,7 +907,7 @@ type CoverageVoidedShares @entity { # type vWithdrawalRecipient @entity { - id: String! + id: Bytes! address: Bytes! withdrawalCredentials: Bytes! @@ -929,7 +930,7 @@ type vWithdrawalRecipient @entity { # type vOracleAggregator @entity { - id: String! + id: Bytes! address: Bytes! contract: MetaContract! @@ -1029,7 +1030,7 @@ type Commission @entity { } type IntegrationChannel @entity { - id: String! + id: Bytes! name: String! implementation: Bytes! contract: MetaContract! @@ -1041,7 +1042,7 @@ type IntegrationChannel @entity { } interface Integration { - id: String! + id: Bytes! address: Bytes! channel: IntegrationChannel! name: String! @@ -1108,7 +1109,7 @@ type MultiPoolRewardsSnapshot @entity { } interface vPoolIntegration { - id: String! + id: Bytes! pools: [MultiPool!]! @derivedFrom(field: "integration") commissions: [Commission!]! @derivedFrom(field: "vPoolIntegration") @@ -1161,11 +1162,10 @@ type ERC20 implements vPoolIntegration & Integration @entity { # vPoolIntegration pools: [MultiPool!]! @derivedFrom(field: "integration") - _poolsDerived: [MultiPool!]! commissions: [Commission!]! @derivedFrom(field: "vPoolIntegration") # Integration - id: String! + id: Bytes! address: Bytes! channel: IntegrationChannel! name: String! @@ -1348,12 +1348,11 @@ type ERC1155Integration implements vPoolIntegration & Integration @entity { # vPoolIntegration pools: [MultiPool!]! @derivedFrom(field: "integration") - _poolsDerived: [MultiPool!]! commissions: [Commission!]! @derivedFrom(field: "vPoolIntegration") maxCommission: BigInt! # Integration - id: String! + id: Bytes! address: Bytes! channel: IntegrationChannel! name: String! @@ -1396,7 +1395,7 @@ type VaultClaim @entity { } type MerkleVault @entity { - id: String! + id: Bytes! root: Bytes! frameSize: BigInt! @@ -1443,7 +1442,7 @@ type vNFTIntegration implements Integration @entity { approvals: [vNFTApprovals!]! @derivedFrom(field: "integration") # Integration - id: String! + id: Bytes! address: Bytes! channel: IntegrationChannel! name: String! diff --git a/src/Cub.mapping.ts b/src/Cub.mapping.ts index 01a9629..3299ea6 100644 --- a/src/Cub.mapping.ts +++ b/src/Cub.mapping.ts @@ -3,14 +3,14 @@ import { AppliedFixes } from '../generated/templates/Cub/Cub'; import { entityUUID, eventUUID } from './utils/utils'; export function handleAppliedFixes(event: AppliedFixes): void { - const cub = Cub.load(entityUUID(event, [])); + const cub = Cub.load(event.address); for (let idx = 0; idx < event.params.fixes.length; ++idx) { const fixId = eventUUID(event, ['fix', event.params.fixes[idx].toHexString()]); const fix = new Fix(fixId); fix.address = event.params.fixes[idx]; - fix.fix = entityUUID(event, []); + fix.fix = event.address; fix.createdAt = event.block.timestamp; fix.createdAtBlock = event.block.number; diff --git a/src/ERC1155.mapping.ts b/src/ERC1155.mapping.ts index 20ada02..70433d4 100644 --- a/src/ERC1155.mapping.ts +++ b/src/ERC1155.mapping.ts @@ -39,7 +39,7 @@ import { import { getOrCreateBalance } from './vPool.mapping'; export function handleSetName(event: SetName): void { - const erc1155 = ERC1155Integration.load(entityUUID(event, [])); + const erc1155 = ERC1155Integration.load(event.address); erc1155!.name = event.params.name; @@ -50,7 +50,7 @@ export function handleSetName(event: SetName): void { } export function handleSetURIPrefix(event: SetURIPrefix): void { - const erc1155 = ERC1155Integration.load(entityUUID(event, [])); + const erc1155 = ERC1155Integration.load(event.address); erc1155!.uriPrefix = event.params.uri; @@ -61,7 +61,7 @@ export function handleSetURIPrefix(event: SetURIPrefix): void { } export function handleSetSymbol(event: SetSymbol): void { - const erc1155 = ERC1155Integration.load(entityUUID(event, [])); + const erc1155 = ERC1155Integration.load(event.address); erc1155!.symbol = event.params.symbol; erc1155!.editedAt = event.block.timestamp; @@ -71,7 +71,7 @@ export function handleSetSymbol(event: SetSymbol): void { } export function handleSetDepositsPaused(event: SetDepositsPaused): void { - const erc1155 = ERC1155Integration.load(entityUUID(event, [])); + const erc1155 = ERC1155Integration.load(event.address); erc1155!.paused = event.params.isPaused; erc1155!.editedAt = event.block.timestamp; @@ -81,9 +81,8 @@ export function handleSetDepositsPaused(event: SetDepositsPaused): void { } export function handleCommissionSharesSold(event: CommissionSharesSold): void { - const erc1155 = ERC1155Integration.load(externalEntityUUID(event.address, [])); - const multiPoolId = erc1155!._poolsDerived[event.params.id.toU32()]; - const multiPool = MultiPool.load(multiPoolId); + const erc1155 = ERC1155Integration.load(event.address); + const multiPool = MultiPool.load(entityUUID(event, [event.params.id.toString()])); multiPool!.soldEth = multiPool!.soldEth.plus(event.params.amountSold); multiPool!.commissionPaid = multiPool!.commissionPaid.plus(event.params.amountSold); const ucs = getOrCreateUnassignedCommissionSold(); @@ -104,13 +103,13 @@ export function handlePoolAdded(event: PoolAdded): void { const tokenAndPoolId = entityUUID(event, [poolId.toString()]); const multiPool = new MultiPool(tokenAndPoolId); multiPool.number = poolId; - multiPool.pool = externalEntityUUID(vPool, []); + multiPool.pool = vPool; multiPool.active = true; multiPool.fees = BigInt.zero(); multiPool.commissionPaid = BigInt.zero(); multiPool.injectedEth = BigInt.zero(); multiPool.exitedEth = BigInt.zero(); - multiPool.integration = entityUUID(event, []); + multiPool.integration = event.address; multiPool.poolAllocation = BigInt.zero(); multiPool.soldEth = BigInt.zero(); const poolBalance = getOrCreateBalance( @@ -133,7 +132,7 @@ export function handlePoolAdded(event: PoolAdded): void { const erc1155 = new ERC1155(tokenAndPoolId); erc1155.pool = tokenAndPoolId; - erc1155.integration = entityUUID(event, []); + erc1155.integration = event.address; erc1155.tokenId = poolId; erc1155.totalSupply = BigInt.zero(); erc1155.totalUnderlyingSupply = BigInt.zero(); @@ -171,7 +170,7 @@ export function handlePoolActivation(event: PoolActivation): void { } export function handleNewCommissionSplit(event: NewCommissionSplit): void { - const erc1155 = ERC1155Integration.load(entityUUID(event, [])); + const erc1155 = ERC1155Integration.load(event.address); const recipients = event.params.recipients; const splits = event.params.splits; const ts = event.block.timestamp; @@ -206,7 +205,7 @@ export function handleNewCommissionSplit(event: NewCommissionSplit): void { } export function handleCommissionWithdrawn(event: CommissionWithdrawn): void { - const erc1155 = ERC1155Integration.load(entityUUID(event, [])); + const erc1155 = ERC1155Integration.load(event.address); const ts = event.block.timestamp; const blockId = event.block.number; @@ -225,7 +224,7 @@ export function handleCommissionWithdrawn(event: CommissionWithdrawn): void { export function handleStake_1_0_0_rc4(event: Stake_1_0_0_rc4): void { const tokenId = event.params.id; const erc1155 = ERC1155.load(entityUUID(event, [tokenId.toString()])); - const erc1155Integration = ERC1155Integration.load(entityUUID(event, [])); + const erc1155Integration = ERC1155Integration.load(event.address); const ts = event.block.timestamp; const blockId = event.block.number; @@ -292,7 +291,7 @@ export function handleStake_1_0_0_rc4(event: Stake_1_0_0_rc4): void { export function handleStake(event: Stake): void { const tokenId = event.params.stakeDetails[0].poolId; const erc1155 = ERC1155.load(entityUUID(event, [tokenId.toString()])); - const erc1155Integration = ERC1155Integration.load(entityUUID(event, [])); + const erc1155Integration = ERC1155Integration.load(event.address); const ts = event.block.timestamp; const blockId = event.block.number; @@ -477,7 +476,7 @@ export function handleApprovalForAll(event: ApprovalForAll): void { export function handleVPoolSharesReceived(event: VPoolSharesReceived): void {} export function handleSetAdmin(event: SetAdmin): void { - const erc1155Integration = ERC1155Integration.load(entityUUID(event, [])); + const erc1155Integration = ERC1155Integration.load(event.address); erc1155Integration!.admin = event.params.admin; erc1155Integration!.editedAt = event.block.timestamp; erc1155Integration!.editedAtBlock = event.block.number; @@ -485,7 +484,7 @@ export function handleSetAdmin(event: SetAdmin): void { } export function handleSetMaxCommission(event: SetMaxCommission): void { - const erc1155Integration = ERC1155Integration.load(entityUUID(event, [])); + const erc1155Integration = ERC1155Integration.load(event.address); erc1155Integration!.maxCommission = event.params.maxCommission; erc1155Integration!.editedAt = event.block.timestamp; erc1155Integration!.editedAtBlock = event.block.number; diff --git a/src/ERC20.mapping.ts b/src/ERC20.mapping.ts index a40fb3b..3641234 100644 --- a/src/ERC20.mapping.ts +++ b/src/ERC20.mapping.ts @@ -55,11 +55,11 @@ function snapshotSupply(event: ethereum.Event): void { const snapshotId = txUniqueUUID(event, [blockId.toString(), ts.toString()]); const snapshot = new ERC20Snapshot(snapshotId); - const integration = ERC20.load(entityUUID(event, [])); + const integration = ERC20.load(event.address); snapshot.totalSupply = integration!.totalSupply; snapshot.createdAt = ts; snapshot.createdAtBlock = blockId; - snapshot.integration = entityUUID(event, []); + snapshot.integration = event.address; snapshot.save(); } @@ -70,8 +70,8 @@ function snapshotBalance(event: ethereum.Event, staker: Address): void { const balance = ERC20Balance.load(entityUUID(event, [staker.toHexString()])); const balanceSnapshotId = txUniqueUUID(event, [staker.toHexString(), blockId.toString(), ts.toString()]); const balanceSnapshot = new ERC20BalanceSnapshot(balanceSnapshotId); - const integration = ERC20.load(entityUUID(event, [])); - balanceSnapshot.integration = entityUUID(event, []); + const integration = ERC20.load(event.address); + balanceSnapshot.integration = event.address; balanceSnapshot.staker = staker; balanceSnapshot.sharesBalance = balance!.sharesBalance; balanceSnapshot.createdAt = ts; @@ -82,7 +82,7 @@ function snapshotBalance(event: ethereum.Event, staker: Address): void { } export function handleSetName(event: SetName): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); erc20!.name = event.params.name; @@ -93,7 +93,7 @@ export function handleSetName(event: SetName): void { } export function handleSetSymbol(event: SetSymbol): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); erc20!.symbol = event.params.symbol; erc20!.editedAt = event.block.timestamp; @@ -103,7 +103,7 @@ export function handleSetSymbol(event: SetSymbol): void { } export function handleSetDepositsPaused(event: SetDepositsPaused): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); erc20!.paused = event.params.isPaused; erc20!.editedAt = event.block.timestamp; @@ -118,10 +118,10 @@ export function handlePoolAdded(event: PoolAdded): void { const multiPool = new MultiPool(entityUUID(event, [poolId.toString()])); multiPool.number = poolId; - multiPool.pool = externalEntityUUID(poolAddress, []); + multiPool.pool = poolAddress; multiPool.active = true; multiPool.fees = BigInt.zero(); - multiPool.integration = entityUUID(event, []); + multiPool.integration = event.address; multiPool.poolAllocation = BigInt.zero(); multiPool.soldEth = BigInt.zero(); multiPool.commissionPaid = BigInt.zero(); @@ -147,15 +147,12 @@ export function handlePoolAdded(event: PoolAdded): void { multiPool.save(); - const erc20 = ERC20.load(externalEntityUUID(event.address, [])); - const pools = erc20!._poolsDerived; - pools.push(multiPool.id); + const erc20 = ERC20.load(event.address); erc20!.editedAt = event.block.timestamp; erc20!.editedAtBlock = event.block.number; - erc20!._poolsDerived = pools; erc20!.save(); - const pool = vPool.load(externalEntityUUID(event.params.poolAddress, [])); + const pool = vPool.load(event.params.poolAddress); const multiPools = pool!.pluggedMultiPools; multiPools.push(multiPool.id); @@ -166,9 +163,9 @@ export function handlePoolAdded(event: PoolAdded): void { } export function handleExitedCommissionShares(event: ExitedCommissionShares): void { - const erc20 = ERC20.load(externalEntityUUID(event.address, [])); - const multiPoolId = erc20!._poolsDerived[event.params.poolId.toU32()]; - const multiPool = MultiPool.load(multiPoolId); + const erc20 = ERC20.load(event.address); + + const multiPool = MultiPool.load(entityUUID(event, [event.params.poolId.toString()])); const poolBalance = PoolBalance.load(multiPool!.shares); const pool = vPool.load(multiPool!.pool); multiPool!.commissionPaid = _computeIntegratorCommissionEarned( @@ -187,9 +184,9 @@ export function handleExitedCommissionShares(event: ExitedCommissionShares): voi } export function handleCommissionSharesSold(event: CommissionSharesSold): void { - const erc20 = ERC20.load(externalEntityUUID(event.address, [])); - const multiPoolId = erc20!._poolsDerived[event.params.id.toU32()]; - const multiPool = MultiPool.load(multiPoolId); + const erc20 = ERC20.load(event.address); + + const multiPool = MultiPool.load(entityUUID(event, [event.params.id.toString()])); multiPool!.soldEth = multiPool!.soldEth.plus(event.params.amountSold); multiPool!.commissionPaid = multiPool!.commissionPaid.plus(event.params.amountSold); multiPool!.save(); @@ -280,7 +277,7 @@ export function handlePoolActivation(event: PoolActivation): void { } export function handleNewCommissionSplit(event: NewCommissionSplit): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); const recipients = event.params.recipients; const splits = event.params.splits; const ts = event.block.timestamp; @@ -315,7 +312,7 @@ export function handleNewCommissionSplit(event: NewCommissionSplit): void { } export function handleCommissionWithdrawn(event: CommissionWithdrawn): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); const ts = event.block.timestamp; const blockId = event.block.number; @@ -332,7 +329,7 @@ export function handleCommissionWithdrawn(event: CommissionWithdrawn): void { } export function handleStake_1_0_0_rc4(event: Stake_1_0_0_rc4): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); const ts = event.block.timestamp; const blockId = event.block.number; @@ -340,7 +337,7 @@ export function handleStake_1_0_0_rc4(event: Stake_1_0_0_rc4): void { const ucs = getOrCreateUnassignedCommissionSold(); const deposit = new ERC20Deposit(eventUUID(event, [event.address.toHexString(), staker.toHexString()])); - deposit.integration = entityUUID(event, []); + deposit.integration = event.address; deposit.depositAmount = BigInt.zero(); if (ucs.active && ucs.tx.equals(event.transaction.hash)) { deposit.depositAmount = deposit.depositAmount.plus(ucs.amount); @@ -363,7 +360,7 @@ export function handleStake_1_0_0_rc4(event: Stake_1_0_0_rc4): void { let balance = ERC20Balance.load(entityUUID(event, [staker.toHexString()])); if (balance == null) { balance = new ERC20Balance(entityUUID(event, [staker.toHexString()])); - balance.integration = entityUUID(event, []); + balance.integration = event.address; balance.staker = staker; balance.sharesBalance = BigInt.zero(); balance.totalDeposited = BigInt.zero(); @@ -411,14 +408,14 @@ export function handleStake_1_0_0_rc4(event: Stake_1_0_0_rc4): void { } export function handleStake(event: Stake): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); const ts = event.block.timestamp; const blockId = event.block.number; const staker = event.params.staker; const deposit = new ERC20Deposit(eventUUID(event, [event.address.toHexString(), staker.toHexString()])); - deposit.integration = entityUUID(event, []); + deposit.integration = event.address; deposit.mintedShares = event.params.mintedTokens; deposit.hash = event.transaction.hash; deposit.staker = staker; @@ -436,7 +433,7 @@ export function handleStake(event: Stake): void { let balance = ERC20Balance.load(entityUUID(event, [staker.toHexString()])); if (balance == null) { balance = new ERC20Balance(entityUUID(event, [staker.toHexString()])); - balance.integration = entityUUID(event, []); + balance.integration = event.address; balance.staker = staker; balance.sharesBalance = BigInt.zero(); balance.totalDeposited = BigInt.zero(); @@ -476,7 +473,7 @@ export function handleStake(event: Stake): void { } export function handleExit(event: Exit): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); const tickets = erc20!.tickets; const details = event.params.exitDetails; const depositDataEntry = new ExitDataEntry(eventUUID(event, ['ExitDataEntry'])); @@ -512,7 +509,7 @@ export function handleTransfer(event: Transfer): void { const to = event.params.to; const value = event.params.value; - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); const balanceFromId = entityUUID(event, [from.toHexString()]); const balanceToId = entityUUID(event, [to.toHexString()]); @@ -528,7 +525,7 @@ export function handleTransfer(event: Transfer): void { if (!ERC20Balance.load(balanceToId)) { const balance = new ERC20Balance(balanceToId); - balance.integration = entityUUID(event, []); + balance.integration = event.address; balance.staker = to; balance.sharesBalance = BigInt.zero(); balance.totalDeposited = BigInt.zero(); @@ -586,7 +583,7 @@ export function handleTransfer(event: Transfer): void { const transferId = eventUUID(event, []); const transfer = new ERC20Transfer(transferId); transfer.from = from; - transfer.integration = entityUUID(event, []); + transfer.integration = event.address; transfer.to = to; transfer.amount = value; transfer.createdAt = ts; @@ -606,7 +603,7 @@ export function handleApproval(event: Approval): void { let approval = ERC20Approval.load(approvalId); if (!approval) { approval = new ERC20Approval(approvalId); - approval.integration = entityUUID(event, []); + approval.integration = event.address; approval.spender = spender; approval.owner = owner; approval.createdAt = ts; @@ -621,7 +618,7 @@ export function handleApproval(event: Approval): void { } export function handleSetAdmin(event: SetAdmin): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); erc20!.admin = event.params.admin; erc20!.editedAt = event.block.timestamp; erc20!.editedAtBlock = event.block.number; @@ -629,7 +626,7 @@ export function handleSetAdmin(event: SetAdmin): void { } export function handleSetMaxCommission(event: SetMaxCommission): void { - const erc20 = ERC20.load(entityUUID(event, [])); + const erc20 = ERC20.load(event.address); erc20!.maxCommission = event.params.maxCommission; erc20!.editedAt = event.block.timestamp; erc20!.editedAtBlock = event.block.number; diff --git a/src/IntegrationRouter.mapping.ts b/src/IntegrationRouter.mapping.ts index 6732cf2..ae16252 100644 --- a/src/IntegrationRouter.mapping.ts +++ b/src/IntegrationRouter.mapping.ts @@ -13,10 +13,10 @@ export function handleChannelImplementationUpdated(event: ChannelImplementationU if (existsChannel(channel)) { const ts = event.block.timestamp; const blockId = event.block.number; - let implem = IntegrationChannel.load(channel.toHexString()); + let implem = IntegrationChannel.load(channel); if (!implem) { - implem = new IntegrationChannel(channel.toHexString()); + implem = new IntegrationChannel(channel); implem.createdAt = ts; implem.createdAtBlock = blockId; } diff --git a/src/MerkleVault.mapping.ts b/src/MerkleVault.mapping.ts index 377f5fc..d6e0bd9 100644 --- a/src/MerkleVault.mapping.ts +++ b/src/MerkleVault.mapping.ts @@ -3,7 +3,7 @@ import { Claimed, SetFrameSize, SetRootAndIpfsHash } from '../generated/template import { entityUUID, eventUUID } from './utils/utils'; export function handleSetFrameSize(event: SetFrameSize): void { - const merkleVault = MerkleVault.load(entityUUID(event, [])); + const merkleVault = MerkleVault.load(event.address); merkleVault!.frameSize = event.params.frameSize; merkleVault!.editedAt = event.block.timestamp; @@ -12,7 +12,7 @@ export function handleSetFrameSize(event: SetFrameSize): void { } export function handleSetRootAndIpfshash(event: SetRootAndIpfsHash): void { - const merkleVault = MerkleVault.load(entityUUID(event, [])); + const merkleVault = MerkleVault.load(event.address); merkleVault!.root = event.params.root; merkleVault!.ipfsHash = event.params.ipfsHash; @@ -22,7 +22,7 @@ export function handleSetRootAndIpfshash(event: SetRootAndIpfsHash): void { } export function handleClaimed(event: Claimed): void { - const merkleVault = MerkleVault.load(entityUUID(event, [])); + const merkleVault = MerkleVault.load(event.address); const claim = new VaultClaim(eventUUID(event, [])); claim.execLayerVault = merkleVault!.id; diff --git a/src/Nexus.mapping.ts b/src/Nexus.mapping.ts index d6e3dfd..7424f60 100644 --- a/src/Nexus.mapping.ts +++ b/src/Nexus.mapping.ts @@ -149,11 +149,11 @@ export function getOrLoadVerificationTracker(): PendingKeyValidationTracker { } function _getOrCreateNexus(addr: Bytes, event: ethereum.Event): Nexus { - let nexus = Nexus.load(externalEntityUUID(Address.fromBytes(addr), [])); + let nexus = Nexus.load(addr); if (nexus == null) { - nexus = new Nexus(entityUUID(event, [])); + nexus = new Nexus(addr); - nexus.address = event.address; + nexus.address = addr; nexus.admin = Address.zero(); nexus.contract = getOrCreateMetaContract('Nexus'); nexus.proxy = getOrCreateTUPProxy(event, Address.fromBytes(addr)).id; @@ -181,12 +181,12 @@ export function handleInitialized(event: Initialized): void { } export function handleSpawnedFactory(event: SpawnedFactory): void { - const treasury = new vTreasury(externalEntityUUID(event.params.treasury, [])); + const treasury = new vTreasury(event.params.treasury); treasury.address = event.params.treasury; - treasury.cub = externalEntityUUID(event.params.treasury, []); + treasury.cub = event.params.treasury; treasury.operator = Address.zero(); treasury.fee = BigInt.zero(); - treasury.factory = externalEntityUUID(event.params.factory, []); + treasury.factory = event.params.factory; treasury.createdAt = event.block.timestamp; treasury.editedAt = event.block.timestamp; treasury.createdAtBlock = event.block.number; @@ -196,12 +196,12 @@ export function handleSpawnedFactory(event: SpawnedFactory): void { treasury.save(); - const factory = new vFactory(externalEntityUUID(event.params.factory, [])); + const factory = new vFactory(event.params.factory); factory.version = BigInt.fromI32(1); factory.address = event.params.factory; factory.contract = getOrCreateMetaContract('vFactory'); - factory.cub = externalEntityUUID(event.params.factory, []); - factory.treasury = externalEntityUUID(Address.zero(), []); + factory.cub = event.params.factory; + factory.treasury = Address.zero(); factory.totalActivatedValidators = BigInt.zero(); factory.operatorName = ''; factory.operatorUrl = ''; @@ -217,13 +217,13 @@ export function handleSpawnedFactory(event: SpawnedFactory): void { } export function handleSpawnedPool(event: SpawnedPool): void { { - const pool = new vPool(externalEntityUUID(event.params.pool, [])); + const pool = new vPool(event.params.pool); pool.address = event.params.pool; pool.contract = getOrCreateMetaContract('vPool'); - pool.cub = externalEntityUUID(event.params.pool, []); - pool.factory = externalEntityUUID(event.params.factory, []); - pool.nexus = entityUUID(event, []); + pool.cub = event.params.pool; + pool.factory = event.params.factory; + pool.nexus = event.address; pool.totalSupply = BigInt.zero(); pool.totalUnderlyingSupply = BigInt.zero(); pool.purchasedValidatorCount = BigInt.zero(); @@ -234,11 +234,11 @@ export function handleSpawnedPool(event: SpawnedPool): void { pool.expectedEpoch = BigInt.zero(); pool.pluggedMultiPools = []; - pool.oracleAggregator = Address.zero().toHexString(); - pool.coverageRecipient = Address.zero().toHexString(); - pool.execLayerRecipient = Address.zero().toHexString(); - pool.withdrawalRecipient = Address.zero().toHexString(); - pool.exitQueue = Address.zero().toHexString(); + pool.oracleAggregator = Address.zero(); + pool.coverageRecipient = Address.zero(); + pool.execLayerRecipient = Address.zero(); + pool.withdrawalRecipient = Address.zero(); + pool.exitQueue = Address.zero(); pool.operatorFee = BigInt.zero(); pool.epochsPerFrame = BigInt.zero(); pool.genesisTimestamp = BigInt.zero(); @@ -260,12 +260,12 @@ export function handleSpawnedPool(event: SpawnedPool): void { vPoolTemplate.create(event.params.pool); } { - const eq = new vExitQueue(externalEntityUUID(event.params.exitQueue, [])); + const eq = new vExitQueue(event.params.exitQueue); eq.address = event.params.exitQueue; eq.contract = getOrCreateMetaContract('vExitQueue'); - eq.pool = externalEntityUUID(event.params.pool, []); - eq.cub = externalEntityUUID(event.params.exitQueue, []); + eq.pool = event.params.pool; + eq.cub = event.params.exitQueue; eq.createdAt = event.block.timestamp; eq.editedAt = event.block.timestamp; @@ -280,13 +280,13 @@ export function handleSpawnedPool(event: SpawnedPool): void { vExitQueueTemplate.create(event.params.exitQueue); } { - const elr = new vExecLayerRecipient(externalEntityUUID(event.params.execLayerRecipient, [])); + const elr = new vExecLayerRecipient(event.params.execLayerRecipient); elr.totalSuppliedEther = BigInt.zero(); elr.address = event.params.execLayerRecipient; elr.contract = getOrCreateMetaContract('vExecLayerRecipient'); - elr.cub = externalEntityUUID(event.params.execLayerRecipient, []); - elr.pool = externalEntityUUID(event.params.pool, []); + elr.cub = event.params.execLayerRecipient; + elr.pool = event.params.pool; elr.createdAt = event.block.timestamp; elr.editedAt = event.block.timestamp; @@ -297,7 +297,7 @@ export function handleSpawnedPool(event: SpawnedPool): void { vExecLayerRecipientTemplate.create(event.params.execLayerRecipient); } { - const cr = new vCoverageRecipient(externalEntityUUID(event.params.coverageRecipient, [])); + const cr = new vCoverageRecipient(event.params.coverageRecipient); cr.totalSuppliedEther = BigInt.zero(); cr.totalVoidedShares = BigInt.zero(); @@ -305,8 +305,8 @@ export function handleSpawnedPool(event: SpawnedPool): void { cr.totalAvailableShares = BigInt.zero(); cr.address = event.params.coverageRecipient; cr.contract = getOrCreateMetaContract('vCoverageRecipient'); - cr.cub = externalEntityUUID(event.params.coverageRecipient, []); - cr.pool = externalEntityUUID(event.params.pool, []); + cr.cub = event.params.coverageRecipient; + cr.pool = event.params.pool; cr.createdAt = event.block.timestamp; cr.editedAt = event.block.timestamp; @@ -318,14 +318,14 @@ export function handleSpawnedPool(event: SpawnedPool): void { } { - const wr = new vWithdrawalRecipient(externalEntityUUID(event.params.withdrawalRecipient, [])); + const wr = new vWithdrawalRecipient(event.params.withdrawalRecipient); wr.withdrawalCredentials = Bytes.fromHexString('0x010000000000000000000000').concat( event.params.withdrawalRecipient ); wr.address = event.params.withdrawalRecipient; - wr.cub = externalEntityUUID(event.params.withdrawalRecipient, []); - wr.pool = externalEntityUUID(event.params.pool, []); + wr.cub = event.params.withdrawalRecipient; + wr.pool = event.params.pool; wr.createdAt = event.block.timestamp; wr.editedAt = event.block.timestamp; @@ -336,12 +336,12 @@ export function handleSpawnedPool(event: SpawnedPool): void { } { - const oa = new vOracleAggregator(externalEntityUUID(event.params.oracleAggregator, [])); + const oa = new vOracleAggregator(event.params.oracleAggregator); oa.address = event.params.oracleAggregator; oa.contract = getOrCreateMetaContract('vOracleAggregator'); - oa.cub = externalEntityUUID(event.params.oracleAggregator, []); - oa.pool = externalEntityUUID(event.params.pool, []); + oa.cub = event.params.oracleAggregator; + oa.pool = event.params.pool; oa.memberCount = BigInt.zero(); oa.quorum = BigInt.fromI32(1); oa.highestReportedEpoch = BigInt.zero(); @@ -359,14 +359,14 @@ export function handleSpawnedPool(event: SpawnedPool): void { export function handleSetCoreHatchers(event: SetCoreHatchers): void { const nexus = _getOrCreateNexus(event.address, event); - nexus.factoryHatcher = externalEntityUUID(event.params.factory, []); - nexus.treasuryHatcher = externalEntityUUID(event.params.treasury, []); - nexus.poolHatcher = externalEntityUUID(event.params.pool, []); - nexus.withdrawalRecipientHatcher = externalEntityUUID(event.params.withdrawalRecipient, []); - nexus.execLayerRecipientHatcher = externalEntityUUID(event.params.execLayerRecipient, []); - nexus.coverageRecipientHatcher = externalEntityUUID(event.params.coverageRecipient, []); - nexus.oracleAggregatorHatcher = externalEntityUUID(event.params.oracleAggregator, []); - nexus.exitQueueHatcher = externalEntityUUID(event.params.exitQueue, []); + nexus.factoryHatcher = event.params.factory; + nexus.treasuryHatcher = event.params.treasury; + nexus.poolHatcher = event.params.pool; + nexus.withdrawalRecipientHatcher = event.params.withdrawalRecipient; + nexus.execLayerRecipientHatcher = event.params.execLayerRecipient; + nexus.coverageRecipientHatcher = event.params.coverageRecipient; + nexus.oracleAggregatorHatcher = event.params.oracleAggregator; + nexus.exitQueueHatcher = event.params.exitQueue; nexus.editedAt = event.block.timestamp; nexus.editedAtBlock = event.block.number; diff --git a/src/PluggableHatcher.mapping.ts b/src/PluggableHatcher.mapping.ts index ae3c9c1..279ae8f 100644 --- a/src/PluggableHatcher.mapping.ts +++ b/src/PluggableHatcher.mapping.ts @@ -19,10 +19,10 @@ import { getOrCreateMetaContract } from './utils/MetaContract.utils'; import { entityUUID, eventUUID, externalEntityUUID } from './utils/utils'; function _getOrCreatePluggableHatcher(addr: Bytes, event: ethereum.Event): PluggableHatcher { - let ph = PluggableHatcher.load(externalEntityUUID(Address.fromBytes(addr), [])); + let ph = PluggableHatcher.load(addr); if (ph == null) { - ph = new PluggableHatcher(externalEntityUUID(Address.fromBytes(addr), [])); + ph = new PluggableHatcher(addr); ph.address = addr; ph.contract = getOrCreateMetaContract('PluggableHatcher'); ph.pauser = Address.zero(); @@ -42,17 +42,16 @@ function _getOrCreatePluggableHatcher(addr: Bytes, event: ethereum.Event): Plugg export function handleUpgraded(event: Upgraded): void { const ph = _getOrCreatePluggableHatcher(event.address, event); - const implementationId = eventUUID(event, [event.params.implementation.toHexString()]); - const implementation = new PluggableHatcherImplementation(implementationId); + const implementation = new PluggableHatcherImplementation(event.params.implementation); implementation.address = event.params.implementation; - implementation.pluggableHatcher = entityUUID(event, []); + implementation.pluggableHatcher = event.address; implementation.createdAt = event.block.timestamp; implementation.createdAtBlock = event.block.number; implementation.editedAt = event.block.timestamp; implementation.editedAtBlock = event.block.number; implementation.save(); - ph.currentImplementation = implementationId; + ph.currentImplementation = event.params.implementation; ph.upgradeCount = ph.upgradeCount.plus(BigInt.fromI32(1)); ph.editedAt = event.block.timestamp; ph.editedAtBlock = event.block.number; @@ -63,13 +62,12 @@ export function handleUpgraded(event: Upgraded): void { export function handleHatched(event: Hatched): void { const ph = _getOrCreatePluggableHatcher(event.address, event); - const cubId = event.params.cub; - const cub = new Cub(externalEntityUUID(cubId, [])); + const cub = new Cub(event.params.cub); cub.address = event.params.cub; cub.contract = getOrCreateMetaContract('Cub'); cub.progress = ph.initialProgress; cub.paused = false; - cub.hatcher = entityUUID(event, []); + cub.hatcher = event.address; cub.constructionData = event.params.cdata; cub.createdAt = event.block.timestamp; cub.createdAtBlock = event.block.number; @@ -87,7 +85,7 @@ export function handleHatched(event: Hatched): void { } export function handlePause(event: Pause): void { - const cub = Cub.load(externalEntityUUID(event.params.cub, [])); + const cub = Cub.load(event.params.cub); cub!.paused = true; @@ -95,7 +93,7 @@ export function handlePause(event: Pause): void { } export function handleUnpause(event: Unpause): void { - const cub = Cub.load(externalEntityUUID(event.params.cub, [])); + const cub = Cub.load(event.params.cub); cub!.paused = false; @@ -148,7 +146,7 @@ export function handleRegisteredGlobalFix(event: RegisteredGlobalFix): void { const globalFixId = entityUUID(event, ['globalFix', event.params.index.toString()]); const globalFix = new Fix(globalFixId); globalFix.address = event.params.fix; - globalFix.globalFix = entityUUID(event, []); + globalFix.globalFix = event.address; globalFix.index = event.params.index; globalFix.deleted = false; @@ -175,7 +173,7 @@ export function handleDeletedGlobalFix(event: DeletedGlobalFix): void { } export function handleAppliedFix(event: AppliedFix): void { - const cub = Cub.load(externalEntityUUID(event.params.cub, [])); + const cub = Cub.load(event.params.cub); const fixId = eventUUID(event, ['fix', event.params.fix.toHexString()]); diff --git a/src/ProxyFactory.mapping.ts b/src/ProxyFactory.mapping.ts index afe3887..29d57b0 100644 --- a/src/ProxyFactory.mapping.ts +++ b/src/ProxyFactory.mapping.ts @@ -39,10 +39,10 @@ export function handleDeployedProxy(event: DeployedProxy): void { ERC20Template.create(event.params.proxy); ERC20_1_0_0_rc4Template.create(event.params.proxy); - const integration = new ERC20(externalEntityUUID(event.params.proxy, [])); + const integration = new ERC20(event.params.proxy); integration.proxy = getOrCreateTUPProxy(event, event.params.proxy).id; integration.address = event.params.proxy; - integration.channel = channel.toHexString(); + integration.channel = channel; integration.paused = false; integration.name = ''; integration.symbol = ''; @@ -51,7 +51,6 @@ export function handleDeployedProxy(event: DeployedProxy): void { integration.decimals = BigInt.fromI32(18); integration.admin = Address.zero(); integration.maxCommission = BigInt.zero(); - integration._poolsDerived = []; integration.tickets = []; integration.summaries = getOrCreateRewardSummaries(event, event.params.proxy).id; if (channel.equals(CHANNEL_NATIVE_20_vPOOL_BYTES32)) { @@ -75,17 +74,16 @@ export function handleDeployedProxy(event: DeployedProxy): void { ERC1155Template.create(event.params.proxy); ERC1155_1_0_0_rc4Template.create(event.params.proxy); - const integration = new ERC1155Integration(externalEntityUUID(event.params.proxy, [])); + const integration = new ERC1155Integration(event.params.proxy); integration.proxy = getOrCreateTUPProxy(event, event.params.proxy).id; integration.address = event.params.proxy; - integration.channel = channel.toHexString(); + integration.channel = channel; integration.paused = false; integration.name = ''; integration.symbol = ''; integration.uriPrefix = ''; integration.totalSupply = BigInt.zero(); integration.totalUnderlyingSupply = BigInt.zero(); - integration._poolsDerived = []; integration.createdAt = event.block.timestamp; integration.editedAt = event.block.timestamp; @@ -103,10 +101,10 @@ export function handleDeployedProxy(event: DeployedProxy): void { } else if (channel.equals(CHANNEL_VNFT_BYTES32)) { vNFTTemplate.create(event.params.proxy); - const vnft = new vNFTIntegration(externalEntityUUID(event.params.proxy, [])); + const vnft = new vNFTIntegration(event.params.proxy); vnft.proxy = getOrCreateTUPProxy(event, event.params.proxy).id; vnft.address = event.params.proxy; - vnft.channel = channel.toHexString(); + vnft.channel = channel; vnft.paused = false; vnft.name = ''; vnft.symbol = ''; @@ -115,9 +113,9 @@ export function handleDeployedProxy(event: DeployedProxy): void { vnft.operatorCommission = BigInt.zero(); vnft.integratorCommission = BigInt.zero(); vnft.integrator = Address.zero(); - vnft.vFactory = externalEntityUUID(Address.zero(), []); + vnft.vFactory = Address.zero(); vnft.extraData = ''; - vnft.execLayerVault = externalEntityUUID(Address.zero(), []); + vnft.execLayerVault = Address.zero(); vnft.soulboundMode = false; vnft.admin = Address.zero(); vnft.type = 'vNFT'; diff --git a/src/TUPProxy.mapping.ts b/src/TUPProxy.mapping.ts index deda4ac..4823ec5 100644 --- a/src/TUPProxy.mapping.ts +++ b/src/TUPProxy.mapping.ts @@ -1,11 +1,11 @@ -import { Address, BigInt, ethereum } from '@graphprotocol/graph-ts'; +import { Address, BigInt, ethereum, log } from '@graphprotocol/graph-ts'; import { TUPProxy, TUPProxyUpgrade } from '../generated/schema'; import { AdminChanged, PauserChanged, SetFreezeTime, Upgraded } from '../generated/templates/TUPProxy/TUPProxy'; import { TUPProxy as TUPProxyTemplate } from '../generated/templates'; import { txUniqueUUID } from './utils/utils'; export function handleAdminChanged(event: AdminChanged): void { - const proxy = TUPProxy.load(event.address.toHexString()); + const proxy = TUPProxy.load(event.address); proxy!.admin = event.params.newAdmin; proxy!.editedAt = event.block.timestamp; proxy!.editedAtBlock = event.block.number; @@ -13,7 +13,7 @@ export function handleAdminChanged(event: AdminChanged): void { } export function handlePauserChanged(event: PauserChanged): void { - const proxy = TUPProxy.load(event.address.toHexString()); + const proxy = TUPProxy.load(event.address); proxy!.pauser = event.params.newPauser; proxy!.editedAt = event.block.timestamp; proxy!.editedAtBlock = event.block.number; @@ -21,7 +21,7 @@ export function handlePauserChanged(event: PauserChanged): void { } export function handleSetFreezeTime(event: SetFreezeTime): void { - const proxy = TUPProxy.load(event.address.toHexString()); + const proxy = TUPProxy.load(event.address); proxy!.freezeTime = event.params.freezeTime; proxy!.editedAt = event.block.timestamp; proxy!.editedAtBlock = event.block.number; @@ -29,10 +29,10 @@ export function handleSetFreezeTime(event: SetFreezeTime): void { } export function handleUpgraded(event: Upgraded): void { - const proxy = TUPProxy.load(event.address.toHexString()); + const proxy = TUPProxy.load(event.address); const upgrade = new TUPProxyUpgrade(txUniqueUUID(event, [event.address.toHexString()])); - upgrade.proxy = event.address.toHexString(); + upgrade.proxy = event.address; upgrade.newImplementation = event.params.implementation; upgrade.oldImplementation = proxy!.implementation; upgrade.createdAt = event.block.timestamp; @@ -49,10 +49,11 @@ export function handleUpgraded(event: Upgraded): void { } export const getOrCreateTUPProxy = (event: ethereum.Event, address: Address): TUPProxy => { - let proxy = TUPProxy.load(address.toHexString()); + let proxy = TUPProxy.load(address); if (proxy == null) { - proxy = new TUPProxy(address.toHexString()); + proxy = new TUPProxy(address); + proxy.address = event.address; proxy.admin = Address.zero(); proxy.pauser = Address.zero(); proxy.freezeTime = BigInt.zero(); @@ -62,6 +63,7 @@ export const getOrCreateTUPProxy = (event: ethereum.Event, address: Address): TU proxy.createdAtBlock = event.block.number; proxy.editedAtBlock = event.block.number; proxy.save(); + TUPProxyTemplate.create(address); } diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 02611f4..79bbe85 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -72,7 +72,7 @@ export function createAddedValidationKeysSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.withdrawalChannel = externalEntityUUID(factoryAddress, [withdrawalChannel.toHexString()]); systemEvent.count = BigInt.fromI32(0); systemEvent.newTotal = BigInt.fromI32(0); @@ -104,7 +104,7 @@ export function createRemovedValidationKeysSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.withdrawalChannel = externalEntityUUID(factoryAddress, [withdrawalChannel.toHexString()]); systemEvent.count = BigInt.fromI32(0); systemEvent.newTotal = BigInt.fromI32(0); @@ -136,7 +136,7 @@ export function createUpdatedLimitSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.withdrawalChannel = externalEntityUUID(factoryAddress, [withdrawalChannel.toHexString()]); systemEvent.oldLimit = null; systemEvent.newLimit = BigInt.fromI32(0); @@ -168,7 +168,7 @@ export function createValidatorOwnerChangedSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.validator = externalEntityUUID(factoryAddress, [validatorId.toString()]); systemEvent.createdAt = event.block.timestamp; @@ -198,7 +198,7 @@ export function createValidatorFeeRecipientChangedSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.validator = externalEntityUUID(factoryAddress, [validatorId.toString()]); systemEvent.createdAt = event.block.timestamp; @@ -228,7 +228,7 @@ export function createValidatorExtraDataChangedSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.validator = externalEntityUUID(factoryAddress, [validatorId.toString()]); systemEvent.createdAt = event.block.timestamp; @@ -258,7 +258,7 @@ export function createDuplicateKeySystemAlert( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.createdAt = event.block.timestamp; systemEvent.createdAtBlock = event.block.number; @@ -311,7 +311,7 @@ export function createFundedValidationKeySystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.depositor = externalEntityUUID(factoryAddress, [depositor.toHexString()]); systemEvent.withdrawalChannel = externalEntityUUID(factoryAddress, [withdrawalChannel.toHexString()]); systemEvent.count = BigInt.fromI32(0); @@ -346,7 +346,7 @@ export function createChangedFactoryParameterSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; systemEvent.parameter = parameter; systemEvent.oldValue = oldValue; @@ -378,8 +378,8 @@ export function createReportProcessedSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.pool = externalEntityUUID(poolAddress, []); - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.createdAt = event.block.timestamp; systemEvent.createdAtBlock = event.block.number; @@ -411,9 +411,8 @@ export function createOracleMemberVotedSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.factory = externalEntityUUID(factoryAddress, []); - systemEvent.pool = externalEntityUUID(poolAddress, []); - systemEvent.factory = externalEntityUUID(factoryAddress, []); + systemEvent.factory = factoryAddress; + systemEvent.pool = poolAddress; systemEvent.createdAt = event.block.timestamp; systemEvent.createdAtBlock = event.block.number; @@ -443,8 +442,8 @@ export function createChangedPoolParameterSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.pool = externalEntityUUID(poolAddress, []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.parameter = parameter; systemEvent.oldValue = oldValue; @@ -478,8 +477,8 @@ export function createChangedCoverageRecipientParameterSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.parameter = parameter; systemEvent.oldValue = oldValue; @@ -511,8 +510,8 @@ export function createCoverageRecipientUpdatedEthSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.delta = BigInt.fromI32(0); systemEvent.total = BigInt.fromI32(0); @@ -545,8 +544,8 @@ export function createCoverageRecipientUpdatedSharesSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.delta = BigInt.fromI32(0); systemEvent.total = BigInt.fromI32(0); @@ -581,9 +580,9 @@ export function createChangedOracleAggregatorParameterSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.oracleAggregator = externalEntityUUID(oracleAggregatorAddress, []); - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.oracleAggregator = oracleAggregatorAddress; + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.parameter = parameter; systemEvent.oldValue = oldValue; @@ -615,8 +614,8 @@ export function createPoolDepositSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.amountEth = BigInt.fromI32(0); systemEvent.amountShares = BigInt.fromI32(0); @@ -648,8 +647,8 @@ export function createPoolValidatorPurchaseSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.validatorCount = BigInt.fromI32(0); systemEvent.validators = []; @@ -683,9 +682,9 @@ export function createNewExitQueueTicketSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.exitQueue = externalEntityUUID(exitQueueAddress, []); - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.exitQueue = exitQueueAddress; + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.createdAt = event.block.timestamp; systemEvent.createdAtBlock = event.block.number; @@ -716,9 +715,9 @@ export function createNewExitQueueCaskSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.exitQueue = externalEntityUUID(exitQueueAddress, []); - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.exitQueue = exitQueueAddress; + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.createdAt = event.block.timestamp; systemEvent.createdAtBlock = event.block.number; @@ -749,9 +748,9 @@ export function createClaimedExitQueueTicketSystemEvent( systemEvent.tx = event.transaction.hash; systemEvent.who = event.transaction.from; - systemEvent.exitQueue = externalEntityUUID(exitQueueAddress, []); - systemEvent.pool = externalEntityUUID(Address.fromBytes(poolAddress), []); - systemEvent.factory = externalEntityUUID(Address.fromBytes(factoryAddress), []); + systemEvent.exitQueue = exitQueueAddress; + systemEvent.pool = poolAddress; + systemEvent.factory = factoryAddress; systemEvent.remainingAmount = BigInt.fromI32(0); systemEvent.remainingEthAmount = BigInt.fromI32(0); diff --git a/src/vCoverageRecipient.mapping.ts b/src/vCoverageRecipient.mapping.ts index 0aa1d81..3d5ea0f 100644 --- a/src/vCoverageRecipient.mapping.ts +++ b/src/vCoverageRecipient.mapping.ts @@ -25,9 +25,9 @@ import { export function handleSuppliedEther(event: SuppliedEther): void { const cseId = txUniqueUUID(event, [event.address.toHexString()]); const cse = new CoverageSuppliedEther(cseId); - const cr = vCoverageRecipient.load(entityUUID(event, [])); + const cr = vCoverageRecipient.load(event.address); - cse.coverageRecipient = entityUUID(event, []); + cse.coverageRecipient = event.address; cse.amount = event.params.amount; cse.createdAt = event.block.timestamp; @@ -47,9 +47,9 @@ export function handleSuppliedEther(event: SuppliedEther): void { export function handleVoidedShares(event: VoidedShares): void { const cseId = txUniqueUUID(event, [event.address.toHexString()]); const cvs = new CoverageVoidedShares(cseId); - const cr = vCoverageRecipient.load(entityUUID(event, [])); + const cr = vCoverageRecipient.load(event.address); - cvs.coverageRecipient = entityUUID(event, []); + cvs.coverageRecipient = event.address; cvs.amount = event.params.amount; cvs.createdAt = event.block.timestamp; @@ -67,7 +67,7 @@ export function handleVoidedShares(event: VoidedShares): void { } export function handleUpdatedEtherForCoverage(event: UpdatedEtherForCoverage): void { - const cr = vCoverageRecipient.load(entityUUID(event, [])); + const cr = vCoverageRecipient.load(event.address); let initialAmount = cr!.totalAvailableEther; @@ -87,7 +87,7 @@ export function handleUpdatedEtherForCoverage(event: UpdatedEtherForCoverage): v } export function handleUpdatedSharesForCoverage(event: UpdatedSharesForCoverage): void { - const cr = vCoverageRecipient.load(entityUUID(event, [])); + const cr = vCoverageRecipient.load(event.address); let initialAmount = cr!.totalAvailableShares; @@ -118,7 +118,7 @@ export function handleAllowedDonor(event: AllowedDonor): void { donor = new CoverageDonor(donorId); donor.address = event.params.donorAddress; - donor.coverageRecipient = entityUUID(event, []); + donor.coverageRecipient = event.address; donor.createdAt = event.block.timestamp; donor.createdAtBlock = event.block.number; @@ -138,7 +138,7 @@ export function handleAllowedDonor(event: AllowedDonor): void { } if (oldValue !== event.params.allowed) { - const coverageRecipient = vCoverageRecipient.load(entityUUID(event, [])); + const coverageRecipient = vCoverageRecipient.load(event.address); const pool = vPool.load(coverageRecipient!.pool); const factory = vFactory.load(pool!.factory); const se = createChangedCoverageRecipientParameterSystemEvent( diff --git a/src/vExecLayerRecipient.mapping.ts b/src/vExecLayerRecipient.mapping.ts index e59da30..27c3332 100644 --- a/src/vExecLayerRecipient.mapping.ts +++ b/src/vExecLayerRecipient.mapping.ts @@ -5,9 +5,9 @@ import { entityUUID, txUniqueUUID } from './utils/utils'; export function handleSuppliedEther(event: SuppliedEther): void { const elseId = txUniqueUUID(event, [event.address.toHexString()]); const else_ = new ExecLayerSuppliedEther(elseId); - const elr = vExecLayerRecipient.load(entityUUID(event, [])); + const elr = vExecLayerRecipient.load(event.address); - else_.execLayerRecipient = entityUUID(event, []); + else_.execLayerRecipient = event.address; else_.amount = event.params.amount; else_.createdAt = event.block.timestamp; diff --git a/src/vExitQueue.mapping.ts b/src/vExitQueue.mapping.ts index da3cf74..2dd2d98 100644 --- a/src/vExitQueue.mapping.ts +++ b/src/vExitQueue.mapping.ts @@ -30,7 +30,7 @@ import { import { Address, BigInt, store } from '@graphprotocol/graph-ts'; export function handlePrintedTicket(event: PrintedTicket): void { - const exitQueue = vExitQueue.load(entityUUID(event, [])); + const exitQueue = vExitQueue.load(event.address); const ticketId = entityUUID(event, [idToIdx(event.params.id).toString()]); const ticket = Ticket.load(ticketId); @@ -41,7 +41,7 @@ export function handlePrintedTicket(event: PrintedTicket): void { ticket!.index = BigInt.fromI32(0); } ticket!.ticketId = event.params.id; - ticket!.exitQueue = entityUUID(event, []); + ticket!.exitQueue = event.address; ticket!.owner = event.params.owner; ticket!.size = event.params.ticket.size; ticket!.position = event.params.ticket.position; @@ -111,7 +111,7 @@ export function handleTransfer(event: Transfer): void { ticket = new Ticket(ticketId); ticket.index = BigInt.zero(); ticket.ticketId = event.params.value; - ticket.exitQueue = entityUUID(event, []); + ticket.exitQueue = event.address; ticket.size = BigInt.zero(); ticket.position = BigInt.zero(); ticket.maxExitable = BigInt.zero(); @@ -143,7 +143,7 @@ function minBI(a: BigInt, b: BigInt): BigInt { } export function handleReceivedCask(event: ReceivedCask): void { - const exitQueue = vExitQueue.load(entityUUID(event, [])); + const exitQueue = vExitQueue.load(event.address); const caskId = entityUUID(event, [event.params.id.toString()]); const cask = new Cask(caskId); @@ -154,7 +154,7 @@ export function handleReceivedCask(event: ReceivedCask): void { cask.index = BigInt.fromI32(0); } cask.caskId = event.params.id; - cask.exitQueue = entityUUID(event, []); + cask.exitQueue = event.address; cask.size = event.params.cask.size; cask.position = event.params.cask.position; cask.value = event.params.cask.value; @@ -220,9 +220,9 @@ export function handleReceivedCask(event: ReceivedCask): void { } export function handleSetPool(event: SetPool): void { - const exitQueue = vExitQueue.load(entityUUID(event, [])); + const exitQueue = vExitQueue.load(event.address); - exitQueue!.pool = externalEntityUUID(event.params.pool, []); + exitQueue!.pool = event.params.pool; exitQueue!.editedAt = event.block.timestamp; exitQueue!.editedAtBlock = event.block.number; @@ -230,7 +230,7 @@ export function handleSetPool(event: SetPool): void { } export function handleFilledTicket(event: FilledTicket): void { - const exitQueue = vExitQueue.load(entityUUID(event, [])); + const exitQueue = vExitQueue.load(event.address); exitQueue!.unclaimedFunds = exitQueue!.unclaimedFunds.plus(event.params.unclaimedEth); exitQueue!.editedAt = event.block.timestamp; @@ -312,7 +312,7 @@ export function handlePayment(event: Payment): void { payment.recipient = event.params.recipient; payment.amount = event.params.amount; - payment.exitQueue = entityUUID(event, []); + payment.exitQueue = event.address; payment.createdAt = event.block.timestamp; payment.editedAt = event.block.timestamp; payment.createdAtBlock = event.block.number; @@ -322,7 +322,7 @@ export function handlePayment(event: Payment): void { } export function handleSuppliedEther(event: SuppliedEther): void { - const exitQueue = vExitQueue.load(entityUUID(event, [])); + const exitQueue = vExitQueue.load(event.address); exitQueue!.unclaimedFunds = exitQueue!.unclaimedFunds.minus(event.params.amount); exitQueue!.editedAt = event.block.timestamp; diff --git a/src/vFactory.mapping.ts b/src/vFactory.mapping.ts index ee12848..7fa2e8e 100644 --- a/src/vFactory.mapping.ts +++ b/src/vFactory.mapping.ts @@ -67,7 +67,7 @@ export function handleAddedValidators(event: AddedValidators): void { if (entity == null) { entity = new WithdrawalChannel(channelId); entity.withdrawalChannel = event.params.withdrawalChannel; - entity.factory = entityUUID(event, []); + entity.factory = event.address; entity.total = BigInt.fromI32(0); entity.funded = BigInt.fromI32(0); entity.limit = BigInt.fromI32(0); @@ -194,7 +194,7 @@ export function handleValidatorRequest(event: ValidatorRequest): void { if (entity == null) { entity = new WithdrawalChannel(channelId); entity.withdrawalChannel = event.params.withdrawalChannel; - entity.factory = entityUUID(event, []); + entity.factory = event.address; entity.total = BigInt.fromI32(0); entity.funded = BigInt.fromI32(0); entity.limit = BigInt.fromI32(0); @@ -332,7 +332,7 @@ export function handleFundedValidator(event: FundedValidator): void { systemEvent.fundedValidationKeys = fundedKeys; systemEvent.save(); - const factory = vFactory.load(entityUUID(event, [])); + const factory = vFactory.load(event.address); factory!.totalActivatedValidators = factory!.totalActivatedValidators.plus(BigInt.fromI32(1)); factory!.save(); } @@ -459,7 +459,7 @@ export function handleSetValidatorExtraData(event: SetValidatorExtraData): void } export function handleSetMetadata(event: SetMetadata): void { - const factory = vFactory.load(entityUUID(event, [])); + const factory = vFactory.load(event.address); let oldValueOperatorName = factory!.operatorName; if (oldValueOperatorName === null) { @@ -518,7 +518,7 @@ export function handleSetMetadata(event: SetMetadata): void { } export function handleSetAdmin(event: SetAdmin): void { - const factory = vFactory.load(entityUUID(event, [])); + const factory = vFactory.load(event.address); let oldValue = factory!.admin; if (oldValue === null) { @@ -538,7 +538,7 @@ export function handleSetAdmin(event: SetAdmin): void { } export function handleChangedOperator(event: ChangedOperator): void { - const factory = vFactory.load(entityUUID(event, [])); + const factory = vFactory.load(event.address); let oldValue = factory!.operator; if (oldValue === null) { @@ -563,27 +563,32 @@ export function handleChangedOperator(event: ChangedOperator): void { } export function handleChangedTreasury(event: ChangedTreasury): void { - const factory = vFactory.load(entityUUID(event, [])); + const factory = vFactory.load(event.address); let oldValue = factory!.treasury; if (oldValue === null) { - oldValue = externalEntityUUID(Address.zero(), []); + oldValue = Address.zero(); } - factory!.treasury = externalEntityUUID(event.params.treasury, []); + factory!.treasury = event.params.treasury; factory!.editedAt = event.block.timestamp; factory!.editedAtBlock = event.block.number; factory!.save(); - const systemEvent = createChangedFactoryParameterSystemEvent(event, event.address, `treasury`, oldValue); + const systemEvent = createChangedFactoryParameterSystemEvent( + event, + event.address, + `treasury`, + oldValue.toHexString() + ); systemEvent.newValue = event.params.treasury.toHexString(); systemEvent.save(); } export function handleSetMinimalRecipientImplementation(event: SetMinimalRecipientImplementation): void { - const factory = vFactory.load(entityUUID(event, [])); + const factory = vFactory.load(event.address); let oldValue = factory!.minimalRecipientImplementation; if (oldValue === null) { @@ -608,21 +613,21 @@ export function handleSetMinimalRecipientImplementation(event: SetMinimalRecipie } export function handleSetHatcherRegistry(event: SetHatcherRegistry): void { - const factory = vFactory.load(entityUUID(event, [])); + const factory = vFactory.load(event.address); let oldValue = factory!.nexus; if (oldValue === null) { - oldValue = externalEntityUUID(Address.zero(), []); + oldValue = Address.zero(); } - factory!.nexus = externalEntityUUID(event.params.hatcherRegistry, []); + factory!.nexus = event.params.hatcherRegistry; factory!.editedAt = event.block.timestamp; factory!.editedAtBlock = event.block.number; factory!.save(); - const systemEvent = createChangedFactoryParameterSystemEvent(event, event.address, `nexus`, oldValue); + const systemEvent = createChangedFactoryParameterSystemEvent(event, event.address, `nexus`, oldValue.toHexString()); systemEvent.newValue = event.params.hatcherRegistry.toHexString(); systemEvent.save(); } @@ -634,7 +639,7 @@ export function handleSetExitTotal(event: SetExitTotal): void { if (channel == null) { channel = new WithdrawalChannel(channelId); channel.withdrawalChannel = event.params.withdrawalChannel; - channel.factory = externalEntityUUID(event.address, []); + channel.factory = event.address; channel.total = BigInt.fromI32(0); channel.funded = BigInt.fromI32(0); channel.limit = BigInt.fromI32(0); @@ -657,7 +662,7 @@ export function handleApproveDepositor(event: ApproveDepositor): void { if (channel == null) { channel = new WithdrawalChannel(channelId); channel.withdrawalChannel = event.params.wc; - channel.factory = externalEntityUUID(event.address, []); + channel.factory = event.address; channel.total = BigInt.fromI32(0); channel.funded = BigInt.fromI32(0); channel.limit = BigInt.fromI32(0); diff --git a/src/vNFT.mapping.ts b/src/vNFT.mapping.ts index ea44c69..c4f3aa6 100644 --- a/src/vNFT.mapping.ts +++ b/src/vNFT.mapping.ts @@ -39,7 +39,7 @@ function getInternalTokenId(vnftIntegrationAddress: Address, externalTokenId: Bi } export function handleSetName(event: SetName): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.name = event.params.name; @@ -49,7 +49,7 @@ export function handleSetName(event: SetName): void { } export function handleSetSymbol(event: SetSymbol): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.symbol = event.params.symbol; @@ -59,7 +59,7 @@ export function handleSetSymbol(event: SetSymbol): void { } export function handleSetExtraData(event: SetExtraData): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.extraData = event.params.extraData; @@ -69,7 +69,7 @@ export function handleSetExtraData(event: SetExtraData): void { } export function handleSetURIPrefix(event: SetURIPrefix): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.uriPrefix = event.params.uriPrefix; @@ -79,7 +79,7 @@ export function handleSetURIPrefix(event: SetURIPrefix): void { } export function handleSetPaused(event: SetPurchasePause): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.paused = event.params.isPaused; @@ -89,9 +89,9 @@ export function handleSetPaused(event: SetPurchasePause): void { } export function handleSetFactory(event: SetFactory): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); - vnftIntegration!.vFactory = externalEntityUUID(event.params.factory, []); + vnftIntegration!.vFactory = event.params.factory; vnftIntegration!.editedAt = event.block.timestamp; vnftIntegration!.editedAtBlock = event.block.number; @@ -99,7 +99,7 @@ export function handleSetFactory(event: SetFactory): void { } export function handleSetOperatorCommission(event: SetOperatorCommission): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.operatorCommission = event.params.operatorCommission; @@ -109,7 +109,7 @@ export function handleSetOperatorCommission(event: SetOperatorCommission): void } export function handleSetIntegratorCommission(event: SetIntegratorCommission): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.integratorCommission = event.params.integratorCommission; @@ -119,7 +119,7 @@ export function handleSetIntegratorCommission(event: SetIntegratorCommission): v } export function handleSetIntegrator(event: SetIntegrator): void { - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.integrator = event.params.integrator; @@ -133,7 +133,7 @@ export function handlePurchasedValidator(event: PurchasedValidator): void { const internalTokenId = event.params.validatorId; const ts = event.block.timestamp; const blockId = event.block.number; - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); const vFactoryAddres = vFactory.load(vnftIntegration!.vFactory)!.address; @@ -141,7 +141,7 @@ export function handlePurchasedValidator(event: PurchasedValidator): void { const vnft = new vNFT(id); vnft.tokenId = tokenId; vnft.internalTokenId = internalTokenId; - vnft.integration = entityUUID(event, []); + vnft.integration = event.address; vnft.owner = event.params.owner; vnft.validator = externalEntityUUID(Address.fromBytes(vFactoryAddres), [internalTokenId.toString()]); @@ -246,9 +246,9 @@ export function handleSetExecLayerVault(event: SetExecLayerVault): void { const blockId = event.block.number; const merkleVaultAddress = event.params.execLayerVault; - let merkleVault = MerkleVault.load(externalEntityUUID(merkleVaultAddress, [])); + let merkleVault = MerkleVault.load(merkleVaultAddress); if (!merkleVault) { - merkleVault = new MerkleVault(externalEntityUUID(merkleVaultAddress, [])); + merkleVault = new MerkleVault(merkleVaultAddress); merkleVault.root = Bytes.empty(); merkleVault.frameSize = BigInt.zero(); merkleVault.ipfsHash = ''; @@ -261,8 +261,8 @@ export function handleSetExecLayerVault(event: SetExecLayerVault): void { MerkleVaultTemplate.create(merkleVaultAddress); } - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); - vnftIntegration!.execLayerVault = externalEntityUUID(merkleVaultAddress, []); + const vnftIntegration = vNFTIntegration.load(event.address); + vnftIntegration!.execLayerVault = merkleVaultAddress; vnftIntegration!.editedAt = ts; vnftIntegration!.editedAtBlock = blockId; @@ -281,7 +281,7 @@ export function handleApprovalForAll(event: ApprovalForAll): void { approval.operator = event.params.operator; approval.createdAt = ts; approval.createdAtBlock = blockId; - approval.integration = entityUUID(event, []); + approval.integration = event.address; } approval.approval = event.params.approved; @@ -312,7 +312,7 @@ export function handleSetSoulboundMode(event: SetSoulboundMode): void { const ts = event.block.timestamp; const blockId = event.block.number; - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.soulboundMode = event.params.active; vnftIntegration!.editedAt = ts; @@ -324,7 +324,7 @@ export function handleSetAdmin(event: SetAdmin): void { const ts = event.block.timestamp; const blockId = event.block.number; - const vnftIntegration = vNFTIntegration.load(entityUUID(event, [])); + const vnftIntegration = vNFTIntegration.load(event.address); vnftIntegration!.admin = event.params.admin; vnftIntegration!.editedAt = ts; diff --git a/src/vOracleAggregator.mapping.ts b/src/vOracleAggregator.mapping.ts index 84911f1..00b5957 100644 --- a/src/vOracleAggregator.mapping.ts +++ b/src/vOracleAggregator.mapping.ts @@ -30,7 +30,7 @@ function getQuorum(memberCount: BigInt): BigInt { } export function handleAddedOracleAggregatorMember(event: AddedOracleAggregatorMember): void { - const oa = vOracleAggregator.load(entityUUID(event, [])); + const oa = vOracleAggregator.load(event.address); const memberCount = oa!.memberCount.toI32(); @@ -39,7 +39,7 @@ export function handleAddedOracleAggregatorMember(event: AddedOracleAggregatorMe const oaMember = new OracleAggregatorMember(oaMemberId); oaMember.address = event.params.member; - oaMember.oracleAggregator = entityUUID(event, []); + oaMember.oracleAggregator = event.address; oaMember.index = BigInt.fromI32(memberCount); oaMember.createdAt = event.block.timestamp; oaMember.createdAtBlock = event.block.number; @@ -70,7 +70,7 @@ export function handleAddedOracleAggregatorMember(event: AddedOracleAggregatorMe } export function handleRemovedOracleAggregatorMember(event: RemovedOracleAggregatorMember): void { - const oa = vOracleAggregator.load(entityUUID(event, [])); + const oa = vOracleAggregator.load(event.address); const memberCount = oa!.memberCount.toI32(); let removedMemberIndex = -1; @@ -131,7 +131,7 @@ export function handleRemovedOracleAggregatorMember(event: RemovedOracleAggregat } function timeSinceLastVariant(epoch: BigInt, oracleAggregatorAddress: Bytes): BigInt { - const oa = vOracleAggregator.load(externalEntityUUID(Address.fromBytes(oracleAggregatorAddress), [])); + const oa = vOracleAggregator.load(oracleAggregatorAddress); if (oa != null) { if (oa.lastVariant != null) { @@ -160,7 +160,7 @@ export function handleGlobalVote( variant: Bytes, report: GlobalMemberVotedReportStruct ): void { - const oa = vOracleAggregator.load(entityUUID(event, [])); + const oa = vOracleAggregator.load(event.address); const variantId = entityUUID(event, [variant.toHexString()]); @@ -180,7 +180,7 @@ export function handleGlobalVote( _variant.activatedCount = report.activatedCount; _variant.stoppedCount = report.stoppedCount; - _variant.oracleAggregator = entityUUID(event, []); + _variant.oracleAggregator = event.address; _variant.createdAt = event.block.timestamp; _variant.createdAtBlock = event.block.number; @@ -224,7 +224,7 @@ export function handleGlobalVote( } export function handleVote(event: ethereum.Event, voter: Bytes, variant: Bytes, report: MemberVotedReportStruct): void { - const oa = vOracleAggregator.load(entityUUID(event, [])); + const oa = vOracleAggregator.load(event.address); const variantId = entityUUID(event, [variant.toHexString()]); @@ -244,7 +244,7 @@ export function handleVote(event: ethereum.Event, voter: Bytes, variant: Bytes, _variant.activatedCount = report.activatedCount; _variant.stoppedCount = report.stoppedCount; - _variant.oracleAggregator = entityUUID(event, []); + _variant.oracleAggregator = event.address; _variant.createdAt = event.block.timestamp; _variant.createdAtBlock = event.block.number; @@ -296,7 +296,7 @@ export function handlerGlobalMemberVoted(event: GlobalMemberVoted): void { } export function handleSubmittedReport(event: SubmittedReport): void { - const oa = vOracleAggregator.load(entityUUID(event, [])); + const oa = vOracleAggregator.load(event.address); const blockId = event.block.timestamp; const ts = event.block.timestamp; @@ -314,7 +314,7 @@ export function handleSubmittedReport(event: SubmittedReport): void { } export function handleSetHighestReportedEpoch(event: SetHighestReportedEpoch): void { - const oa = vOracleAggregator.load(entityUUID(event, [])); + const oa = vOracleAggregator.load(event.address); oa!.highestReportedEpoch = event.params.epoch; oa!.editedAt = event.block.timestamp; oa!.editedAtBlock = event.block.number; diff --git a/src/vPool.mapping.ts b/src/vPool.mapping.ts index aeb4b3e..b0db73c 100644 --- a/src/vPool.mapping.ts +++ b/src/vPool.mapping.ts @@ -32,7 +32,8 @@ import { vPoolRewardEntry, IntegrationRewardEntry, PeriodRewardSummary, - DepositDataEntry + DepositDataEntry, + ERC1155Integration } from '../generated/schema'; import { Bytes, BigInt, Address, store, log, DataSourceContext, dataSource } from '@graphprotocol/graph-ts'; import { ethereum } from '@graphprotocol/graph-ts/chain/ethereum'; @@ -59,7 +60,7 @@ export function getOrCreateBalance(pool: Bytes, account: Bytes, timestamp: BigIn if (balance == null) { balance = new PoolBalance(balanceId); balance.address = account; - balance.pool = externalEntityUUID(Address.fromBytes(pool), []); + balance.pool = pool; balance.amount = BigInt.zero(); balance.totalApproval = BigInt.zero(); balance.createdAt = timestamp; @@ -80,7 +81,7 @@ function saveOrEraseBalance(balance: PoolBalance, event: ethereum.Event): void { } export function handleSetCommittedEthers(event: SetCommittedEthers): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); pool!.editedAt = event.block.timestamp; pool!.editedAtBlock = event.block.number; @@ -90,7 +91,7 @@ export function handleSetCommittedEthers(event: SetCommittedEthers): void { } export function handleSetDepositedEthers(event: SetDepositedEthers): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); pool!.editedAt = event.block.timestamp; pool!.editedAtBlock = event.block.number; @@ -100,7 +101,7 @@ export function handleSetDepositedEthers(event: SetDepositedEthers): void { } export function handleSetRequestedExits(event: SetRequestedExits): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); pool!.editedAt = event.block.timestamp; pool!.editedAtBlock = event.block.number; @@ -110,7 +111,7 @@ export function handleSetRequestedExits(event: SetRequestedExits): void { } export function handleDeposit(event: Deposit): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); const poolDeposit = new PoolDeposit(eventUUID(event, ['deposit'])); @@ -164,7 +165,7 @@ export function handleDeposit(event: Deposit): void { } export function handleMint(event: Mint): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); const balance = getOrCreateBalance( event.address, @@ -185,7 +186,7 @@ export function handleMint(event: Mint): void { } export function handleBurn(event: Burn): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); const balance = getOrCreateBalance(event.address, event.params.burner, event.block.timestamp, event.block.number); @@ -201,15 +202,15 @@ export function handleBurn(event: Burn): void { } export function handleTransfer(event: Transfer): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); const fromBalance = getOrCreateBalance(event.address, event.params.from, event.block.timestamp, event.block.number); const toBalance = getOrCreateBalance(event.address, event.params.to, event.block.timestamp, event.block.number); - const exitQueue = vExitQueue.load(externalEntityUUID(event.params.to, [])); - const erc20Integration = ERC20.load(externalEntityUUID(event.params.from, [])); - const erc1155Integration = ERC1155.load(externalEntityUUID(event.params.from, [])); + const exitQueue = vExitQueue.load(event.params.to); + const erc20Integration = ERC20.load(event.params.from); + const erc1155Integration = ERC1155Integration.load(event.params.from); if ( exitQueue != null && @@ -264,7 +265,7 @@ export function handleTransfer(event: Transfer): void { } export function handlePurchasedValidators(event: PurchasedValidators): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); const validatorCount = pool!.purchasedValidatorCount.toI32(); const validators: string[] = []; @@ -321,7 +322,7 @@ function maxBigInt(a: BigInt, b: BigInt): BigInt { } export function handleSetConsensusLayerSpec(event: SetConsensusLayerSpec): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); pool!.epochsUntilFinal = event.params.consensusLayerSpec.epochsUntilFinal; pool!.slotsPerEpoch = event.params.consensusLayerSpec.slotsPerEpoch; @@ -352,7 +353,7 @@ function _computeTotalUnderlyingSupply(pool: vPool, lastReport: Report | null): } export function handleProcessedReport(event: ProcessedReport): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); const reportId = entityUUID(event, [event.params.epoch.toString()]); const report = new Report(reportId); @@ -623,7 +624,7 @@ export function handleProcessedReport(event: ProcessedReport): void { } export function handleSetContractLinks(event: SetContractLinks): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); const withdrawalRecipientOld = pool!.withdrawalRecipient; const exitQueueOld = pool!.exitQueue; @@ -631,11 +632,11 @@ export function handleSetContractLinks(event: SetContractLinks): void { const coverageRecipientOld = pool!.coverageRecipient; const oracleAggregatorOld = pool!.oracleAggregator; - pool!.withdrawalRecipient = externalEntityUUID(event.params.withdrawalRecipient, []); - pool!.exitQueue = externalEntityUUID(event.params.exitQueue, []); - pool!.execLayerRecipient = externalEntityUUID(event.params.execLayerRecipient, []); - pool!.coverageRecipient = externalEntityUUID(event.params.coverageRecipient, []); - pool!.oracleAggregator = externalEntityUUID(event.params.oracleAggregator, []); + pool!.withdrawalRecipient = event.params.withdrawalRecipient; + pool!.exitQueue = event.params.exitQueue; + pool!.execLayerRecipient = event.params.execLayerRecipient; + pool!.coverageRecipient = event.params.coverageRecipient; + pool!.oracleAggregator = event.params.oracleAggregator; pool!.editedAt = event.block.timestamp; pool!.editedAtBlock = event.block.number; @@ -647,7 +648,7 @@ export function handleSetContractLinks(event: SetContractLinks): void { vFactory.load(pool!.factory)!.address, event.address, `withdrawalRecipient`, - withdrawalRecipientOld + withdrawalRecipientOld.toHexString() ); systemEvent.newValue = event.params.withdrawalRecipient.toHexString(); systemEvent.save(); @@ -658,7 +659,7 @@ export function handleSetContractLinks(event: SetContractLinks): void { vFactory.load(pool!.factory)!.address, event.address, `exitQueue`, - exitQueueOld + exitQueueOld.toHexString() ); systemEvent.newValue = event.params.exitQueue.toHexString(); systemEvent.save(); @@ -669,7 +670,7 @@ export function handleSetContractLinks(event: SetContractLinks): void { vFactory.load(pool!.factory)!.address, event.address, `execLayerRecipient`, - execLayerRecipientOld + execLayerRecipientOld.toHexString() ); systemEvent.newValue = event.params.execLayerRecipient.toHexString(); systemEvent.save(); @@ -680,7 +681,7 @@ export function handleSetContractLinks(event: SetContractLinks): void { vFactory.load(pool!.factory)!.address, event.address, `coverageRecipient`, - coverageRecipientOld + coverageRecipientOld.toHexString() ); systemEvent.newValue = event.params.coverageRecipient.toHexString(); systemEvent.save(); @@ -691,7 +692,7 @@ export function handleSetContractLinks(event: SetContractLinks): void { vFactory.load(pool!.factory)!.address, event.address, `oracleAggregator`, - oracleAggregatorOld + oracleAggregatorOld.toHexString() ); systemEvent.newValue = event.params.oracleAggregator.toHexString(); systemEvent.save(); @@ -699,7 +700,7 @@ export function handleSetContractLinks(event: SetContractLinks): void { } export function handleSetOperatorFee(event: SetOperatorFee): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); let oldValue = pool!.operatorFee; pool!.operatorFee = event.params.operatorFeeBps; @@ -722,7 +723,7 @@ export function handleSetOperatorFee(event: SetOperatorFee): void { } export function handleSetEpochsPerFrame(event: SetEpochsPerFrame): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); let oldValue = pool!.epochsPerFrame; @@ -747,7 +748,7 @@ export function handleSetEpochsPerFrame(event: SetEpochsPerFrame): void { } export function handleSetReportBounds(event: SetReportBounds): void { - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); pool!.maxAPRUpperBound = event.params.maxAPRUpperBound; pool!.maxAPRUpperCoverageBoost = event.params.maxAPRUpperCoverageBoost; @@ -811,7 +812,7 @@ export function handleApproveDepositor(event: ApproveDepositor): void { depositor.allowed = event.params.allowed; depositor.address = event.params.depositor; - depositor.pool = externalEntityUUID(event.address, []); + depositor.pool = event.address; depositor.depositedEth = BigInt.fromI32(0); depositor.createdAt = event.block.timestamp; depositor.createdAtBlock = event.block.number; @@ -826,7 +827,7 @@ export function handleApproveDepositor(event: ApproveDepositor): void { depositor.save(); } - const pool = vPool.load(entityUUID(event, [])); + const pool = vPool.load(event.address); if (oldValue != event.params.allowed) { const systemEvent = createChangedPoolParameterSystemEvent( diff --git a/src/vTreasury.mapping.ts b/src/vTreasury.mapping.ts index 709b560..2be2c9b 100644 --- a/src/vTreasury.mapping.ts +++ b/src/vTreasury.mapping.ts @@ -3,7 +3,7 @@ import { entityUUID, eventUUID } from './utils/utils'; import { SetAutoCover, SetFee, SetOperator, VoteChanged, Withdraw } from '../generated/templates/vTreasury/vTreasury'; export function handleSetOperator(event: SetOperator): void { - const treasury = vTreasury.load(entityUUID(event, [])); + const treasury = vTreasury.load(event.address); treasury!.operator = event.params.operator; @@ -13,7 +13,7 @@ export function handleSetOperator(event: SetOperator): void { } export function handleSetFee(event: SetFee): void { - const treasury = vTreasury.load(entityUUID(event, [])); + const treasury = vTreasury.load(event.address); treasury!.fee = event.params.fee; @@ -26,7 +26,7 @@ export function handleSetAutoCover(event: SetAutoCover): void { const autoCoverId = entityUUID(event, ['auto-cover', event.params.pool.toHexString()]); const autoCover = new AutoCover(autoCoverId); - autoCover.treasury = entityUUID(event, []); + autoCover.treasury = event.address; autoCover.autoCoverBps = event.params.autoCover; @@ -41,7 +41,7 @@ export function handleWithdraw(event: Withdraw): void { const withdrawId = eventUUID(event, ['withdraw']); const withdraw = new TreasuryWithdrawal(withdrawId); - withdraw.treasury = entityUUID(event, []); + withdraw.treasury = event.address; withdraw.operator = event.params.operator; withdraw.globalRecipient = event.params.globalRecipient; @@ -59,7 +59,7 @@ export function handleVoteChanged(event: VoteChanged): void { const voteFeeId = eventUUID(event, ['fee-vote']); const vote = new TreasuryFeeVote(voteFeeId); - vote.treasury = entityUUID(event, []); + vote.treasury = event.address; vote.voter = event.params.voter; vote.operatorFeeVote = event.params.operatorFeeVote; diff --git a/yarn.lock b/yarn.lock index 8c4a54a..3c393f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -488,7 +488,7 @@ console-table-printer "^2.11.1" ethers "^5.6.0" -"@graphprotocol/cost-model@0.1.16": +"@graphprotocol/cost-model@0.1.16", "@graphprotocol/cost-model@^0.1.16": version "0.1.16" resolved "https://registry.yarnpkg.com/@graphprotocol/cost-model/-/cost-model-0.1.16.tgz#42e6889a23934f293f119db9ac23159be019df0c" integrity sha512-oDBhXH4sdKLduw0PgcK6rWPrzqJ4eFH9BTWz81c2iMIdTrm3n92eixCrhTwB3Nd1JpM1y0Bz9sMIvRGvC6htoA== @@ -496,13 +496,15 @@ "@mapbox/node-pre-gyp" "1.0.9" cargo-cp-artifact "0.1.6" -"@graphprotocol/graph-cli@0.51.2": - version "0.51.2" - resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.51.2.tgz#ad333a5110b4835e648c3205b46a2582653d1966" - integrity sha512-C+h6HLeYhsNFpV3TmVz1j6MMYA0K81+iInysFdnqX2J1ZwH7ldiHZyJuNq4ajxZlXhBL7+UV9zx7id6OSaj6GA== +"@graphprotocol/graph-cli@^0.60.0": + version "0.60.0" + resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.60.0.tgz#afcae7a966ad348886f49372d36c4ca6c35b9434" + integrity sha512-8tGaQJ0EzAPtkDXCAijFGoVdJXM+pKFlGxjiU31TdG5bS4cIUoSB6yWojVsFFod0yETAwf+giel/0/8sudYsDw== dependencies: "@float-capital/float-subgraph-uncrashable" "^0.0.0-alpha.4" "@oclif/core" "2.8.6" + "@oclif/plugin-autocomplete" "^2.3.6" + "@oclif/plugin-not-found" "^2.4.0" "@whatwg-node/fetch" "^0.8.4" assemblyscript "0.19.23" binary-install-raw "0.0.13" @@ -723,14 +725,66 @@ wordwrap "^1.0.0" wrap-ansi "^7.0.0" +"@oclif/core@^2.15.0": + version "2.15.0" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.15.0.tgz#f27797b30a77d13279fba88c1698fc34a0bd0d2a" + integrity sha512-fNEMG5DzJHhYmI3MgpByTvltBOMyFcnRIUMxbiz2ai8rhaYgaTHMG3Q38HcosfIvtw9nCjxpcQtC8MN8QtVCcA== + dependencies: + "@types/cli-progress" "^3.11.0" + ansi-escapes "^4.3.2" + ansi-styles "^4.3.0" + cardinal "^2.1.1" + chalk "^4.1.2" + clean-stack "^3.0.1" + cli-progress "^3.12.0" + debug "^4.3.4" + ejs "^3.1.8" + get-package-type "^0.1.0" + globby "^11.1.0" + hyperlinker "^1.0.0" + indent-string "^4.0.0" + is-wsl "^2.2.0" + js-yaml "^3.14.1" + natural-orderby "^2.0.3" + object-treeify "^1.1.33" + password-prompt "^1.1.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + supports-color "^8.1.1" + supports-hyperlinks "^2.2.0" + ts-node "^10.9.1" + tslib "^2.5.0" + widest-line "^3.1.0" + wordwrap "^1.0.0" + wrap-ansi "^7.0.0" + +"@oclif/plugin-autocomplete@^2.3.6": + version "2.3.10" + resolved "https://registry.yarnpkg.com/@oclif/plugin-autocomplete/-/plugin-autocomplete-2.3.10.tgz#787f6208cdfe10ffc68ad89e9e7f1a7ad0e8987f" + integrity sha512-Ow1AR8WtjzlyCtiWWPgzMyT8SbcDJFr47009riLioHa+MHX2BCDtVn2DVnN/E6b9JlPV5ptQpjefoRSNWBesmg== + dependencies: + "@oclif/core" "^2.15.0" + chalk "^4.1.0" + debug "^4.3.4" + +"@oclif/plugin-not-found@^2.4.0": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-2.4.3.tgz#3d24095adb0f3876cb4bcfdfdcb775086cf6d4b5" + integrity sha512-nIyaR4y692frwh7wIHZ3fb+2L6XEecQwRDIb4zbEam0TvaVmBQWZoColQyWA84ljFBPZ8XWiQyTz+ixSwdRkqg== + dependencies: + "@oclif/core" "^2.15.0" + chalk "^4" + fast-levenshtein "^3.0.0" + "@peculiar/asn1-schema@^2.3.6": - version "2.3.6" - resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz#3dd3c2ade7f702a9a94dfb395c192f5fa5d6b922" - integrity sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA== + version "2.3.8" + resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.8.tgz#04b38832a814e25731232dd5be883460a156da3b" + integrity sha512-ULB1XqHKx1WBU/tTFIA+uARuRoBVZ4pNdOA878RDrRbBfBGcSzi5HBkdScC6ZbHn8z7L8gmKCgPC1LHRrP46tA== dependencies: asn1js "^3.0.5" - pvtsutils "^1.3.2" - tslib "^2.4.0" + pvtsutils "^1.3.5" + tslib "^2.6.2" "@peculiar/json-schema@^1.1.12": version "1.1.12" @@ -1011,16 +1065,16 @@ integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== "@types/bn.js@^5.1.0": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682" - integrity sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g== + version "5.1.3" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.3.tgz#0857f00da3bf888a26a44b4a477c7819b17dacc5" + integrity sha512-wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg== dependencies: "@types/node" "*" "@types/cli-progress@^3.11.0": - version "3.11.0" - resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.0.tgz#ec79df99b26757c3d1c7170af8422e0fc95eef7e" - integrity sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg== + version "3.11.4" + resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.4.tgz#58d9e60bd5fd85a57984890ef9c9d831a0dda896" + integrity sha512-yufTxeeNCZuEIxx2uebK8lpSAsJM4lvzakm/VxzYhDtqhXCzwH9jpn7nPCxzrROuEbLATqhFq4MIPoG0tlrsvw== dependencies: "@types/node" "*" @@ -1087,11 +1141,18 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node@*", "@types/node@>=13.7.0": +"@types/node@*": version "20.3.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898" integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw== +"@types/node@>=13.7.0": + version "20.8.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.7.tgz#ad23827850843de973096edfc5abc9e922492a25" + integrity sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ== + dependencies: + undici-types "~5.25.1" + "@types/node@^10.0.3": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" @@ -1113,17 +1174,22 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/pbkdf2@^3.0.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.0.tgz#039a0e9b67da0cdc4ee5dab865caa6b267bb66b1" - integrity sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ== + version "3.1.1" + resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.1.tgz#c290c1f0d3dc364af94c2c5ee92046a13b7f89fd" + integrity sha512-4HCoGwR3221nOc7G0Z/6KgTNGgaaFGkbGrtUJsB+zlKX2LBVjFHHIUkieMBgHHXgBH5Gq6dZHJKdBYdtlhBQvw== dependencies: "@types/node" "*" -"@types/qs@*", "@types/qs@^6.2.31": +"@types/qs@*": version "6.9.7" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== +"@types/qs@^6.2.31": + version "6.9.9" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.9.tgz#66f7b26288f6799d279edf13da7ccd40d2fa9197" + integrity sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg== + "@types/range-parser@*": version "1.2.4" resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" @@ -1135,9 +1201,9 @@ integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow== "@types/secp256k1@^4.0.1": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.3.tgz#1b8e55d8e00f08ee7220b4d59a6abe89c37a901c" - integrity sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w== + version "4.0.5" + resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.5.tgz#14b1766b4fbc198b0af5599d9fd21c89056633ce" + integrity sha512-aIonTBMErtE3T9MxDvTZRzcrT/mCqpEZBw3CCY/i+oG9n57N/+7obBkhFgavUAIrX21bU0LHg1XRgtaLdelBhA== dependencies: "@types/node" "*" @@ -1259,9 +1325,9 @@ acorn-walk@^8.1.1: integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^8.4.1: - version "8.9.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" - integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== aes-js@3.0.0: version "3.0.0" @@ -1313,11 +1379,6 @@ ansi-colors@^4.1.1: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== -ansi-escapes@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" - integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== - ansi-escapes@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" @@ -1790,12 +1851,13 @@ bytes@3.1.2: integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== call-bind@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + version "1.0.5" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" + integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" + function-bind "^1.1.2" + get-intrinsic "^1.2.1" + set-function-length "^1.1.1" callsites@^3.0.0: version "3.1.0" @@ -1838,7 +1900,7 @@ chalk@3.0.0, chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@4.1.2, chalk@^4.0.2, chalk@^4.1.2: +chalk@4.1.2, chalk@^4, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -2128,17 +2190,6 @@ cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -2184,6 +2235,15 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" +define-data-property@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" + integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== + dependencies: + get-intrinsic "^1.2.1" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + delay@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d" @@ -2663,14 +2723,14 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-fifo@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.0.tgz#03e381bcbfb29932d7c3afde6e15e83e05ab4d8b" - integrity sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw== + version "1.3.2" + resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c" + integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ== fast-glob@^3.2.9: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== + version "3.3.1" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" + integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -2693,6 +2753,13 @@ fast-json-stringify@^2.5.2: rfdc "^1.2.0" string-similarity "^4.0.1" +fast-levenshtein@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz#37b899ae47e1090e40e3fd2318e4d5f0142ca912" + integrity sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ== + dependencies: + fastest-levenshtein "^1.0.7" + fast-querystring@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.2.tgz#a6d24937b4fc6f791b4ee31dcb6f53aeafb89f53" @@ -2717,6 +2784,11 @@ fast-url-parser@^1.1.3: dependencies: punycode "^1.3.2" +fastest-levenshtein@^1.0.7: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + fastify-error@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/fastify-error/-/fastify-error-0.3.1.tgz#8eb993e15e3cf57f0357fc452af9290f1c1278d2" @@ -2879,14 +2951,14 @@ fs.realpath@^1.0.0: integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== gauge@^3.0.0: version "3.0.2" @@ -2903,15 +2975,15 @@ gauge@^3.0.0: strip-ansi "^6.0.1" wide-align "^1.1.2" -get-intrinsic@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" - integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" + integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== dependencies: - function-bind "^1.1.1" - has "^1.0.3" + function-bind "^1.1.2" has-proto "^1.0.1" has-symbols "^1.0.3" + hasown "^2.0.0" get-iterator@^1.0.2: version "1.0.2" @@ -3061,6 +3133,13 @@ gluegun@5.1.2: which "2.0.2" yargs-parser "^21.0.0" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" @@ -3089,9 +3168,9 @@ graphql@16.3.0: integrity sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A== graphql@^16.6.0: - version "16.7.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.7.1.tgz#11475b74a7bff2aefd4691df52a0eca0abd9b642" - integrity sha512-DRYR9tf+UGU0KOsMcKAlXeFfX89UiiIZ0dRU3mR0yJfu6OjZqUcp68NnFLnqQU5RexygFoDy1EW+ccOYcPfmHg== + version "16.8.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07" + integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw== har-schema@^2.0.0: version "2.0.0" @@ -3116,6 +3195,13 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-property-descriptors@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" + integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== + dependencies: + get-intrinsic "^1.2.2" + has-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" @@ -3131,13 +3217,6 @@ has-unicode@^2.0.1: resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - hash-base@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" @@ -3155,6 +3234,13 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hasown@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" + integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== + dependencies: + function-bind "^1.1.2" + helmet@5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/helmet/-/helmet-5.0.2.tgz#3264ec6bab96c82deaf65e3403c369424cb2366c" @@ -3703,9 +3789,9 @@ jsprim@^1.2.2: verror "1.10.0" keccak@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" - integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== + version "3.0.4" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d" + integrity sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q== dependencies: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" @@ -3835,10 +3921,10 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^9.1.1: - version "9.1.2" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835" - integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ== +"lru-cache@^9.1.1 || ^10.0.0": + version "10.0.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a" + integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g== lru_map@^0.3.3: version "0.3.3" @@ -3995,10 +4081,10 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2": - version "6.0.2" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.2.tgz#542844b6c4ce95b202c0995b0a471f1229de4c81" - integrity sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== minizlib@^2.1.1: version "2.1.2" @@ -4117,11 +4203,6 @@ ngeohash@0.6.3: resolved "https://registry.yarnpkg.com/ngeohash/-/ngeohash-0.6.3.tgz#10b1e80be5488262ec95c56cf2dbb6c45fbdf245" integrity sha512-kltF0cOxgx1AbmVzKxYZaoB0aj7mOxZeHaerEtQV0YaqnkXNq26WWqMmJ6lTqShYxVRWZ/mwvvTrNeOwdslWiw== -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - node-addon-api@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" @@ -4142,16 +4223,16 @@ node-fetch@^2.6.1, node-fetch@^2.6.7: whatwg-url "^5.0.0" node-fetch@^2.6.8: - version "2.6.11" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" - integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== dependencies: whatwg-url "^5.0.0" node-gyp-build@^4.2.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" - integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== + version "4.6.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e" + integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ== nopt@^5.0.0: version "5.0.0" @@ -4201,9 +4282,9 @@ object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1: integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.9.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" - integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== object-treeify@^1.1.33: version "1.1.33" @@ -4361,35 +4442,30 @@ parseurl@~1.3.3: integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== password-prompt@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/password-prompt/-/password-prompt-1.1.2.tgz#85b2f93896c5bd9e9f2d6ff0627fa5af3dc00923" - integrity sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/password-prompt/-/password-prompt-1.1.3.tgz#05e539f4e7ca4d6c865d479313f10eb9db63ee5f" + integrity sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw== dependencies: - ansi-escapes "^3.1.0" - cross-spawn "^6.0.5" + ansi-escapes "^4.3.2" + cross-spawn "^7.0.3" path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== -path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== - path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-scurry@^1.6.1: - version "1.9.2" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.9.2.tgz#90f9d296ac5e37e608028e28a447b11d385b3f63" - integrity sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg== + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== dependencies: - lru-cache "^9.1.1" - minipass "^5.0.0 || ^6.0.2" + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-to-regexp@0.1.7: version "0.1.7" @@ -4613,9 +4689,9 @@ promise@^8.0.0: asap "~2.0.6" protobufjs@^6.10.2: - version "6.11.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" - integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== + version "6.11.4" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa" + integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -4679,12 +4755,12 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -pvtsutils@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.2.tgz#9f8570d132cdd3c27ab7d51a2799239bf8d8d5de" - integrity sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ== +pvtsutils@^1.3.2, pvtsutils@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.5.tgz#b8705b437b7b134cd7fd858f025a23456f1ce910" + integrity sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA== dependencies: - tslib "^2.4.0" + tslib "^2.6.1" pvutils@^1.1.3: version "1.1.3" @@ -5014,30 +5090,18 @@ semver@7.4.0: dependencies: lru-cache "^6.0.0" -semver@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - semver@^6.0.0: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.2, semver@^7.3.5: +semver@^7.0.0, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" -semver@^7.3.7: - version "7.5.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" - integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== - dependencies: - lru-cache "^6.0.0" - send@0.17.2: version "0.17.2" resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" @@ -5104,6 +5168,16 @@ set-cookie-parser@^2.4.1: resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51" integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ== +set-function-length@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed" + integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ== + dependencies: + define-data-property "^1.1.1" + get-intrinsic "^1.2.1" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -5122,13 +5196,6 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== - dependencies: - shebang-regex "^1.0.0" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -5136,11 +5203,6 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== - shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" @@ -5230,9 +5292,9 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sshpk@^1.7.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" - integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== + version "1.18.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028" + integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -5419,7 +5481,19 @@ tar-stream@^1.1.2: to-buffer "^1.1.1" xtend "^4.0.0" -tar@^6.1.0, tar@^6.1.11: +tar@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" + integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +tar@^6.1.11: version "6.1.15" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== @@ -5574,7 +5648,12 @@ tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0: +tslib@^2.0.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.1, tslib@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + +tslib@^2.1.0, tslib@^2.3.1: version "2.6.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== @@ -5621,6 +5700,11 @@ underscore@^1.13.1: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== +undici-types@~5.25.1: + version "5.25.3" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3" + integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -5771,13 +5855,6 @@ which@2.0.2, which@^2.0.0, which@^2.0.1: dependencies: isexe "^2.0.0" -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - wide-align@^1.1.2: version "1.1.5" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"