fix: build

.changeset/clever-flies-sneeze.md

@@ -0,0 +1,26 @@
+---
+"@abstract-money/cli": minor
+"@abstract-money/core": minor
+"@abstract-money/cosmwasm-utils": minor
+"@abstract-money/react": minor
+---
+
+First release of **abstract.js** revamped SDK!
+
+New SDK structure involves multiple packages, each with its own dependencies.
+This allows for more flexibility and better control over the SDK.
+
+Old-new packages mapping:
+
+- `@abstract-money/abstract.js` -> `@abstract-money/core`
+- `@abstract-money/abstract.js-react` -> `@abstract-money/react`
+- `@abstract-money/cosmwasm` -> `@abstract-money/cosmwasm-utils`
+
+A new package was introduced, `@abstract-money/cli` that adopts a quicker
+development setup when using Abstract contracts.
+A developer is now not obligated to download the Abstract contract schemas himself,
+and can simply enumerate the required contracts via the `registry` plugin,
+available at `@abstract-money/cli/plugins`, and the CLI will download and cache them
+itself.
+This feature also allowed to cut out the boilerplate code from the old `@abstract-money/abstract.js`,
+yet keeping the backwards compatibility.

.github/workflows/on-push-to-main.yml

@@ -1,7 +1,7 @@
 name: Main
 on:
   push:
-    branches: [main]
+    branches: [mainline]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -31,7 +31,7 @@ jobs:
 
       - name: Create version pull request or publish to npm
         id: changesets
-        uses: changesets/action@v1
+        uses: changesets/action@v1.4.1
         with:
           title: "chore: version packages"
           commit: "chore: version packages"

examples/wagemos-cosmoskit-nextjs/package.json

@@ -10,8 +10,8 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@abstract-money/core": "workspace:@abstract-money/core@*",
-    "@abstract-money/react": "workspace:@abstract-money/react@*",
+    "@abstract-money/core": "workspace:*",
+    "@abstract-money/react": "workspace:*",
     "@chain-registry/types": "^0.13.1",
     "@cosmjs/amino": "^0.31.0",
     "@cosmjs/cosmwasm-stargate": "^0.31.0",
@@ -44,7 +44,7 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@abstract-money/cli": "workspace:@abstract-money/cli@*",
+    "@abstract-money/cli": "workspace:*",
     "@keplr-wallet/types": "^0.12.44",
     "@types/node": "^20",
     "@types/react": "^18",

examples/wagemos-cosmoskit-nextjs/src/_generated/index.ts

