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

Upgrade Gummyroll SDK to Solita #164

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

Upgrade Gummyroll SDK to Solita #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17b4c95
working with two directories
samwise2 Aug 2, 2022
42e8fa5
consolidated into one sdk
samwise2 Aug 2, 2022
25e54fa
cleanup
samwise2 Aug 2, 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
2 changes: 1 addition & 1 deletion cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@project-serum/anchor": "0.24.2",
"@solana/web3.js": "^1.50.1",
"@sorend-solana/gummyroll": "^0.0.5",
"@sorend-solana/gummyroll": "^0.0.6",
"@sorend-solana/utils": "^0.0.5",
"@sorend-solana/gumball-machine": "^0.0.5",
"commander": "^9.2.0",
Expand Down
17 changes: 14 additions & 3 deletions cli/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,17 @@
borsh "^0.7.0"
chai "^4.3.4"

"@sorend-solana/gummyroll@^0.0.6":
version "0.0.6"
resolved "https://registry.yarnpkg.com/@sorend-solana/gummyroll/-/gummyroll-0.0.6.tgz#1f95f67bb0f4ec09a0e9813237ff632646aae9f0"
integrity sha512-2v66GDvmbhZystKCO6eGD59OQcDkVHGyMxFTJXXSipbWQo2wx5uYaU1y5nQUTYlOBpgbjIPcV+LACSyXqrCx7A==
dependencies:
"@metaplex-foundation/beet" "^0.4.0"
"@metaplex-foundation/beet-solana" "^0.3.0"
"@project-serum/anchor" "0.24.2"
"@solana/web3.js" "^1.50.1"
"@sorend-solana/utils" "^0.0.5"

"@sorend-solana/utils@^0.0.5":
version "0.0.5"
resolved "https://registry.yarnpkg.com/@sorend-solana/utils/-/utils-0.0.5.tgz#d0e21445c59a7deba06bceea3ad3caff88b04ea3"
Expand Down Expand Up @@ -198,9 +209,9 @@
integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==

"@types/node@*":
version "18.6.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.2.tgz#ffc5f0f099d27887c8d9067b54e55090fcd54126"
integrity sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==
version "18.6.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.3.tgz#4e4a95b6fe44014563ceb514b2598b3e623d1c98"
integrity sha512-6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg==

"@types/node@^12.12.54":
version "12.20.55"
Expand Down
2 changes: 1 addition & 1 deletion contracts/sdk/bubblegum/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@project-serum/anchor": "0.24.2",
"@solana/spl-token": "^0.1.8",
"@solana/web3.js": "^1.50.1",
"@sorend-solana/gummyroll": "^0.0.5",
"@sorend-solana/gummyroll": "^0.0.6",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes, the beginning of package administration h#ll

"@sorend-solana/utils": "^0.0.5",
"@metaplex-foundation/beet": "^0.4.0",
"@metaplex-foundation/beet-solana": "^0.3.0"
Expand Down
70 changes: 9 additions & 61 deletions contracts/sdk/bubblegum/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,16 @@
superstruct "^0.14.2"
tweetnacl "^1.0.0"

"@sorend-solana/gummyroll@^0.0.5":
version "0.0.5"
resolved "https://registry.yarnpkg.com/@sorend-solana/gummyroll/-/gummyroll-0.0.5.tgz#5420959f7c4839148722b4be76f89fc2b7cdf545"
integrity sha512-wbzo2ZEgu4kgNIaSYJKlEspqjTjrA0YTJaeYWFbonx/F2rICaaiwWj3Nfox0nYPmtgSfWTZeFHIRTnAxOrrA/g==
"@sorend-solana/gummyroll@^0.0.6":
version "0.0.6"
resolved "https://registry.yarnpkg.com/@sorend-solana/gummyroll/-/gummyroll-0.0.6.tgz#1f95f67bb0f4ec09a0e9813237ff632646aae9f0"
integrity sha512-2v66GDvmbhZystKCO6eGD59OQcDkVHGyMxFTJXXSipbWQo2wx5uYaU1y5nQUTYlOBpgbjIPcV+LACSyXqrCx7A==
dependencies:
"@metaplex-foundation/beet" "^0.4.0"
"@metaplex-foundation/beet-solana" "^0.3.0"
"@project-serum/anchor" "0.24.2"
"@solana/web3.js" "^1.50.1"
"@sorend-solana/utils" "^0.0.5"
borsh "^0.7.0"
chai "^4.3.4"

"@sorend-solana/utils@^0.0.5":
version "0.0.5"
Expand Down Expand Up @@ -197,9 +197,9 @@
integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==

