Skip to content

Commit 0438f62

Browse files
authored
Merge pull request #1037 from graphprotocol/fix_oz_n-07
fix: address typographical errors throughout codebase. (OZ N-07)
2 parents 54286e3 + 374f57d commit 0438f62

16 files changed

+31
-31
lines changed

packages/contracts/contracts/curation/Curation.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ contract Curation is CurationV2Storage, GraphUpgradeable {
257257

258258
/**
259259
* @notice Get the amount of token reserves in a curation pool.
260-
* @param _subgraphDeploymentID Subgraph deployment curation poool
260+
* @param _subgraphDeploymentID Subgraph deployment curation pool
261261
* @return Amount of token reserves in the curation pool
262262
*/
263263
function getCurationPoolTokens(bytes32 _subgraphDeploymentID) external view override returns (uint256) {
@@ -286,7 +286,7 @@ contract Curation is CurationV2Storage, GraphUpgradeable {
286286

287287
/**
288288
* @notice Get the amount of signal in a curation pool.
289-
* @param _subgraphDeploymentID Subgraph deployment curation poool
289+
* @param _subgraphDeploymentID Subgraph deployment curation pool
290290
* @return Amount of signal minted for the subgraph deployment
291291
*/
292292
function getCurationPoolSignal(bytes32 _subgraphDeploymentID) public view override returns (uint256) {

packages/contracts/contracts/curation/ICuration.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ interface ICuration {
8484

8585
/**
8686
* @notice Get the amount of signal in a curation pool.
87-
* @param _subgraphDeploymentID Subgraph deployment curation poool
87+
* @param _subgraphDeploymentID Subgraph deployment curation pool
8888
* @return Amount of signal minted for the subgraph deployment
8989
*/
9090
function getCurationPoolSignal(bytes32 _subgraphDeploymentID) external view returns (uint256);
9191

9292
/**
9393
* @notice Get the amount of token reserves in a curation pool.
94-
* @param _subgraphDeploymentID Subgraph deployment curation poool
94+
* @param _subgraphDeploymentID Subgraph deployment curation pool
9595
* @return Amount of token reserves in the curation pool
9696
*/
9797
function getCurationPoolTokens(bytes32 _subgraphDeploymentID) external view returns (uint256);

packages/contracts/contracts/l2/curation/L2Curation.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ contract L2Curation is CurationV3Storage, GraphUpgradeable, IL2Curation {
147147

148148
/**
149149
* @notice Assign Graph Tokens collected as curation fees to the curation pool reserve.
150-
* @dev This function can only be called by the Staking contract and will do the bookeeping of
150+
* @dev This function can only be called by the Staking contract and will do the Bookkeeping of
151151
* transferred tokens into this contract.
152152
* @param _subgraphDeploymentID SubgraphDeployment where funds should be allocated as reserves
153153
* @param _tokens Amount of Graph Tokens to add to reserves
@@ -326,7 +326,7 @@ contract L2Curation is CurationV3Storage, GraphUpgradeable, IL2Curation {
326326

327327
/**
328328
* @notice Get the amount of token reserves in a curation pool.
329-
* @param _subgraphDeploymentID Subgraph deployment curation poool
329+
* @param _subgraphDeploymentID Subgraph deployment curation pool
330330
* @return Amount of token reserves in the curation pool
331331
*/
332332
function getCurationPoolTokens(bytes32 _subgraphDeploymentID) external view override returns (uint256) {
@@ -355,7 +355,7 @@ contract L2Curation is CurationV3Storage, GraphUpgradeable, IL2Curation {
355355

356356
/**
357357
* @notice Get the amount of signal in a curation pool.
358-
* @param _subgraphDeploymentID Subgraph deployment curation poool
358+
* @param _subgraphDeploymentID Subgraph deployment curation pool
359359
* @return Amount of signal minted for the subgraph deployment
360360
*/
361361
function getCurationPoolSignal(bytes32 _subgraphDeploymentID) public view override returns (uint256) {

packages/contracts/contracts/rewards/IRewardsIssuer.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ interface IRewardsIssuer {
3333
function getSubgraphAllocatedTokens(bytes32 _subgraphDeploymentId) external view returns (uint256);
3434

3535
/**
36-
* @notice Wether or not an allocation is active (i.e open)
36+
* @notice Whether or not an allocation is active (i.e open)
3737
* @param _allocationId Allocation Id
38-
* @return Wether or not the allocation is active
38+
* @return Whether or not the allocation is active
3939
*/
4040
function isActiveAllocation(address _allocationId) external view returns (bool);
4141
}

packages/contracts/contracts/staking/Staking.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ abstract contract Staking is StakingV4Storage, GraphUpgradeable, IStakingBase, M
912912
if (curationFees > 0) {
913913
// Transfer and call collect()
914914
// This function transfer tokens to a trusted protocol contracts
915-
// Then we call collect() to do the transfer bookeeping
915+
// Then we call collect() to do the transfer Bookkeeping
916916
rewardsManager().onSubgraphSignalUpdate(_subgraphDeploymentID);
917917
TokenUtils.pushTokens(_graphToken, address(curation), curationFees);
918918
curation.collect(_subgraphDeploymentID, curationFees);

packages/contracts/contracts/staking/libs/Stakes.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ library Stakes {
8585
/**
8686
* @dev Unlock tokens.
8787
* @param stake Stake data
88-
* @param _tokens Amount of tokens to unkock
88+
* @param _tokens Amount of tokens to unlock
8989
*/
9090
function unlockTokens(Stakes.Indexer storage stake, uint256 _tokens) internal {
9191
stake.tokensLocked = stake.tokensLocked.sub(_tokens);

packages/horizon/contracts/interfaces/ITAPCollector.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ interface ITAPCollector is IPaymentsCollector {
3535
}
3636

3737
/**
38-
* Trown when the caller is not the data service the RAV was issued to
38+
* Thrown when the caller is not the data service the RAV was issued to
3939
* @param caller The address of the caller
4040
* @param dataService The address of the data service
4141
*/

packages/horizon/contracts/interfaces/internal/IHorizonStakingExtension.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ interface IHorizonStakingExtension is IRewardsIssuer, IL2StakingBase {
162162
function isAllocation(address allocationID) external view returns (bool);
163163

164164
/**
165-
* @notice Retrun the time in blocks to unstake
165+
* @notice Return the time in blocks to unstake
166166
* @return Thawing period in blocks
167167
*/
168168
// solhint-disable-next-line func-name-mixedcase

packages/horizon/contracts/interfaces/internal/IHorizonStakingMain.sol

+6-6
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ interface IHorizonStakingMain {
253253
* @param thawRequestId The ID of the thaw request
254254
* @param tokens The amount of tokens being released
255255
* @param shares The amount of shares being released
256-
* @param thawingUntil The timestamp until the stake has thawn
256+
* @param thawingUntil The timestamp until the stake has thawed
257257
*/
258258
event ThawRequestFulfilled(bytes32 indexed thawRequestId, uint256 tokens, uint256 shares, uint64 thawingUntil);
259259

@@ -417,7 +417,7 @@ interface IHorizonStakingMain {
417417
error HorizonStakingStillThawing(uint256 until);
418418

419419
/**
420-
* @notice Thrown when a service provider attempts to operate on verifieres that are not allowed.
420+
* @notice Thrown when a service provider attempts to operate on verifiers that are not allowed.
421421
* @dev Only applies to stake from locked wallets.
422422
*/
423423
error HorizonStakingVerifierNotAllowed(address verifier);
@@ -578,7 +578,7 @@ interface IHorizonStakingMain {
578578
/**
579579
* @notice Remove tokens from a provision and move them back to the service provider's idle stake.
580580
* @dev The parameter `nThawRequests` can be set to a non zero value to fulfill a specific number of thaw
581-
* requests in the event that fulfulling all of them results in a gas limit error.
581+
* requests in the event that fulfilling all of them results in a gas limit error.
582582
*
583583
* Requirements:
584584
* - Must have previously initiated a thaw request using {thaw}.
@@ -704,7 +704,7 @@ interface IHorizonStakingMain {
704704
* @notice Withdraw undelegated tokens from a provision after thawing.
705705
* Tokens can be automatically re-delegated to another provision by setting `newServiceProvider`.
706706
* @dev The parameter `nThawRequests` can be set to a non zero value to fulfill a specific number of thaw
707-
* requests in the event that fulfulling all of them results in a gas limit error.
707+
* requests in the event that fulfilling all of them results in a gas limit error.
708708
*
709709
* Requirements:
710710
* - Must have previously initiated a thaw request using {undelegate}.
@@ -744,7 +744,7 @@ interface IHorizonStakingMain {
744744
/**
745745
* @notice Delegate tokens to the subgraph data service provision.
746746
* This function is for backwards compatibility with the legacy staking contract.
747-
* It only allows delegting to the subgraph data service and DOES NOT have slippage protection.
747+
* It only allows delegating to the subgraph data service and DOES NOT have slippage protection.
748748
* @dev See {delegate}.
749749
* @param serviceProvider The service provider address
750750
* @param tokens The amount of tokens to delegate
@@ -754,7 +754,7 @@ interface IHorizonStakingMain {
754754
/**
755755
* @notice Undelegate tokens from the subgraph data service provision and start thawing them.
756756
* This function is for backwards compatibility with the legacy staking contract.
757-
* It only allows undelegting from the subgraph data service.
757+
* It only allows undelegating from the subgraph data service.
758758
* @dev See {undelegate}.
759759
* @param serviceProvider The service provider address
760760
* @param shares The amount of shares to undelegate

packages/horizon/contracts/interfaces/internal/IHorizonStakingTypes.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ interface IHorizonStakingTypes {
3939
* @dev See {ServiceProviderInternal} for the actual storage representation
4040
*/
4141
struct ServiceProvider {
42-
// Total amount of tokens on the provider stake (only staked by the provider, inludes all provisions)
42+
// Total amount of tokens on the provider stake (only staked by the provider, includes all provisions)
4343
uint256 tokensStaked;
4444
// Total amount of tokens locked in provisions (only staked by the provider)
4545
uint256 tokensProvisioned;
@@ -50,7 +50,7 @@ interface IHorizonStakingTypes {
5050
* @dev It contains deprecated fields from the `Indexer` struct to maintain storage compatibility.
5151
*/
5252
struct ServiceProviderInternal {
53-
// Total amount of tokens on the provider stake (only staked by the provider, inludes all provisions)
53+
// Total amount of tokens on the provider stake (only staked by the provider, includes all provisions)
5454
uint256 tokensStaked;
5555
// (Deprecated) Tokens used in allocations
5656
uint256 __DEPRECATED_tokensAllocated; // solhint-disable-line graph/leading-underscore

packages/horizon/contracts/payments/GraphPayments.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ contract GraphPayments is Initializable, MulticallUpgradeable, GraphDirectory, I
2424

2525
/**
2626
* @notice Constructor for the {GraphPayments} contract
27-
* @dev This contract is upgradeable however we stil use the constructor to set
27+
* @dev This contract is upgradeable however we still use the constructor to set
2828
* a few immutable variables.
2929
* @param controller The address of the Graph controller
3030
* @param protocolPaymentCut The protocol tax in PPM

packages/horizon/contracts/staking/HorizonStaking.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ contract HorizonStaking is HorizonStakingBase, IHorizonStakingMain {
6262
}
6363

6464
/**
65-
* @dev The staking contract is upgradeable however we stil use the constructor to set
65+
* @dev The staking contract is upgradeable however we still use the constructor to set
6666
* a few immutable variables.
6767
* @param controller The address of the Graph controller contract.
6868
* @param stakingExtensionAddress The address of the staking extension contract.
@@ -903,7 +903,7 @@ contract HorizonStaking is HorizonStakingBase, IHorizonStakingMain {
903903
*
904904
* @param _thawRequestId The ID of the current thaw request
905905
* @param _acc The accumulator data for the thaw requests being fulfilled
906-
* @return Wether the thaw request is still thawing, indicating that the traversal should continue or stop.
906+
* @return Whether the thaw request is still thawing, indicating that the traversal should continue or stop.
907907
* @return The updated accumulator data
908908
*/
909909
function _fulfillThawRequest(bytes32 _thawRequestId, bytes memory _acc) private returns (bool, bytes memory) {

packages/horizon/contracts/staking/HorizonStakingBase.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ abstract contract HorizonStakingBase is
3939
address internal immutable SUBGRAPH_DATA_SERVICE_ADDRESS;
4040

4141
/**
42-
* @dev The staking contract is upgradeable however we stil use the constructor to set
42+
* @dev The staking contract is upgradeable however we still use the constructor to set
4343
* a few immutable variables.
4444
* @param controller The address of the Graph controller contract.
4545
* @param subgraphDataServiceAddress The address of the subgraph data service.

packages/horizon/contracts/staking/HorizonStakingExtension.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ contract HorizonStakingExtension is HorizonStakingBase, IL2StakingBase, IHorizon
4141
}
4242

4343
/**
44-
* @dev The staking contract is upgradeable however we stil use the constructor to set
44+
* @dev The staking contract is upgradeable however we still use the constructor to set
4545
* a few immutable variables.
4646
* @param controller The address of the Graph controller contract.
4747
* @param subgraphDataServiceAddress The address of the subgraph data service.
@@ -296,7 +296,7 @@ contract HorizonStakingExtension is HorizonStakingBase, IL2StakingBase, IHorizon
296296
}
297297

298298
/**
299-
* @notice Retrun the time in blocks to unstake
299+
* @notice Return the time in blocks to unstake
300300
* Deprecated, now enforced by each data service (verifier)
301301
* @return Thawing period in blocks
302302
*/
@@ -569,7 +569,7 @@ contract HorizonStakingExtension is HorizonStakingBase, IL2StakingBase, IHorizon
569569
if (curationFees > 0) {
570570
// Transfer and call collect()
571571
// This function transfer tokens to a trusted protocol contracts
572-
// Then we call collect() to do the transfer bookeeping
572+
// Then we call collect() to do the transfer Bookkeeping
573573
_graphRewardsManager().onSubgraphSignalUpdate(_subgraphDeploymentID);
574574
_graphToken().pushTokens(address(curation), curationFees);
575575
curation.collect(_subgraphDeploymentID, curationFees);

packages/subgraph-service/contracts/DisputeManager.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ contract DisputeManager is
272272
}
273273

274274
/**
275-
* @notice Once the dispute period ends, if the disput status remains Pending,
275+
* @notice Once the dispute period ends, if the dispute status remains Pending,
276276
* the fisherman can cancel the dispute and get back their initial deposit.
277277
* @dev Cancel a dispute with Id `disputeId`
278278
* @param disputeId Id of the dispute to be cancelled

packages/subgraph-service/contracts/utilities/AllocationManager.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ abstract contract AllocationManager is EIP712Upgradeable, GraphDirectory, Alloca
142142
error AllocationManagerZeroTokensAllocation(address allocationId);
143143

144144
/**
145-
* @notice Thrown when attempting to collect indexing rewards on a closed allocationl
145+
* @notice Thrown when attempting to collect indexing rewards on a closed allocation
146146
* @param allocationId The id of the allocation
147147
*/
148148
error AllocationManagerAllocationClosed(address allocationId);
@@ -453,7 +453,7 @@ abstract contract AllocationManager is EIP712Upgradeable, GraphDirectory, Alloca
453453
}
454454

455455
/**
456-
* @notice Verifies ownsership of an allocation id by verifying an EIP712 allocation proof
456+
* @notice Verifies ownership of an allocation id by verifying an EIP712 allocation proof
457457
* @dev Requirements:
458458
* - Signer must be the allocation id address
459459
* @param _indexer The address of the indexer

0 commit comments

Comments
 (0)