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

add new governance package #2423

Merged
merged 3 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
--frozen-lockfile true
--add.exact true
ignore-scripts true
2 changes: 1 addition & 1 deletion actions/createLUTproposal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
withSignOffProposal,
withAddSignatory,
RpcContext,
} from '@solana/spl-governance'
} from '@realms-today/spl-governance'
import {
sendTransactionsV3,
SequenceType,
Expand Down
2 changes: 1 addition & 1 deletion actions/createProposal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
withSignOffProposal,
withAddSignatory,
MultiChoiceType,
} from '@solana/spl-governance'
} from '@realms-today/spl-governance'
import {
sendTransactionsV3,
SequenceType,
Expand Down
2 changes: 1 addition & 1 deletion cli/helpers/createBase64Proposal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
withCreateProposal,
withInsertTransaction,
withSignOffProposal,
} from '@solana/spl-governance'
} from '@realms-today/spl-governance'
import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js'
import { chunk } from 'lodash'
import { sendSignAndConfirmTransactions } from '@blockworks-foundation/mangolana/lib/transactions'
Expand Down
2 changes: 1 addition & 1 deletion hooks/queries/useProgramVersionQuery.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getGovernanceProgramVersion } from '@solana/spl-governance'
import { getGovernanceProgramVersion } from '@realms-today/spl-governance'
import { useConnection } from '@solana/wallet-adapter-react'
import { Connection, PublicKey } from '@solana/web3.js'
import { useQuery } from '@tanstack/react-query'
Expand Down
2 changes: 1 addition & 1 deletion hub/components/EditRealmConfig/createTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
getRealm,
getGovernanceProgramVersion,
SYSTEM_PROGRAM_ID,
} from '@solana/spl-governance';
} from '@realms-today/spl-governance';
import type {
Connection,
PublicKey,
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"@radix-ui/react-toast": "1.0.0",
"@radix-ui/react-toolbar": "1.0.0",
"@radix-ui/react-tooltip": "1.0.0",
"@realms-today/spl-governance": "0.3.29",
"@sentry/nextjs": "7.81.1",
"@solana-mobile/wallet-adapter-mobile": "2.0.0",
"@solana/buffer-layout": "4.0.0",
Expand Down
44 changes: 41 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4048,6 +4048,19 @@
"@react-spring/shared" "~9.6.0"
"@react-spring/types" "~9.6.0"

"@realms-today/[email protected]":
version "0.3.29"
resolved "https://registry.yarnpkg.com/@realms-today/spl-governance/-/spl-governance-0.3.29.tgz#147f70aff4fa4fbd515ebe3ebbec12b0705fc4c8"
integrity sha512-j25gdQIzSYC1MfUhRTd7O9WuBdpWzNWDHItffRt0xQCrpeIHV1jVb0zGn0rR/H5uAsmoY6PcLrJYn5aMtN+gPg==
dependencies:
"@solana/web3.js" "^1.22.0"
axios "^1.1.3"
bignumber.js "^9.0.1"
bn.js "^5.1.3"
borsh "^0.3.1"
bs58 "^4.0.1"
superstruct "^0.15.2"

"@rollup/[email protected]":
version "24.0.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-24.0.0.tgz#fb7cf4a6029f07ec42b25daa535c75b05a43f75c"
Expand Down Expand Up @@ -16112,7 +16125,7 @@ string-similarity@^4.0.3:
resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b"
integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==

"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand All @@ -16130,6 +16143,15 @@ string-width@^1.0.1:
is-fullwidth-code-point "^1.0.0"
strip-ansi "^3.0.0"

"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
Expand Down Expand Up @@ -16251,7 +16273,7 @@ stringify-object@^3.3.0:
is-obj "^1.0.1"
is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -16279,6 +16301,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
dependencies:
ansi-regex "^4.1.0"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
Expand Down Expand Up @@ -17673,7 +17702,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -17699,6 +17728,15 @@ wrap-ansi@^5.1.0:
string-width "^3.0.0"
strip-ansi "^5.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down
Loading