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

[WIP] - MLabs contribution PR #5

Open
wants to merge 602 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
602 commits
Select commit Hold shift + click to select a range
2f1cc4b
NFT: Refactor quickcheck
t4ccer Oct 16, 2021
1e459a8
Merge branch 'staging' of into nft-tests
t4ccer Oct 17, 2021
ace722f
More clear test names
t4ccer Oct 17, 2021
3326d89
Actually resolve merge conflict
t4ccer Oct 18, 2021
f14f83e
Merge pull request #179 from mlabs-haskell/nft-tests
zygomeb Oct 18, 2021
a7f66c8
Bangify on-chain code (#190)
iupii Oct 28, 2021
35f1fd6
Nft: proof based linked list implementation (closing #170 #174) (#176)
cstml Nov 2, 2021
7c15382
Reimplement NFT QuickCheck
t4ccer Nov 1, 2021
36ed90c
Add Nft auction types
aske Nov 3, 2021
d4810c3
Add auction operations to nft redeemer
aske Nov 3, 2021
7d948d5
Add auction state to nft information
aske Nov 3, 2021
9c61cbc
Merge pull request #216 from mlabs-haskell/nft-fix-quickcheck
zygomeb Nov 3, 2021
980831d
wip
aske Nov 4, 2021
6e7e92d
Merge remote-tracking branch 'origin/staging' into aske/linked-list-n…
aske Nov 4, 2021
1314468
Add endpoint handlers, test trace
aske Nov 4, 2021
95ecfad
Add on-chain check for nodes order
t4ccer Nov 5, 2021
8300a9a
Merge pull request #225 from mlabs-haskell/nft/check-node-order
zygomeb Nov 5, 2021
bae7e3f
Fix nftVal in auction endpoints
aske Nov 5, 2021
5240ef2
Add more checks
aske Nov 5, 2021
cd7c807
wip
aske Nov 5, 2021
98181ee
update: re-implemented query contracts
cstml Nov 2, 2021
9184a53
WIP: query not returning anything - type checking out
cstml Nov 4, 2021
de77a94
update: working query tests
cstml Nov 5, 2021
50a119c
update: reduce chance of error by using common logging msg
cstml Nov 5, 2021
7c8d9ce
cleanup: remove one redundant function
cstml Nov 5, 2021
090bd42
More auction checks and formatting
aske Nov 5, 2021
7609930
Merge pull request #218 from mlabs-haskell/nft/list-refactor-query
zygomeb Nov 5, 2021
77c9ac6
Implement `query-list-nfts` with tests
t4ccer Nov 5, 2021
0685ec5
new: added additional necessary tests for validation
cstml Nov 8, 2021
cc5447b
Merge pull request #227 from mlabs-haskell/nft/list-nfts-query
cstml Nov 8, 2021
ec51c60
Merge pull request #232 from mlabs-haskell/nft-list/additional-necess…
zygomeb Nov 8, 2021
f168c0c
Add bid datum consistency check
aske Nov 8, 2021
dbfbe46
Port nft auction script tests (2 are still broken)
aske Nov 8, 2021
00d3474
Comment out 2 broken tests
aske Nov 9, 2021
7857a8f
Formatting
aske Nov 9, 2021
8e0f3aa
Merge remote-tracking branch 'origin/staging' into aske/linked-list-n…
aske Nov 9, 2021
192242a
Formatting
aske Nov 9, 2021
9bf4c33
Linting
aske Nov 9, 2021
d26b733
Linting
aske Nov 9, 2021
1e194e7
Fix warnings and breakage due to new writer instance
aske Nov 9, 2021
d61054f
Add `getApplicationCurrencySymbol` contract
t4ccer Nov 5, 2021
02967f3
NFT: Check that datum id correspond to NFT (#235)
t4ccer Nov 9, 2021
8b80d3d
Merge pull request #237 from mlabs-haskell/nft/symbol-from-head
zygomeb Nov 9, 2021
522144d
Merge remote-tracking branch 'origin/staging' into aske/linked-list-n…
aske Nov 9, 2021
a239b8a
Fix mismatchingId test
aske Nov 9, 2021
7fc960e
Merge pull request #236 from mlabs-haskell/aske/linked-list-nft-auction
zygomeb Nov 9, 2021
207df87
Implement additional validation checks
t4ccer Nov 8, 2021
b52785f
Merge pull request #243 from mlabs-haskell/nft/more-validator-checks
zygomeb Nov 10, 2021
5d2234c
Upgrade Plutus (#241)
ngua Nov 10, 2021
d6ab559
formatting: fix
cstml Nov 10, 2021
32cc153
Use Liqwid-Labs/plutus-extra (#245)
ngua Nov 11, 2021
80cdc8a
Nft pab endpoints (#246)
mikekeke Nov 11, 2021
7804156
endpoint for querying content status (#247) (#242)
cstml Nov 11, 2021
8495523
Add test for script size
t4ccer Nov 11, 2021
7bf5587
Merge pull request #248 from mlabs-haskell/nft/script-size
zygomeb Nov 12, 2021
b111c10
Implement tests for Auction
t4ccer Nov 10, 2021
6785938
Implement missing Auction validator checks
t4ccer Nov 12, 2021
0713d65
Init validation checks added #211. Some typos.
RadNi Nov 13, 2021
bbaf9af
Admin list added to app parameters. #211 #249
RadNi Nov 13, 2021
7d57431
fourmolu and hlint formatting
RadNi Nov 13, 2021
e5abc75
test for app initialization.
RadNi Nov 14, 2021
369cdfb
test for app initialization. #251
RadNi Nov 14, 2021
c5c3bf0
Merge branch 'amirhossein/on-chain-init-admin' of https://github.com/…
RadNi Nov 14, 2021
9e5eb32
fourmolu formatting
RadNi Nov 14, 2021
5afb2c4
Merge pull request #256 from mlabs-haskell/nft/auction-quickcheck
zygomeb Nov 15, 2021
c792504
Merge branch 'staging' of https://github.com/mlabs-haskell/plutus-use…
RadNi Nov 15, 2021
9b37a48
Remove auction owner check
t4ccer Nov 15, 2021
96887c8
using toUserId helper. fourmolu formatting.
RadNi Nov 15, 2021
2057c2e
removed FIXME with a new comment.
RadNi Nov 15, 2021
6541c77
Merge pull request #257 from mlabs-haskell/amirhossein/on-chain-init-…
zygomeb Nov 15, 2021
f5e39f5
Merge pull request #261 from mlabs-haskell/nft/remove-auction-owner-c…
zygomeb Nov 15, 2021
5c1defc
NFT: Basic Governance (#255)
cstml Nov 16, 2021
c3ef7ca
update: parametrise Gov (#278)
cstml Nov 22, 2021
1fa4037
Add API docs (#259)
t4ccer Nov 23, 2021
dac85a4
NFT: Implement governance fees (#283)
t4ccer Nov 23, 2021
4e33b78
Issue 258 policy swap (#284)
mikekeke Nov 24, 2021
661bad6
Convert nix setup to flakes (#292)
ngua Nov 25, 2021
091b993
Nft parametrise validator (#289)
cstml Nov 26, 2021
c025a8c
NFT: Implement fees support in quickcheck model (#295)
t4ccer Nov 26, 2021
e532106
QuickCheck fix/hack
ngua Nov 29, 2021
efee35b
Use nix for CI format/lint
ngua Nov 30, 2021
ac1ffc7
Merge pull request #300 from mlabs-haskell/rory/fix/ci-format-lint
zygomeb Nov 30, 2021
d98ea7a
Flakes fixes/improvements
ngua Nov 26, 2021
aeb1d79
Workaround to enable `exactDeps`
ngua Dec 1, 2021
63b007b
Re-enable cabal in shell
ngua Dec 1, 2021
a6ee1f0
Merge pull request #298 from mlabs-haskell/rory/fix/flakes
zygomeb Dec 1, 2021
1eb97d6
Implement no locked funds tests (#302)
t4ccer Dec 3, 2021
030dcb1
Fix Validator to support fees (#307)
t4ccer Dec 3, 2021
f5b693e
Rename legacy nft module to avoid name conflict (#309)
nrutledge Dec 6, 2021
aa1a828
Rename legacy Nft test folder/module (#311)
nrutledge Dec 6, 2021
407e6c8
Add missing packages to shell
ngua Dec 7, 2021
75efa4f
Merge pull request #312 from mlabs-haskell/rory/flake-shell-ps
zygomeb Dec 7, 2021
48310f2
Limit Validator and Tests to cover only MVP
t4ccer Dec 12, 2021
b2dfde6
Merge pull request #317 from mlabs-haskell/minimal-validator
zygomeb Dec 15, 2021
45b604e
Fix Cabal and HLS configuration files. (#308)
bladyjoker Dec 15, 2021
f5849b1
Add spooky dependency
t4ccer Dec 10, 2021
cb1ece9
Spookify ScriptContext
t4ccer Dec 14, 2021
653722b
Spookify datums
t4ccer Dec 21, 2021
bce4ffa
Spookify `Address`
t4ccer Dec 22, 2021
b5ca282
Merge pull request #318 from mlabs-haskell/spookify
zygomeb Jan 3, 2022
3fb3acf
Fix Spooky conversions
t4ccer Dec 27, 2021
6fa3732
Merge pull request #320 from mlabs-haskell/spookify-fixes
zygomeb Jan 6, 2022
2a0f269
Spookify `DatumHash`
t4ccer Jan 6, 2022
48fb026
Spookify `Value`
t4ccer Jan 6, 2022
718254a
Merge branch 'staging' into main
zygomeb Jan 7, 2022
9829990
Spookify `PubKeyHash`
t4ccer Jan 6, 2022
e8ede36
Spookify `ValidatorHash`
t4ccer Jan 6, 2022
c926fd1
Fix `TxId`
t4ccer Jan 6, 2022
274402a
Use constant fee rate
t4ccer Jan 6, 2022
05068c0
Scaffolding for the EfficientNFT
Jan 7, 2022
da2695d
Merge pull request #321 from mlabs-haskell/spookify-scriptcontext
zygomeb Jan 7, 2022
347bda5
Fix type errors
Jan 7, 2022
4b979c1
Address hlint suggestions
Jan 9, 2022
2a4a17e
Parameterise the monetary policy with content hash
Jan 9, 2022
9c62106
Check datum hash of payment tx outs
Jan 10, 2022
d6f8ce8
build fixes
mikekeke Jan 11, 2022
332ef47
Merge pull request #322 from mlabs-haskell/misha/efficient-nft-market…
mikekeke Jan 11, 2022
40fe538
Add marketplace validator
Jan 11, 2022
19d1936
Add `mint` contract
t4ccer Jan 10, 2022
b9585e3
Add `setPrice` contract
t4ccer Jan 10, 2022
8f410c1
Add `changeOwner` contract
t4ccer Jan 10, 2022
8eedd9c
Create endpoints
t4ccer Jan 10, 2022
2441283
Formatting
t4ccer Jan 11, 2022
5fba65c
Fix cabal
t4ccer Jan 11, 2022
53f0644
Compare datums instead of datumhashes on-chain
Jan 11, 2022
838c3f0
Implement marketplace validator
Jan 11, 2022
0360903
Add inlinable pragma to mkValidator
Jan 11, 2022
9fdd1ee
Remove unused functions
Jan 11, 2022
9f9a08d
Buying a token should not require a signature
Jan 11, 2022
31c82b9
Merge pull request #324 from mlabs-haskell/cabal-fix
zygomeb Jan 11, 2022
1478617
Merge pull request #327 from mlabs-haskell/gergely/changeowner-wo-sign
zygomeb Jan 11, 2022
0c6797e
Merge pull request #325 from mlabs-haskell/gergely/fix-onchain-datumhash
zygomeb Jan 11, 2022
9701519
Add datum with currency symbol to marketplace validator
Jan 12, 2022
17e739f
Simplified validator
Jan 12, 2022
5490a1e
Resolve comments
t4ccer Jan 12, 2022
a1d9548
wip: Efficient NFT sctipr test
mikekeke Jan 12, 2022
687ddd5
Merge pull request #323 from mlabs-haskell/efficient-nft-marketplace/…
zygomeb Jan 12, 2022
faa2082
Merge branch 'gergely/efficient-nft-marketplace' into misha/efficient…
mikekeke Jan 13, 2022
a2e861a
Merge branch 'gergely/efficient-nft-marketplace' of github.com:mlabs-…
Jan 13, 2022
417d992
Merge pull request #326 from mlabs-haskell/gergely/marketplace-validator
szg251 Jan 13, 2022
75766e5
token policy fixes:
mikekeke Jan 13, 2022
b76135a
Remove unused imports
Jan 13, 2022
902ebec
Merge branch 'gergely/efficient-nft-marketplace' into misha/efficient…
mikekeke Jan 13, 2022
c79a5dd
minting datum check fix
mikekeke Jan 13, 2022
a86c8b9
Remove cabal.project workaround
ngua Jan 13, 2022
a58a34f
Simplify build CI
ngua Jan 13, 2022
d124ea0
Add plutus-tx-spooky to inputs
ngua Jan 13, 2022
5301f7b
check owners share and utxo datum
mikekeke Jan 13, 2022
e665df4
faster `toBin`
mikekeke Jan 13, 2022
f6ca960
Merge pull request #328 from mlabs-haskell/misha/efficient-nft-market…
zygomeb Jan 13, 2022
c13b946
hlint and formatting fixes
mikekeke Jan 13, 2022
761aa03
Add missing flag to `nix build`
ngua Jan 13, 2022
fc9d350
missed `ownerPkh` put back
mikekeke Jan 13, 2022
a46931d
build fix
mikekeke Jan 13, 2022
4e64012
Merge pull request #330 from mlabs-haskell/gergely/efficient-nft-mark…
zygomeb Jan 13, 2022
38cefd7
Merge pull request #329 from mlabs-haskell/rory/fix-nix
zygomeb Jan 14, 2022
7cc5155
Update `plutus`
t4ccer Jan 13, 2022
39b3f9c
Efficient NFT:
mikekeke Jan 14, 2022
4abf3ab
Add `marketplace-deposit` contract
t4ccer Jan 12, 2022
c6552c6
Efficient NFT:
mikekeke Jan 14, 2022
5a29f82
Merge pull request #332 from mlabs-haskell/t4/plutus-upgrade
zygomeb Jan 14, 2022
e01c264
Add datums when changing owner
t4ccer Jan 14, 2022
de6db31
Add `marketplace-redeem` contract
t4ccer Jan 12, 2022
f0fb058
Add `marketplace-buy` contract
t4ccer Jan 12, 2022
d5a334c
Add `marketplace-set-price` contract
t4ccer Jan 12, 2022
79cd002
Merge pull request #335 from mlabs-haskell/t4/nft-add-datum
zygomeb Jan 14, 2022
049785c
Merge pull request #336 from mlabs-haskell/t4/offchain-marketplace
zygomeb Jan 14, 2022
ddb165a
refactoring:
mikekeke Jan 17, 2022
f1cdb11
Merge branch 'staging' into misha/efficient-nft-mint-tests
mikekeke Jan 17, 2022
af35059
post merege fixes:
mikekeke Jan 17, 2022
8a92bfe
Merge branch 'staging' into misha/efficient-nft-mint-tests
mikekeke Jan 17, 2022
3b7a2bc
Merge pull request #334 from mlabs-haskell/misha/efficient-nft-mint-t…
zygomeb Jan 17, 2022
a6c8102
tmp
mikekeke Jan 18, 2022
2fb8df7
Rewrite validator according to spec
t4ccer Jan 18, 2022
7d9b83b
Use updates plutus-extra
Jan 18, 2022
9ad14f9
Merge pull request #340 from mlabs-haskell/t4/efficient-nft-rewrite
zygomeb Jan 18, 2022
3fd77db
Efficient NFT:
mikekeke Jan 19, 2022
f13539e
Add first test for the ChangeOwner
Jan 19, 2022
582a06c
Fix formatting
Jan 19, 2022
2acb55d
Merge branch 'staging' of github.com:mlabs-haskell/plutus-use-cases i…
Jan 19, 2022
91a786b
Fix formatting
Jan 19, 2022
2e59231
Merge and tests fixes
mikekeke Jan 19, 2022
dc01aab
Fix tests
Jan 19, 2022
4c96ea8
EfficientNFT `ChangePrice` tests:
mikekeke Jan 19, 2022
c4828f1
Merge branch 'staging' into misha/efficient-nft/change-price-tests
mikekeke Jan 19, 2022
784982b
formatting fix
mikekeke Jan 19, 2022
8b55496
Add redeemer params to TokenMint contexts
Jan 19, 2022
ddca1cf
Add more tests for ChangeOwner
Jan 19, 2022
25f1ad7
Simplify checkMintAndBurn validator
Jan 19, 2022
05cc747
Remove unused imports
Jan 19, 2022
602d896
Add trace
t4ccer Jan 19, 2022
04d0f81
checkMintAndBurn refactoring
mikekeke Jan 20, 2022
763509c
Improve readability
Jan 20, 2022
fa0486b
Add `mint` and `set-price` quickcheck model
t4ccer Jan 19, 2022
a880c1c
Update tasty-plutus to 6.0
Jan 20, 2022
bcb5045
Add a property test for ChangeOwner action
Jan 20, 2022
f0eb01a
Add QuasiQuotes language extension pragma for hlint
Jan 20, 2022
250309e
Merge pull request #342 from mlabs-haskell/misha/efficient-nft/change…
zygomeb Jan 20, 2022
eb4e2b7
Merge branch 'staging' of github.com:mlabs-haskell/plutus-use-cases i…
Jan 21, 2022
d0ed3d6
Add QuasiQuotes language extension for hlint
Jan 21, 2022
486ecea
Merge pull request #343 from mlabs-haskell/gergely/tests
szg251 Jan 21, 2022
648ef93
Add rest of action to quickcheck model
t4ccer Jan 21, 2022
967100d
Merge branch 'staging' into t4/efficient-nft-quickcheck
t4ccer Jan 24, 2022
60157c8
Fix tests
t4ccer Jan 24, 2022
6713b43
Merge pull request #345 from mlabs-haskell/t4/efficient-nft-quickcheck
zygomeb Jan 24, 2022
ac6b715
Rewrite minting policy according to v4
t4ccer Jan 25, 2022
96dacdc
Rewrite offchain contracts according to v4
t4ccer Jan 25, 2022
cda244b
Fix tests
t4ccer Jan 25, 2022
4ba26a1
Update `plutus-extra` to upstream branch
t4ccer Jan 25, 2022
fff95ba
Revert "Update `plutus-extra` to upstream branch"
t4ccer Jan 25, 2022
8932d43
Switch `haskell.nix` to `nixpkgs-unstable`
t4ccer Jan 26, 2022
6932419
Merge pull request #346 from mlabs-haskell/t4/v4-minting-policy
zygomeb Jan 26, 2022
ab49d83
Add locking script
t4ccer Jan 27, 2022
6d6905c
Update `plutus-extra` to upstream branch
t4ccer Jan 25, 2022
e30fa51
Add unstake tests
t4ccer Jan 28, 2022
8074cd7
Add restake tests
t4ccer Jan 31, 2022
b33773e
Merge pull request #347 from mlabs-haskell/t4/v4-locking-script
zygomeb Feb 1, 2022
1e2a298
Fix burning
t4ccer Feb 1, 2022
19155fe
Fix datum requirement on NFT purchase
t4ccer Feb 1, 2022
c023a91
Update `plutus-apps` to fork
t4ccer Feb 1, 2022
3731dc1
Add missing type signatures
t4ccer Feb 3, 2022
76afdd2
Merge pull request #348 from mlabs-haskell/t4/policy-fixes
zygomeb Feb 7, 2022
9ed4830
Add `plutus-simple-model` to deps
t4ccer Feb 4, 2022
ad4724c
Add resource usage tests
t4ccer Feb 6, 2022
04f04c3
Merge pull request #349 from mlabs-haskell/t4/resource-test
zygomeb Feb 10, 2022
143beeb
Add marketplace escrow script
t4ccer Feb 9, 2022
94a2c0a
Add marketplace escrow tests
t4ccer Feb 10, 2022
8e6c7ad
Simplify marketplace
t4ccer Feb 13, 2022
dd96073
Resolve comments
t4ccer Feb 17, 2022
3d5295a
Simplify marketplace even further
t4ccer Feb 17, 2022
5d63bec
Merge pull request #351 from mlabs-haskell/t4/marketplace
zygomeb Feb 18, 2022
9c608c8
Add `plutip` to deps
t4ccer Feb 14, 2022
2c9ce29
Add `plutip` tests
t4ccer Feb 21, 2022
3d80922
Fix CI
t4ccer Feb 21, 2022
36fb06a
Update `plutip`
t4ccer Feb 24, 2022
b021c88
Add plutip tasty tests
t4ccer Feb 25, 2022
d340283
Merge pull request #354 from mlabs-haskell/t4/plutip
zygomeb Mar 2, 2022
1f4f60e
Add fee collecting script
t4ccer Feb 28, 2022
f56c3b2
Add fee vault tests
t4ccer Mar 1, 2022
a49d6ee
Switch from sha2 to blake2
t4ccer Mar 2, 2022
c4df46a
Merge pull request #355 from mlabs-haskell/t4/fee-vault
zygomeb Mar 3, 2022
c9ce424
Merge pull request #356 from mlabs-haskell/t4/blake2
zygomeb Mar 4, 2022
f451433
Write `ToData`/`FromData`/`UnsafeFromData` instances manually
t4ccer Mar 19, 2022
927eade
Merge pull request #359 from mlabs-haskell/t4/manual-insances
zygomeb Mar 22, 2022
51667b9
Merge pull request #360 from mlabs-haskell/staging
zygomeb Mar 30, 2022
4fc224e
Move to Hydra
t4ccer Jul 22, 2022
e7abb51
Move to hydra
t4ccer Aug 10, 2022
5abf2ea
Merge pull request #369 from mlabs-haskell/t4/hydra-master
t4ccer Aug 10, 2022
6afb707
Add nix symlinks
t4ccer Aug 10, 2022
189dc6b
Merge pull request #370 from mlabs-haskell/t4/nix-links
t4ccer Aug 10, 2022
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
4 changes: 4 additions & 0 deletions .github/format.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Extensions necessary to tell fourmolu about
EXTENSIONS="-o -XTypeApplications -o -XTemplateHaskell -o -XImportQualifiedPost -o -XPatternSynonyms -o -fplugin=RecordDotPreprocessor"
SOURCES=$(git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs')
fourmolu --mode check --check-idempotence $EXTENSIONS $SOURCES
4 changes: 4 additions & 0 deletions .github/local-formatting.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Extensions necessary to tell fourmolu about
EXTENSIONS="-o -XTypeApplications -o -XTemplateHaskell -o -XImportQualifiedPost -o -XPatternSynonyms -o -fplugin=RecordDotPreprocessor"
SOURCES=$(git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs')
fourmolu --mode inplace --check-idempotence $EXTENSIONS $SOURCES
Loading