"@types/node@*":
version "18.6.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.2.tgz#ffc5f0f099d27887c8d9067b54e55090fcd54126"
integrity sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==
version "18.6.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.3.tgz#4e4a95b6fe44014563ceb514b2598b3e623d1c98"
integrity sha512-6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg==

"@types/node@^12.12.54":
version "12.20.55"
Expand Down Expand Up @@ -236,11 +236,6 @@ ansicolors@^0.3.2, ansicolors@~0.3.2:
resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==

assertion-error@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==

base-x@^3.0.2:
version "3.0.9"
resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.9.tgz#6349aaabb58526332de9f60995e548a53fe21320"
Expand Down Expand Up @@ -356,24 +351,6 @@ camelcase@^6.2.1:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==

chai@^4.3.4:
version "4.3.6"
resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==
dependencies:
assertion-error "^1.1.0"
check-error "^1.0.2"
deep-eql "^3.0.1"
get-func-name "^2.0.0"
loupe "^2.3.1"
pathval "^1.1.1"
type-detect "^4.0.5"

check-error@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==

commander@^2.20.3:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
Expand All @@ -398,13 +375,6 @@ debug@^4.3.3, debug@^4.3.4:
dependencies:
ms "2.1.2"

deep-eql@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
dependencies:
type-detect "^4.0.0"

delay@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
Expand Down Expand Up @@ -468,11 +438,6 @@ file-uri-to-path@1.0.0:
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==

get-func-name@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==

hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3:
version "1.1.7"
resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
Expand Down Expand Up @@ -551,13 +516,6 @@ lodash@^4.17.20:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

loupe@^2.3.1:
version "2.3.4"
resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3"
integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==
dependencies:
get-func-name "^2.0.0"

lower-case@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
Expand Down Expand Up @@ -617,11 +575,6 @@ pako@^2.0.3:
resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d"
integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg==

pathval@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==

prettier@^2.5.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
Expand Down Expand Up @@ -733,11 +686,6 @@ tweetnacl@^1.0.0:
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==

type-detect@^4.0.0, type-detect@^4.0.5:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==

typescript@^4.3.5:
version "4.7.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
Expand Down
2 changes: 1 addition & 1 deletion contracts/sdk/gumball-machine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@project-serum/anchor": "0.24.2",
"@solana/web3.js": "^1.50.1",
"@solana/spl-token": "^0.1.8",
"@sorend-solana/gummyroll": "^0.0.5",
"@sorend-solana/gummyroll": "^0.0.6",
"@sorend-solana/utils": "^0.0.5",
"@sorend-solana/bubblegum": "^0.0.6",
"@metaplex-foundation/beet": "^0.4.0",
Expand Down
17 changes: 14 additions & 3 deletions contracts/sdk/gumball-machine/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,17 @@
borsh "^0.7.0"
chai "^4.3.4"

"@sorend-solana/gummyroll@^0.0.6":
version "0.0.6"
resolved "https://registry.yarnpkg.com/@sorend-solana/gummyroll/-/gummyroll-0.0.6.tgz#1f95f67bb0f4ec09a0e9813237ff632646aae9f0"
integrity sha512-2v66GDvmbhZystKCO6eGD59OQcDkVHGyMxFTJXXSipbWQo2wx5uYaU1y5nQUTYlOBpgbjIPcV+LACSyXqrCx7A==
dependencies:
"@metaplex-foundation/beet" "^0.4.0"
"@metaplex-foundation/beet-solana" "^0.3.0"
"@project-serum/anchor" "0.24.2"
"@solana/web3.js" "^1.50.1"
"@sorend-solana/utils" "^0.0.5"

"@sorend-solana/utils@^0.0.5":
version "0.0.5"
resolved "https://registry.yarnpkg.com/@sorend-solana/utils/-/utils-0.0.5.tgz#d0e21445c59a7deba06bceea3ad3caff88b04ea3"
Expand Down Expand Up @@ -210,9 +221,9 @@
integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==

"@types/node@*":
version "18.6.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.2.tgz#ffc5f0f099d27887c8d9067b54e55090fcd54126"
integrity sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==
version "18.6.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.3.tgz#4e4a95b6fe44014563ceb514b2598b3e623d1c98"
integrity sha512-6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg==

"@types/node@^12.12.54":
version "12.20.55"
Expand Down
2 changes: 1 addition & 1 deletion contracts/sdk/gummyroll/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Gummyroll SDK

Docs TBD.
Docs TBD.
Loading