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

feat: erc721 consecutive extension #202

Merged
merged 103 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
c5f18be
++
qalisander Jun 18, 2024
e7424c9
++
qalisander Jun 19, 2024
ee6c923
++
qalisander Jun 20, 2024
f373f7b
++
qalisander Jun 20, 2024
a13560f
++
qalisander Jun 20, 2024
14369c8
++
qalisander Jun 21, 2024
474ea96
++
qalisander Jun 21, 2024
e525ac1
++
qalisander Jun 21, 2024
3379789
++
qalisander Jun 21, 2024
50171d8
++
qalisander Jun 21, 2024
d84eddb
++
qalisander Jun 21, 2024
3df4f82
++
qalisander Jun 21, 2024
0fe00dc
++
qalisander Jun 21, 2024
7fbaaea
++
qalisander Jun 21, 2024
df54910
Merge remote-tracking branch 'refs/remotes/origin/main' into checkpoints
qalisander Jun 25, 2024
4ba3887
checkpoints library contract with tests and docs
qalisander Jun 26, 2024
2de0e0e
++
qalisander Jun 27, 2024
c597ec7
++
qalisander Jun 27, 2024
d50a360
++
qalisander Jun 27, 2024
a58d7e0
++
qalisander Jun 27, 2024
e11f67f
++
qalisander Jun 27, 2024
78777d4
++
qalisander Jun 27, 2024
8fdcc3a
++
qalisander Jun 27, 2024
7a3ca49
add mint consecutive and burn implementation
qalisander Jul 1, 2024
7c0ff94
++
qalisander Jul 1, 2024
a213b15
add more test cases for push and upper_lookup_recent
qalisander Jul 2, 2024
8523f1e
++
qalisander Jul 2, 2024
bcce1a0
++
qalisander Jul 3, 2024
06d0b3e
++
qalisander Jul 3, 2024
ab378c6
Merge remote-tracking branch 'refs/remotes/origin/main' into checkpoints
qalisander Jul 3, 2024
9408fdd
add erc721consecutive scratch
qalisander Jun 27, 2024
a243066
feat(access): add AccessControl e2e tests (#178)
alexfertel Jul 3, 2024
b599044
add test scratch for consecutive
qalisander Jul 3, 2024
1636d95
add consecutive as a separate extension
qalisander Jul 5, 2024
863e415
++
qalisander Jul 5, 2024
6f5b83e
++
qalisander Jul 5, 2024
9a9aeb7
build(deps): bump crate-ci/typos from 1.22.9 to 1.23.0 (#180)
dependabot[bot] Jul 5, 2024
c1aaec8
feat: add the Trace160 contract to keep checkpoints (#162)
qalisander Jul 5, 2024
997b3b7
++
qalisander Jul 5, 2024
7de19f2
build(deps): bump crate-ci/typos from 1.23.0 to 1.23.1 (#188)
dependabot[bot] Jul 8, 2024
2c46b83
feat: bench AccessControl gas usage (#186)
alexfertel Jul 8, 2024
62bcbe9
add error mapping
qalisander Jul 9, 2024
3bea033
++
qalisander Jul 9, 2024
954fa01
test(erc20): add ERC-20 Pausable Extension E2E tests (#181)
bidzyyys Jul 9, 2024
5f3d4bb
add init function
qalisander Jul 10, 2024
8c0512a
test(erc721): integration tests for ERC721 token and its extensions (…
bidzyyys Jul 10, 2024
73a1289
build(deps): bump crate-ci/typos from 1.23.1 to 1.23.2 (#192)
dependabot[bot] Jul 11, 2024
1e174c6
add init function
qalisander Jul 11, 2024
0d234d9
++
qalisander Jul 11, 2024
af523db
feat: Nonces implementation (#187)
developeruche Jul 11, 2024
a01c054
fix: solve clippy warnings (#194)
bidzyyys Jul 11, 2024
fcfceaf
update docs
qalisander Jul 12, 2024
99abce9
add stop mint consecutive feature
qalisander Jul 12, 2024
9215fb2
add mints and transfer_from tests
qalisander Jul 12, 2024
bf7bd43
++
qalisander Jul 12, 2024
fd92550
add error tests
qalisander Jul 12, 2024
f3b937f
ref(docs): polish Nonces tests & docs (#195)
alexfertel Jul 15, 2024
6232e9a
add transfer_from and burns tests
qalisander Jul 15, 2024
fa70e30
feat: bench merkle proofs verification gas usage (#196)
alexfertel Jul 15, 2024
e9165b4
Merge remote-tracking branch 'refs/remotes/origin/main' into consecut…
qalisander Jul 15, 2024
35c2fa7
add e2e tests for consecutive
qalisander Jul 16, 2024
cfafef0
update docs
qalisander Jul 17, 2024
e30aec4
Merge remote-tracking branch 'refs/remotes/origin/main' into erc721-c…
qalisander Jul 17, 2024
303996c
++
qalisander Jul 17, 2024
33a6c48
++
qalisander Jul 17, 2024
c6cc2cb
++
qalisander Jul 19, 2024
ee6d83a
++
qalisander Jul 19, 2024
fcd0b18
++
qalisander Jul 19, 2024
cdd3507
++
qalisander Jul 19, 2024
e7daf7e
++
qalisander Jul 19, 2024
0d7d509
++
qalisander Jul 19, 2024
ce6202b
++
qalisander Jul 19, 2024
9b67bb8
Merge remote-tracking branch 'refs/remotes/origin/main' into erc721-c…
qalisander Jul 23, 2024
fc7e6a0
++
qalisander Jul 23, 2024
ef270cb
inline __owner_of_inner function
qalisander Jul 23, 2024
7e618de
++
qalisander Jul 23, 2024
50f658e
Merge remote-tracking branch 'refs/remotes/origin/main' into erc721-c…
qalisander Jul 23, 2024
c468cdf
++
qalisander Jul 23, 2024
56d5291
++
qalisander Jul 23, 2024
fe9b0cb
++
qalisander Jul 23, 2024
3995926
++
qalisander Jul 23, 2024
faccf8b
remove constructor.sol
qalisander Jul 23, 2024
7b8590f
use generics for params
qalisander Jul 24, 2024
e4a150b
++
qalisander Jul 24, 2024
4f9e61b
++
qalisander Jul 24, 2024
8908bc9
Use solidity constructor with consecutive erc721 (#220)
qalisander Aug 6, 2024
b6dd73c
Merge remote-tracking branch 'refs/remotes/origin/main' into erc721-c…
qalisander Aug 6, 2024
529548d
++
qalisander Aug 6, 2024
cfcdbb9
++
qalisander Aug 6, 2024
8bdf906
++
qalisander Aug 6, 2024
b5e3752
++
qalisander Aug 6, 2024
3217d43
++
qalisander Aug 6, 2024
8c4267a
++
qalisander Aug 6, 2024
dc34b93
++
qalisander Aug 6, 2024
9ccd744
++
qalisander Aug 8, 2024
22d0961
++
qalisander Aug 8, 2024
90029a4
++
qalisander Aug 8, 2024
5609163
++
qalisander Aug 8, 2024
503c1eb
++
qalisander Aug 8, 2024
4fb347f
++
qalisander Aug 12, 2024
78c9bf7
Merge remote-tracking branch 'refs/remotes/origin/main' into erc721-c…
qalisander Aug 12, 2024
04b836a
++
qalisander Aug 12, 2024
af0ce93
++
qalisander Aug 12, 2024
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 .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
cache-on-failure: true

- name: install cargo-stylus
run: cargo install cargo-stylus cargo-stylus-check
run: cargo install cargo-stylus@0.4.1 cargo-stylus-check@0.4.1

- name: install solc
run: |
Expand Down
21 changes: 19 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ members = [
"examples/erc20",
"examples/erc20-permit",
"examples/erc721",
"examples/erc721-consecutive",
"examples/erc721-metadata",
"examples/merkle-proofs",
"examples/ownable",
Expand All @@ -27,6 +28,7 @@ default-members = [
"examples/erc20",
"examples/erc20-permit",
"examples/erc721",
"examples/erc721-consecutive",
"examples/erc721-metadata",
"examples/merkle-proofs",
"examples/ownable",
Expand Down Expand Up @@ -81,7 +83,7 @@ alloy-sol-types = { version = "0.3.1", default-features = false }
const-hex = { version = "1.11.1", default-features = false }
eyre = "0.6.8"
keccak-const = "0.2.0"
koba = "0.1.2"
koba = "0.2.0"
once_cell = "1.19.0"
rand = "0.8.5"
regex = "1.10.4"
Expand Down
8 changes: 6 additions & 2 deletions benches/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use alloy::{
},
};
use alloy_primitives::U128;
use e2e::Account;
use e2e::{Account, ReceiptExt};
use koba::config::{Deploy, Generate, PrivateKey};
use serde::Deserialize;

Expand Down Expand Up @@ -77,5 +77,9 @@ async fn deploy(
quiet: true,
};

koba::deploy(&config).await.expect("should deploy contract")
koba::deploy(&config)
.await
.expect("should deploy contract")
.address()
.expect("should return contract address")
}
Loading
Loading