Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
677 commits
Select commit Hold shift + click to select a range
7f267da
ignore TODO.md
caffeinum Jul 24, 2022
e70b572
ERC1155 (#56)
caffeinum Jul 24, 2022
01b3415
support ascii art
caffeinum Jul 24, 2022
8e5ea9e
update links buildship.xyz
caffeinum Jul 24, 2022
9bc329d
add buildship ascii art
caffeinum Jul 24, 2022
bc52595
Merge branch 'main' of github.com:buildship-dev/nft-contracts
caffeinum Jul 26, 2022
ba08f6b
fix base nft start token id error
caffeinum Jul 27, 2022
fd47f69
add mint batch extension for admin access
caffeinum Jul 29, 2022
8b46876
scripts: predictable random
caffeinum Jul 29, 2022
c77ab79
ignore md files
caffeinum Aug 1, 2022
b339ab8
Allowlist factory (#64)
caffeinum Aug 1, 2022
9da44f9
remove erc721 versions, only keep in v3-archive branch
caffeinum Aug 1, 2022
4a9f938
use mintedBy mapping for maxPerWallet limit
caffeinum Aug 2, 2022
cd1e0df
draft fix bug, add tests (#60)
caffeinum Aug 2, 2022
5b3901a
upgrade to erc721a v4
caffeinum Aug 2, 2022
c22c73b
remove erc1155, only keep in archive-erc1155 branch
caffeinum Aug 2, 2022
a1e86f3
change default royalty receiver to owner (#66)
caffeinum Aug 8, 2022
885a7e1
reduce max supply (#61)
caffeinum Aug 10, 2022
6b97468
Refactor to deploy small proxy as separate contract (#55)
caffeinum Aug 25, 2022
9c8f1af
move tests files
caffeinum Aug 25, 2022
658cd4f
erc721community: make constants private
caffeinum Aug 25, 2022
a44ad10
NOT TESTED autoapprove for seaport: change opensea address (#62)
caffeinum Aug 26, 2022
2259f76
autoapprove for seaport: change opensea address (#62)
caffeinum Aug 26, 2022
e5bf316
update metaversebasenft to match new interface
caffeinum Aug 26, 2022
bc2774f
Merge branch 'main' of github.com:buildship-dev/nft-contracts
caffeinum Aug 26, 2022
9c51573
make constants internal
caffeinum Aug 26, 2022
6a71978
rename MetaverseNFT (#68)
caffeinum Aug 26, 2022
9e2375d
adding checks for vanity address, update to use 721721001
caffeinum Aug 26, 2022
bb8f24a
fix coverage script
caffeinum Aug 26, 2022
08571a4
scripts: fix nonce for deploy-proxy
caffeinum Aug 26, 2022
f912869
refactor scripts/upload into package
caffeinum Sep 6, 2022
47f19c9
upgrade plugin
caffeinum Sep 6, 2022
bef75be
Create DynamicPricePresaleListExtension.sol (#67)
caffeinum Sep 11, 2022
7fa18d9
add .title to allowlist in storage (#70)
caffeinum Sep 16, 2022
d02875a
add goerli network
caffeinum Sep 19, 2022
46f7e36
add goerli verify
caffeinum Sep 23, 2022
fd84091
fix: dynamic price check in presale (#69)
caffeinum Sep 24, 2022
8a66c8b
fix dynamic presale contract error
caffeinum Sep 26, 2022
ce006e5
fix deploy-proxy
caffeinum Oct 5, 2022
16c9a43
fix fix for proxy deploy
caffeinum Oct 5, 2022
354493a
refactor: add LimitedSupply extension base
caffeinum Oct 17, 2022
41a8191
allowlist: fix price(0)
caffeinum Oct 20, 2022
7084f4f
Merge pull request #79 from buildship-dev/feature/limited-presale
caffeinum Oct 25, 2022
f419bb3
remove unused code
caffeinum Oct 27, 2022
00e58f4
fix interface
caffeinum Oct 27, 2022
9be8e82
Merge pull request #81 from buildship-dev/fix/refactor-counters
caffeinum Oct 27, 2022
96acba6
add hardhat plugins
caffeinum Oct 27, 2022
611b2bd
add docs
caffeinum Oct 27, 2022
ac049d5
mint batch
caffeinum Oct 27, 2022
60a26aa
fix wrong docs for mintbatch
caffeinum Oct 27, 2022
17c30a4
feature/foundry (#82)
caffeinum Oct 27, 2022
6646074
Merge branch 'main' into feature/mint-batch
caffeinum Oct 27, 2022
8cab630
foundry: add mint batch ext test
caffeinum Oct 27, 2022
c1a16dc
update docs
caffeinum Oct 27, 2022
941826c
fix ci tests
caffeinum Oct 27, 2022
2869668
add spdx to test
caffeinum Oct 27, 2022
50eb367
run foundry toolchain in hh test
caffeinum Oct 27, 2022
ba08fab
Merge branch 'main' into feature/mint-batch
caffeinum Oct 27, 2022
b54cc8e
fix ci
caffeinum Oct 27, 2022
08bd29e
fix ci, skip watch
caffeinum Oct 27, 2022
f1bdfb8
Merge branch 'main' into feature/mint-batch
caffeinum Oct 27, 2022
7f42524
fix deploy proxy script that made coverage fail
caffeinum Oct 27, 2022
0f6abdd
Merge branch 'main' into feature/mint-batch
caffeinum Oct 27, 2022
f1902c3
foundry: fix tests for MintBatchExtension
caffeinum Oct 31, 2022
126705f
fix formatting
caffeinum Oct 31, 2022
28c9b05
add foundry coverage to ci
caffeinum Oct 31, 2022
118b612
Merge branch 'main' into feature/mint-batch
caffeinum Oct 31, 2022
ada2b15
add foundry snapshot to workflow
caffeinum Oct 31, 2022
63def3b
fix foundry workflow main branch
caffeinum Oct 31, 2022
1b3b569
fix coverage ci script
caffeinum Oct 31, 2022
5b0d589
Merge branch 'main' into feature/mint-batch
caffeinum Oct 31, 2022
1ac9f10
gh workflow autoupdate wiki
caffeinum Oct 31, 2022
f02d0a5
workflows/docgen: use updated action
caffeinum Oct 31, 2022
51fa609
fix gh workflow cache
caffeinum Oct 31, 2022
dd9db8f
move docs to wiki (#85)
caffeinum Oct 31, 2022
dfadaf8
try fix docgen
caffeinum Oct 31, 2022
525ca78
fix wiki script
caffeinum Oct 31, 2022
91be023
dont store wiki directory in repo
caffeinum Oct 31, 2022
944ade7
dont clean wiki directory
caffeinum Oct 31, 2022
b05e3c0
use directory
caffeinum Oct 31, 2022
9662cf0
fix empty directory error
caffeinum Oct 31, 2022
563ea99
fix docgen workflow
caffeinum Oct 31, 2022
5427227
trigger build
caffeinum Oct 31, 2022
f91f44c
Merge pull request #86 from buildship-dev/fix/gh-actions
caffeinum Oct 31, 2022
909af3d
add docupdate script
caffeinum Oct 31, 2022
563402a
try another docgen script
caffeinum Oct 31, 2022
57b4b1b
fix docgen script
caffeinum Oct 31, 2022
4652492
move to .wiki
caffeinum Oct 31, 2022
a5bb71b
F
caffeinum Oct 31, 2022
7c667c9
rm extra echo
caffeinum Oct 31, 2022
ed025c4
merge main
caffeinum Oct 31, 2022
a0d12d4
update offchain allowance extension
caffeinum Nov 3, 2022
60b699c
auto upload to ipfs
caffeinum Nov 3, 2022
8230fc6
update hardhat-ipfs-upload plugin
caffeinum Nov 3, 2022
73d8f37
fix upload script
caffeinum Nov 3, 2022
19b94f1
change github action to output into checks
caffeinum Nov 3, 2022
4a4c01d
fix
caffeinum Nov 3, 2022
844066a
add github comment
caffeinum Nov 3, 2022
9addcdc
fix
caffeinum Nov 3, 2022
84cd325
fix output
caffeinum Nov 3, 2022
3298a0c
fix
caffeinum Nov 3, 2022
90a59e7
fix output formats
caffeinum Nov 3, 2022
c5edfd2
Merge branch 'feature/auto-ipfs' into feature/offchain-allowance
caffeinum Nov 3, 2022
b295427
auto upload to ipfs (#88)
caffeinum Nov 3, 2022
b1c5dd3
Merge remote-tracking branch 'origin/main' into feature/offchain-allo…
caffeinum Nov 3, 2022
42efba9
fix tests
caffeinum Nov 3, 2022
6027e21
mv file to normal case
caffeinum Nov 3, 2022
41865b5
fix old tests
caffeinum Nov 3, 2022
4305a25
fix tests
caffeinum Nov 3, 2022
82f6061
feat: OpenSea Operator Filterer (#91)
theshadowagent Nov 15, 2022
704c8f2
add dynamic test
caffeinum Nov 19, 2022
a55c428
add .extension check in signature
caffeinum Nov 19, 2022
c60433f
Merge remote-tracking branch 'origin/main' into feature/offchain-allo…
caffeinum Nov 19, 2022
e1b05d9
fix linter var name conflict
caffeinum Nov 24, 2022
b25ef57
Merge remote-tracking branch 'origin/main' into feature/mint-batch
caffeinum Nov 25, 2022
01d1530
edit function names
caffeinum Dec 9, 2022
ac33a6b
remove mint to owner
caffeinum Dec 9, 2022
057d8ab
fix tests
caffeinum Dec 9, 2022
a8c0446
Merge pull request #87 from buildship-dev/feature/offchain-allowance
caffeinum Dec 15, 2022
57fb4c1
Merge remote-tracking branch 'origin/main' into feature/mint-batch
caffeinum Dec 15, 2022
83a4777
Merge pull request #83 from buildship-dev/feature/mint-batch
caffeinum Dec 15, 2022
666fb32
fix failing tests for proxy (#92)
caffeinum Dec 16, 2022
40bc053
add no-watermark implementation
caffeinum Oct 14, 2022
b2e4cd9
erc721community: change onlyBuildship
caffeinum Oct 17, 2022
25a928c
remove DEVELOPER() from IERC721Community, make it internal in impleme…
theshadowagent Oct 27, 2022
95d4725
update main
caffeinum Dec 16, 2022
7e9a1a8
rename wl to _
caffeinum Dec 16, 2022
05c2660
add wl tests
caffeinum Dec 16, 2022
c542fcc
update readme
caffeinum Dec 16, 2022
f97652a
add more tests
caffeinum Dec 16, 2022
975338c
fix test
caffeinum Dec 16, 2022
64c0d65
configure tenderly
caffeinum Dec 16, 2022
e9abe78
configure foundry for verification
caffeinum Dec 16, 2022
c900c08
Feature/forge doc (#93)
caffeinum Jan 18, 2023
6905ba0
Feature/forge doc (#94)
caffeinum Jan 18, 2023
c08143a
fix ghpages script
caffeinum Jan 18, 2023
bd747d3
gh pages use wiki again
caffeinum Jan 18, 2023
46cb35b
fix artifact name
caffeinum Jan 18, 2023
84c9928
try custom action
caffeinum Jan 18, 2023
21b8f12
fix script
caffeinum Jan 18, 2023
865d3f3
remove checkout step
caffeinum Jan 18, 2023
d24d790
fix script
caffeinum Jan 18, 2023
0c3047f
rollback normal action
caffeinum Jan 18, 2023
462b477
rollback normal action
caffeinum Jan 18, 2023
8f41f47
Merge branch 'main' of github.com:buildship-dev/nft-contracts
caffeinum Jan 18, 2023
8d91ff7
Create codeball.yml
caffeinum Feb 19, 2023
6d73c5f
formatting
caffeinum Feb 23, 2023
8bd2f09
feature/allowlist multiamount (#98)
caffeinum Mar 23, 2023
732243e
update artgene
caffeinum Mar 27, 2023
774ebe4
change comment
caffeinum Apr 3, 2023
ebd8638
don't remove token uri ext
caffeinum Apr 3, 2023
bb7e8fb
remove old tests
caffeinum Apr 3, 2023
1a438ec
fix new tests
caffeinum Apr 3, 2023
421e546
update vanity deployer
caffeinum Apr 5, 2023
ea3b15e
scripts: fix gasprice deploy
caffeinum Apr 5, 2023
6f6c804
update ascii art
theshadowagent Apr 5, 2023
ceb29f4
delete comments
theshadowagent Apr 5, 2023
8e6f0a2
fix etherscan verification
caffeinum Apr 6, 2023
ba59526
hh config ignore errors
caffeinum Apr 6, 2023
213de89
update deps
caffeinum Apr 6, 2023
93cf89c
artgene: edit to PLATFORM
caffeinum Apr 6, 2023
6abf358
update deps
caffeinum Apr 6, 2023
333685c
create ArtgenePlatform global config (#100)
caffeinum Apr 13, 2023
ea9c2b0
implementation: rename dev address to treasury
caffeinum Apr 14, 2023
08eceb5
update platform address
theshadowagent Apr 22, 2023
1cf2fd1
foundry: add tests
caffeinum Apr 23, 2023
9ad43c0
remove old watermark from allowlist
theshadowagent Apr 23, 2023
55d21af
add new watermark to allowlist
theshadowagent Apr 23, 2023
9265694
add IERC4906: emit event on metadata update
caffeinum Apr 24, 2023
46cd7a3
metadata-update: use totalMinted (for the base of some tokens burned)
caffeinum Apr 24, 2023
eff9c5a
draft open collection
caffeinum Apr 24, 2023
6379bf7
update solidity, openzeppelin
caffeinum Apr 24, 2023
f9eaf1c
add open edition into implementation, refactor remove old methods
caffeinum Apr 24, 2023
c07f0be
Merge branch 'feature/v5' into feature/open-collection
caffeinum Apr 24, 2023
0bc6d1e
implementation: update public version
caffeinum Apr 24, 2023
77b1de2
update deps
caffeinum Apr 24, 2023
a9495a7
artgene implementation: replace Developer to Platform
caffeinum Apr 25, 2023
61f6dd2
foundry: update solidity version
caffeinum Apr 25, 2023
392fe6a
test: test new implementation instead
caffeinum Apr 25, 2023
36de212
burnable: draft
caffeinum Apr 25, 2023
40f2258
add tokenHTML, event Evolution, dna on-chain generation
caffeinum Apr 25, 2023
aae3cb8
autoformat solidity
caffeinum Apr 25, 2023
f3314dc
autoformat solidity
caffeinum Apr 25, 2023
cf0985d
Merge branch 'feature/v5' into feature/burnable
caffeinum Apr 26, 2023
64c927f
fix merge errors
caffeinum Apr 26, 2023
df69d79
hh: fix coverage
caffeinum Apr 26, 2023
671bb0f
implementation: add allow burn
caffeinum Apr 26, 2023
9d84964
forge: add coverage view
caffeinum Apr 26, 2023
29707b4
Merge branch 'feature/burnable' into feature/v5
caffeinum Apr 26, 2023
5a4e676
add events
caffeinum Apr 26, 2023
b38231a
edit solidity requirement to 0.8.0
caffeinum Apr 26, 2023
177d571
autoformat tests
caffeinum Apr 26, 2023
4c28c73
demo: use artgene open supply constant
caffeinum Apr 26, 2023
c32d735
artgene: explicitly set private variable visibility
caffeinum Apr 27, 2023
d0a5950
update scripts
caffeinum Apr 27, 2023
ee5e426
update implementation address
caffeinum Apr 27, 2023
57b5012
scripts:fix deploy script
caffeinum Apr 27, 2023
31f7041
deploy: fix gas issues
caffeinum Apr 27, 2023
fe9d75d
Merge pull request #99 from artgenexyz/feature/v5
caffeinum Apr 27, 2023
8d0cc7e
Create autopr.yml
caffeinum Apr 30, 2023
3b0c369
Merge pull request #102 from artgenexyz/caffeinum-patch-1
caffeinum Apr 30, 2023
1cd4cd0
draft deploy to zksync goerli
caffeinum May 16, 2023
8a83c15
draft deploy to zksync goerli
caffeinum May 16, 2023
3ac5786
ignore build artifacts
caffeinum May 16, 2023
219d670
ignore build artifacts
caffeinum May 16, 2023
e3d1478
deploy to zksync era mainnet
caffeinum May 16, 2023
0d150f2
deploy to zksync era mainnet
caffeinum May 16, 2023
9b623ee
update implementation
caffeinum Jun 1, 2023
5331c70
update implementation
caffeinum Jun 1, 2023
8327037
update gitignore
caffeinum Jun 19, 2023
8f3cad8
Merge branch 'feature/zksync' of github.com:artgenexyz/nft-contracts …
caffeinum Jun 19, 2023
6ebe932
add gitignore
caffeinum Jun 19, 2023
33a0015
Merge remote-tracking branch 'origin/main' into feature/zksync
caffeinum Jun 28, 2023
00ad17f
forge install: solidity-examples
caffeinum Jun 28, 2023
e8a7a8f
update zksync deps, fix verification, allow to pass args
caffeinum Jun 29, 2023
03b31c7
disable tenderly
caffeinum Jun 29, 2023
6204ba1
use platform address dynamically
caffeinum Jun 30, 2023
14a95fc
forge install: era-contracts
caffeinum Jun 30, 2023
0d3ef19
🔀 chore(IArtgenePlatform.sol): update ARTGENE_PLATFORM_ADDRESS consta…
caffeinum Jul 5, 2023
d475a1f
update deploy scripts to use both goerli and zksync
caffeinum Jul 5, 2023
8f1b999
add Gradients deployment
caffeinum Jul 5, 2023
a2038b2
layerzero experiments
caffeinum Jul 5, 2023
7699c67
🔍 chore(.gitignore): add 'cache-zk' to the list of ignored files to p…
caffeinum Jul 5, 2023
78f2405
📦 chore(AllowlistBase.sol): add AllowlistBase contract
caffeinum Jul 5, 2023
1bb3322
🔧 chore(zk_deploy.ts): add 'noCompile' flag to skip re-compilation du…
caffeinum Jul 5, 2023
b31b9e9
(config) tasks: refactor, add call and deploy tasks
caffeinum Jul 5, 2023
19da648
📦 chore(hardhat.config.ts): add @nomicfoundation/hardhat-foundry plug…
caffeinum Jul 5, 2023
23403e0
tasks: add evm deploy task
caffeinum Jul 5, 2023
7fcffa3
tasks: fix zksync args
caffeinum Jul 6, 2023
de5e6be
📝 chore(L1NFT.sol,L2NFTProxy.sol): add L1NFT + L2NFTProxy contract im…
caffeinum Jul 6, 2023
fd84d1e
contracts: update for mainnet
caffeinum Jul 6, 2023
5065707
tasks: adapt for mainnet deploy
caffeinum Jul 6, 2023
84877cf
lz: mainnet values:
caffeinum Jul 6, 2023
e4e1665
tasks: minor features
caffeinum Jul 13, 2023
424d108
onchain: deploy Squigmania
caffeinum Jul 13, 2023
7bc3f33
add l2 deployments
caffeinum Jul 17, 2023
f1cf17f
deployments: RIPPLES (22 Jul)
caffeinum Jul 25, 2023
7f230f8
deployments: colormcode (24 July)
caffeinum Jul 25, 2023
06f9e73
onchain-art: smaller contract size (remove .nft reference)
caffeinum Jul 25, 2023
4b8f5bb
deployments: allowlists args
caffeinum Jul 25, 2023
99ca415
deployments: aurora js code
caffeinum Jul 25, 2023
14cbc59
zksync: add local setup
caffeinum Jul 25, 2023
aa356b2
L1NFT: draft pay from L1
caffeinum Jul 25, 2023
fa4e758
deployments: allowlist for colormcode
caffeinum Jul 25, 2023
cd51bc4
foundry: add zksync networks to use with `cast`
caffeinum Jul 27, 2023
4d2f01a
deployments: Rejection (16 Aug)
caffeinum Aug 16, 2023
10e3fb0
deployments: Go With The Flow (17 Aug)
caffeinum Aug 17, 2023
e4d9958
deploy artgene721 factory
caffeinum Aug 29, 2023
787dc05
hardhat: fix bun runner
caffeinum Oct 5, 2023
8ac9a37
⬆️ chore(package.json): update dependencies
caffeinum Oct 5, 2023
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ forge-coverage


cache
cache-zk
forge-cache
out

Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "lib/solidity-examples"]
path = lib/solidity-examples
url = https://github.com/LayerZero-Labs/solidity-examples
[submodule "lib/era-contracts"]
path = lib/era-contracts
url = https://github.com/matter-labs/era-contracts
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,29 @@ Then, to test your code:
npx hardhat test
```

### ZkSync

1. Setup env variable ZKSYNC=true when you compile

```bash
ZKSYNC=true hh compile
```

2. Deploy contracts

```bash
hh deploy-zksync --network zksync|zksyncEra
```

#### Gas Costs?

```
gasUsed * maxFeePerGas + pubdata * gasPerPubdata * gasPriceL1
(developer) (zksync load) (developer) (operator) (l1 load)
```

Also see `results.md` for more details.

### Checking different versions of ERC721CommunityImplementation:

```bash
Expand Down
12 changes: 10 additions & 2 deletions contracts/Artgene721Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ contract Artgene721Base is

// test if platform is deployed
require(
ARTGENE_PLATFORM_ADDRESS.code.length != 0,
getArtgenePlatformAddress().code.length != 0,
"Platform not deployed"
);

(PLATFORM_FEE, PLATFORM_TREASURY) = IArtgenePlatform(
ARTGENE_PLATFORM_ADDRESS
getArtgenePlatformAddress()
).getPlatformInfo();

_configure(
Expand Down Expand Up @@ -395,6 +395,14 @@ contract Artgene721Base is
emit ExtensionRevoked(_extension);
}

function revokeAllExtensions() public onlyOwner {
for (uint256 index = 0; index < extensions.length; index++) {
emit ExtensionRevoked(address(extensions[index]));
}

delete extensions;
}

function setRenderer(address _renderer) public onlyOwner {
require(_renderer != address(this), "Cannot add self as renderer");

Expand Down
Loading