Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spelling fixes #422

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/1155-contracts/test/nft/ZoraCreator1155.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1662,7 +1662,7 @@ contract ZoraCreator1155Test is Test {
// update mint card price
createEthToken(111, uint96(mintTicketPrice), true);

// update quanity to be fuzzy value - 1
// update quantity to be fuzzy value - 1
quantity = quantity - 1;

totalReward = target.computeTotalReward(mints.getEthPrice(), quantity);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ contract Zora1155PremintExecutorProxyTest is Test, IHasContractName {

bytes memory signature = _signPremint(ZoraCreator1155Attribution.hashPremint(premintConfig), PremintEncoding.HASHED_VERSION_1, deterministicAddress);

// use old mint fee - this is prior to having the `mintFee` functino on premint executor
// use old mint fee - this is prior to having the `mintFee` function on premint executor
mintFeeAmount = 0.000777 ether;

// create 1155 contract via premint, using legacy interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ contract ZoraCreator1155PreminterTest is Test {
uint256 chainId = block.chainid;

// get contract hash, which is unique per contract creation config, and can be used
// retreive the address created for a contract
// retrieve the address created for a contract
address contractAddress = preminter.getContractAddress(contractConfig);

// 2. Call smart contract to get digest to sign for creation params.
Expand Down Expand Up @@ -173,7 +173,7 @@ contract ZoraCreator1155PreminterTest is Test {
uint256 chainId = block.chainid;

// get contract hash, which is unique per contract creation config, and can be used
// retreive the address created for a contract
// retrieve the address created for a contract
address contractAddress = preminter.getContractAddress(contractConfig);

// 2. Call smart contract to get digest to sign for creation params.
Expand Down Expand Up @@ -213,7 +213,7 @@ contract ZoraCreator1155PreminterTest is Test {
vm.prank(premintExecutor);
tokenId = preminter.premintV2{value: mintCost}(contractConfig, premintConfig, signature, quantityToMint, defaultMintArguments).tokenId;

// a new token shoudl have been created, with x tokens minted to the executor, on the same contract address
// a new token should have been created, with x tokens minted to the executor, on the same contract address
// as before since the contract config didnt change
assertEq(created1155Contract.balanceOf(premintExecutor, tokenId), quantityToMint);
}
Expand All @@ -229,7 +229,7 @@ contract ZoraCreator1155PreminterTest is Test {
uint256 chainId = block.chainid;

// get contract hash, which is unique per contract creation config, and can be used
// retreive the address created for a contract
// retrieve the address created for a contract
address contractAddress = preminter.getContractAddress(contractConfig);

// 2. Call smart contract to get digest to sign for creation params.
Expand Down
2 changes: 1 addition & 1 deletion packages/1155-deployments/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

### Patch Changes

- c2a0a2b: Moved dev depenencies to devDependencies since they are not needed by external users of the package, they are only used for codegen
- c2a0a2b: Moved dev dependencies to devDependencies since they are not needed by external users of the package, they are only used for codegen

## 0.0.3

Expand Down
2 changes: 1 addition & 1 deletion packages/1155-deployments/script/UpgradePreminter.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ contract UpgradePreminter is ZoraDeployerBase {

upgradeTarget = deployment.preminterImpl;

console2.log("Upgrade PremintExecutor target and implementatin:", upgradeTarget, preminterImplementation);
console2.log("Upgrade PremintExecutor target and implementation:", upgradeTarget, preminterImplementation);
console2.log("To upgrade, use this calldata:");
console2.logBytes(upgradeCalldata);

Expand Down
4 changes: 2 additions & 2 deletions packages/1155-deployments/script/copy-deployed-contracts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ async function copyEnvironmentRunFiles() {

// a recent version of forge added a bug where the returns value with some sort of url based encoding.
// the below code is a hack to fix this. It should be removed once forge is fixed.
// use string regex replace all to remove all instances of \\ from returns (this appeared in a wierd version of forge)
// also opening and closing quotes that incorrecly appear before opening bracket:
// use string regex replace all to remove all instances of \\ from returns (this appeared in a weird version of forge)
// also opening and closing quotes that incorrectly appear before opening bracket:
const filtered = returns
.replace(/\\/g, "")
.replace('"{', "{")
Expand Down
2 changes: 1 addition & 1 deletion packages/1155-deployments/script/getPendingUpgrades.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ async function getVersions({

let contractImpl: Address | null = null;

// try to get contract fro rpc
// try to get contract for rpc
try {
contractImpl = await publicClient.readContract({
address: factoryImpl as Address,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ contract DeterministicDeployerScript is Script {
bytes memory proxyCreationCode,
uint256 proxyShimSaltSuffix
) internal returns (DeterministicParams memory) {
// 1. Get salt with first bytes that match address, and resulting determinisitic factory proxy deployer address
// 1. Get salt with first bytes that match address, and resulting deterministic factory proxy deployer address
(bytes32 proxyDeployerSalt, bytes memory proxyDeployerCreationCode, address proxyDeployerAddress) = getProxyDeployerParams();
// replace first 20 characters of salt with deployer address, so that the salt can be used with
// ImmutableCreate2Factory.safeCreate2 when called by this deployer's account:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ contract DeterministicProxyDeployerTest is DeterministicDeployerScript, Test {
(address deployerAddress, uint256 deployerPrivateKey) = makeAddrAndKey("deployer");

vm.assume(nonce > vm.getNonce(deployerAddress));
// we set the nonce to a random value, to prove this doesn't affect the deterministic addrss
// we set the nonce to a random value, to prove this doesn't affect the deterministic address
vm.setNonce(deployerAddress, nonce);

DeterministicProxyDeployer factoryProxyDeployer = _deployKnownZoraFactoryProxy(bytes32(0));
Expand Down
2 changes: 1 addition & 1 deletion packages/1155-deployments/test/UpgradesTestBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ contract UpgradesTestBase is ForkDeploymentConfig, DeploymentTestingUtils, Test
console2.log("skipping premint with MINTs test, MINTs not deployed");
return;
}
console2.log("testing collecing premints with MINTs");
console2.log("testing collecting premints with MINTs");
// test premints:
address collector = makeAddr("collector");
vm.deal(collector, 10 ether);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ contract ZoraCreator1155FactoryBase is ForkDeploymentConfig, Test {
}

function _createErc1155Contract(IZoraCreator1155Factory factory) private returns (IZoraCreator1155 target) {
// create the contract, with no toekns
// create the contract, with no tokens
bytes[] memory initSetup = new bytes[](0);

address admin = creator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "forge-std/Script.sol";
import {ProxyDeployerScript} from "../src/ProxyDeployerScript.sol";

/// @dev This should be run once on chains to deploye the Mints proxy to;
/// It creates the determinstic proxy deployer on the desired chain,
/// It creates the deterministic proxy deployer on the desired chain,
/// based on the saved byte code and salt a config generated previously in the
/// script SaveProxyDeployerConfig.s.sol
contract DeployProxyDeployer is ProxyDeployerScript {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ contract GenerateDeterminsticDeployment is ProxyDeployerScript {
expectedAddress = vm.parseAddress(addressStr);

uint256 saltIndex = LibString.indexOf(result, "Salt: ");
// bytes lengh is 32, + 0x
// bytes length is 32, + 0x
// slice is start to end exclusive
// if start is saltIndex + 6, end should be startIndex + 6 + 64 + 0x (2)
uint256 startBytes32 = saltIndex + 6;
Expand Down Expand Up @@ -105,7 +105,7 @@ contract GenerateDeterminsticDeployment is ProxyDeployerScript {

vm.startBroadcast();

// create a proxy deployer, which we can use to generated determistic addresses and corresponding params.
// create a proxy deployer, which we can use to generated deterministic addresses and corresponding params.
// proxy deployer code is based on code saved to file from running the script SaveProxyDeployerConfig.s.sol
DeterministicUUPSProxyDeployer proxyDeployer = createOrGetDeterministicProxyDeployer();

Expand Down