Skip to content

Commit 586902b

Browse files
authored
Merge pull request #24 from mikemaccana-edwardbot/fix/quasar-spl-pin-working-revision
fix(quasar): pin quasar deps to 623bb70 (upstream zeropod 0.3.0 regression)
2 parents 024f154 + ff030ff commit 586902b

44 files changed

Lines changed: 339 additions & 75 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

basics/account-data/quasar/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ client = []
2222
debug = []
2323

2424
[dependencies]
25-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
25+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
26+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
27+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
28+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
29+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
30+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
31+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2632
solana-instruction = { version = "3.2.0" }
2733

2834
[dev-dependencies]

basics/checking-accounts/quasar/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ client = []
2222
debug = []
2323

2424
[dependencies]
25-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
25+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
26+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
27+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
28+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
29+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
30+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
31+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2632
solana-instruction = { version = "3.2.0" }
2733

2834
[dev-dependencies]

basics/close-account/quasar/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ client = []
2020
debug = []
2121

2222
[dependencies]
23-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
23+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
24+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
25+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
26+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
27+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
28+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
29+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2430
solana-instruction = { version = "3.2.0" }
2531

2632
[dev-dependencies]

basics/counter/quasar/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ client = []
2222
debug = []
2323

2424
[dependencies]
25-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
25+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
26+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
27+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
28+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
29+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
30+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
31+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2632
solana-instruction = { version = "3.2.0" }
2733

2834
[dev-dependencies]

basics/create-account/quasar/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ client = []
2222
debug = []
2323

2424
[dependencies]
25-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
25+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
26+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
27+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
28+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
29+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
30+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
31+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2632
solana-instruction = { version = "3.2.0" }
2733

2834
[dev-dependencies]

basics/cross-program-invocation/quasar/hand/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ client = []
2121
debug = []
2222

2323
[dependencies]
24-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
24+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
25+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
26+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
27+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
28+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
29+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
30+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2531
solana-instruction = { version = "3.2.0" }
2632

2733
[dev-dependencies]

basics/cross-program-invocation/quasar/lever/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ client = []
2121
debug = []
2222

2323
[dependencies]
24-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
24+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
25+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
26+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
27+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
28+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
29+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
30+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2531
solana-instruction = { version = "3.2.0" }
2632

2733
[dev-dependencies]

basics/favorites/quasar/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ client = []
2020
debug = []
2121

2222
[dependencies]
23-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
23+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
24+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
25+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
26+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
27+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
28+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
29+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2430
solana-instruction = { version = "3.2.0" }
2531

2632
[dev-dependencies]

basics/hello-solana/quasar/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ client = []
2222
debug = []
2323

2424
[dependencies]
25-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar" }
25+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
26+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
27+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
28+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
29+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
30+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
31+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2632
solana-instruction = { version = "3.2.0" }
2733

2834
[dev-dependencies]

basics/pda-rent-payer/quasar/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ client = []
2222
debug = []
2323

2424
[dependencies]
25-
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
25+
# quasar pin rationale: master HEAD currently fails to compile because zeropod 0.3.x
26+
# auto-generates accessor methods that conflict with hand-written ones in quasar-spl
27+
# (E0592 duplicate definitions for delegate / close_authority / mint_authority /
28+
# freeze_authority). Upstream fix is on the zeropod branch (skip_accessor + bump),
29+
# not yet merged to master. 623bb70 is the last working rev on master before zeropod
30+
# 0.3 was bumped. Unpin (back to branch = "master") once upstream merges the fix.
31+
quasar-lang = { git = "https://github.com/blueshift-gg/quasar", rev = "623bb70" }
2632
solana-instruction = { version = "3.2.0" }
2733

2834
[dev-dependencies]

0 commit comments

Comments
 (0)