diff --git a/packages/1155-contracts/test/nft/ZoraCreator1155.t.sol b/packages/1155-contracts/test/nft/ZoraCreator1155.t.sol index 7058eebc..7888efd8 100644 --- a/packages/1155-contracts/test/nft/ZoraCreator1155.t.sol +++ b/packages/1155-contracts/test/nft/ZoraCreator1155.t.sol @@ -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); diff --git a/packages/1155-contracts/test/premint/Zora1155PremintExecutorProxy.t.sol b/packages/1155-contracts/test/premint/Zora1155PremintExecutorProxy.t.sol index cef4c0c8..35902823 100644 --- a/packages/1155-contracts/test/premint/Zora1155PremintExecutorProxy.t.sol +++ b/packages/1155-contracts/test/premint/Zora1155PremintExecutorProxy.t.sol @@ -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 diff --git a/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol b/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol index 5b021489..7c7c2c81 100644 --- a/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol +++ b/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol @@ -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. @@ -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. @@ -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); } @@ -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. diff --git a/packages/1155-deployments/CHANGELOG.md b/packages/1155-deployments/CHANGELOG.md index 87f4fca6..0b0e70a0 100644 --- a/packages/1155-deployments/CHANGELOG.md +++ b/packages/1155-deployments/CHANGELOG.md @@ -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 diff --git a/packages/1155-deployments/script/UpgradePreminter.s.sol b/packages/1155-deployments/script/UpgradePreminter.s.sol index e1de152f..96e1dbbb 100644 --- a/packages/1155-deployments/script/UpgradePreminter.s.sol +++ b/packages/1155-deployments/script/UpgradePreminter.s.sol @@ -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); diff --git a/packages/1155-deployments/script/copy-deployed-contracts.ts b/packages/1155-deployments/script/copy-deployed-contracts.ts index dc56cac3..2f7d6ac2 100644 --- a/packages/1155-deployments/script/copy-deployed-contracts.ts +++ b/packages/1155-deployments/script/copy-deployed-contracts.ts @@ -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('"{', "{") diff --git a/packages/1155-deployments/script/getPendingUpgrades.ts b/packages/1155-deployments/script/getPendingUpgrades.ts index 75dda534..a3b2cd6d 100644 --- a/packages/1155-deployments/script/getPendingUpgrades.ts +++ b/packages/1155-deployments/script/getPendingUpgrades.ts @@ -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, diff --git a/packages/1155-deployments/src/DeterministicDeployerScript.sol b/packages/1155-deployments/src/DeterministicDeployerScript.sol index fec24d00..38f7c86d 100644 --- a/packages/1155-deployments/src/DeterministicDeployerScript.sol +++ b/packages/1155-deployments/src/DeterministicDeployerScript.sol @@ -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: diff --git a/packages/1155-deployments/test/NewFactoryProxyDeployer.t.sol b/packages/1155-deployments/test/NewFactoryProxyDeployer.t.sol index 3d5c8301..607ef395 100644 --- a/packages/1155-deployments/test/NewFactoryProxyDeployer.t.sol +++ b/packages/1155-deployments/test/NewFactoryProxyDeployer.t.sol @@ -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)); diff --git a/packages/1155-deployments/test/UpgradesTestBase.sol b/packages/1155-deployments/test/UpgradesTestBase.sol index bfb87e41..17f2d810 100644 --- a/packages/1155-deployments/test/UpgradesTestBase.sol +++ b/packages/1155-deployments/test/UpgradesTestBase.sol @@ -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); diff --git a/packages/1155-deployments/test/ZoraCreator1155FactoryBase.sol b/packages/1155-deployments/test/ZoraCreator1155FactoryBase.sol index f9163b31..ad3952a5 100644 --- a/packages/1155-deployments/test/ZoraCreator1155FactoryBase.sol +++ b/packages/1155-deployments/test/ZoraCreator1155FactoryBase.sol @@ -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; diff --git a/packages/mints-deployments/script/DeployProxyDeployer.s.sol b/packages/mints-deployments/script/DeployProxyDeployer.s.sol index 10be2e46..ef5952ee 100644 --- a/packages/mints-deployments/script/DeployProxyDeployer.s.sol +++ b/packages/mints-deployments/script/DeployProxyDeployer.s.sol @@ -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 { diff --git a/packages/mints-deployments/script/GenerateDeterministicDeployment.s.sol b/packages/mints-deployments/script/GenerateDeterministicDeployment.s.sol index 4998e5a6..14f79bec 100644 --- a/packages/mints-deployments/script/GenerateDeterministicDeployment.s.sol +++ b/packages/mints-deployments/script/GenerateDeterministicDeployment.s.sol @@ -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; @@ -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();