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.

Sign up for GitHub

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

Disable allow lists on public phases. #9

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Disable allow lists on public phases. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
739e14f
Allow lists disabled on public phases
gonzaotc Oct 27, 2024
ee7a76d
merged main changes
gonzaotc Oct 27, 2024
aea171b
removed tests for hybrid phase
gonzaotc Oct 28, 2024
1674c13
chore: fix test name
gonzaotc Oct 28, 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
4 changes: 2 additions & 2 deletions Anchor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ resolution = true
skip-lint = false

[programs.localnet]
rarible_editions = "E3NtU7ozVJ73VGQk4ZaYvKzZsFHQxQaeS7ijzcGg4Sd4"
rarible_editions_controls = "DtdtodSsgeNXbu3rycGCkJEpRuZ48rjFSBfgj8JKzTV2"
rarible_editions = "ATBinC7ZuN1YPkEDoVPpoPbwoaoaik5tEK4M2zt6g622"
rarible_editions_controls = "Ge7qXDjDbMykjwfFPQ5XfwEbGUfbSunwdLZHvquxZzoS"

[registry]
url = "https://api.apr.dev"
Expand Down
2 changes: 1 addition & 1 deletion programs/rarible_editions/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use anchor_lang::prelude::*;
pub mod instructions;
pub use instructions::*;

declare_id!("E3NtU7ozVJ73VGQk4ZaYvKzZsFHQxQaeS7ijzcGg4Sd4");
declare_id!("ATBinC7ZuN1YPkEDoVPpoPbwoaoaik5tEK4M2zt6g622");

pub mod errors;
pub mod state;
Expand Down
5 changes: 5 additions & 0 deletions programs/rarible_editions_controls/src/instructions/add_phase.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ pub fn add_phase(ctx: Context<AddPhaseCtx>, input: InitialisePhaseInput) -> Resu
panic!("Merkle root must be provided for private phases");
}

// Disable hybrid phases for now
if !input.is_private && input.merkle_root.is_some() {
panic!("Allowlists are currently disabled on public phases");
}

let editions_controls = &mut ctx.accounts.editions_controls;

editions_controls.phases.push(Phase{
Expand Down
2 changes: 1 addition & 1 deletion programs/rarible_editions_controls/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pub use logic::*;

pub mod instructions;
pub use instructions::*;
declare_id!("DtdtodSsgeNXbu3rycGCkJEpRuZ48rjFSBfgj8JKzTV2");
declare_id!("Ge7qXDjDbMykjwfFPQ5XfwEbGUfbSunwdLZHvquxZzoS");

pub mod errors;
pub mod state;
Expand Down
2 changes: 1 addition & 1 deletion target/types/rarible_editions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* IDL can be found at `target/idl/rarible_editions.json`.
*/
export type RaribleEditions = {
"address": "E3NtU7ozVJ73VGQk4ZaYvKzZsFHQxQaeS7ijzcGg4Sd4",
"address": "ATBinC7ZuN1YPkEDoVPpoPbwoaoaik5tEK4M2zt6g622",
"metadata": {
"name": "raribleEditions",
"version": "0.2.1",
Expand Down
10 changes: 5 additions & 5 deletions target/types/rarible_editions_controls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* IDL can be found at `target/idl/rarible_editions_controls.json`.
*/
export type RaribleEditionsControls = {
"address": "DtdtodSsgeNXbu3rycGCkJEpRuZ48rjFSBfgj8JKzTV2",
"address": "Ge7qXDjDbMykjwfFPQ5XfwEbGUfbSunwdLZHvquxZzoS",
"metadata": {
"name": "raribleEditionsControls",
"version": "0.2.1",
Expand Down Expand Up @@ -51,7 +51,7 @@ export type RaribleEditionsControls = {
},
{
"name": "raribleEditionsProgram",
"address": "E3NtU7ozVJ73VGQk4ZaYvKzZsFHQxQaeS7ijzcGg4Sd4"
"address": "ATBinC7ZuN1YPkEDoVPpoPbwoaoaik5tEK4M2zt6g622"
}
],
"args": [
Expand Down Expand Up @@ -152,7 +152,7 @@ export type RaribleEditionsControls = {
},
{
"name": "raribleEditionsProgram",
"address": "E3NtU7ozVJ73VGQk4ZaYvKzZsFHQxQaeS7ijzcGg4Sd4"
"address": "ATBinC7ZuN1YPkEDoVPpoPbwoaoaik5tEK4M2zt6g622"
}
],
"args": [
Expand Down Expand Up @@ -365,7 +365,7 @@ export type RaribleEditionsControls = {
},
{
"name": "raribleEditionsProgram",
"address": "E3NtU7ozVJ73VGQk4ZaYvKzZsFHQxQaeS7ijzcGg4Sd4"
"address": "ATBinC7ZuN1YPkEDoVPpoPbwoaoaik5tEK4M2zt6g622"
}
],
"args": [
Expand Down Expand Up @@ -595,7 +595,7 @@ export type RaribleEditionsControls = {
},
{
"name": "raribleEditionsProgram",
"address": "E3NtU7ozVJ73VGQk4ZaYvKzZsFHQxQaeS7ijzcGg4Sd4"
"address": "ATBinC7ZuN1YPkEDoVPpoPbwoaoaik5tEK4M2zt6g622"
}
],
"args": [
Expand Down
Loading
Loading