Skip to content

Multiple FeeAccounts #126

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

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e1050f7
added base instructions, to test
luke-truitt Sep 18, 2024
87c043b
updated core functions
luke-truitt Sep 19, 2024
eb946e3
Simplified Logic
luke-truitt Sep 26, 2024
6e27db2
Added generic payment mint
luke-truitt Sep 27, 2024
7d13e13
Address Updated
luke-truitt Sep 30, 2024
a88a517
feat: updated README and script
luke-truitt Oct 2, 2024
49df95b
feat: market fee
luke-truitt Oct 11, 2024
61965be
[Feature]: crates: merkle-tree, merkle-tree-cli, merkle-tree-verify (#1)
gonzaotc Oct 24, 2024
1ba243e
feat: adding thaw
Oct 28, 2024
65d0ad2
feat: proper delegation
Oct 29, 2024
b93a335
Merge branch 'luket/base_marketplace' of github.com:rarible/protocol-…
Oct 29, 2024
599c613
Feature/add primary (#3)
ifelsedeveloper Oct 30, 2024
40a046b
Feature/add primary (#4)
ifelsedeveloper Oct 30, 2024
1afeeee
Luket/base marketplace (#5)
ifelsedeveloper Oct 30, 2024
6d63ce4
feat: remove unused
ifelsedeveloper Oct 30, 2024
aa916f9
fix: update order size
Oct 31, 2024
6e6efba
Feature/add primary (#6)
ifelsedeveloper Nov 5, 2024
2b29a6e
Feature/primary cli (#7)
ifelsedeveloper Nov 5, 2024
1a419fc
Merge branch 'luket/base_marketplace'
ifelsedeveloper Nov 5, 2024
381281c
Feature/market cli (#9)
ifelsedeveloper Nov 8, 2024
ef0e5ce
Feature/new deploy vanity (#10)
ifelsedeveloper Nov 8, 2024
2846183
Feature/svm merkle trees (#8)
gonzaotc Nov 9, 2024
f7e8d69
Feature/market cli (#11)
ifelsedeveloper Nov 9, 2024
7eb2838
feat: include wSOL
Nov 12, 2024
2e48530
Feature/market cli (#12)
ifelsedeveloper Nov 25, 2024
983d1de
Feature/market cli (#13)
ifelsedeveloper Nov 27, 2024
e534fa5
feat: added multi fee
Nov 27, 2024
0b13393
fix: merge conf
Nov 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,16 @@ test-ledger
.yarn
.env

**/test_keys
test/merkle_tree.json
test/merkle_tree_test_csv.json

build
*.csv
merkle_tree.json
proofs/
data/
data/**/*
backup-keys
metadata
cat-meta
6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

44 changes: 34 additions & 10 deletions Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@
resolution = true
skip-lint = false

[programs.devnet]
rarible_editions = "Rari9ftBd6vFdtpn8TDLwN2ze24KKkM5MLEETNiBMNn"
rarible_editions_controls = "RariUNM3vz1rwxPg8UJyRAN7rSKXxgd2ncS2ddCa4ZE"
rarible_marketplace = "Rarim7DMoD45z1o25QWPsWvTdFSSEdxaxriwWZLLTic"

[programs.localnet]
wen_wns_marketplace = "sALEeD9VGNquoGSXvUAKLeVbXdjiPCb3FTuTm1xSLod"
wen_new_standard = "wns1gDLt8fgLcGhWi5MqAqgXpwEP1JftKE9eZnXS1HM"
wen_royalty_distribution = "diste3nXmK7ddDTs1zb6uday6j4etCa9RChD8fJ1xay"
wen_transfer_guard = "LockdqYQ9X2kwtWB99ioSbxubAmEi8o9jqYwbXgrrRw"
rarible_editions = "Rari9ftBd6vFdtpn8TDLwN2ze24KKkM5MLEETNiBMNn"
rarible_editions_controls = "RariUNM3vz1rwxPg8UJyRAN7rSKXxgd2ncS2ddCa4ZE"
rarible_marketplace = "Rarim7DMoD45z1o25QWPsWvTdFSSEdxaxriwWZLLTic"

[programs.devnet]
wen_wns_marketplace = "sALEeD9VGNquoGSXvUAKLeVbXdjiPCb3FTuTm1xSLod"
wen_new_standard = "wns1gDLt8fgLcGhWi5MqAqgXpwEP1JftKE9eZnXS1HM"
wen_royalty_distribution = "diste3nXmK7ddDTs1zb6uday6j4etCa9RChD8fJ1xay"
wen_transfer_guard = "LockdqYQ9X2kwtWB99ioSbxubAmEi8o9jqYwbXgrrRw"
[programs.mainnet]
rarible_editions = "Rari9ftBd6vFdtpn8TDLwN2ze24KKkM5MLEETNiBMNn"
rarible_editions_controls = "RariUNM3vz1rwxPg8UJyRAN7rSKXxgd2ncS2ddCa4ZE"
rarible_marketplace = "Rarim7DMoD45z1o25QWPsWvTdFSSEdxaxriwWZLLTic"

[registry]
url = "https://api.apr.dev"
Expand All @@ -29,4 +32,25 @@ test = "RUST_LOG= yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.tes
[test]
startup_wait = 50000
shutdown_wait = 2000
upgradeable = false
upgradeable = true

[test.validator]
bind_address = "0.0.0.0"
url = "https://api.devnet.solana.com"
ledger = ".anchor/test-ledger"
rpc_port = 8899

[[test.validator.clone]]
address = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"

[[test.validator.clone]]
address = "BGUMAp9Gq7iTEuizy4pqaxsTyUCBK68MDfK752saRPUY"

[[test.validator.clone]]
address = "cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK"

[[test.validator.clone]]
address = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s"

[[test.validator.clone]]
address = "RariGDYwEF1jQA4kisHxBxiv1TDuBPVHNNoXFNYriFb"
Loading