Skip to content

Commit

Permalink
Merge branch 'develop' into TESTING.MD
Browse files Browse the repository at this point in the history
  • Loading branch information
CJ42 authored Jan 15, 2024
2 parents 6414fb0 + 31e072f commit 0f08101
Show file tree
Hide file tree
Showing 29 changed files with 2 additions and 14,304 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/solc_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
run: |
if [[ "<" == "${{ steps.comparison.outputs.comparison-result }}" ]]
then
solc $(ls contracts/**/*.sol | grep -v "Compatible\|Extension4337\|contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset") \
solc $(ls contracts/**/*.sol | grep -v "Extension4337\|contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset") \
--allow-paths $(pwd)/node_modules/ \
@=node_modules/@ \
solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
Expand Down
8 changes: 0 additions & 8 deletions .mythx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,12 @@ analyze:
- contracts/LSP4DigitalAssetMetadata/LSP4DigitalAssetMetadata.sol
- contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol
- contracts/LSP7DigitalAsset/presets/LSP7Mintable.sol
- contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20Mintable.sol
- contracts/LSP7DigitalAsset/extensions/LSP7Burnable.sol
- contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.sol
- contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.sol
- contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.sol
- contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol
- contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721Mintable.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.sol
# - Vault & Social Recovery
- contracts/LSP9Vault/LSP9Vault.sol
Expand All @@ -52,13 +48,9 @@ analyze:
# - Tokens & NFTs
- contracts/LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol
- contracts/LSP7DigitalAsset/presets/LSP7MintableInit.sol
- contracts/LSP7DigitalAsset/presets/LSP7CompatibleERC20MintableInit.sol
- contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20InitAbstract.sol
- contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol
- contracts/LSP8IdentifiableDigitalAsset/presets/LSP8MintableInit.sol
- contracts/LSP8IdentifiableDigitalAsset/presets/LSP8CompatibleERC721MintableInit.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupplyInitAbstract.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CompatibleERC721InitAbstract.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8EnumerableInitAbstract.sol
# - Vault & Social Recovery
- contracts/LSP9Vault/LSP9VaultInit.sol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The factory should not be deployed directly from a floating branch in the reposi

- Openzeppelin package version: `"@openzeppelin/contracts": "^4.9.2"`
- The source code is generated with `0.8.17` compiler version and with `9999999` optimization runs.
- Checkout to `PLACE_HOLDER` commit in the [lsp-smart-contract](https://github.com/lukso-network/lsp-smart-contracts) repo to obtain the exact copy of the code, change the compiler settings in `hardhat.config.ts` and compile to produce the same bytecode.
- Checkout to `9e1519f94293b96efa2ebc8f459fde65cc43fecd` commit in the [lsp-smart-contract](https://github.com/lukso-network/lsp-smart-contracts) repo to obtain the exact copy of the code, change the compiler settings in `hardhat.config.ts` and compile to produce the same bytecode.

[CREATE2]: https://eips.ethereum.org/EIPS/eip-1014
[Nick Factory]: https://github.com/Arachnid/deterministic-deployment-proxy
260 changes: 0 additions & 260 deletions contracts/LSP7DigitalAsset/extensions/LSP7CompatibleERC20.sol

This file was deleted.

Loading

0 comments on commit 0f08101

Please sign in to comment.