Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Giannis Chatziveroglou committed Sep 19, 2023
1 parent 2a0ae86 commit c91861a
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 87 deletions.
11 changes: 1 addition & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,10 @@

This is an open UI for Hydra, a protocol on Solana for facilitating collective account pooling, fan out wallet and dao treasury. It can be thought of as a group-owned wallet that can accept funds. Unlike a multi-signature wallet, this is meant to collect and distribute funds, not execute group transactions. More information on the protocol can be found a https://github.com/GlassEaters/hydra.

| Package | Description | Version |
| :-------- | :------------------- | :---------------------------- |
| `Devnet` | Devnet ui for Hydra | https://dev-hydra.cardinal.so |
| `Mainnet` | Mainnet ui for Hydra | https://hydra.cardinal.so |

<p align="center">
<img src="./public/example.png" />
</p>

## Getting Started

```bash
git clone https://github.com/cardinal-labs/hydra-ui.git
git clone https://github.com/solana-nft-programs/hydra-ui.git
cd hydra-ui
yarn install
yarn dev
Expand Down
2 changes: 1 addition & 1 deletion common/Header.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useWallet } from '@solana/wallet-adapter-react'
import { WalletMultiButton } from '@solana/wallet-adapter-react-ui'
import { AccountConnect } from '@cardinal/namespaces-components'
import { AccountConnect } from '@solana-nft-programs/namespaces-components'

import { Wallet } from '@saberhq/solana-contrib'
import { useRouter } from 'next/router'
Expand Down
2 changes: 1 addition & 1 deletion hooks/useFanoutMembershipMintVouchers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { PublicKey } from '@solana/web3.js'
import { useEnvironmentCtx } from 'providers/EnvironmentProvider'

import { useDataHook } from './useDataHook'
import { AccountData } from '@cardinal/common'
import { AccountData } from '@solana-nft-programs/common'
import { FanoutMembershipMintVoucher } from '@glasseaters/hydra-sdk'

const HYDRA_PROGRAM_ID = new PublicKey(
Expand Down
2 changes: 1 addition & 1 deletion hooks/useFanoutMembershipVouchers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { PublicKey } from '@solana/web3.js'
import { useEnvironmentCtx } from 'providers/EnvironmentProvider'

import { useDataHook } from './useDataHook'
import { AccountData } from '@cardinal/common'
import { AccountData } from '@solana-nft-programs/common'
import { FanoutMembershipVoucher } from '@glasseaters/hydra-sdk'

const HYDRA_PROGRAM_ID = new PublicKey(
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hydra-ui",
"version": "0.1.0",
"private": true,
"homepage": "https://hydra.cardinal.so",
"homepage": "https://hydra.host.so",
"license": "Apache-2.0",
"scripts": {
"dev": "next dev",
Expand All @@ -11,10 +11,10 @@
"lint": "next lint"
},
"dependencies": {
"@cardinal/common": "^8.0.0",
"@cardinal/namespaces-components": "^3.1.0",
"@cardinal/staking": "^2.3.0",
"@cardinal/token-manager": "^4.5.1",
"@solana-nft-programs/common": "^8.0.0",
"@solana-nft-programs/namespaces-components": "^3.1.0",
"@solana-nft-programs/staking": "^2.3.0",
"@solana-nft-programs/token-manager": "^4.5.1",
"@emotion/styled": "^11.8.1",
"@glasseaters/hydra-sdk": "^0.3.2",
"@coral-xyz/anchor": "^0.27.0",
Expand Down
4 changes: 2 additions & 2 deletions pages/[walletId]/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DisplayAddress } from '@cardinal/namespaces-components'
import { executeTransaction } from '@cardinal/staking'
import { DisplayAddress } from '@solana-nft-programs/namespaces-components'
import { executeTransaction } from '@solana-nft-programs/staking'
import { FanoutClient } from '@glasseaters/hydra-sdk'
import { Wallet } from '@coral-xyz/anchor/dist/cjs/provider'
import { useWallet } from '@solana/wallet-adapter-react'
Expand Down
36 changes: 18 additions & 18 deletions pages/_app.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import './styles.css'
import '@cardinal/namespaces-components/dist/esm/styles.css'
import '@solana-nft-programs/namespaces-components/dist/esm/styles.css'
import type { AppProps } from 'next/app'
import { WalletProvider } from '@solana/wallet-adapter-react'
import { WalletIdentityProvider } from '@cardinal/namespaces-components'
import { WalletIdentityProvider } from '@solana-nft-programs/namespaces-components'
import { WalletModalProvider } from '@solana/wallet-adapter-react-ui'

import {
Expand All @@ -26,23 +26,23 @@ const App = ({
}: AppProps & { cluster: string }) => {
return (
<>
<Head>
<Head>
<title>Hydra UI</title>
</Head>
<EnvironmentProvider defaultCluster={cluster}>
<WalletProvider
wallets={[new PhantomWalletAdapter(), new GlowWalletAdapter()]}
>
<WalletIdentityProvider>
<WalletModalProvider>
<>
<ToastContainer />
<Component {...pageProps} />
</>
</WalletModalProvider>
</WalletIdentityProvider>
</WalletProvider>
</EnvironmentProvider>
</Head>
<EnvironmentProvider defaultCluster={cluster}>
<WalletProvider
wallets={[new PhantomWalletAdapter(), new GlowWalletAdapter()]}
>
<WalletIdentityProvider>
<WalletModalProvider>
<>
<ToastContainer />
<Component {...pageProps} />
</>
</WalletModalProvider>
</WalletIdentityProvider>
</WalletProvider>
</EnvironmentProvider>
</>
)
}
Expand Down
4 changes: 2 additions & 2 deletions pages/create/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const Home: NextPage = () => {
throw 'Please specify at least one member'
}
if (!hydraWalletMembers || hydraWalletMembers.length > 9) {
throw 'Too many members - submit a PR to https://github.com/cardinal-labs/hydra-ui to increase this minimum'
throw 'Too many members - submit a PR to https://github.com/solana-nft-programs/hydra-ui to increase this minimum'
}

const fanoutId = (await FanoutClient.fanoutKey(walletName))[0]
Expand Down Expand Up @@ -139,7 +139,7 @@ const Home: NextPage = () => {
className="appearance-none block w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-3 px-4 mb-3 leading-tight focus:outline-none focus:bg-white"
name="grid-first-name"
type="text"
placeholder="cardinal-wallet"
placeholder="wallet"
onChange={(e) => {
setWalletName(e.target.value)
setSuccess(false)
Expand Down
6 changes: 4 additions & 2 deletions pages/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,15 @@ const Home: NextPage = () => {
id="grid-first-name"
onSubmit={() => alert('HEr')}
type="text"
placeholder="cardinal-wallet"
placeholder="wallet"
onChange={(e) => {
setWalletName(e.target.value)
}}
value={walletName}
/>
<span className="text-xs mt-1 mb-3 block text-gray-400 italic">We currently only support Hydra wallets of membership model Wallet</span>
<span className="text-xs mt-1 mb-3 block text-gray-400 italic">
We currently only support Hydra wallets of membership model Wallet
</span>
<div>
<div
className="bg-blue-400 text-white hover:bg-blue-500 px-4 py-3 rounded-md float-right cursor-pointer"
Expand Down
4 changes: 2 additions & 2 deletions public/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "Cardinal",
"name": "Cardinal Consensus",
"short_name": "",
"name": "Consensus",
"icons": [
{
"src": "favicon.ico",
Expand Down
86 changes: 43 additions & 43 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
eip1193-provider "^1.0.1"
js-sha3 "^0.8.0"

"@cardinal/certificates@^1.2.3", "@cardinal/certificates@^1.3.0":
"@solana-nft-programs/certificates@^1.2.3", "@solana-nft-programs/certificates@^1.3.0":
version "1.3.4"
resolved "https://registry.yarnpkg.com/@cardinal/certificates/-/certificates-1.3.4.tgz#151e9d80624cb7f90185c15cbca5bbafcdb8fd00"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/certificates/-/certificates-1.3.4.tgz#151e9d80624cb7f90185c15cbca5bbafcdb8fd00"
integrity sha512-IVr8CGS3OP3fe7L/W1Y4FIaCGf6223vPx5wVeQ/ug9NO6uOI9aRgayFP4j2ZOGrPKMz8SdRj12xgPX6LGc+JFg==
dependencies:
"@project-serum/anchor" "0.20.1"
Expand All @@ -113,9 +113,9 @@
ts-mocha "^9.0.2"
typescript "^4.5.5"

"@cardinal/common@^5.0.2":
"@solana-nft-programs/common@^5.0.2":
version "5.0.7"
resolved "https://registry.yarnpkg.com/@cardinal/common/-/common-5.0.7.tgz#f225b9eb4a8e7d780a14d80a1c0ba4c495be2d06"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/common/-/common-5.0.7.tgz#f225b9eb4a8e7d780a14d80a1c0ba4c495be2d06"
integrity sha512-7sZDczfvNFq9uSiYO94Mfjhf8GIk/644xTFawNtCau127GBK2BBsu06TEGLwfELc9dc0b22g4MWQJC0yoU90ow==
dependencies:
"@project-serum/anchor" "^0.25.0"
Expand All @@ -126,9 +126,9 @@
polished "^4.2.2"
tslib "^2.4.0"

"@cardinal/common@^7.0.0", "@cardinal/common@^7.1.3", "@cardinal/common@^7.2.3":
"@solana-nft-programs/common@^7.0.0", "@solana-nft-programs/common@^7.1.3", "@solana-nft-programs/common@^7.2.3":
version "7.2.3"
resolved "https://registry.yarnpkg.com/@cardinal/common/-/common-7.2.3.tgz#0a335684e0317eb90b41bdb567b8149b27a9ba14"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/common/-/common-7.2.3.tgz#0a335684e0317eb90b41bdb567b8149b27a9ba14"
integrity sha512-DDTAwqHiP2yzE2WakJj2vJbvIBab7vIOgUJloeSFquYzwiwltY/R/S+82AlxE9KVnTudARRvHqxfuQbewToOcg==
dependencies:
"@coral-xyz/anchor" "^0.27.0"
Expand All @@ -142,9 +142,9 @@
polished "^4.2.2"
tslib "^2.4.0"

"@cardinal/common@^8.0.0":
"@solana-nft-programs/common@^8.0.0":
version "8.0.0"
resolved "https://registry.yarnpkg.com/@cardinal/common/-/common-8.0.0.tgz#716c1f6f944c7521b7750cbd4211fca2c68830d5"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/common/-/common-8.0.0.tgz#716c1f6f944c7521b7750cbd4211fca2c68830d5"
integrity sha512-kgjPoD7owZ0vyX0vJ0oSOgyJCx/yzCek+w5gjPVFZxFtLWwxssBAbd1NnZ6qIq0er8S0wFsLZnBRNh32drprEw==
dependencies:
"@coral-xyz/anchor" "^0.27.0"
Expand All @@ -158,9 +158,9 @@
polished "^4.2.2"
tslib "^2.4.0"

"@cardinal/creator-standard@^2.1.7", "@cardinal/creator-standard@^2.4.0":
"@solana-nft-programs/creator-standard@^2.1.7", "@solana-nft-programs/creator-standard@^2.4.0":
version "2.4.0"
resolved "https://registry.yarnpkg.com/@cardinal/creator-standard/-/creator-standard-2.4.0.tgz#cae7787a6003218a1030148cc99316058bbd3bb6"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/creator-standard/-/creator-standard-2.4.0.tgz#cae7787a6003218a1030148cc99316058bbd3bb6"
integrity sha512-VgQ4ksXamR9xCsycu7att1lYZdt7Sg4XnbTTVkYG1V5v/K5k6LXB4NlEfTMHizAaNktE8HOdsj+K8rptmemH7A==
dependencies:
"@metaplex-foundation/rustbin" "^0.3.1"
Expand All @@ -169,13 +169,13 @@
"@solana/spl-token" "^0.3.5"
"@solana/web3.js" "^1.66.2"

"@cardinal/namespaces-components@^3.1.0":
"@solana-nft-programs/namespaces-components@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@cardinal/namespaces-components/-/namespaces-components-3.1.0.tgz#654d20f5feb68612f550be2ee441a71cac1683c1"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/namespaces-components/-/namespaces-components-3.1.0.tgz#654d20f5feb68612f550be2ee441a71cac1683c1"
integrity sha512-1aBdg2ihtf/omTDwZZo6VIiDzgxwjawlpVEXRlkptRJRCKkRIjZBsajpKQeMfndEOCiQEcIHmMOV86TJ9Y1hcg==
dependencies:
"@cardinal/certificates" "^1.3.0"
"@cardinal/namespaces" "^3.1.0"
"@solana-nft-programs/certificates" "^1.3.0"
"@solana-nft-programs/namespaces" "^3.1.0"
"@emotion/react" "^11.7.1"
"@emotion/styled" "^11.6.0"
"@headlessui/react" "^1.6.1"
Expand All @@ -200,91 +200,91 @@
typescript "^4.1.2"
webpack-merge "^5.8.0"

"@cardinal/namespaces@^2.0.42":
"@solana-nft-programs/namespaces@^2.0.42":
version "2.0.59"
resolved "https://registry.yarnpkg.com/@cardinal/namespaces/-/namespaces-2.0.59.tgz#9e251c3a38f78faca58e208d1c5f2e10fa8c829b"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/namespaces/-/namespaces-2.0.59.tgz#9e251c3a38f78faca58e208d1c5f2e10fa8c829b"
integrity sha512-2waZMfLyzAKi5y7bWBPzuqP/FDSjLS5u9VhsBLfEQbNOR3BHmHrSwrYPpAfV+IrULNBSSg8jobxoD5b94C3GEQ==
dependencies:
"@cardinal/certificates" "^1.2.3"
"@cardinal/namespaces" "^2.0.42"
"@solana-nft-programs/certificates" "^1.2.3"
"@solana-nft-programs/namespaces" "^2.0.42"
"@metaplex-foundation/mpl-token-metadata" "^0.0.2"
"@project-serum/anchor" "^0.20.1"
"@saberhq/solana-contrib" "^1.12.23"
"@solana/spl-token" "^0.1.8"
typescript "^4.5.4"

"@cardinal/namespaces@^3.1.0":
"@solana-nft-programs/namespaces@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@cardinal/namespaces/-/namespaces-3.1.0.tgz#bee4acdf3d2bcf63aa5c02502f61fb8024ac4039"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/namespaces/-/namespaces-3.1.0.tgz#bee4acdf3d2bcf63aa5c02502f61fb8024ac4039"
integrity sha512-eX44mI0EFZrzvIHKGS/j0iUJPmCrl1av89jfSqWf6ldYYwLyENQysyOQv2az718pbJd9H5IQb+kJX0JLlQCo/w==
dependencies:
"@cardinal/certificates" "^1.2.3"
"@cardinal/namespaces" "^2.0.42"
"@solana-nft-programs/certificates" "^1.2.3"
"@solana-nft-programs/namespaces" "^2.0.42"
"@metaplex-foundation/mpl-token-metadata" "^0.0.2"
"@project-serum/anchor" "^0.20.1"
"@saberhq/solana-contrib" "^1.12.23"
"@solana/spl-token" "^0.1.8"
typescript "^4.5.4"

"@cardinal/payment-manager@^2.1.1":
"@solana-nft-programs/payment-manager@^2.1.1":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@cardinal/payment-manager/-/payment-manager-2.2.0.tgz#37272351b0af637c2658619f5c23554d356c1577"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/payment-manager/-/payment-manager-2.2.0.tgz#37272351b0af637c2658619f5c23554d356c1577"
integrity sha512-1W28Eg3qCjiNqib+UWpuM5D7GvKS9wsO6QcrnJvxqJbYgSRYH+C0A8OwkgRxhVwJsVfHYN7OThYcUBCqZTdLBA==
dependencies:
"@cardinal/common" "^5.0.2"
"@solana-nft-programs/common" "^5.0.2"
"@metaplex-foundation/mpl-token-metadata" "^2.5.2"
"@project-serum/anchor" "^0.25.0"
"@solana/spl-token" "^0.3.6"
"@solana/web3.js" "^1.66.2"

"@cardinal/payment-manager@^4.0.1":
"@solana-nft-programs/payment-manager@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@cardinal/payment-manager/-/payment-manager-4.0.1.tgz#8f3dde29998f1a3cfb51530f90221e378367aacc"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/payment-manager/-/payment-manager-4.0.1.tgz#8f3dde29998f1a3cfb51530f90221e378367aacc"
integrity sha512-vPenOu9frkMRXmnL11Iqim0WjBc+El5MGmJVguQev81BOTSOgQ1uGH60fapFvNsYS263xNID8MRgzkACtoUjeA==
dependencies:
"@cardinal/common" "^7.1.3"
"@solana-nft-programs/common" "^7.1.3"
"@metaplex-foundation/mpl-token-metadata" "^2.8.3"
"@project-serum/anchor" "^0.26.0"
"@solana/spl-token" "^0.3.6"
"@solana/web3.js" "^1.66.2"

"@cardinal/rewards-center@^2.4.0":
"@solana-nft-programs/rewards-center@^2.4.0":
version "2.7.3"
resolved "https://registry.yarnpkg.com/@cardinal/rewards-center/-/rewards-center-2.7.3.tgz#1e2105fe9ff117bcb5594a2a25453ef17b9739f3"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/rewards-center/-/rewards-center-2.7.3.tgz#1e2105fe9ff117bcb5594a2a25453ef17b9739f3"
integrity sha512-xB2uYm0/02Na6+9t/pqSnwQgaX7T6ec9Dcj705Hd3OHEvc8YnyIEfwlnU1lQKzkq4U63nlTTd4zXcraGmTEtGw==
dependencies:
"@cardinal/common" "^7.0.0"
"@cardinal/creator-standard" "^2.4.0"
"@solana-nft-programs/common" "^7.0.0"
"@solana-nft-programs/creator-standard" "^2.4.0"
"@coral-xyz/anchor" "0.26.0"
"@metaplex-foundation/mpl-token-auth-rules" "^1.1.0"
"@msgpack/msgpack" "^2.8.0"
"@solana/spl-token" "^0.3.6"
"@solana/web3.js" "^1.66.2"
bn.js "^5.2.0"

"@cardinal/staking@^2.3.0":
"@solana-nft-programs/staking@^2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@cardinal/staking/-/staking-2.3.0.tgz#ddfeab6985c3cfa245840bd45ad5b2aa57caabe6"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/staking/-/staking-2.3.0.tgz#ddfeab6985c3cfa245840bd45ad5b2aa57caabe6"
integrity sha512-0tYopG3LW/XDRsCZTt7znAREuLwgdSQJMvG+DpkljwsKHTTVUKBGx9/yTLynuQeJVmvNiwfT8QJKW18X1lKWkQ==
dependencies:
"@cardinal/common" "^7.2.3"
"@cardinal/payment-manager" "^2.1.1"
"@cardinal/rewards-center" "^2.4.0"
"@cardinal/token-manager" "^4.3.2"
"@solana-nft-programs/common" "^7.2.3"
"@solana-nft-programs/payment-manager" "^2.1.1"
"@solana-nft-programs/rewards-center" "^2.4.0"
"@solana-nft-programs/token-manager" "^4.3.2"
"@coral-xyz/anchor" "0.27.0"
"@metaplex-foundation/mpl-token-auth-rules" "^1.1.0"
"@metaplex-foundation/mpl-token-metadata" "^2.8.1"
"@solana/spl-token" "^0.3.6"
"@solana/web3.js" "^1.34.0"

"@cardinal/token-manager@^4.3.2", "@cardinal/token-manager@^4.5.1":
"@solana-nft-programs/token-manager@^4.3.2", "@solana-nft-programs/token-manager@^4.5.1":
version "4.5.1"
resolved "https://registry.yarnpkg.com/@cardinal/token-manager/-/token-manager-4.5.1.tgz#37ed638fa109fba24169bfa7fba486c529e8be52"
resolved "https://registry.yarnpkg.com/@solana-nft-programs/token-manager/-/token-manager-4.5.1.tgz#37ed638fa109fba24169bfa7fba486c529e8be52"
integrity sha512-/pvxl7VmCKbFlr0BBnwFtzPcIJ4Z6oE9fOkWSkjR1+6xF+iiLT+YGJZ2qrO54M9F3zMCQfRY1HwzWxChRJBSYQ==
dependencies:
"@cardinal/common" "^7.1.3"
"@cardinal/creator-standard" "^2.1.7"
"@cardinal/payment-manager" "^4.0.1"
"@solana-nft-programs/common" "^7.1.3"
"@solana-nft-programs/creator-standard" "^2.1.7"
"@solana-nft-programs/payment-manager" "^4.0.1"
"@metaplex-foundation/mpl-token-auth-rules" "^1.0.0"
"@metaplex-foundation/mpl-token-metadata" "^2.8.3"
"@msgpack/msgpack" "^2.8.0"
Expand Down

0 comments on commit c91861a

Please sign in to comment.