@@ -1,3 +1,5 @@
+'use client'
+
 import {
   SigningCosmWasmClient,
   CosmWasmClient,

examples/wagemos-cosmoskit-nextjs/src/app/@bets/_components/place-bet-dialog.tsx → examples/wagemos-cosmoskit-nextjs/src/app/_components/place-bet-dialog.tsx

@@ -8,16 +8,16 @@ import { Loader2 } from 'lucide-react'
 import { useCallback, useState } from 'react'
 import { SubmitHandler, useForm } from 'react-hook-form'
 import { z } from 'zod'
-import { betting } from '../../../_generated'
-import { RoundResponse } from '../../../_generated/cosmwasm-codegen/Betting.types'
-import { Button } from '../../../components/ui/button'
+import { betting } from '../../_generated'
+import { RoundResponse } from '../../_generated/cosmwasm-codegen/Betting.types'
+import { Button } from '../../components/ui/button'
 import {
   Dialog,
   DialogContent,
   DialogFooter,
   DialogHeader,
   DialogTitle,
-} from '../../../components/ui/dialog'
+} from '../../components/ui/dialog'
 import {
   Form,
   FormControl,
@@ -26,16 +26,16 @@ import {
   FormItem,
   FormLabel,
   FormMessage,
-} from '../../../components/ui/form'
-import { Input } from '../../../components/ui/input'
+} from '../../components/ui/form'
+import { Input } from '../../components/ui/input'
 import {
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '../../../components/ui/select'
-import { useToast } from '../../../components/ui/use-toast'
+} from '../../components/ui/select'
+import { useToast } from '../../components/ui/use-toast'
 
 const placeBetSchema = z.object({
   amount: z.coerce

examples/wagemos-graz-nextjs/src/app/@bets/_components/round.tsx → examples/wagemos-cosmoskit-nextjs/src/app/_components/round.tsx

@@ -1,6 +1,6 @@
 import { ComponentProps } from 'react'
-import { Badge } from '../../../components/ui/badge'
-import { cn } from '../../../utils'
+import { Badge } from '../../components/ui/badge'
+import { cn } from '../../utils'
 
 export function Round({ className, ...rest }: ComponentProps<'div'>) {
   return (

examples/wagemos-cosmoskit-nextjs/src/app/layout.tsx

@@ -1,6 +1,11 @@
-import { AbstractProvider } from '@abstract-money/react'
+'use client'
+
+import { AbstractAccountId } from '@abstract-money/core'
+import {
+  AbstractAccountIdProvider,
+  AbstractProvider,
+} from '@abstract-money/react'
 import '@interchain-ui/react/styles'
-import type { Metadata } from 'next'
 import { Inter, Poppins } from 'next/font/google'
 import { Toaster } from '../components/ui/toaster'
 import { cn } from '../utils'
@@ -14,27 +19,25 @@ const poppins = Poppins({
   variable: '--font-display',
 })
 
-export const metadata: Metadata = {
-  title: 'Wagemos App',
-  description: 'Wagemos App using Abstract SDK',
-}
-
 export default function RootLayout({
   children,
-  bets,
 }: {
   children: React.ReactNode
-  bets: React.ReactNode
 }) {
   return (
     <html lang="en">
       <body className={cn(inter.variable, poppins.variable)}>
         <CosmosKitProvider>
           <AbstractProvider>
-            <main className="flex flex-col items-center p-24 min-h-screen">
-              {children}
-              {bets}
-            </main>
+            <AbstractAccountIdProvider
+              accountId={AbstractAccountId.fromStringId('neutron-18')}
+            >
+              <main className="flex flex-col items-center p-24 min-h-screen">
+                <section className="mt-10">
+                  <div className="mt-10">{children}</div>
+                </section>
+              </main>
+            </AbstractAccountIdProvider>
           </AbstractProvider>
         </CosmosKitProvider>
         <Toaster />

examples/wagemos-cosmoskit-nextjs/src/app/page.tsx

@@ -1,10 +1,81 @@
+'use client'
+
+import { betting } from '../_generated'
+import { PlaceBetDialog } from './_components/place-bet-dialog'
+import {
+  Round,
+  RoundBody,
+  RoundDescription,
+  RoundFooter,
+  RoundHeader,
+  RoundId,
+  RoundName,
+  RoundStatus,
+  RoundTeamMember,
+  RoundTeams,
+  RoundTotalBet,
+  RoundWinningTeam,
+} from './_components/round'
 import { WalletButton } from './_components/wallet-button'
 
 export default function Home() {
+  const { data, isLoading, isError } = betting.queries.useListRounds({
+    args: {},
+    chain: 'neutron',
+  })
+  if (isLoading) return <p>Loading...</p>
+  if (isError) return <p>Error</p>
   return (
     <>
       <h1>WAGEMOS with cosmoskit</h1>
       <WalletButton />
+      <div>
+        <h4>List of Rounds:</h4>
+        <div className="grid row-auto gap-2 md:grid-cols-2">
+          {data.rounds.map((round) => {
+            const status =
+              typeof round.status === 'string'
+                ? { status: round.status }
+                : ({
+                    status: 'closed',
+                    winningTeam: round.status.closed.winning_team?.seq,
+                  } as const)
+            return (
+              <Round key={round.id}>
+                <RoundHeader>
+                  <RoundName>{round.name}</RoundName>
+                  <RoundId>ID: {round.id}</RoundId>
+                  <RoundStatus open={status.status === 'open'}>
+                    {status.status}
+                  </RoundStatus>
+                  {status.winningTeam && (
+                    <RoundWinningTeam>
+                      Winner Account Sequence: {status.winningTeam}
+                    </RoundWinningTeam>
+                  )}
+                </RoundHeader>
+                <RoundBody>
+                  <RoundDescription>{round.description}</RoundDescription>
+                  <p>Team members:</p>
+                  <RoundTeams>
+                    {round.teams.map((member, i) => (
+                      <RoundTeamMember key={i}>
+                        Account Seq: {member.seq}
+                      </RoundTeamMember>
+                    ))}
+                  </RoundTeams>
+                </RoundBody>
+                <RoundFooter>
+                  <RoundTotalBet>
+                    Total Bet: {round.total_bet.amount} {round.total_bet.name}
+                  </RoundTotalBet>
+                  {status.status === 'open' && <PlaceBetDialog round={round} />}
+                </RoundFooter>
+              </Round>
+            )
+          })}
+        </div>
+      </div>
     </>
   )
 }

examples/wagemos-graz-nextjs/package.json

@@ -12,8 +12,8 @@
     "generate": "graz generate -g -b"
   },
   "dependencies": {
-    "@abstract-money/core": "workspace:@abstract-money/core@*",
-    "@abstract-money/react": "workspace:@abstract-money/react@*",
+    "@abstract-money/core": "workspace:*",
+    "@abstract-money/react": "workspace:*",
     "@cosmjs/amino": "^0.31.0",
     "@cosmjs/cosmwasm-stargate": "^0.31.0",
     "@cosmjs/encoding": "^0.31.0",
@@ -43,7 +43,7 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@abstract-money/cli": "workspace:@abstract-money/cli@*",
+    "@abstract-money/cli": "workspace:*",
     "@keplr-wallet/types": "^0.12.44",
     "@types/node": "^20",
     "@types/react": "^18",