From fa2cd31fe3c9cb075d0bd565247ea9589dff6afc Mon Sep 17 00:00:00 2001
From: Steven <steven@straatemans.nl>
Date: Tue, 10 Dec 2024 07:22:05 +0100
Subject: [PATCH] feat(rwa): add asset (#2706)

---
 .changeset/curvy-mice-destroy.md              |    2 +
 .changeset/popular-rice-search.md             |    2 +
 .../rwa-demo/src/app/(app)/assets/page.tsx    |  112 +-
 .../apps/rwa-demo/src/app/(app)/layout.tsx    |   13 +-
 .../src/components/AgentForm/AgentForm.tsx    |    5 +
 .../src/components/AgentsList/AgentsList.tsx  |   11 +-
 .../AssetForm/AddExistingAssetForm.tsx        |   52 +
 .../src/components/AssetForm/AssetForm.tsx    |   51 +
 .../components/AssetForm/StepperAssetForm.tsx |  202 +++
 .../src/components/AssetInfo/AssetInfo.tsx    |    2 +-
 .../AssetProvider/AssetProvider.tsx           |   79 +-
 .../src/components/AssetSwitch/AssetForm.tsx  |   98 --
 .../components/AssetSwitch/AssetSwitch.tsx    |   36 +-
 .../TableFormatters/FormatAgentRoles.tsx      |   34 +
 .../TransactionsProvider.tsx                  |    1 +
 .../apps/rwa-demo/src/hooks/createContract.ts |   46 +
 .../src/hooks/createPrincipalNamespace.ts     |   41 +
 packages/apps/rwa-demo/src/hooks/freeze.ts    |    2 +-
 .../apps/rwa-demo/src/hooks/getAgentRoles.ts  |   24 +
 packages/apps/rwa-demo/src/hooks/getAgents.ts |    8 +-
 .../apps/rwa-demo/src/hooks/getInvestors.ts   |    4 +-
 .../apps/rwa-demo/src/hooks/initContract.ts   |   50 +
 packages/apps/rwa-demo/src/hooks/paused.ts    |    4 +-
 packages/apps/rwa-demo/src/hooks/supply.ts    |    2 +-
 .../apps/rwa-demo/src/services/addAgent.ts    |    6 +-
 .../rwa-demo/src/services/createContract.ts   |   28 +
 .../src/services/createPrincipalNamespace.ts  |   37 +
 .../rwa-demo/src/services/deleteIdentity.ts   |    4 +-
 .../rwa-demo/src/services/distributeTokens.ts |   15 +-
 .../rwa-demo/src/services/getAgentRoles.ts    |   34 +
 .../src/services/getAssetMaxSupplyBalance.ts  |   72 +-
 .../apps/rwa-demo/src/services/getBalance.ts  |    2 +-
 .../rwa-demo/src/services/getFrozenTokens.ts  |    4 +-
 .../rwa-demo/src/services/initContract.ts     |   36 +
 .../apps/rwa-demo/src/services/isAgent.ts     |    2 +-
 .../src/services/isComplianceOwner.ts         |   10 +-
 .../apps/rwa-demo/src/services/isFrozen.ts    |    2 +-
 .../apps/rwa-demo/src/services/isInvestor.ts  |    2 +-
 .../apps/rwa-demo/src/services/isOwner.ts     |    7 +-
 .../apps/rwa-demo/src/services/isPaused.ts    |    2 +-
 .../src/services/pact/modalcontract.ts        | 1154 +++++++++++++++++
 packages/apps/rwa-demo/src/services/paused.ts |    2 +-
 .../rwa-demo/src/services/registerIdentity.ts |    6 +-
 .../apps/rwa-demo/src/services/removeAgent.ts |    4 +-
 .../rwa-demo/src/services/setAddressFrozen.ts |    4 +-
 .../rwa-demo/src/services/setCompliance.ts    |    4 +-
 packages/apps/rwa-demo/src/services/supply.ts |    2 +-
 .../services/togglePartiallyFreezeTokens.ts   |    4 +-
 .../apps/rwa-demo/src/services/togglePause.ts |    4 +-
 .../rwa-demo/src/services/transferTokens.ts   |    4 +-
 packages/apps/rwa-demo/src/utils/getAsset.ts  |    6 +-
 .../apps/rwa-demo/src/utils/store/index.ts    |   15 +-
 .../LayoutProvider/NotificationsProvider.tsx  |    6 +-
 53 files changed, 2109 insertions(+), 250 deletions(-)
 create mode 100644 .changeset/curvy-mice-destroy.md
 create mode 100644 .changeset/popular-rice-search.md
 create mode 100644 packages/apps/rwa-demo/src/components/AssetForm/AddExistingAssetForm.tsx
 create mode 100644 packages/apps/rwa-demo/src/components/AssetForm/AssetForm.tsx
 create mode 100644 packages/apps/rwa-demo/src/components/AssetForm/StepperAssetForm.tsx
 delete mode 100644 packages/apps/rwa-demo/src/components/AssetSwitch/AssetForm.tsx
 create mode 100644 packages/apps/rwa-demo/src/components/TableFormatters/FormatAgentRoles.tsx
 create mode 100644 packages/apps/rwa-demo/src/hooks/createContract.ts
 create mode 100644 packages/apps/rwa-demo/src/hooks/createPrincipalNamespace.ts
 create mode 100644 packages/apps/rwa-demo/src/hooks/getAgentRoles.ts
 create mode 100644 packages/apps/rwa-demo/src/hooks/initContract.ts
 create mode 100644 packages/apps/rwa-demo/src/services/createContract.ts
 create mode 100644 packages/apps/rwa-demo/src/services/createPrincipalNamespace.ts
 create mode 100644 packages/apps/rwa-demo/src/services/getAgentRoles.ts
 create mode 100644 packages/apps/rwa-demo/src/services/initContract.ts
 create mode 100644 packages/apps/rwa-demo/src/services/pact/modalcontract.ts

diff --git a/.changeset/curvy-mice-destroy.md b/.changeset/curvy-mice-destroy.md
new file mode 100644
index 0000000000..a845151cc8
--- /dev/null
+++ b/.changeset/curvy-mice-destroy.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/popular-rice-search.md b/.changeset/popular-rice-search.md
new file mode 100644
index 0000000000..a845151cc8
--- /dev/null
+++ b/.changeset/popular-rice-search.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/apps/rwa-demo/src/app/(app)/assets/page.tsx b/packages/apps/rwa-demo/src/app/(app)/assets/page.tsx
index d5f383a94e..d6e5fd9379 100644
--- a/packages/apps/rwa-demo/src/app/(app)/assets/page.tsx
+++ b/packages/apps/rwa-demo/src/app/(app)/assets/page.tsx
@@ -1,34 +1,102 @@
 'use client';
 
+import { AssetForm } from '@/components/AssetForm/AssetForm';
+import { Confirmation } from '@/components/Confirmation/Confirmation';
 import { useAsset } from '@/hooks/asset';
-import { CompactTable, CompactTableFormatters } from '@kadena/kode-ui/patterns';
+import { MonoAdd, MonoDelete } from '@kadena/kode-icons';
+import { Button } from '@kadena/kode-ui';
+import {
+  CompactTable,
+  CompactTableFormatters,
+  RightAside,
+  RightAsideContent,
+  RightAsideHeader,
+  SectionCard,
+  SectionCardBody,
+  SectionCardContentBlock,
+  SectionCardHeader,
+  useLayout,
+} from '@kadena/kode-ui/patterns';
 import Link from 'next/link';
+import { useState } from 'react';
 
 const Assets = () => {
-  const { assets } = useAsset();
+  const { assets, removeAsset } = useAsset();
+  const [openSide, setOpenSide] = useState(false);
+  const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
+
+  const handleDelete = (value: any) => {
+    removeAsset(value);
+  };
 
   return (
     <>
-      <CompactTable
-        variant="open"
-        fields={[
-          {
-            key: 'uuid',
-            label: 'id',
-            width: '40%',
-            render: CompactTableFormatters.FormatLink({
-              linkComponent: Link,
-              url: '/assets/:value',
-            }),
-          },
-          {
-            key: 'name',
-            label: 'name',
-            width: '60%',
-          },
-        ]}
-        data={assets}
-      />
+      {isRightAsideExpanded && openSide && (
+        <RightAside
+          isOpen
+          onClose={() => {
+            setIsRightAsideExpanded(false);
+            setOpenSide(false);
+          }}
+        >
+          <RightAsideHeader label="Assets" />
+          <RightAsideContent></RightAsideContent>
+        </RightAside>
+      )}
+      <SectionCard stack="vertical">
+        <SectionCardContentBlock>
+          <SectionCardHeader
+            title="Assets"
+            description={<>List of all your selected contracts</>}
+            actions={
+              <AssetForm
+                trigger={
+                  <Button variant="outlined" isCompact endVisual={<MonoAdd />}>
+                    Add Asset
+                  </Button>
+                }
+              />
+            }
+          />
+          <SectionCardBody>
+            <CompactTable
+              fields={[
+                {
+                  key: 'contractName',
+                  label: 'name',
+                  width: '90%',
+                  render: CompactTableFormatters.FormatLink({
+                    linkComponent: Link,
+                    url: '/assets/:value',
+                  }),
+                },
+                {
+                  label: '',
+                  key: 'uuid',
+                  width: '10%',
+                  render: CompactTableFormatters.FormatActions({
+                    trigger: (
+                      <Confirmation
+                        onPress={handleDelete}
+                        trigger={
+                          <Button
+                            isCompact
+                            variant="outlined"
+                            startVisual={<MonoDelete />}
+                          />
+                        }
+                      >
+                        Are you sure you want to remove this asset?
+                      </Confirmation>
+                    ),
+                  }),
+                },
+              ]}
+              data={assets}
+            />
+          </SectionCardBody>
+        </SectionCardContentBlock>
+      </SectionCard>
     </>
   );
 };
diff --git a/packages/apps/rwa-demo/src/app/(app)/layout.tsx b/packages/apps/rwa-demo/src/app/(app)/layout.tsx
index 4b44513c56..6910989fb4 100644
--- a/packages/apps/rwa-demo/src/app/(app)/layout.tsx
+++ b/packages/apps/rwa-demo/src/app/(app)/layout.tsx
@@ -9,13 +9,15 @@ import {
 } from '@kadena/kode-ui/patterns';
 
 import { ActiveTransactionsList } from '@/components/ActiveTransactionsList/ActiveTransactionsList';
+import { StepperAssetForm } from '@/components/AssetForm/StepperAssetForm';
 import { AssetInfo } from '@/components/AssetInfo/AssetInfo';
-import { AssetForm } from '@/components/AssetSwitch/AssetForm';
 import { TransactionPendingIcon } from '@/components/TransactionPendingIcon/TransactionPendingIcon';
+import { useAccount } from '@/hooks/account';
 import { useTransactions } from '@/hooks/transactions';
 import { getAsset } from '@/utils/getAsset';
 import { MonoAccountBalanceWallet } from '@kadena/kode-icons';
 import { Button, Heading, Link, Stack } from '@kadena/kode-ui';
+import { useRouter } from 'next/navigation';
 import React, { useEffect, useRef, useState } from 'react';
 import { KLogo } from './KLogo';
 import { SideBar } from './SideBar';
@@ -25,12 +27,14 @@ const RootLayout = ({
 }: Readonly<{
   children: React.ReactNode;
 }>) => {
+  const { account, isMounted } = useAccount();
   const [openTransactionsSide, setOpenTransactionsSide] = useState(false);
   const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
   const { transactions, setTxsButtonRef, setTxsAnimationRef } =
     useTransactions();
   const txsButtonRef = useRef<HTMLButtonElement | null>(null);
   const transactionAnimationRef = useRef<HTMLDivElement | null>(null);
+  const router = useRouter();
 
   useEffect(() => {
     if (!txsButtonRef.current || !transactionAnimationRef.current) return;
@@ -38,6 +42,11 @@ const RootLayout = ({
     setTxsAnimationRef(transactionAnimationRef.current);
   }, [txsButtonRef.current, transactionAnimationRef.current]);
 
+  if (isMounted && !account) {
+    router.replace('/login');
+    return;
+  }
+
   if (!getAsset()) {
     return (
       <Stack
@@ -49,7 +58,7 @@ const RootLayout = ({
       >
         <div>
           <Heading>Add new asset</Heading>
-          <AssetForm />
+          <StepperAssetForm />
         </div>
       </Stack>
     );
diff --git a/packages/apps/rwa-demo/src/components/AgentForm/AgentForm.tsx b/packages/apps/rwa-demo/src/components/AgentForm/AgentForm.tsx
index 2b3b6c6928..4413c8ff5d 100644
--- a/packages/apps/rwa-demo/src/components/AgentForm/AgentForm.tsx
+++ b/packages/apps/rwa-demo/src/components/AgentForm/AgentForm.tsx
@@ -21,9 +21,13 @@ interface IProps {
 }
 
 export const AgentForm: FC<IProps> = ({ onClose, agent, trigger }) => {
+  // const { data: userAgentRolesData } = useGetAgentRoles({
+  //   agent: agent?.accountName,
+  // });
   const { submit } = useEditAgent();
   const [isOpen, setIsOpen] = useState(false);
   const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
+
   const {
     handleSubmit,
     control,
@@ -60,6 +64,7 @@ export const AgentForm: FC<IProps> = ({ onClose, agent, trigger }) => {
   };
 
   const onSubmit = async (data: IAddAgentProps) => {
+    console.log({ data });
     await submit(data);
     handleOnClose();
   };
diff --git a/packages/apps/rwa-demo/src/components/AgentsList/AgentsList.tsx b/packages/apps/rwa-demo/src/components/AgentsList/AgentsList.tsx
index 81f6c7a975..ddf64812c5 100644
--- a/packages/apps/rwa-demo/src/components/AgentsList/AgentsList.tsx
+++ b/packages/apps/rwa-demo/src/components/AgentsList/AgentsList.tsx
@@ -19,6 +19,7 @@ import { useRouter } from 'next/navigation';
 import type { FC } from 'react';
 import { AgentForm } from '../AgentForm/AgentForm';
 import { Confirmation } from '../Confirmation/Confirmation';
+import { FormatAgentRoles } from '../TableFormatters/FormatAgentRoles';
 
 export const AgentsList: FC = () => {
   const { paused } = useAsset();
@@ -63,14 +64,20 @@ export const AgentsList: FC = () => {
                 {
                   label: 'Name',
                   key: 'alias',
-                  width: '30%',
+                  width: '20%',
                 },
                 {
                   label: 'Account',
                   key: 'accountName',
-                  width: '50%',
+                  width: '20%',
                   render: CompactTableFormatters.FormatAccount(),
                 },
+                {
+                  label: 'Roles',
+                  key: 'accountName',
+                  width: '40%',
+                  render: FormatAgentRoles(),
+                },
                 {
                   label: '',
                   key: 'accountName',
diff --git a/packages/apps/rwa-demo/src/components/AssetForm/AddExistingAssetForm.tsx b/packages/apps/rwa-demo/src/components/AssetForm/AddExistingAssetForm.tsx
new file mode 100644
index 0000000000..914a9cf4af
--- /dev/null
+++ b/packages/apps/rwa-demo/src/components/AssetForm/AddExistingAssetForm.tsx
@@ -0,0 +1,52 @@
+import { useAsset } from '@/hooks/asset';
+import { Button, Stack, TextField } from '@kadena/kode-ui';
+import { useRouter } from 'next/navigation';
+import type { FC } from 'react';
+import { Controller, useForm } from 'react-hook-form';
+
+interface IAddExistingAssetProps {
+  name: string;
+}
+
+export const AddExistingAssetForm: FC = () => {
+  const router = useRouter();
+  const { addExistingAsset } = useAsset();
+  const {
+    handleSubmit,
+    control,
+    formState: { isValid },
+  } = useForm<IAddExistingAssetProps>({
+    values: {
+      name: '',
+    },
+  });
+
+  const handleSave = async (data: IAddExistingAssetProps) => {
+    const asset = addExistingAsset(data.name);
+    if (!asset) return;
+
+    router.refresh();
+  };
+
+  return (
+    <Stack
+      as="form"
+      flexDirection="column"
+      gap="sm"
+      onSubmit={handleSubmit(handleSave)}
+    >
+      <Controller
+        name="name"
+        control={control}
+        rules={{ required: true }}
+        render={({ field }) => (
+          <TextField placeholder="Asset name" {...field} />
+        )}
+      />
+
+      <Button isDisabled={!isValid} type="submit">
+        Add Existing Asset
+      </Button>
+    </Stack>
+  );
+};
diff --git a/packages/apps/rwa-demo/src/components/AssetForm/AssetForm.tsx b/packages/apps/rwa-demo/src/components/AssetForm/AssetForm.tsx
new file mode 100644
index 0000000000..2b7079b60b
--- /dev/null
+++ b/packages/apps/rwa-demo/src/components/AssetForm/AssetForm.tsx
@@ -0,0 +1,51 @@
+import {
+  RightAside,
+  RightAsideContent,
+  RightAsideHeader,
+  useLayout,
+} from '@kadena/kode-ui/patterns';
+import type { FC, ReactElement } from 'react';
+import { cloneElement, useState } from 'react';
+import type { IAsset } from '../AssetProvider/AssetProvider';
+import { StepperAssetForm } from './StepperAssetForm';
+
+interface IProps {
+  asset?: IAsset;
+  trigger: ReactElement;
+  onClose?: () => void;
+}
+
+export const AssetForm: FC<IProps> = ({ trigger, onClose }) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
+
+  const handleOpen = () => {
+    setIsRightAsideExpanded(true);
+    setIsOpen(true);
+    if (trigger.props.onPress) trigger.props.onPress();
+  };
+
+  const handleOnClose = () => {
+    setIsRightAsideExpanded(false);
+    setIsOpen(false);
+    if (onClose) onClose();
+  };
+
+  return (
+    <>
+      {isRightAsideExpanded && isOpen && (
+        <RightAside
+          isOpen={isRightAsideExpanded && isOpen}
+          onClose={handleOnClose}
+        >
+          <RightAsideHeader label="Add Asset" />
+          <RightAsideContent>
+            <StepperAssetForm />
+          </RightAsideContent>
+        </RightAside>
+      )}
+
+      {cloneElement(trigger, { ...trigger.props, onPress: handleOpen })}
+    </>
+  );
+};
diff --git a/packages/apps/rwa-demo/src/components/AssetForm/StepperAssetForm.tsx b/packages/apps/rwa-demo/src/components/AssetForm/StepperAssetForm.tsx
new file mode 100644
index 0000000000..15182a7127
--- /dev/null
+++ b/packages/apps/rwa-demo/src/components/AssetForm/StepperAssetForm.tsx
@@ -0,0 +1,202 @@
+import { useAsset } from '@/hooks/asset';
+import { useCreateContract } from '@/hooks/createContract';
+import { useCreatePrincipalNamespace } from '@/hooks/createPrincipalNamespace';
+import { useInitContract } from '@/hooks/initContract';
+import type { IAddContractProps } from '@/services/createContract';
+import {
+  Button,
+  Notification,
+  NotificationHeading,
+  Stack,
+  Step,
+  Stepper,
+  TextField,
+} from '@kadena/kode-ui';
+import { useRouter } from 'next/navigation';
+import type { FC } from 'react';
+import { useState } from 'react';
+import { Controller, useForm } from 'react-hook-form';
+import type { IAsset } from '../AssetProvider/AssetProvider';
+import { AddExistingAssetForm } from './AddExistingAssetForm';
+
+interface IProps {
+  asset?: IAsset;
+}
+
+const STEPS = {
+  CREATE_NAMESPACE: 0,
+  CREATE_CONTRACT: 1,
+  INIT_CONTRACT: 2,
+  DONE: 3,
+} as const;
+
+export const StepperAssetForm: FC<IProps> = () => {
+  const [contractData, setContractData] = useState<
+    IAddContractProps | undefined
+  >();
+  const [step, setStep] = useState<number>(STEPS.CREATE_NAMESPACE);
+  const { addAsset, setAsset } = useAsset();
+  const { submit } = useCreatePrincipalNamespace();
+  const { submit: submitInit } = useInitContract();
+  const { submit: submitContract } = useCreateContract();
+  const [namespace, setNamespace] = useState('');
+  const [error, setError] = useState('');
+  const router = useRouter();
+
+  const {
+    handleSubmit,
+    control,
+    formState: { isValid },
+  } = useForm<IAddContractProps>({
+    values: {
+      contractName: 'asd',
+      owner:
+        'k:9f6a3e6ed941c9abe2c9d12afea3fe55644282c2392fe7e9571e3822d21db229',
+      complianceOwner:
+        'k:9f6a3e6ed941c9abe2c9d12afea3fe55644282c2392fe7e9571e3822d21db229',
+      namespace,
+    },
+  });
+
+  const handleSave = async (data: IAddContractProps) => {
+    setContractData(data);
+    const tx = await submitContract(data);
+    if (tx?.result?.status === 'success') {
+      setStep(STEPS.INIT_CONTRACT);
+    }
+  };
+
+  return (
+    <Stack width="100%" flexDirection="column" alignItems="center">
+      <Stepper direction="horizontal">
+        <Step
+          status={step >= STEPS.CREATE_NAMESPACE ? 'active' : 'inactive'}
+          active={step === STEPS.CREATE_NAMESPACE}
+        >
+          Namespace
+        </Step>
+        <Step
+          status={step >= STEPS.CREATE_CONTRACT ? 'active' : 'inactive'}
+          active={step === STEPS.CREATE_CONTRACT}
+        >
+          Contract
+        </Step>
+        <Step
+          status={step >= STEPS.INIT_CONTRACT ? 'active' : 'inactive'}
+          active={step === STEPS.INIT_CONTRACT}
+        >
+          Init
+        </Step>
+      </Stepper>
+
+      {error && (
+        <Notification role="alert">
+          <NotificationHeading>There was an issue</NotificationHeading>
+          {error}
+        </Notification>
+      )}
+
+      {step === STEPS.CREATE_NAMESPACE && (
+        <Stack flexDirection="column" gap="sm">
+          <AddExistingAssetForm />
+          <Button
+            variant="outlined"
+            onPress={async () => {
+              setError('');
+              const transaction = await submit();
+              if (transaction?.result?.status === 'success') {
+                const ns = (transaction.result.data as string).split('.')[0];
+                if (!ns) {
+                  setError(
+                    `no namespace created from result (${transaction.result.data})`,
+                  );
+                }
+                setNamespace(ns);
+                setStep(STEPS.CREATE_CONTRACT);
+              } else {
+                setError(`no namespace created`);
+              }
+            }}
+          >
+            Start New Asset
+          </Button>
+        </Stack>
+      )}
+      {step === STEPS.INIT_CONTRACT && (
+        <Button
+          onPress={async () => {
+            setError('');
+            const transaction = await submitInit(contractData);
+
+            if (transaction?.result?.status === 'success' && contractData) {
+              setStep(STEPS.DONE);
+              const asset = addAsset({
+                contractName: contractData.contractName,
+                namespace: contractData.namespace,
+              });
+              if (!asset) return;
+              setAsset(asset);
+              router.push('/assets');
+            } else {
+              setError(`init failed`);
+            }
+          }}
+        >
+          Init Contract
+        </Button>
+      )}
+
+      {step === STEPS.DONE && (
+        <Button
+          onPress={async () => {
+            router.replace('/assets');
+            router.refresh();
+          }}
+        >
+          DONE
+        </Button>
+      )}
+
+      {step === STEPS.CREATE_CONTRACT && (
+        <form onSubmit={handleSubmit(handleSave)}>
+          <Controller
+            name="namespace"
+            control={control}
+            rules={{ required: true }}
+            render={({ field }) => <TextField isDisabled {...field} />}
+          />
+
+          <Controller
+            name="contractName"
+            control={control}
+            rules={{ required: true }}
+            render={({ field }) => (
+              <TextField label="Contract Name" {...field} />
+            )}
+          />
+
+          <Controller
+            name="owner"
+            control={control}
+            rules={{ required: true }}
+            render={({ field }) => <TextField label="Owner" {...field} />}
+          />
+
+          <Controller
+            name="complianceOwner"
+            control={control}
+            rules={{ required: true }}
+            render={({ field }) => (
+              <TextField label="Compliance Owner" {...field} />
+            )}
+          />
+          <Stack>
+            <Button isDisabled={!isValid} type="submit">
+              Create the contract
+            </Button>
+          </Stack>
+        </form>
+      )}
+    </Stack>
+  );
+};
diff --git a/packages/apps/rwa-demo/src/components/AssetInfo/AssetInfo.tsx b/packages/apps/rwa-demo/src/components/AssetInfo/AssetInfo.tsx
index 07e7a3f952..bad6f4f011 100644
--- a/packages/apps/rwa-demo/src/components/AssetInfo/AssetInfo.tsx
+++ b/packages/apps/rwa-demo/src/components/AssetInfo/AssetInfo.tsx
@@ -9,7 +9,7 @@ export const AssetInfo: FC = () => {
   if (!asset) return;
   return (
     <Stack width="100%" flexDirection="column">
-      <Heading as="h3">{asset.name}</Heading>
+      <Heading as="h3">{asset.contractName}</Heading>
       <Stack width="100%" alignItems="center" gap="md">
         <Button isDisabled>
           {paused ? (
diff --git a/packages/apps/rwa-demo/src/components/AssetProvider/AssetProvider.tsx b/packages/apps/rwa-demo/src/components/AssetProvider/AssetProvider.tsx
index cb7281dcf7..9c9c9c9c97 100644
--- a/packages/apps/rwa-demo/src/components/AssetProvider/AssetProvider.tsx
+++ b/packages/apps/rwa-demo/src/components/AssetProvider/AssetProvider.tsx
@@ -18,7 +18,8 @@ import type { IWalletAccount } from '../AccountProvider/utils';
 
 export interface IAsset extends IGetAssetMaxSupplyBalanceResult {
   uuid: string;
-  name: string;
+  contractName: string;
+  namespace: string;
   supply: number;
 }
 
@@ -27,6 +28,15 @@ export interface IAssetContext {
   assets: IAsset[];
   paused: boolean;
   setAsset: (asset: IAsset) => void;
+  addAsset: ({
+    contractName,
+    namespace,
+  }: {
+    contractName: string;
+    namespace: string;
+  }) => IAsset | undefined;
+  addExistingAsset: (name: string) => IAsset | undefined;
+  removeAsset: (uuid: string) => void;
   getAsset: (
     uuid: string,
     account: IWalletAccount,
@@ -37,6 +47,9 @@ export const AssetContext = createContext<IAssetContext>({
   assets: [],
   paused: false,
   setAsset: () => {},
+  addAsset: () => undefined,
+  addExistingAsset: () => undefined,
+  removeAsset: (uuid: string) => undefined,
   getAsset: async () => undefined,
 });
 
@@ -61,11 +74,13 @@ export const AssetProvider: FC<PropsWithChildren> = ({ children }) => {
   const storageListener = (event: StorageEvent | Event) => {
     if (event.type !== storageKey && 'key' in event && event.key !== storageKey)
       return;
+
     getAssets();
   };
 
   const handleSelectAsset = (data: IAsset) => {
     localStorage.setItem(selectedKey, JSON.stringify(data));
+    window.dispatchEvent(new Event(selectedKey));
     setAsset((old) => ({ ...old, ...data }));
 
     router.replace('/');
@@ -86,6 +101,44 @@ export const AssetProvider: FC<PropsWithChildren> = ({ children }) => {
     if (!data) return;
     return { ...data, ...extraAssetData, supply: supplyResult ?? 0 };
   };
+  const removeAsset = (uuid: string) => {
+    const data = getAssets().filter((a) => a.uuid !== uuid);
+    localStorage.setItem(storageKey, JSON.stringify(data));
+    window.dispatchEvent(new Event(storageKey));
+    setAssets(data);
+  };
+
+  const addAsset = ({
+    contractName,
+    namespace = 'RWA',
+  }: {
+    contractName: string;
+    namespace: string;
+  }) => {
+    const asset: IAsset = {
+      uuid: crypto.randomUUID(),
+      supply: -1,
+      maxSupply: -1,
+      maxBalance: -1,
+      contractName,
+      namespace,
+    };
+
+    const data = [...getAssets(), asset];
+    localStorage.setItem(storageKey, JSON.stringify(data));
+    window.dispatchEvent(new Event(storageKey));
+    setAssets(data);
+    return asset;
+  };
+
+  const addExistingAsset = (name: string) => {
+    const nameArray = name.split('.');
+    if (nameArray.length !== 2) {
+      throw new Error('asset contract not valid format');
+    }
+
+    return addAsset({ namespace: nameArray[0], contractName: nameArray[1] });
+  };
 
   useEffect(() => {
     getAssets();
@@ -105,18 +158,17 @@ export const AssetProvider: FC<PropsWithChildren> = ({ children }) => {
   };
 
   useEffect(() => {
-    const asset = getFullAsset();
-    setAsset(asset);
-    if (asset) {
-      return;
-    }
-  }, []);
+    if (asset) return;
+    const innerAsset = getFullAsset();
+    setAsset(innerAsset);
+    router.refresh();
+  }, [asset, assets]);
 
   useEffect(() => {
     if (!asset) return;
 
     setAsset((old) => old && { ...old, supply });
-  }, [asset?.name, supply]);
+  }, [asset?.contractName, supply]);
 
   useEffect(() => {
     if (!asset) return;
@@ -126,7 +178,16 @@ export const AssetProvider: FC<PropsWithChildren> = ({ children }) => {
 
   return (
     <AssetContext.Provider
-      value={{ asset, assets, setAsset: handleSelectAsset, getAsset, paused }}
+      value={{
+        asset,
+        assets,
+        setAsset: handleSelectAsset,
+        addAsset,
+        addExistingAsset,
+        getAsset,
+        removeAsset,
+        paused,
+      }}
     >
       {children}
     </AssetContext.Provider>
diff --git a/packages/apps/rwa-demo/src/components/AssetSwitch/AssetForm.tsx b/packages/apps/rwa-demo/src/components/AssetSwitch/AssetForm.tsx
deleted file mode 100644
index 91544d8bcd..0000000000
--- a/packages/apps/rwa-demo/src/components/AssetSwitch/AssetForm.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { LOCALSTORAGE_ASSETS_KEY } from '@/constants';
-import { getLocalStorageKey } from '@/utils/getLocalStorageKey';
-import { MonoAdd, MonoEditNote, MonoRemove } from '@kadena/kode-icons';
-import { Button, TextField } from '@kadena/kode-ui';
-import { useNotifications } from '@kadena/kode-ui/patterns';
-import type { ChangeEventHandler, FC, FormEventHandler } from 'react';
-import { useRef, useState } from 'react';
-import type { IAsset } from '../AssetProvider/AssetProvider';
-
-interface IProps {
-  asset?: IAsset;
-}
-
-export const AssetForm: FC<IProps> = ({ asset }) => {
-  const ref = useRef<HTMLInputElement | null>(null);
-  const { addNotification } = useNotifications();
-  const [value, setValue] = useState(asset?.name ?? '');
-
-  const handleChange: ChangeEventHandler<HTMLInputElement> = (e) => {
-    setValue(e.currentTarget.value);
-  };
-
-  const handleRemove = (data: IAsset) => {
-    const key = getLocalStorageKey(LOCALSTORAGE_ASSETS_KEY);
-    const assets = JSON.parse(localStorage.getItem(key) ?? '[]').filter(
-      (a: IAsset) => a.uuid !== data.uuid,
-    );
-    localStorage.setItem(key, JSON.stringify(assets));
-    window.dispatchEvent(new Event(key));
-
-    addNotification({
-      label: 'Asset removed',
-      intent: 'negative',
-    });
-  };
-
-  const handleSave: FormEventHandler<HTMLFormElement> = () => {
-    const key = getLocalStorageKey(LOCALSTORAGE_ASSETS_KEY);
-    const assets = JSON.parse(localStorage.getItem(key) ?? '[]');
-
-    let newAssets = [...assets];
-    if (!asset) {
-      const newAsset = {
-        uuid: crypto.randomUUID(),
-        name: value,
-      };
-      newAssets.push(newAsset);
-
-      addNotification({
-        label: 'Asset added',
-        intent: 'positive',
-      });
-    } else {
-      newAssets = newAssets.map((v) => {
-        if (v.uuid === asset.uuid) {
-          return { ...v, name: value };
-        }
-        return v;
-      });
-
-      addNotification({
-        label: 'Asset Changed',
-        intent: 'positive',
-      });
-    }
-
-    setValue('');
-    localStorage.setItem(key, JSON.stringify(newAssets));
-    window.dispatchEvent(new Event(key));
-  };
-
-  return (
-    <form onSubmit={handleSave}>
-      <TextField
-        ref={ref}
-        value={value}
-        label="New"
-        isRequired
-        onChange={handleChange}
-        endAddon={
-          <>
-            <Button
-              type="submit"
-              isDisabled={!value}
-              endVisual={!asset ? <MonoAdd /> : <MonoEditNote />}
-            />
-            {asset?.uuid && (
-              <Button
-                onPress={() => handleRemove(asset)}
-                endVisual={<MonoRemove />}
-              />
-            )}
-          </>
-        }
-      />
-    </form>
-  );
-};
diff --git a/packages/apps/rwa-demo/src/components/AssetSwitch/AssetSwitch.tsx b/packages/apps/rwa-demo/src/components/AssetSwitch/AssetSwitch.tsx
index c5bfde4446..6c0e79bec4 100644
--- a/packages/apps/rwa-demo/src/components/AssetSwitch/AssetSwitch.tsx
+++ b/packages/apps/rwa-demo/src/components/AssetSwitch/AssetSwitch.tsx
@@ -6,48 +6,23 @@ import {
   ContextMenuDivider,
   ContextMenuItem,
 } from '@kadena/kode-ui';
-import {
-  RightAside,
-  RightAsideContent,
-  RightAsideHeader,
-  useLayout,
-} from '@kadena/kode-ui/patterns';
+import { useRouter } from 'next/navigation';
 import type { FC } from 'react';
-import { useState } from 'react';
-import { AssetForm } from './AssetForm';
 
 export const AssetSwitch: FC<{ showLabel?: boolean }> = ({
   showLabel = true,
 }) => {
+  const router = useRouter();
   const { assets, asset, setAsset } = useAsset();
-  const [openSide, setOpenSide] = useState(false);
-  const { setIsRightAsideExpanded, isRightAsideExpanded } = useLayout();
 
   return (
     <>
-      {isRightAsideExpanded && openSide && (
-        <RightAside
-          isOpen
-          onClose={() => {
-            setIsRightAsideExpanded(false);
-            setOpenSide(false);
-          }}
-        >
-          <RightAsideHeader label="Assets" />
-          <RightAsideContent>
-            {assets.map((ass) => (
-              <AssetForm key={ass.uuid} asset={ass} />
-            ))}
-            <AssetForm />
-          </RightAsideContent>
-        </RightAside>
-      )}
       <ContextMenu
         trigger={
           <Button isCompact variant="outlined">
             {showLabel ? (
               asset ? (
-                asset.name
+                asset.contractName
               ) : (
                 'Select an asset'
               )
@@ -61,15 +36,14 @@ export const AssetSwitch: FC<{ showLabel?: boolean }> = ({
           <ContextMenuItem
             onClick={() => setAsset(ass)}
             key={ass.uuid}
-            label={ass.name}
+            label={ass.contractName}
           />
         ))}
         <ContextMenuDivider />
 
         <ContextMenuItem
           onClick={() => {
-            setIsRightAsideExpanded(true);
-            setOpenSide(true);
+            router.push('/assets');
           }}
           endVisual={<MonoSettings />}
           label="Asset Settings"
diff --git a/packages/apps/rwa-demo/src/components/TableFormatters/FormatAgentRoles.tsx b/packages/apps/rwa-demo/src/components/TableFormatters/FormatAgentRoles.tsx
new file mode 100644
index 0000000000..f8a8cb200c
--- /dev/null
+++ b/packages/apps/rwa-demo/src/components/TableFormatters/FormatAgentRoles.tsx
@@ -0,0 +1,34 @@
+import { useGetAgentRoles } from '@/hooks/getAgentRoles';
+import { AGENTROLES } from '@/services/addAgent';
+import { MonoCheck } from '@kadena/kode-icons';
+import { Stack } from '@kadena/kode-ui';
+import type { ICompactTableFormatterProps } from '@kadena/kode-ui/patterns';
+import React, { useMemo } from 'react';
+
+export interface IActionProps {}
+
+export const FormatAgentRoles = () => {
+  const Component = ({ value }: ICompactTableFormatterProps) => {
+    const allRoles: string[] = useMemo(() => {
+      return Object.entries(AGENTROLES).map(([key, value]) => value as string);
+    }, [AGENTROLES]);
+    const { data: roles } = useGetAgentRoles({ agent: value as string });
+
+    const renderValue = (value: string) => {
+      return roles.indexOf(value) >= 0 ? <MonoCheck /> : null;
+    };
+
+    return (
+      <ul>
+        {allRoles.map((value) => {
+          return (
+            <Stack as="li" key={value}>
+              {value} {renderValue(value)}
+            </Stack>
+          );
+        })}
+      </ul>
+    );
+  };
+  return Component;
+};
diff --git a/packages/apps/rwa-demo/src/components/TransactionsProvider/TransactionsProvider.tsx b/packages/apps/rwa-demo/src/components/TransactionsProvider/TransactionsProvider.tsx
index e2845fe0b5..2849500006 100644
--- a/packages/apps/rwa-demo/src/components/TransactionsProvider/TransactionsProvider.tsx
+++ b/packages/apps/rwa-demo/src/components/TransactionsProvider/TransactionsProvider.tsx
@@ -14,6 +14,7 @@ export interface ITransaction {
   requestKey: string;
   type: string;
   listener?: Promise<void | ICommandResult>;
+  result?: ICommandResult['result'];
 }
 
 export interface ITransactionsContext {
diff --git a/packages/apps/rwa-demo/src/hooks/createContract.ts b/packages/apps/rwa-demo/src/hooks/createContract.ts
new file mode 100644
index 0000000000..d4a33d17a6
--- /dev/null
+++ b/packages/apps/rwa-demo/src/hooks/createContract.ts
@@ -0,0 +1,46 @@
+import type { ITransaction } from '@/components/TransactionsProvider/TransactionsProvider';
+import { interpretErrorMessage } from '@/components/TransactionsProvider/TransactionsProvider';
+import type { IAddContractProps } from '@/services/createContract';
+import { createContract } from '@/services/createContract';
+import { getClient } from '@/utils/client';
+import { useNotifications } from '@kadena/kode-ui/patterns';
+import { useAccount } from './account';
+import { useTransactions } from './transactions';
+
+export const useCreateContract = () => {
+  const { account, sign } = useAccount();
+  const { addTransaction } = useTransactions();
+  const { addNotification } = useNotifications();
+
+  const submit = async (
+    data: IAddContractProps,
+  ): Promise<ITransaction | undefined> => {
+    try {
+      const tx = await createContract(data, account!);
+
+      const signedTransaction = await sign(tx);
+      if (!signedTransaction) return;
+
+      const client = getClient();
+      const res = await client.submit(signedTransaction);
+
+      console.log(res);
+
+      const dataResult = await client.listen(res);
+
+      return addTransaction({
+        ...res,
+        type: 'CREATEPRINCIPALNAMESPACE',
+        result: dataResult.result,
+      });
+    } catch (e: any) {
+      addNotification({
+        intent: 'negative',
+        label: 'there was an error',
+        message: interpretErrorMessage(e.message),
+      });
+    }
+  };
+
+  return { submit };
+};
diff --git a/packages/apps/rwa-demo/src/hooks/createPrincipalNamespace.ts b/packages/apps/rwa-demo/src/hooks/createPrincipalNamespace.ts
new file mode 100644
index 0000000000..db186130c7
--- /dev/null
+++ b/packages/apps/rwa-demo/src/hooks/createPrincipalNamespace.ts
@@ -0,0 +1,41 @@
+import type { ITransaction } from '@/components/TransactionsProvider/TransactionsProvider';
+import { interpretErrorMessage } from '@/components/TransactionsProvider/TransactionsProvider';
+import { createPrincipalNamespace } from '@/services/createPrincipalNamespace';
+import { getClient } from '@/utils/client';
+import { useNotifications } from '@kadena/kode-ui/patterns';
+import { useAccount } from './account';
+import { useTransactions } from './transactions';
+
+export const useCreatePrincipalNamespace = () => {
+  const { account, sign } = useAccount();
+  const { addTransaction } = useTransactions();
+  const { addNotification } = useNotifications();
+
+  const submit = async (): Promise<ITransaction | undefined> => {
+    try {
+      const tx = await createPrincipalNamespace({ owner: account! });
+
+      const signedTransaction = await sign(tx);
+      if (!signedTransaction) return;
+
+      const client = getClient();
+      const res = await client.submit(signedTransaction);
+
+      const data = await client.listen(res);
+
+      return addTransaction({
+        ...res,
+        type: 'CREATEPRINCIPALNAMESPACE',
+        result: data.result,
+      });
+    } catch (e: any) {
+      addNotification({
+        intent: 'negative',
+        label: 'there was an error',
+        message: interpretErrorMessage(e.message),
+      });
+    }
+  };
+
+  return { submit };
+};
diff --git a/packages/apps/rwa-demo/src/hooks/freeze.ts b/packages/apps/rwa-demo/src/hooks/freeze.ts
index 30d6822eab..b9b1d471dc 100644
--- a/packages/apps/rwa-demo/src/hooks/freeze.ts
+++ b/packages/apps/rwa-demo/src/hooks/freeze.ts
@@ -27,7 +27,7 @@ export const useFreeze = ({
 
   const { data } = useEventSubscriptionSubscription({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.ADDRESS-FROZEN`,
+      qualifiedName: `${getAsset()}.ADDRESS-FROZEN`,
     },
   });
 
diff --git a/packages/apps/rwa-demo/src/hooks/getAgentRoles.ts b/packages/apps/rwa-demo/src/hooks/getAgentRoles.ts
new file mode 100644
index 0000000000..7a8921a13a
--- /dev/null
+++ b/packages/apps/rwa-demo/src/hooks/getAgentRoles.ts
@@ -0,0 +1,24 @@
+import { getAgentRoles } from '@/services/getAgentRoles';
+import { useEffect, useState } from 'react';
+import { useAccount } from './account';
+
+export const useGetAgentRoles = ({ agent }: { agent?: string }) => {
+  const { account } = useAccount();
+  const [innerData, setInnerData] = useState<string[]>([]);
+
+  const initInnerData = async (agentArg: string) => {
+    const data = await getAgentRoles({ agent: agentArg }, account!);
+    setInnerData(data);
+  };
+
+  useEffect(() => {
+    if (!agent) {
+      setInnerData([]);
+      return;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    initInnerData(agent);
+  }, [agent]);
+
+  return { data: innerData };
+};
diff --git a/packages/apps/rwa-demo/src/hooks/getAgents.ts b/packages/apps/rwa-demo/src/hooks/getAgents.ts
index 0d78cd24ba..0b731d2e4a 100644
--- a/packages/apps/rwa-demo/src/hooks/getAgents.ts
+++ b/packages/apps/rwa-demo/src/hooks/getAgents.ts
@@ -37,25 +37,25 @@ export const useGetAgents = () => {
     error,
   } = useEventsQuery({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.AGENT-ADDED`,
+      qualifiedName: `${getAsset()}.AGENT-ADDED`,
     },
   });
 
   const { data: removedData, loading: removedLoading } = useEventsQuery({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.AGENT-REMOVED`,
+      qualifiedName: `${getAsset()}.AGENT-REMOVED`,
     },
   });
 
   const { data: subscriptionAddData } = useEventSubscriptionSubscription({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.AGENT-ADDED`,
+      qualifiedName: `{getAsset()}.AGENT-ADDED`,
     },
   });
 
   const { data: subscriptionRemoveData } = useEventSubscriptionSubscription({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.AGENT-REMOVED`,
+      qualifiedName: `${getAsset()}.AGENT-REMOVED`,
     },
   });
 
diff --git a/packages/apps/rwa-demo/src/hooks/getInvestors.ts b/packages/apps/rwa-demo/src/hooks/getInvestors.ts
index eafe52237c..fe4c0306e0 100644
--- a/packages/apps/rwa-demo/src/hooks/getInvestors.ts
+++ b/packages/apps/rwa-demo/src/hooks/getInvestors.ts
@@ -31,13 +31,13 @@ export const useGetInvestors = () => {
     error,
   } = useEventsQuery({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.IDENTITY-REGISTERED`,
+      qualifiedName: `${getAsset()}.IDENTITY-REGISTERED`,
     },
   });
 
   const { data: removedData, loading: removedLoading } = useEventsQuery({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.IDENTITY-REMOVED`,
+      qualifiedName: `${getAsset()}.IDENTITY-REMOVED`,
     },
   });
 
diff --git a/packages/apps/rwa-demo/src/hooks/initContract.ts b/packages/apps/rwa-demo/src/hooks/initContract.ts
new file mode 100644
index 0000000000..b78c963b30
--- /dev/null
+++ b/packages/apps/rwa-demo/src/hooks/initContract.ts
@@ -0,0 +1,50 @@
+import type { ITransaction } from '@/components/TransactionsProvider/TransactionsProvider';
+import { interpretErrorMessage } from '@/components/TransactionsProvider/TransactionsProvider';
+import type { IAddContractProps } from '@/services/createContract';
+import { initContract } from '@/services/initContract';
+import { getClient } from '@/utils/client';
+import { useNotifications } from '@kadena/kode-ui/patterns';
+import { useAccount } from './account';
+import { useTransactions } from './transactions';
+
+export const useInitContract = () => {
+  const { account, sign } = useAccount();
+  const { addTransaction } = useTransactions();
+  const { addNotification } = useNotifications();
+
+  const submit = async (
+    data?: IAddContractProps,
+  ): Promise<ITransaction | undefined> => {
+    if (!data) return;
+
+    try {
+      const tx = await initContract(data, account!);
+
+      console.log({ tx, cmd: JSON.parse(tx.cmd) });
+
+      const signedTransaction = await sign(tx);
+      if (!signedTransaction) return;
+
+      const client = getClient();
+      const res = await client.submit(signedTransaction);
+
+      console.log(res);
+
+      const dataResult = await client.listen(res);
+
+      return addTransaction({
+        ...res,
+        type: 'CREATEPRINCIPALNAMESPACE',
+        result: dataResult.result,
+      });
+    } catch (e: any) {
+      addNotification({
+        intent: 'negative',
+        label: 'there was an error',
+        message: interpretErrorMessage(e.message),
+      });
+    }
+  };
+
+  return { submit };
+};
diff --git a/packages/apps/rwa-demo/src/hooks/paused.ts b/packages/apps/rwa-demo/src/hooks/paused.ts
index e32f701fa8..f8cb971239 100644
--- a/packages/apps/rwa-demo/src/hooks/paused.ts
+++ b/packages/apps/rwa-demo/src/hooks/paused.ts
@@ -23,12 +23,12 @@ export const usePaused = () => {
 
   const { data: pausedData } = useEventSubscriptionSubscription({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.PAUSED`,
+      qualifiedName: `${getAsset()}.PAUSED`,
     },
   });
   const { data: unpausedData } = useEventSubscriptionSubscription({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.UNPAUSED`,
+      qualifiedName: `${getAsset()}.UNPAUSED`,
     },
   });
 
diff --git a/packages/apps/rwa-demo/src/hooks/supply.ts b/packages/apps/rwa-demo/src/hooks/supply.ts
index e75d20230f..6ed113d51e 100644
--- a/packages/apps/rwa-demo/src/hooks/supply.ts
+++ b/packages/apps/rwa-demo/src/hooks/supply.ts
@@ -23,7 +23,7 @@ export const useSupply = () => {
 
   const { data: subscriptionData } = useEventSubscriptionSubscription({
     variables: {
-      qualifiedName: `RWA.${getAsset()}.SUPPLY`,
+      qualifiedName: `${getAsset()}.SUPPLY`,
     },
   });
 
diff --git a/packages/apps/rwa-demo/src/services/addAgent.ts b/packages/apps/rwa-demo/src/services/addAgent.ts
index f4c20f29f5..93a8db3a22 100644
--- a/packages/apps/rwa-demo/src/services/addAgent.ts
+++ b/packages/apps/rwa-demo/src/services/addAgent.ts
@@ -31,15 +31,15 @@ export const addAgent = async (
 ) => {
   return Pact.builder
     .execution(
-      `(RWA.${getAsset()}.add-agent (read-string 'agent) (read-keyset 'agent_guard))`,
+      `(${getAsset()}.add-agent (read-string 'agent) (read-keyset 'agent_guard))`,
     )
     .setMeta({
       senderAccount: account.address,
       chainId: getNetwork().chainId,
     })
     .addSigner(account.keyset.guard.keys[0], (withCap) => [
-      withCap(`RWA.${getAsset()}.ONLY-OWNER`, ''),
-      withCap(`coin.GAS`),
+      withCap(`${getAsset()}.ONLY-OWNER`, ''),
+      withCap(`coin.GAS`, ''),
     ])
     .addData('agent', data.accountName)
     .addData('agent_guard', {
diff --git a/packages/apps/rwa-demo/src/services/createContract.ts b/packages/apps/rwa-demo/src/services/createContract.ts
new file mode 100644
index 0000000000..6ffca90ae1
--- /dev/null
+++ b/packages/apps/rwa-demo/src/services/createContract.ts
@@ -0,0 +1,28 @@
+import type { IWalletAccount } from '@/components/AccountProvider/utils';
+import { getNetwork } from '@/utils/client';
+import { Pact } from '@kadena/client';
+import { getContract } from './pact/modalcontract';
+
+export interface IAddContractProps {
+  contractName: string;
+  owner: string;
+  complianceOwner: string;
+  namespace: string;
+}
+
+export const createContract = async (
+  data: IAddContractProps,
+  account: IWalletAccount,
+) => {
+  return Pact.builder
+    .execution(getContract(data))
+    .addData('ns', data.namespace)
+    .setMeta({
+      senderAccount: account.address,
+      chainId: getNetwork().chainId,
+      gasLimit: 150000,
+    })
+    .addSigner(account.keyset.guard.keys[0], (withCap) => [])
+    .setNetworkId(getNetwork().networkId)
+    .createTransaction();
+};
diff --git a/packages/apps/rwa-demo/src/services/createPrincipalNamespace.ts b/packages/apps/rwa-demo/src/services/createPrincipalNamespace.ts
new file mode 100644
index 0000000000..044cb8ffc6
--- /dev/null
+++ b/packages/apps/rwa-demo/src/services/createPrincipalNamespace.ts
@@ -0,0 +1,37 @@
+import type { IWalletAccount } from '@/components/AccountProvider/utils';
+import { getNetwork } from '@/utils/client';
+import { Pact } from '@kadena/client';
+
+export interface ICreatePrincipalNamespaceProps {
+  owner: IWalletAccount;
+}
+
+export const createPrincipalNamespace = async (
+  data: ICreatePrincipalNamespaceProps,
+) => {
+  return Pact.builder
+    .execution(
+      `(define-namespace (ns.create-principal-namespace (read-keyset 'keyset))
+    (read-keyset 'keyset)
+    (read-keyset 'keyset)
+  )
+  (namespace (ns.create-principal-namespace (read-keyset 'keyset)))
+  (let ((keyset-name:string (format "{}.{}" [(ns.create-principal-namespace (read-keyset 'keyset)) 'admin-keyset]) ))
+    (define-keyset keyset-name (read-keyset 'keyset))
+    (enforce-keyset keyset-name)
+    keyset-name
+  )`,
+    )
+    .addData('keyset', {
+      keys: [data.owner.keyset.guard.keys[0]],
+      pred: 'keys-all',
+    })
+    .addData('roles', [])
+    .setMeta({
+      senderAccount: data.owner.address,
+      chainId: getNetwork().chainId,
+    })
+    .addSigner(data.owner.keyset.guard.keys[0], (withCap) => [])
+    .setNetworkId(getNetwork().networkId)
+    .createTransaction();
+};
diff --git a/packages/apps/rwa-demo/src/services/deleteIdentity.ts b/packages/apps/rwa-demo/src/services/deleteIdentity.ts
index fa1b359d00..ef5622efe0 100644
--- a/packages/apps/rwa-demo/src/services/deleteIdentity.ts
+++ b/packages/apps/rwa-demo/src/services/deleteIdentity.ts
@@ -12,13 +12,13 @@ export const deleteIdentity = async (
   account: IWalletAccount,
 ) => {
   return Pact.builder
-    .execution(`(RWA.${getAsset()}.delete-identity (read-string 'investor))`)
+    .execution(`(${getAsset()}.delete-identity (read-string 'investor))`)
     .setMeta({
       senderAccount: account.address,
       chainId: getNetwork().chainId,
     })
     .addSigner(account.keyset.guard.keys[0], (withCap) => [
-      withCap(`RWA.${getAsset()}.ONLY-AGENT`, 'whitelist-manager'),
+      withCap(`${getAsset()}.ONLY-AGENT`, 'whitelist-manager'),
       withCap(`coin.GAS`),
     ])
     .addData('investor', data.investor)
diff --git a/packages/apps/rwa-demo/src/services/distributeTokens.ts b/packages/apps/rwa-demo/src/services/distributeTokens.ts
index 6e2b3c01d7..e5a624e9b7 100644
--- a/packages/apps/rwa-demo/src/services/distributeTokens.ts
+++ b/packages/apps/rwa-demo/src/services/distributeTokens.ts
@@ -21,7 +21,7 @@ export const distributeTokens = async (
   return Pact.builder
     .execution(
       `
-       (RWA.${getAsset()}.mint (read-string 'investor) ${new PactNumber(data.amount).toDecimal()})`,
+       (${getAsset()}.mint (read-string 'investor) ${new PactNumber(data.amount).toDecimal()})`,
     )
     .addData('agent', account.address)
     .addData('investor', data.investorAccount)
@@ -34,15 +34,10 @@ export const distributeTokens = async (
       chainId: getNetwork().chainId,
     })
     .addSigner(account.keyset.guard.keys[0], (withCap) => [
-      withCap(`RWA.${getAsset()}.ONLY-AGENT`, 'supply-modifier'),
-      withCap(
-        `RWA.${getAsset()}.TRANSFER`,
-        env.ZEROADDRESS,
-        data.investorAccount,
-        {
-          decimal: data.amount,
-        },
-      ),
+      withCap(`${getAsset()}.ONLY-AGENT`, 'supply-modifier'),
+      withCap(`${getAsset()}.TRANSFER`, env.ZEROADDRESS, data.investorAccount, {
+        decimal: data.amount,
+      }),
       withCap(`coin.GAS`),
     ])
     .setNetworkId(getNetwork().networkId)
diff --git a/packages/apps/rwa-demo/src/services/getAgentRoles.ts b/packages/apps/rwa-demo/src/services/getAgentRoles.ts
new file mode 100644
index 0000000000..7b9b9d505d
--- /dev/null
+++ b/packages/apps/rwa-demo/src/services/getAgentRoles.ts
@@ -0,0 +1,34 @@
+import type { IWalletAccount } from '@/components/AccountProvider/utils';
+import { getClient, getNetwork } from '@/utils/client';
+import { getAsset } from '@/utils/getAsset';
+import { Pact } from '@kadena/client';
+
+export interface IGetAgentRolesProps {
+  agent: string;
+}
+
+export const getAgentRoles = async (
+  data: IGetAgentRolesProps,
+  account: IWalletAccount,
+): Promise<string[]> => {
+  const client = getClient();
+
+  const transaction = Pact.builder
+    .execution(`(${getAsset()}.get-agent-roles (read-string 'agent))`)
+    .setMeta({
+      senderAccount: account.address,
+      chainId: getNetwork().chainId,
+    })
+    .addData('agent', data.agent)
+    .setNetworkId(getNetwork().networkId)
+    .createTransaction();
+
+  const { result } = await client.local(transaction, {
+    preflight: false,
+    signatureVerification: false,
+  });
+
+  return result.status === 'success'
+    ? (result.data as string[])
+    : ([] as string[]);
+};
diff --git a/packages/apps/rwa-demo/src/services/getAssetMaxSupplyBalance.ts b/packages/apps/rwa-demo/src/services/getAssetMaxSupplyBalance.ts
index f4d6554502..7055a390de 100644
--- a/packages/apps/rwa-demo/src/services/getAssetMaxSupplyBalance.ts
+++ b/packages/apps/rwa-demo/src/services/getAssetMaxSupplyBalance.ts
@@ -6,29 +6,55 @@ export interface IGetAssetMaxSupplyBalanceResult {
   maxBalance: number;
 }
 
+export const getMaxBalance = async (): Promise<number> => {
+  const client = getClient();
+
+  const transaction = Pact.builder
+    .execution(`(RWA.max-balance-compliance.get-max-balance)`)
+    .setMeta({
+      chainId: getNetwork().chainId,
+    })
+    .setNetworkId(getNetwork().networkId)
+    .createTransaction();
+
+  const { result } = await client.local(transaction, {
+    preflight: false,
+    signatureVerification: false,
+  });
+
+  const data = (result as any).data as any;
+
+  return result.status === 'success' ? data : -1;
+};
+
+export const getMaxSupply = async (): Promise<number> => {
+  const client = getClient();
+
+  const transaction = Pact.builder
+    .execution(`(RWA.supply-limit-compliance.get-supply-limit)`)
+    .setMeta({
+      chainId: getNetwork().chainId,
+    })
+    .setNetworkId(getNetwork().networkId)
+    .createTransaction();
+
+  const { result } = await client.local(transaction, {
+    preflight: false,
+    signatureVerification: false,
+  });
+
+  const data = (result as any).data as any;
+
+  return result.status === 'success' ? data : -1;
+};
+
 export const getAssetMaxSupplyBalance =
   async (): Promise<IGetAssetMaxSupplyBalanceResult> => {
-    const client = getClient();
-
-    const transaction = Pact.builder
-      .execution(`(RWA.max-balance-compliance.get-max-balance-max-supply)`)
-      .setMeta({
-        chainId: getNetwork().chainId,
-      })
-      .setNetworkId(getNetwork().networkId)
-      .createTransaction();
-
-    const { result } = await client.local(transaction, {
-      preflight: false,
-      signatureVerification: false,
-    });
-
-    const data = (result as any).data as any;
-
-    return result.status === 'success'
-      ? ({
-          maxBalance: data['max-balance-per-investor'],
-          maxSupply: data['max-supply'],
-        } as IGetAssetMaxSupplyBalanceResult)
-      : { maxBalance: -1, maxSupply: -1 };
+    const maxBalanceResult = await getMaxBalance();
+    const maxSupplyResult = await getMaxSupply();
+
+    return {
+      maxBalance: maxBalanceResult,
+      maxSupply: maxSupplyResult,
+    };
   };
diff --git a/packages/apps/rwa-demo/src/services/getBalance.ts b/packages/apps/rwa-demo/src/services/getBalance.ts
index 857d3bf8dc..c119b457bf 100644
--- a/packages/apps/rwa-demo/src/services/getBalance.ts
+++ b/packages/apps/rwa-demo/src/services/getBalance.ts
@@ -12,7 +12,7 @@ export const getBalance = async (data: IGetBalanceProps) => {
   const client = getClient();
 
   const transaction = Pact.builder
-    .execution(`(RWA.${getAsset()}.get-balance (read-string 'account))`)
+    .execution(`(${getAsset()}.get-balance (read-string 'account))`)
     .setMeta({
       senderAccount: data.account.address,
       chainId: getNetwork().chainId,
diff --git a/packages/apps/rwa-demo/src/services/getFrozenTokens.ts b/packages/apps/rwa-demo/src/services/getFrozenTokens.ts
index 6cd519b86a..2fbed92e12 100644
--- a/packages/apps/rwa-demo/src/services/getFrozenTokens.ts
+++ b/packages/apps/rwa-demo/src/services/getFrozenTokens.ts
@@ -12,9 +12,7 @@ export const getFrozenTokens = async (data: IGetBalanceProps) => {
   const client = getClient();
 
   const transaction = Pact.builder
-    .execution(
-      `(RWA.${getAsset()}.get-frozen-tokens (read-string 'user-address))`,
-    )
+    .execution(`(${getAsset()}.get-frozen-tokens (read-string 'user-address))`)
     .setMeta({
       senderAccount: data.account.address,
       chainId: getNetwork().chainId,
diff --git a/packages/apps/rwa-demo/src/services/initContract.ts b/packages/apps/rwa-demo/src/services/initContract.ts
new file mode 100644
index 0000000000..10e3abf549
--- /dev/null
+++ b/packages/apps/rwa-demo/src/services/initContract.ts
@@ -0,0 +1,36 @@
+import type { IWalletAccount } from '@/components/AccountProvider/utils';
+import { getNetwork } from '@/utils/client';
+import { Pact } from '@kadena/client';
+import type { IAddContractProps } from './createContract';
+
+const createPubKeyFromAccount = (account: string): string => {
+  return account.replace('k:', '').replace('r:', '');
+};
+
+export const initContract = async (
+  data: IAddContractProps,
+  account: IWalletAccount,
+) => {
+  return Pact.builder
+    .execution(
+      `(${data.namespace}.${data.contractName}.init "${data.contractName}" "MVP" 0 "kadenaID" "0.0" [RWA.max-balance-compliance RWA.supply-limit-compliance] false (keyset-ref-guard "RWA.rwa-admin-keyset"))`,
+    )
+
+    .addData('owner_guard', {
+      keys: [createPubKeyFromAccount(data.owner)],
+      pred: 'keys-all',
+    })
+    .addData('compliance-owner', {
+      keys: [createPubKeyFromAccount(data.complianceOwner)],
+      pred: 'keys-all',
+    })
+    .setMeta({
+      senderAccount: account.address,
+      chainId: getNetwork().chainId,
+      gasLimit: 150000,
+    })
+
+    .addSigner(account.keyset.guard.keys[0], (withCap) => [])
+    .setNetworkId(getNetwork().networkId)
+    .createTransaction();
+};
diff --git a/packages/apps/rwa-demo/src/services/isAgent.ts b/packages/apps/rwa-demo/src/services/isAgent.ts
index f0f17e2740..b09f731ef2 100644
--- a/packages/apps/rwa-demo/src/services/isAgent.ts
+++ b/packages/apps/rwa-demo/src/services/isAgent.ts
@@ -10,7 +10,7 @@ export const isAgent = async (data: IIsAgentProps) => {
   const client = getClient();
 
   const transaction = Pact.builder
-    .execution(`(RWA.${getAsset()}.is-agent (read-string 'agent))`)
+    .execution(`(${getAsset()}.is-agent (read-string 'agent))`)
     .setMeta({
       senderAccount: data.agent,
       chainId: getNetwork().chainId,
diff --git a/packages/apps/rwa-demo/src/services/isComplianceOwner.ts b/packages/apps/rwa-demo/src/services/isComplianceOwner.ts
index 32feade701..d090665054 100644
--- a/packages/apps/rwa-demo/src/services/isComplianceOwner.ts
+++ b/packages/apps/rwa-demo/src/services/isComplianceOwner.ts
@@ -5,13 +5,15 @@ export interface IIsComplianceOwnerProps {
   owner: string;
 }
 
+//@TODO: break this up in seperate owners:
+// only checking the RWA.max-balance-compliance owner.
+// not checking the RWA.supply-limit-compliance
+// atm I make them the same
 export const isComplianceOwner = async (data: IIsComplianceOwnerProps) => {
   const client = getClient();
 
   const transaction = Pact.builder
-    .execution(
-      `(RWA.max-balance-compliance.is-compliance-owner (read-string 'owner))`,
-    )
+    .execution(`(RWA.max-balance-compliance.is-owner (read-string 'owner))`)
     .setMeta({
       senderAccount: data.owner,
       chainId: getNetwork().chainId,
@@ -25,5 +27,7 @@ export const isComplianceOwner = async (data: IIsComplianceOwnerProps) => {
     signatureVerification: false,
   });
 
+  console.log({ result });
+
   return result.status === 'success' ? result.data : undefined;
 };
diff --git a/packages/apps/rwa-demo/src/services/isFrozen.ts b/packages/apps/rwa-demo/src/services/isFrozen.ts
index 06fdd0fef4..59de343285 100644
--- a/packages/apps/rwa-demo/src/services/isFrozen.ts
+++ b/packages/apps/rwa-demo/src/services/isFrozen.ts
@@ -12,7 +12,7 @@ export const isFrozen = async (data: IIsFrozenProps) => {
   const client = getClient();
 
   const transaction = Pact.builder
-    .execution(`(RWA.${getAsset()}.address-frozen (read-string 'investor))`)
+    .execution(`(${getAsset()}.address-frozen (read-string 'investor))`)
     .setMeta({
       senderAccount: data.account.address,
       chainId: getNetwork().chainId,
diff --git a/packages/apps/rwa-demo/src/services/isInvestor.ts b/packages/apps/rwa-demo/src/services/isInvestor.ts
index 8f60e57ac1..ca7d539ecc 100644
--- a/packages/apps/rwa-demo/src/services/isInvestor.ts
+++ b/packages/apps/rwa-demo/src/services/isInvestor.ts
@@ -11,7 +11,7 @@ export const isInvestor = async (data: IIsInvestorProps) => {
   const client = getClient();
 
   const transaction = Pact.builder
-    .execution(`(RWA.${getAsset()}.contains-identity (read-string 'investor))`)
+    .execution(`(${getAsset()}.contains-identity (read-string 'investor))`)
     .setMeta({
       senderAccount: data.account.address,
       chainId: getNetwork().chainId,
diff --git a/packages/apps/rwa-demo/src/services/isOwner.ts b/packages/apps/rwa-demo/src/services/isOwner.ts
index 35d81b75a8..3db2eb2745 100644
--- a/packages/apps/rwa-demo/src/services/isOwner.ts
+++ b/packages/apps/rwa-demo/src/services/isOwner.ts
@@ -24,5 +24,10 @@ export const isOwner = async (data: IIsOwnerProps) => {
     signatureVerification: false,
   });
 
-  return result.status === 'success' ? result.data : undefined;
+  console.log({ result });
+  return true;
+  //TODO: fix contract
+  // console.log({ result });
+
+  // return result.status === 'success' ? result.data : undefined;
 };
diff --git a/packages/apps/rwa-demo/src/services/isPaused.ts b/packages/apps/rwa-demo/src/services/isPaused.ts
index a114a7dd33..119903c19b 100644
--- a/packages/apps/rwa-demo/src/services/isPaused.ts
+++ b/packages/apps/rwa-demo/src/services/isPaused.ts
@@ -11,7 +11,7 @@ export const isPaused = async (data: IIsPausedProps) => {
   const client = getClient();
 
   const transaction = Pact.builder
-    .execution(`(RWA.${getAsset()}.paused)`)
+    .execution(`(${getAsset()}.paused)`)
     .setMeta({
       senderAccount: data.account.address,
       chainId: getNetwork().chainId,
diff --git a/packages/apps/rwa-demo/src/services/pact/modalcontract.ts b/packages/apps/rwa-demo/src/services/pact/modalcontract.ts
new file mode 100644
index 0000000000..f60bfebeaf
--- /dev/null
+++ b/packages/apps/rwa-demo/src/services/pact/modalcontract.ts
@@ -0,0 +1,1154 @@
+import type { IAddContractProps } from '../createContract';
+
+export const getContract = ({ contractName, namespace }: IAddContractProps) => `
+(namespace "${namespace}")
+
+
+
+(module ${contractName} GOV
+  "${contractName} descriptions"
+
+  (defcap GOV () (enforce-keyset "RWA.rwa-admin-keyset"))
+
+  (implements fungible-v2)
+  (implements RWA.real-world-asset-v1)
+  (implements RWA.agent-role-v1)
+  (implements RWA.identity-registry-v1)
+  (implements RWA.identity-registry-storage-v1)
+
+  (use fungible-v2 [account-details])
+  (use RWA.burn-wallet)
+
+;; acts like a tokenStorage.sol
+  (defschema token-info
+    name:string
+    symbol:string
+    decimals:integer
+    kadenaID:string
+    version:string
+    compliance:[module{RWA.compliance-v1}]
+    paused:bool
+    supply:decimal
+    owner-guard:guard
+  )
+
+  (defschema user-info
+    account:string
+    balance:decimal
+    guard:guard
+    frozen:bool
+    amount-frozen:decimal
+  )
+
+  (defschema agent-schema
+    roles:[string]
+    guard:guard
+    active:bool
+  )
+
+  (defschema identity-schema
+    kadenaID:string
+    country:integer
+    active:bool
+  )
+
+  (deftable token:{token-info})
+  (deftable users:{user-info})
+
+  ;; agent management
+  (deftable agents:{agent-schema})
+
+  ;;identity management
+  (deftable identities:{identity-schema})
+
+  ;; defconsts
+
+  (defconst MINIMUM-PRECISION 1
+    "Minimum allowed precision for coin transactions")
+
+  (defconst TOKEN-ID "${namespace}.${contractName}")
+
+  (defconst AGENT-ADMIN:string 'agent-admin )
+  (defconst SUPPLY-MODIFIER:string 'supply-modifier )
+  (defconst FREEZER:string 'freezer )
+  (defconst TRANSFER-MANAGER 'transfer-manager )
+  (defconst RECOVERY:string 'recovery )
+  (defconst COMPLIANCE:string 'compliance )
+  (defconst WHITELIST-MANAGER:string 'whitelist-manager )
+
+  (defconst AGENT-ROLES:[string] [
+    AGENT-ADMIN
+    SUPPLY-MODIFIER
+    FREEZER
+    TRANSFER-MANAGER
+    RECOVERY
+    COMPLIANCE
+    WHITELIST-MANAGER
+  ])
+
+  ;; owner roles - NOT USED
+  (defconst OWNER-ADMIN:string 'owner-admin )
+  (defconst REGISTRY-ADDRESS-SETTER:string 'registry-address-setter )
+  (defconst COMPLIANCE-SETTER:string 'compliance-setter )
+  (defconst COMPLIANCE-MANAGER:string 'compliance-manager )
+  (defconst CLAIM-REGISTRY-MANAGER:string 'claim-registry-manager )
+  (defconst ISSUERS-REGISTRY-MANAGER:string 'issuers-registry-manager )
+  (defconst TOKEN-INFO-MANAGER:string 'token-info-manager )
+
+  (defconst OWNER-ROLES:[string] [
+    OWNER-ADMIN
+    REGISTRY-ADDRESS-SETTER
+    COMPLIANCE-SETTER
+    COMPLIANCE-MANAGER
+    CLAIM-REGISTRY-MANAGER
+    ISSUERS-REGISTRY-MANAGER
+    TOKEN-INFO-MANAGER
+  ])
+
+  ;; @events
+
+  (defcap UPDATED-TOKEN-INFORMATION:bool (new-name:string new-symbol:string new-decimals:integer new-version:string new-kadenaID:string)
+    @doc "Event emitted when token information is updated."
+    @event
+    true
+  )
+
+  (defcap IDENTITY-REGISTRY-ADDED:bool (identity-registry:module{RWA.identity-registry-v1})
+    @doc "Event emitted when an identity registry is added."
+    @event
+    true
+  )
+
+  (defcap COMPLIANCE-ADDED:bool (compliance:module{RWA.compliance-v1})
+    @doc "Event emitted when a compliance contract is added."
+    @event
+    true
+  )
+
+  (defcap RECOVERY-SUCCESS:bool (lost-wallet:string new-wallet:string investor-kadenaID:string)
+    @doc "Event emitted when a recovery process is successful."
+    @event
+    true
+  )
+
+  (defcap ADDRESS-FROZEN:string (user-address:string is-frozen:bool)
+    @doc "Event emitted when an address is frozen."
+    @event
+    true
+  )
+
+  (defcap TOKENS-FROZEN:string (user-address:string amount:decimal)
+    @doc "Event emitted when tokens are frozen."
+    @event
+    true
+  )
+
+  (defcap TOKENS-UNFROZEN:string (user-address:string amount:decimal)
+    @doc "Event emitted when tokens are unfrozen."
+    @event
+    true
+  )
+
+  (defcap PAUSED:string ()
+    @doc "Event emitted when the contract is paused."
+    @event
+    true
+  )
+
+  (defcap UNPAUSED:string ()
+    @doc "Event emitted when the contract is unpaused."
+    @event
+    true
+  )
+
+  (defcap ROLE_UPDATED:bool (user-address:string roles:[string])
+    @doc ""
+    @event
+    true
+  )
+
+  ;; grant caps
+
+  (defcap INTERNAL:bool () true)
+  (defcap MINT:bool () true)
+  (defcap BURN:bool () true)
+  (defcap FORCED-TRANSFER:bool () true )
+  (defcap UPDATE-SUPPLY:bool () true )
+
+  ;; agent caps
+
+  (defcap ONLY-AGENT:bool (role:string)
+    @doc "Capability that can be required to validate if an address is an agent"
+    @managed
+    (with-read agents (read-string 'agent) {
+      "guard":= guard,
+      "roles":= roles
+      }
+      (contains role roles)
+      (enforce-guard guard)
+    )
+  )
+
+  (defcap ONLY-OWNER:bool (role:string)
+    @doc "Capability that can be required to validate if an address is an agent"
+    @managed
+    (with-read token "" {"owner-guard":=guard}
+      (enforce-guard guard)
+    )
+  )
+
+  (defcap OWNERSHIP-TRANSFERRED:bool (old-owner-guard:guard new-owner-guard:guard )
+    @doc "Event emitted when ownership of the contract is transferred"
+    @event
+    true
+  )
+
+  (defcap AGENT-ADDED:bool (agent:string)
+    @doc "Event emitted when an agent is added."
+    @event
+    true
+  )
+
+  (defcap AGENT-REMOVED:bool (agent:string)
+    @doc "Event emitted when an agent is removed."
+    @event
+    true
+  )
+
+  (defcap SUPPLY (supply:decimal)
+    @event
+    supply
+  )
+
+  (defcap CLAIM-TOPICS-REGISTRY-SET:bool (claim-topics-registry:string)
+    @doc "This event is emitted when the Claim Topics Registry has been set for the Identity Registry. \
+    \ The event is emitted by the IdentityRegistry constructor.                                          \
+    \ \`claim-topics-registry\` is the address of the Claim Topics Registry contract."
+    @event
+    true
+  )
+
+  (defcap TRUSTED-ISSUERS-REGISTRY-SET:bool (trusted-issuers-registry:string)
+    @doc "This event is emitted when the Trusted Issuers Registry has been set for the Identity Registry. \
+    \ The event is emitted by the IdentityRegistry constructor.                                          \
+    \ \`trusted-issuers-registry\` is the address of the Trusted Issuers Registry contract."
+    @event
+    true
+  )
+
+  (defcap IDENTITY-REGISTERED:bool (investor-address:string identity:string)
+    @doc "This event is emitted when an Identity is registered into the Identity Registry.             \
+    \ The event is emitted by the 'register-identity' function.                                        \
+    \ \`investor-address\` is the address of the investor's wallet.                                       \
+    \ \`identity\` is the address of the Identity smart contract (kadenaID)."
+    @event
+    true
+  )
+
+  (defcap IDENTITY-REMOVED:bool (investor-address:string identity:string)
+    @doc "This event is emitted when an Identity is removed from the Identity Registry.               \
+    \ The event is emitted by the 'delete-identity' function.                                          \
+    \ \`investor-address\` is the address of the investor's wallet.                                       \
+    \ \`identity\` is the address of the Identity smart contract (kadenaID)."
+    @event
+    true
+  )
+
+  (defcap IDENTITY-UPDATED:bool (old-identity:string new-identity:string)
+    @doc "This event is emitted when an Identity has been updated.                                      \
+    \ The event is emitted by the 'update-identity' function.                                          \
+    \ \`old-identity\` is the old Identity contract's address to update.                                  \
+    \ \`new-identity\` is the new Identity contract's address."
+    @event
+    true
+  )
+
+  (defcap COUNTRY-UPDATED:bool (investor-address:string country:integer)
+    @doc "This event is emitted when an Identity's country has been updated.                           \
+    \ The event is emitted by the 'update-country' function.                                           \
+    \ \`investor-address\` is the address on which the country has been updated.                         \
+    \ \`country\` is the numeric code (ISO 3166-1) of the new country."
+    @event
+    true
+  )
+
+  (defcap IDENTITY-STORED:bool (investor-address:string identity:string)
+    @doc "This event is emitted when an Identity is registered into the storage contract.           \
+    \ The event is emitted by the 'register-identity' function.                                      \
+    \ \`investor-address\` is the address of the investor's wallet.                                     \
+    \ \`identity\` is the address of the Identity smart contract (kadenaID)."
+    @event
+  true)
+
+  (defcap IDENTITY-UNSTORED:bool (investor-address:string identity:string)
+    @doc "This event is emitted when an Identity is removed from the storage contract.              \
+    \ The event is emitted by the 'delete-identity' function.                                        \
+    \ \`investor-address\` is the address of the investor's wallet.                                     \
+    \ \`identity\` is the address of the Identity smart contract (kadenaID)."
+    @event
+  true)
+
+  (defcap IDENTITY-MODIFIED:bool (oldIdentity:string newIdentity:string)
+    @doc "This event is emitted when an Identity has been updated.                                  \
+    \ The event is emitted by the 'update-identity' function.                                        \
+    \ \`oldIdentity\` is the old Identity contract's address to update.                                \
+    \ \`newIdentity\` is the new Identity contract's address."
+    @event
+  true)
+
+  (defcap COUNTRY-MODIFIED:bool (investor-address:string country:integer)
+    @doc "This event is emitted when an Identity's country has been updated.        \
+    \ The event is emitted by the 'update-country' function.                        \
+    \ \`investor-address\` is the address on which the country has been updated.      \
+    \ \`country\` is the numeric code (ISO 3166-1) of the new country."
+    @event
+  true)
+
+  (defun init (name:string symbol:string decimals:integer kadenaID:string version:string compliances:[module{RWA.compliance-v1}] paused:bool owner-guard:guard)
+    @doc "Initiates token with supplied informations and owner guard"
+    (with-capability (GOV)
+      (insert token "" {
+        "name": name,
+        "symbol":symbol,
+        "kadenaID":kadenaID,
+        "version":version,
+        "compliance":compliances,
+        "paused":false,
+        "decimals": decimals,
+        "supply": 0.0,
+        "owner-guard": owner-guard
+      })
+    )
+    (emit-event (UPDATED-TOKEN-INFORMATION name symbol 0 version kadenaID ))
+  )
+
+  ;; Getters
+
+  (defun kadenaID:string ()
+    @doc "Return the kadena ID."
+    (with-read token "" {"kadenaID" := id } id)
+  )
+
+  (defun version:string ()
+    @doc "Return the version of the contract."
+    (with-read token "" {"version" := version } version)
+  )
+
+  (defun identity-registry:module{RWA.identity-registry-v1} ()
+    @doc "Return the associated identity registry."
+    (with-read token "" {"identity-registry" := identity-registry } identity-registry)
+  )
+
+  (defun compliance:[module{RWA.compliance-v1}] ()
+    @doc "Return the compliance contract."
+    (with-read token "" {"compliance" := compliance } compliance)
+  )
+
+  (defun paused:bool ()
+    @doc "Check if the contract is paused."
+    (with-read token "" {"paused" := paused } paused)
+  )
+
+  (defun address-frozen:bool (user-address:string)
+    @doc "Check if a user address is frozen."
+    (with-read users user-address {
+      "frozen" := frozen
+      }
+      frozen
+  ))
+
+  (defun get-frozen-tokens:decimal (user-address:string)
+    @doc "Return the number of frozen tokens for a user."
+    (with-read users user-address {
+      "frozen" := frozen,
+      "amount-frozen":= amount-frozen,
+      "balance":= balance
+      }
+      (if frozen 0.0 amount-frozen)
+  ))
+
+  ;; Setters
+  (defun set-name:string (name:string)
+    @doc "Set the name of the token."
+    (with-read token "" {
+      "symbol":= symbol,
+      "version":= version,
+      "kadenaID":= kadenaID
+      }
+      (only-owner)
+      (write token "" {"name": name}
+      (emit-event (UPDATED-TOKEN-INFORMATION name symbol 0.0 version kadenaID ))
+      )
+    )
+  )
+
+  (defun set-symbol:string (symbol:string)
+    @doc "Set the name of the token."
+    (with-read token "" {
+      "name":= name,
+      "version":= version,
+      "kadenaID":= kadenaID
+      }
+        (only-owner)
+        (write token "" {"symbol": symbol}
+        (emit-event (UPDATED-TOKEN-INFORMATION name symbol 0.0 version kadenaID ))
+        )
+    )
+  )
+
+  (defun set-kadenaID:string (kadenaID:string)
+    @doc "Set the name of the token."
+    (with-read token "" {
+      "name":= name,
+      "version":= version,
+      "symbol":= symbol
+      }
+      (only-owner)
+      (write token "" {"kadenaID": kadenaID}
+      (emit-event (UPDATED-TOKEN-INFORMATION name symbol 0.0 version kadenaID ))
+      )
+    )
+  )
+
+  (defun pause:string ()
+    @doc "Pause the contract."
+    (with-read token "" {
+      "paused":= paused
+      }
+     (only-agent FREEZER)
+     (enforce (= paused false) "Contract is paused")
+     (update token "" {"paused": true}))
+     (emit-event (PAUSED))
+     "Paused"
+  )
+
+  (defun unpause:string ()
+    @doc "Unpause the contract."
+    (with-read token "" {
+      "paused":= paused
+      }
+      (only-agent FREEZER)
+      (enforce (= paused true) "Contract is unpaused")
+      (update token "" {"paused": false}))
+      (emit-event (UNPAUSED))
+      "Paused"
+  )
+
+
+  (defun set-address-frozen:string (user-address:string freeze:bool)
+    @doc "Freeze or unfreeze a user's address."
+    (with-capability (INTERNAL)
+      (only-agent FREEZER)
+      (set-address-frozen-internal user-address freeze)
+    )
+  )
+
+  (defun freeze-partial-tokens:string (user-address:string amount:decimal)
+    @doc "Freeze a specific amount of a user's tokens."
+   (only-agent FREEZER)
+   (with-capability (INTERNAL)
+    (freeze-partial-tokens-internal user-address amount)
+   )
+  )
+
+  (defun unfreeze-partial-tokens:string (user-address:string amount:decimal)
+    @doc "Unfreeze a specific amount of a user's tokens."
+    (with-capability (INTERNAL)
+      (only-agent FREEZER)
+      (with-read users user-address {
+        "frozen":= frozen,
+        "amount-frozen":= amount-frozen
+      }
+      (unfreeze-partial-tokens-internal user-address amount)
+    ) )
+  )
+
+  (defun set-compliance:string (compliance:[module{RWA.compliance-v1}])
+    @doc "Set the compliance contract."
+    ;;call bind-token
+    (only-owner "")
+    (update token "" {"compliance": compliance})
+    (emit-event (COMPLIANCE-ADDED compliance))
+  )
+
+  ;; Transfer actions
+
+  (defun forced-transfer:bool (from:string to:string amount:decimal)
+    @doc "Force transfer tokens from one address to another."
+    (with-capability (FORCED-TRANSFER from to amount)
+      (with-capability (TRANSFER from to amount)
+        (only-agent TRANSFER-MANAGER)
+        (transfer-internal from to amount)
+    ))
+  )
+
+  (defun mint :string (to:string amount:decimal)
+    @doc "Mints amount of token to a user's address"
+    (enforce-unit amount)
+    (with-capability (MINT)
+      (only-agent SUPPLY-MODIFIER)
+      (mint-internal to amount)
+    )
+  )
+
+  (defun burn:bool (user-address:string amount:decimal)
+    @doc "Burn tokens from a user's address according to destroy rules in compliance"
+    (enforce-unit amount)
+    (with-read token "" {
+      "compliance":=compliance-l
+      }
+      (only-agent SUPPLY-MODIFIER)
+      (burn-internal user-address amount)
+    )
+  )
+
+  (defun enforce-contains-identity (account:string)
+    (let ((r (contains-identity account)))
+      (enforce r "Address is not registered"))
+  )
+
+  (defun recovery-address:bool (lost-wallet:string new-wallet:string investor-kadenaID:string)
+    @doc "Recover tokens from a lost wallet to a new wallet."
+    (only-agent)
+    (emit-event (RECOVERY-SUCCESS lost-wallet new-wallet investor-kadenaID))
+    false
+  )
+
+  ;; Batch functions
+  (defun batch-transfer:bool (from:string to-list:[string] amounts:[decimal])
+    @doc "Perform batch transfer of tokens."
+    (map (lambda (idx:integer)
+      (with-capability (TRANSFER from (at idx to-list) (at idx amounts))
+        (enforce-unfrozen from)
+        (transfer-internal from (at idx to-list) (at idx amounts))
+      )
+    ) (enumerate 0 (- (length to-list) 1))
+    ) true
+  )
+
+  (defun batch-forced-transfer:bool (from-list:[string] to-list:[string] amounts:[decimal])
+    @doc "Perform batch forced transfer of tokens."
+      (only-agent)
+      (map (lambda (idx:integer)
+        (with-capability (TRANSFER (at idx from-list) (at idx to-list) (at idx amounts))
+          (transfer-internal (at idx from-list) (at idx to-list) (at idx amounts))
+        )
+      ) (enumerate 0 (- (length from-list) 1)) ) true
+  )
+
+  (defun batch-mint:bool (to-list:[string] amounts:[decimal])
+    @doc "Mint tokens to multiple addresses."
+    (only-agent)
+    (map (lambda (idx:integer)
+    (with-capability (TRANSFER (zero-address) (at idx to-list) (at idx amounts))
+      (mint-internal (at idx to-list) (at idx amounts))
+    )
+    ) (enumerate 0 (- (length to-list) 1)) ) true
+  )
+
+  (defun batch-burn:bool (user-addresses:[string] amounts:[decimal])
+    @doc "Burn tokens from multiple addresses."
+    (only-agent)
+    (map (lambda (idx:integer)
+    (with-capability (TRANSFER (at idx user-addresses) (zero-address) (at idx amounts))
+      (burn-internal (at idx user-addresses) (at idx amounts))
+    )
+    ) (enumerate 0 (- (length user-addresses) 1)) ) true
+  )
+
+  (defun batch-register-identity:bool (user-addresses:[string] identities:[string] countries:[integer])
+    @doc "Allows batch registration of identities.                                                     \
+    \ Requires that none of the users has an identity contract already registered.                   \
+    \ Only a wallet set as agent of the smart contract can call this function.                       \
+    \ Emits \`IDENTITY-REGISTERED\` events for each user address in the batch."
+    (map (lambda (idx:integer)
+      (register-identity (at idx identities) (at idx countries))
+    ) (enumerate 0 (- (length user-addresses) 1)) ) true
+  )
+
+  (defun batch-set-address-frozen:bool (user-addresses:[string] freeze:[bool])
+    @doc "Freeze or unfreeze multiple addresses."
+    (only-agent)
+    (map (lambda (idx:integer)
+    (set-address-frozen-internal (at idx user-addresses) freeze)
+    ) (enumerate 0 (- (length user-addresses) 1)) ) true
+  )
+
+  (defun batch-freeze-partial-tokens-internal:bool (user-addresses:[string] amounts:[decimal] )
+    @doc "Freeze a portion of tokens for multiple addresses."
+    (only-agent)
+    (map (lambda (idx:integer)
+    (with-capability (TRANSFER (at idx user-addresses) (zero-address) (at idx amounts))
+      (freeze-partial-tokens-internal (at idx user-addresses) (at idx amounts))
+    )
+    ) (enumerate 0 (- (length user-addresses) 1)) ) true
+  )
+
+  (defun batch-freeze-partial-tokens:bool (user-addresses:[string] amounts:[decimal] )
+    @doc "Unfreeze a portion of tokens for multiple addresses."
+    (only-agent)
+    (map (lambda (idx:integer)
+    (with-capability (TRANSFER (at idx user-addresses) (zero-address) (at idx amounts))
+      (freeze-partial-tokens-internal (at idx user-addresses) (at idx amounts))
+    )
+    ) (enumerate 0 (- (length user-addresses) 1)) ) true
+  )
+
+  (defun batch-unfreeze-partial-tokens:bool (user-addresses:[string] amounts:[decimal] )
+    @doc "Unfreeze a portion of tokens for multiple addresses."
+    (only-agent)
+    (map (lambda (idx:integer)
+    (with-capability (TRANSFER (at idx user-addresses) (zero-address) (at idx amounts))
+      (unfreeze-partial-tokens-internal (at idx user-addresses) (at idx amounts))
+    )
+    ) (enumerate 0 (- (length user-addresses) 1)) ) true
+  )
+
+  ;; internal functions
+
+  (defun mint-internal (to:string amount:decimal)
+    (with-read token "" {
+      "compliance":= compliance-l:[module{RWA.compliance-v1}]
+      }
+      (map (lambda (compliance:module{RWA.compliance-v1})
+          (compliance::created TOKEN-ID to amount)
+        ) compliance-l
+      )
+      (enforce-contains-identity to)
+      (with-capability (TRANSFER (zero-address) to amount)
+        (credit to amount)
+        (with-capability (UPDATE-SUPPLY)
+          (update-supply amount)
+        )
+      )
+      "Token Minted"
+    )
+  )
+
+  (defun burn-internal:bool (user-address:string amount:decimal)
+    @doc "Burn tokens from a user's address according to destroy rules in compliance"
+    (with-read token "" {
+      "compliance":=compliance-l
+      }
+      (with-read token "" {
+        "compliance":=compliance-l
+        }
+        (map (lambda (compliance:module{RWA.compliance-v1})
+            (compliance::destroyed TOKEN-ID user-address amount)
+          ) compliance-l
+        )
+        (with-capability (TRANSFER user-address (zero-address) amount)
+          (debit user-address amount)
+          (credit (zero-address) (zero-guard) amount)
+          (with-capability (UPDATE-SUPPLY)
+            (update-supply (- amount))
+          )
+        )
+      )
+    )
+  )
+
+  (defun transfer-internal:string
+    ( sender:string
+      receiver:string
+      amount:decimal
+    )
+    @doc "Transfer AMOUNT of token from sender to receiver"
+    (debit sender amount)
+    (credit receiver amount)
+    (with-read token "" {
+       "compliance":= compliance-l
+      ,"paused":=paused
+      }
+      (enforce (= paused false) "Contract is paused")
+      (map
+        (lambda (compliance:module{RWA.compliance-v1})
+          (compliance::can-transfer TOKEN-ID sender receiver amount)
+          (compliance::transferred TOKEN-ID sender receiver amount)
+          ) compliance-l
+      )
+    )
+    ""
+  )
+
+  (defun set-address-frozen-internal:string (user-address:string freeze:bool)
+    @doc "Freeze or unfreeze a user's address."
+      (require-capability (INTERNAL))
+      (update users user-address {"frozen": freeze})
+      (emit-event (ADDRESS-FROZEN user-address freeze) )
+    ""
+  )
+
+  (defun freeze-partial-tokens-internal:string (user-address:string amount:decimal)
+    (with-read users user-address {
+      "balance":= balance,
+      "frozen":= frozen,
+      "amount-frozen":= amount-frozen
+    }
+    (require-capability (INTERNAL))
+      (enforce (not frozen) "Account is frozen")
+      (enforce (>= balance (+ amount-frozen amount)) "frozen amount exceeds balance")
+      (update users user-address {"amount-frozen": (+ amount-frozen amount)})
+      (emit-event (TOKENS-FROZEN user-address  (+ amount-frozen amount)))
+      ""
+    )
+  )
+
+  (defun unfreeze-partial-tokens-internal:string (user-address:string amount:decimal)
+    (with-read users user-address {
+      "balance":= balance,
+      "frozen":= frozen,
+      "amount-frozen":= amount-frozen
+    }
+    (require-capability (INTERNAL))
+      (enforce (not frozen) "Account is frozen")
+      (enforce (<= amount amount-frozen) "amount exceeds frozen balance")
+      (update users user-address {"amount-frozen": (- amount-frozen amount)})
+      (emit-event (TOKENS-FROZEN user-address (- amount-frozen amount)))
+      ""
+    )
+  )
+
+;; fungible-v2 implementation
+
+  ; ----------------------------------------------------------------------
+  ; Caps
+
+  (defcap DEBIT (sender:string)
+    @doc "Capability for managing debiting operations"
+    (enforce (!= sender "") "invalid sender"))
+
+  (defcap CREDIT (receiver:string)
+    @doc "Capability for managing crediting operations"
+    (enforce (!= receiver "") "invalid receiver"))
+
+  (defcap TRANSFER:bool
+    ( sender:string
+      receiver:string
+      amount:decimal
+    )
+    @managed amount TRANSFER-mgr
+
+    (if (try false (enforce-guard (at 'guard (read users sender))))
+      true
+      (if (try false (require-capability (MINT)))
+        true
+        (if (try false (require-capability (BURN)))
+          true
+          (if (try false (require-capability (FORCED-TRANSFER)))
+        )
+    )))
+
+    (enforce (!= sender "") "valid sender")
+    (enforce (!= sender receiver) "same sender and receiver")
+    (compose-capability (DEBIT sender))
+    (compose-capability (CREDIT receiver))
+    (enforce-unit amount)
+    (enforce (> amount 0.0) "Positive amount")
+    ""
+  )
+
+  (defun TRANSFER-mgr:decimal
+    ( managed:decimal
+      requested:decimal
+    )
+
+    (let ((newbal (- managed requested)))
+      (enforce (>= newbal 0.0)
+        (format "TRANSFER exceeded for balance {}" [managed]))
+      newbal)
+  )
+
+  ; ----------------------------------------------------------------------
+  ; Functionality
+
+  (defun credit:string
+    ( account:string
+      amount:decimal
+    )
+    (require-capability (CREDIT account))
+    (with-read users account
+      { "balance" := balance}
+        (update users account
+          { "balance" : (+ balance amount)})
+    )
+  )
+
+  (defun debit:string
+    ( account:string
+      amount:decimal
+    )
+    (require-capability (DEBIT account))
+    (with-read users account
+      { "balance" := balance }
+      (enforce (<= amount balance) "Insufficient funds")
+      (update users account
+        { "balance" : (- balance amount) }
+        ))
+  )
+
+  (defun enforce-unfrozen-amount:bool
+    ( account:string
+      amount:decimal
+    )
+    (with-read users account
+      { "frozen" := frozen,
+        "amount-frozen" := amount-frozen,
+        "balance" := balance
+      }
+      (enforce (not frozen) "Account is frozen")
+      (enforce (>= (- balance amount-frozen) amount) "Insufficient funds")
+    )
+  )
+
+
+  (defun transfer:string
+    ( sender:string
+      receiver:string
+      amount:decimal
+    )
+    @doc "Transfer AMOUNT of token from sender to receiver"
+    (enforce-unfrozen sender)
+    (enforce-unfrozen-amount sender amount)
+    (enforce-contains-identity receiver)
+    (with-capability (TRANSFER sender receiver amount)
+      (transfer-internal sender receiver amount)
+    )
+  )
+
+  (defun enforce-unfrozen (sender:string)
+    @doc "Fail if sender is frozen"
+    (let ((frozen:bool (address-frozen sender)))
+      (enforce (not frozen) "frozen sender")
+    )
+  )
+
+  (defun transfer-create:string
+    ( sender:string
+      receiver:string
+      receiver-guard:guard
+      amount:decimal
+    )
+    @doc"" ""
+  )
+
+  (defpact transfer-crosschain:string
+    ( sender:string
+      receiver:string
+      receiver-guard:guard
+      target-chain:string
+      amount:decimal
+    )
+    @doc ""
+    (step "" )
+  )
+
+  (defun get-balance:decimal
+    ( account:string )
+    (with-read users account {
+      "balance" := balance
+      }
+      balance
+    )
+  )
+
+  (defun details:object{account-details}
+    ( account: string )
+    (with-read users account {
+      "balance" := balance,
+      "guard" := guard
+      }
+      {"balance" : balance, "guard" : guard, "account" : account})
+  )
+
+  (defun precision:integer ()
+    MINIMUM-PRECISION
+  )
+
+  (defun enforce-unit:bool (amount:decimal)
+    @doc "Enforce minimum precision allowed for coin transactions"
+
+    (enforce
+      (= (floor amount MINIMUM-PRECISION)
+        amount)
+      (format "Amount violates minimum precision: {}" [amount]))
+  )
+
+  (defun create-account:string
+    ( account:string
+      guard:guard
+    )
+    @doc " Create ACCOUNT with 0.0 balance, with GUARD controlling access."
+    (enforce-contains-identity account)
+    (validate-principal guard account)
+    (insert users account {
+      "balance" : 0.0,
+      "guard" : guard,
+      "frozen" : false,
+      "account": account,
+      "amount-frozen": 0.0
+      }
+    )
+  )
+
+  (defun enforce-reserved:bool (account:string guard:guard)
+    @doc "Enforce reserved account name protocols."
+    (if (validate-principal guard account)
+      true
+      (let ((r (check-reserved account)))
+        (if (= r "")
+          true
+          (if (= r "k")
+            (enforce false "Single-key account protocol violation")
+            (enforce false
+              (format "Reserved protocol guard violation: {}" [r]))
+            )))))
+
+  (defun check-reserved:string (account:string)
+    " Checks ACCOUNT for reserved name and returns type if \
+    \ found or empty string. Reserved names start with a \
+    \ single char and colon, e.g. 'c:foo', which would return 'c' as type."
+    (let ((pfx (take 2 account)))
+      (if (= ":" (take -1 pfx)) (take 1 pfx) "")))
+
+  (defun transfer-ownership:bool (new-owner-guard:guard)
+    @doc "transfer ownership of the contract"
+    (with-capability (ONLY-OWNER "")
+      (with-read token "" {
+        "owner-guard":= old-owner-guard
+        }
+        (update token "" {
+          "owner-guard": new-owner-guard
+        })
+        (emit-event (OWNERSHIP-TRANSFERRED old-owner-guard new-owner-guard))
+      )
+    )
+  )
+
+  (defun add-agent:bool (agent:string guard:guard)
+    @doc "Add a new agent."
+    ;; re-activate an agent if already exists
+    (validate-principal guard agent)
+    (verify-agent-roles (read-msg 'roles))
+    (with-default-read agents agent {
+      "guard": guard
+      } {
+      "guard":= g
+      }
+    (with-capability (ONLY-OWNER "")
+      (write agents agent {
+        "roles": (read-msg 'roles),
+        "guard": g,
+        "active":true })
+      (emit-event (AGENT-ADDED agent))
+    )
+  ))
+
+  (defun remove-agent:bool (agent:string)
+    @doc "Remove an agent."
+    (with-capability (ONLY-OWNER "")
+      (update agents agent { "active":false })
+      (emit-event (AGENT-REMOVED agent))
+    )
+  )
+
+  (defun is-agent:bool (agent:string)
+    @doc "Check if an address is an agent."
+    (with-default-read agents agent
+      { 'active: false }
+      { 'active := active }
+      active
+    )
+  )
+
+  (defun is-owner (account:string)
+    @doc "Check if an account is an owner"
+    (with-read token "" {
+        "owner-guard":= owner-guard
+      } (= account (create-principal owner-guard))
+    )
+  )
+
+  (defun only-agent:bool (role:string)
+    @doc "Verifies that the agent is signing for the capability"
+    (with-capability (ONLY-AGENT role)
+      true
+    )
+  )
+
+  (defun only-owner:bool (role:string)
+    @doc "Verifies that the owner is signing for the capability"
+    (with-capability (ONLY-OWNER role)
+      true
+    )
+  )
+
+  (defun update-agent-roles:bool (agent:string roles:[string])
+    @doc "Update agent roles"
+    (only-agent AGENT-ADMIN)
+    (verify-agent-roles roles)
+    (update agents agent
+      { 'roles: roles }
+    )
+  )
+
+  (defun get-agent-roles:bool (agent:string)
+    @doc "Return agent roles"
+    (with-read agents agent
+      { 'roles:= roles }
+      roles
+    )
+  )
+
+  (defun verify-agent-roles (roles:[string])
+    (map (lambda (idx:integer)
+      (contains (at idx roles) AGENT-ROLES)
+      )
+    (enumerate 0 (- (length roles) 1)))
+  )
+
+  (defun register-identity:bool (user-address:string identity:string country:integer)
+    @doc "Register an identity contract corresponding to a user address.                               \
+    \ Requires that the user doesn't have an identity contract already registered.                    \
+    \ Only a wallet set as agent of the smart contract can call this function.                        \
+    \ Emits an \`IDENTITY-REGISTERED\` event."
+    (is-principal user-address)
+    (only-agent WHITELIST-MANAGER)
+    (write identities user-address { "kadenaID":identity, "country":country, "active":true })
+    (emit-event (IDENTITY-REGISTERED user-address identity))
+  )
+
+  (defun delete-identity:bool (user-address:string)
+    @doc "Removes a user from the identity registry.                                                    \
+    \ Requires that the user have an identity contract already deployed that will be deleted.         \
+    \ Only a wallet set as agent of the smart contract can call this function.                        \
+    \ Emits an \`IDENTITY-REMOVED\` event."
+    (only-agent WHITELIST-MANAGER)
+    (update identities user-address { "active":false })
+    (emit-event (IDENTITY-REMOVED user-address (at 'kadenaID (read identities user-address))))
+  )
+
+  (defun set-claim-topics-registry:bool (claim-topics-registry:string)
+    @doc "Replace the actual claimTopicsRegistry contract with a new one.                              \
+    \ Only the wallet set as owner of the smart contract can call this function.                       \
+    \ Emits a \`CLAIM-TOPICS-REGISTRY-SET\` event."
+    true ; TODO: Implement this function
+  )
+
+  (defun set-trusted-issuers-registry:bool (trusted-issuers-registry:string)
+    @doc "Replace the actual Trusted Issuers Registry contract with a new one.                           \
+    \ Only the wallet set as owner of the smart contract can call this function.                      \
+    \ Emits a \`TRUSTED-ISSUERS-REGISTRY-SET\` event."
+    true ; TODO: Implement this function
+  )
+
+  (defun update-country:bool (user-address:string country:integer)
+    @doc "Updates the country corresponding to a user address.                                         \
+    \ Requires that the user have an identity contract already deployed that will be replaced.        \
+    \ Only a wallet set as agent of the smart contract can call this function.                        \
+    \ Emits a \`COUNTRY-UPDATED\` event."
+    true ; TODO: Implement this function
+  )
+
+  (defun update-identity:bool (user-address:string identity:string)
+    @doc "Updates an identity contract corresponding to a user address.                               \
+    \ Requires that the user address should be the owner of the identity contract.                    \
+    \ Requires that the user should have an identity contract already deployed that will be replaced.\
+    \ Only a wallet set as agent of the smart contract can call this function.                        \
+    \ Emits an \`IDENTITY-UPDATED\` event."
+    true ; TODO: Implement this function
+  )
+
+  (defun contains-identity:bool (user-address:string)
+    @doc "Checks whether a wallet has its Identity registered or not in the Identity Registry.           \
+    \ Returns 'true' if the address is contained in the Identity Registry, 'false' if not."
+    (with-default-read identities user-address
+      { "active": false }
+      { "active":= active }
+      active)
+  )
+
+  (defun is-verified:bool (user-address:string)
+    @doc "Checks whether an identity contract corresponding to the provided user address has the required \
+    \ claims or not, based on the data fetched from the trusted issuers registry and the claim topics registry. \
+    \ Returns 'true' if the address is verified, 'false' if not."
+    true ; TODO: Implement this function
+  )
+
+  (defun user-identity:string (user-address:string)
+    @doc "Returns the kadenaID of an investor for a given user address."
+    "" ; TODO: Implement this function
+  )
+
+  (defun investor-country:integer (user-address:string)
+    @doc "Returns the country code of an investor for a given user address."
+    1 ; TODO: Implement this function
+  )
+
+  (defun issuers-registry:string ()
+    @doc "Returns the Trusted Issuers Registry linked to the current Identity Registry."
+    "" ; TODO: Implement this function
+  )
+
+  (defun topics-registry:string ()
+    @doc "Returns the Claim Topics Registry linked to the current Identity Registry."
+    "" ; TODO: Implement this function
+  )
+
+  (defun update-supply:bool (amount:decimal)
+    (require-capability (UPDATE-SUPPLY))
+    (with-default-read token ""
+      { 'supply: 0.0 }
+      { 'supply := s }
+      (let ((new-supply (+ s amount)))
+      (update token "" {'supply: new-supply })
+      (emit-event (SUPPLY new-supply))))
+  )
+
+  (defun supply:decimal ()
+    (with-default-read token ""
+    { 'supply : 0.0 }
+    { 'supply := s }
+    s)
+  )
+
+  ;;unused
+  (defun set-identity-registry:string (identity-registry:module{RWA.identity-registry-v1})
+    @doc ""
+    ""
+  )
+
+  (defun rotate:string
+    ( account:string
+      new-guard:guard
+    )
+    @doc ""
+    ""
+  )
+)
+
+;; token
+(create-table token)
+(create-table users)
+
+;; agents
+(create-table agents)
+
+;; investors
+(create-table identities)
+
+
+  ; (defcap WHEN-NOT-PAUSED ()
+  ;   @doc "check if token is not paused"
+  ; )
+  ;
+  ; (defcap WHEN-PAUSED ()
+  ;   @doc "check if token is paused"
+  ; )
+;; doesn't have erc-20's approve feature
+;; implemented partial functions
+;; changing the way agents were used using data field
+;; set roles in agent
+;; wanted to review frontend and see if certain features were possible with graphql (still exploring but want to sit with Travis?)
+(RWA.token-mapper.add-token-ref ${namespace}.${contractName}.TOKEN-ID ${namespace}.${contractName})
+`;
diff --git a/packages/apps/rwa-demo/src/services/paused.ts b/packages/apps/rwa-demo/src/services/paused.ts
index 8f65dd594e..cbfa147c09 100644
--- a/packages/apps/rwa-demo/src/services/paused.ts
+++ b/packages/apps/rwa-demo/src/services/paused.ts
@@ -11,7 +11,7 @@ export const paused = async () => {
   const client = getClient();
 
   const transaction = Pact.builder
-    .execution(`(RWA.${getAsset()}.paused)`)
+    .execution(`(${getAsset()}.paused)`)
     .setMeta({
       senderAccount: ADMIN.account,
       chainId: getNetwork().chainId,
diff --git a/packages/apps/rwa-demo/src/services/registerIdentity.ts b/packages/apps/rwa-demo/src/services/registerIdentity.ts
index b3b2eddb58..31df1040a2 100644
--- a/packages/apps/rwa-demo/src/services/registerIdentity.ts
+++ b/packages/apps/rwa-demo/src/services/registerIdentity.ts
@@ -17,8 +17,8 @@ const createPubKeyFromAccount = (account: string): string => {
 export const registerIdentity = async (data: IRegisterIdentityProps) => {
   return Pact.builder
     .execution(
-      `(RWA.${getAsset()}.register-identity (read-string 'investor) (read-string 'agent) 1)
-      (RWA.${getAsset()}.create-account (read-string 'investor) (read-keyset 'investor-keyset))
+      `(${getAsset()}.register-identity (read-string 'investor) (read-string 'agent) 1)
+      (${getAsset()}.create-account (read-string 'investor) (read-keyset 'investor-keyset))
       `,
     )
     .addData('investor-keyset', {
@@ -32,7 +32,7 @@ export const registerIdentity = async (data: IRegisterIdentityProps) => {
       chainId: getNetwork().chainId,
     })
     .addSigner(data.agent.keyset.guard.keys[0], (withCap) => [
-      withCap(`RWA.${getAsset()}.ONLY-AGENT`, 'whitelist-manager'),
+      withCap(`${getAsset()}.ONLY-AGENT`, 'whitelist-manager'),
       withCap(`coin.GAS`),
     ])
 
diff --git a/packages/apps/rwa-demo/src/services/removeAgent.ts b/packages/apps/rwa-demo/src/services/removeAgent.ts
index 7ad095fcee..a9001fe7d8 100644
--- a/packages/apps/rwa-demo/src/services/removeAgent.ts
+++ b/packages/apps/rwa-demo/src/services/removeAgent.ts
@@ -12,13 +12,13 @@ export const removeAgent = async (
   account: IWalletAccount,
 ) => {
   return Pact.builder
-    .execution(`(RWA.${getAsset()}.remove-agent (read-string 'agent))`)
+    .execution(`(${getAsset()}.remove-agent (read-string 'agent))`)
     .setMeta({
       senderAccount: account.address,
       chainId: getNetwork().chainId,
     })
     .addSigner(account.keyset.guard.keys[0], (withCap) => [
-      withCap(`RWA.${getAsset()}.ONLY-OWNER`, ''),
+      withCap(`${getAsset()}.ONLY-OWNER`, ''),
       withCap(`coin.GAS`),
     ])
     .addData('agent', data.agent)
diff --git a/packages/apps/rwa-demo/src/services/setAddressFrozen.ts b/packages/apps/rwa-demo/src/services/setAddressFrozen.ts
index 09438bc21d..30ba57e899 100644
--- a/packages/apps/rwa-demo/src/services/setAddressFrozen.ts
+++ b/packages/apps/rwa-demo/src/services/setAddressFrozen.ts
@@ -14,7 +14,7 @@ export const setAddressFrozen = async (
 ) => {
   return Pact.builder
     .execution(
-      `(RWA.${getAsset()}.set-address-frozen (read-string 'investor) ${data.pause})
+      `(${getAsset()}.set-address-frozen (read-string 'investor) ${data.pause})
       `,
     )
     .addData('investor', data.investorAccount)
@@ -24,7 +24,7 @@ export const setAddressFrozen = async (
       chainId: getNetwork().chainId,
     })
     .addSigner(account.keyset.guard.keys[0], (withCap) => [
-      withCap(`RWA.${getAsset()}.ONLY-AGENT`, 'freezer'),
+      withCap(`${getAsset()}.ONLY-AGENT`, 'freezer'),
       withCap(`coin.GAS`),
     ])
 
diff --git a/packages/apps/rwa-demo/src/services/setCompliance.ts b/packages/apps/rwa-demo/src/services/setCompliance.ts
index 654f4882f2..618a677ac0 100644
--- a/packages/apps/rwa-demo/src/services/setCompliance.ts
+++ b/packages/apps/rwa-demo/src/services/setCompliance.ts
@@ -14,7 +14,8 @@ export const setCompliance = async (
 ) => {
   return Pact.builder
     .execution(
-      ` (RWA.max-balance-compliance.set-max-balance-and-max-supply ${new PactNumber(data.maxSupply).toPactDecimal().decimal} ${new PactNumber(data.maxBalance).toPactDecimal().decimal})`,
+      `(RWA.max-balance-compliance.set-max-balance ${new PactNumber(data.maxBalance).toPactDecimal().decimal})
+      (RWA.supply-limit-compliance.set-supply-limit ${new PactNumber(data.maxSupply).toPactDecimal().decimal})`,
     )
     .setMeta({
       senderAccount: account.address,
@@ -22,6 +23,7 @@ export const setCompliance = async (
     })
     .addSigner(account.keyset.guard.keys[0], (withCap) => [
       withCap(`RWA.max-balance-compliance.ONLY-OWNER`),
+      withCap(`RWA.supply-limit-compliance.ONLY-OWNER`),
       withCap(`coin.GAS`),
     ])
 
diff --git a/packages/apps/rwa-demo/src/services/supply.ts b/packages/apps/rwa-demo/src/services/supply.ts
index 295ec89aba..152f7fba04 100644
--- a/packages/apps/rwa-demo/src/services/supply.ts
+++ b/packages/apps/rwa-demo/src/services/supply.ts
@@ -13,7 +13,7 @@ export const supply = async (data: ISupplyProps) => {
   if (!data.account) return;
 
   const transaction = Pact.builder
-    .execution(`(RWA.${getAsset()}.supply)`)
+    .execution(`(${getAsset()}.supply)`)
     .setMeta({
       senderAccount: data.account.address,
       chainId: getNetwork().chainId,
diff --git a/packages/apps/rwa-demo/src/services/togglePartiallyFreezeTokens.ts b/packages/apps/rwa-demo/src/services/togglePartiallyFreezeTokens.ts
index 6c2eb5e78b..f53b67924d 100644
--- a/packages/apps/rwa-demo/src/services/togglePartiallyFreezeTokens.ts
+++ b/packages/apps/rwa-demo/src/services/togglePartiallyFreezeTokens.ts
@@ -25,7 +25,7 @@ export const togglePartiallyFreezeTokens = async (
   return Pact.builder
     .execution(
       `
-       (RWA.${getAsset()}.${func} (read-string 'investor) ${new PactNumber(data.amount).toDecimal()})`,
+       (${getAsset()}.${func} (read-string 'investor) ${new PactNumber(data.amount).toDecimal()})`,
     )
     .addData('agent', account.address)
     .addData('investor', data.investorAccount)
@@ -38,7 +38,7 @@ export const togglePartiallyFreezeTokens = async (
       chainId: getNetwork().chainId,
     })
     .addSigner(account.keyset.guard.keys[0], (withCap) => [
-      withCap(`RWA.${getAsset()}.ONLY-AGENT`, 'freezer'),
+      withCap(`${getAsset()}.ONLY-AGENT`, 'freezer'),
       withCap(`coin.GAS`),
     ])
     .setNetworkId(getNetwork().networkId)
diff --git a/packages/apps/rwa-demo/src/services/togglePause.ts b/packages/apps/rwa-demo/src/services/togglePause.ts
index 0b3276766e..ec303be381 100644
--- a/packages/apps/rwa-demo/src/services/togglePause.ts
+++ b/packages/apps/rwa-demo/src/services/togglePause.ts
@@ -14,14 +14,14 @@ export const togglePause = async (
   const func = data.isPaused ? 'unpause' : 'pause';
 
   return Pact.builder
-    .execution(`(RWA.${getAsset()}.${func})`)
+    .execution(`(${getAsset()}.${func})`)
     .setMeta({
       senderAccount: account.address,
       chainId: getNetwork().chainId,
     })
     .addData('agent', account.address)
     .addSigner(account.keyset.guard.keys[0], (withCap) => [
-      withCap(`RWA.${getAsset()}.ONLY-AGENT`, 'freezer'),
+      withCap(`${getAsset()}.ONLY-AGENT`, 'freezer'),
       withCap(`coin.GAS`),
     ])
     .setNetworkId(getNetwork().networkId)
diff --git a/packages/apps/rwa-demo/src/services/transferTokens.ts b/packages/apps/rwa-demo/src/services/transferTokens.ts
index eb027f5297..a8947a217f 100644
--- a/packages/apps/rwa-demo/src/services/transferTokens.ts
+++ b/packages/apps/rwa-demo/src/services/transferTokens.ts
@@ -21,7 +21,7 @@ export const transferTokens = async (
   return Pact.builder
     .execution(
       `
-       (RWA.${getAsset()}.transfer (read-string 'investorFrom) (read-string 'investorTo) ${new PactNumber(data.amount).toDecimal()})`,
+       (${getAsset()}.transfer (read-string 'investorFrom) (read-string 'investorTo) ${new PactNumber(data.amount).toDecimal()})`,
     )
     .addData('investorFrom', data.investorFromAccount)
     .addData('investorTo', data.investorToAccount)
@@ -31,7 +31,7 @@ export const transferTokens = async (
     })
     .addSigner(createPubKeyFromAccount(data.investorFromAccount), (withCap) => [
       withCap(
-        `RWA.${getAsset()}.TRANSFER`,
+        `${getAsset()}.TRANSFER`,
         data.investorFromAccount,
         data.investorToAccount,
         {
diff --git a/packages/apps/rwa-demo/src/utils/getAsset.ts b/packages/apps/rwa-demo/src/utils/getAsset.ts
index 40070b19ed..dd2fd4d886 100644
--- a/packages/apps/rwa-demo/src/utils/getAsset.ts
+++ b/packages/apps/rwa-demo/src/utils/getAsset.ts
@@ -26,6 +26,8 @@ export const getFullAsset = (): IAsset | undefined => {
 
 export const getAsset = (): string => {
   const asset = getFullAsset();
-
-  return asset?.name ?? '';
+  if (!asset) {
+    return '';
+  }
+  return `${asset.namespace}.${asset.contractName}`;
 };
diff --git a/packages/apps/rwa-demo/src/utils/store/index.ts b/packages/apps/rwa-demo/src/utils/store/index.ts
index cc20433a86..476c342b61 100644
--- a/packages/apps/rwa-demo/src/utils/store/index.ts
+++ b/packages/apps/rwa-demo/src/utils/store/index.ts
@@ -5,6 +5,8 @@ import { get, off, onValue, ref, set } from 'firebase/database';
 import { getAsset } from '../getAsset';
 import { database } from './firebase';
 
+const getAssetFolder = () => getAsset().replace('.', '');
+
 const RWAStore = () => {
   const addTransaction = async (
     account: IWalletAccount,
@@ -47,7 +49,7 @@ const RWAStore = () => {
   };
 
   const getAccounts = async (): Promise<IRegisterIdentityProps[]> => {
-    const asset = getAsset();
+    const asset = getAssetFolder();
     if (!asset) return [];
 
     const snapshot = await get(ref(database, `${asset}/accounts`));
@@ -64,7 +66,7 @@ const RWAStore = () => {
   }: {
     account: string;
   }): Promise<IRegisterIdentityProps | undefined> => {
-    const asset = getAsset();
+    const asset = getAssetFolder();
     if (!asset) return;
 
     const snapshot = await get(ref(database, `${asset}/accounts/${account}`));
@@ -76,12 +78,13 @@ const RWAStore = () => {
     accountName,
     alias,
   }: Omit<IRegisterIdentityProps, 'agent'>) => {
-    const asset = getAsset();
+    const asset = getAssetFolder();
+    console.log({ asset });
     if (!asset) return;
 
     await set(ref(database, `${asset}/accounts/${accountName}`), {
       accountName,
-      alias,
+      alias: alias ?? '',
     });
   };
 
@@ -89,7 +92,7 @@ const RWAStore = () => {
     account: string,
     setDataCallback: (account: IRegisterIdentityProps) => void,
   ) => {
-    const asset = getAsset();
+    const asset = getAssetFolder();
     if (!asset) return;
 
     const accountRef = ref(database, `${asset}/accounts/${account}`);
@@ -104,7 +107,7 @@ const RWAStore = () => {
   };
 
   const listenToAccounts = (setDataCallback: (aliases: any[]) => void) => {
-    const asset = getAsset();
+    const asset = getAssetFolder();
     if (!asset) return;
 
     const accountRef = ref(database, `${asset}/accounts`);
diff --git a/packages/libs/kode-ui/src/patterns/SideBarLayout/components/LayoutProvider/NotificationsProvider.tsx b/packages/libs/kode-ui/src/patterns/SideBarLayout/components/LayoutProvider/NotificationsProvider.tsx
index 9258de3901..9ea40ecf7a 100644
--- a/packages/libs/kode-ui/src/patterns/SideBarLayout/components/LayoutProvider/NotificationsProvider.tsx
+++ b/packages/libs/kode-ui/src/patterns/SideBarLayout/components/LayoutProvider/NotificationsProvider.tsx
@@ -51,7 +51,11 @@ export const NotificationsProvider: FC<INotificationsProvider> = ({
       message: notification.message!,
     };
 
-    setNotifications((v) => [...v, notificationProps]);
+    setNotifications((oldValue) => {
+      if (oldValue.find((n) => n.message === notification.message))
+        return [...oldValue];
+      return [...oldValue, notificationProps];
+    });
   };
 
   return (