diff --git a/.github/workflows/_rust_tests.yml b/.github/workflows/_rust_tests.yml
index ce9f40d94c0..6abe2108be8 100644
--- a/.github/workflows/_rust_tests.yml
+++ b/.github/workflows/_rust_tests.yml
@@ -72,8 +72,7 @@ jobs:
 
   check-unused-deps:
     name: Check Unused Dependencies (${{ matrix.flags }})
-    # Temporarily disabled until the nightly build bug is resolved
-    if: (!cancelled() && false)
+    if: (!cancelled())
     strategy:
       matrix:
         flags: ["--all-features", "--no-default-features"]
diff --git a/Cargo.lock b/Cargo.lock
index 8cb47548a46..c2fd51fc912 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5743,6 +5743,7 @@ dependencies = [
  "move-analyzer",
  "move-binary-format",
  "move-bytecode-verifier-meter",
+ "move-cli",
  "move-command-line-common",
  "move-core-types",
  "move-package",
diff --git a/apps/ui-kit/src/lib/components/organisms/dialog/Dialog.tsx b/apps/ui-kit/src/lib/components/organisms/dialog/Dialog.tsx
index d36846dc852..ddd77e87df7 100644
--- a/apps/ui-kit/src/lib/components/organisms/dialog/Dialog.tsx
+++ b/apps/ui-kit/src/lib/components/organisms/dialog/Dialog.tsx
@@ -7,6 +7,7 @@ import cx from 'classnames';
 import * as React from 'react';
 import { Close } from '@iota/ui-icons';
 import { useEffect, useState } from 'react';
+import { DialogPosition } from './dialog.enums';
 
 const Dialog = RadixDialog.Root;
 const DialogTrigger = RadixDialog.Trigger;
@@ -35,34 +36,55 @@ const DialogContent = React.forwardRef<
     React.ComponentPropsWithoutRef<typeof RadixDialog.Content> & {
         containerId?: string;
         showCloseOnOverlay?: boolean;
+        position?: DialogPosition;
     }
->(({ className, containerId, showCloseOnOverlay, children, ...props }, ref) => {
-    const [containerElement, setContainerElement] = useState<HTMLElement | undefined>(undefined);
+>(
+    (
+        {
+            className,
+            containerId,
+            showCloseOnOverlay,
+            children,
+            position = DialogPosition.Center,
+            ...props
+        },
+        ref,
+    ) => {
+        const [containerElement, setContainerElement] = useState<HTMLElement | undefined>(
+            undefined,
+        );
 
-    useEffect(() => {
-        // This ensures document.getElementById is called in the client-side environment only.
-        // note. containerElement cant be null
-        const element = containerId ? document.getElementById(containerId) : undefined;
-        setContainerElement(element ?? undefined);
-    }, [containerId]);
-
-    return (
-        <RadixDialog.Portal container={containerElement}>
-            <DialogOverlay showCloseIcon={showCloseOnOverlay} />
-            <RadixDialog.Content
-                ref={ref}
-                className="absolute left-1/2 top-1/2 z-[99999] flex max-h-[60vh] w-80 max-w-[85vw] -translate-x-1/2 -translate-y-1/2 flex-col justify-center overflow-hidden rounded-xl bg-primary-100 dark:bg-neutral-6 md:w-96"
-                {...props}
-            >
-                <VisuallyHidden.Root>
-                    <RadixDialog.Title />
-                    <RadixDialog.Description />
-                </VisuallyHidden.Root>
-                {children}
-            </RadixDialog.Content>
-        </RadixDialog.Portal>
-    );
-});
+        useEffect(() => {
+            // This ensures document.getElementById is called in the client-side environment only.
+            // note. containerElement cant be null
+            const element = containerId ? document.getElementById(containerId) : undefined;
+            setContainerElement(element ?? undefined);
+        }, [containerId]);
+        const positionClass =
+            position === DialogPosition.Right
+                ? 'right-0 h-screen top-0 w-full max-w-[500px]'
+                : 'max-h-[60vh] left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 rounded-xl w-80 max-w-[85vw]';
+        return (
+            <RadixDialog.Portal container={containerElement}>
+                <DialogOverlay showCloseIcon={showCloseOnOverlay} />
+                <RadixDialog.Content
+                    ref={ref}
+                    className={cx(
+                        'absolute z-[99999] flex flex-col justify-center overflow-hidden bg-primary-100 dark:bg-neutral-6 md:w-96',
+                        positionClass,
+                    )}
+                    {...props}
+                >
+                    <VisuallyHidden.Root>
+                        <RadixDialog.Title />
+                        <RadixDialog.Description />
+                    </VisuallyHidden.Root>
+                    {children}
+                </RadixDialog.Content>
+            </RadixDialog.Portal>
+        );
+    },
+);
 DialogContent.displayName = RadixDialog.Content.displayName;
 
 const DialogTitle = React.forwardRef<
diff --git a/apps/ui-kit/src/lib/components/organisms/dialog/dialog.enums.ts b/apps/ui-kit/src/lib/components/organisms/dialog/dialog.enums.ts
new file mode 100644
index 00000000000..053d6ca0ee7
--- /dev/null
+++ b/apps/ui-kit/src/lib/components/organisms/dialog/dialog.enums.ts
@@ -0,0 +1,7 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export enum DialogPosition {
+    Center = 'center',
+    Right = 'right',
+}
diff --git a/apps/ui-kit/src/lib/components/organisms/dialog/index.ts b/apps/ui-kit/src/lib/components/organisms/dialog/index.ts
index e666b2e9217..42965e76f7c 100644
--- a/apps/ui-kit/src/lib/components/organisms/dialog/index.ts
+++ b/apps/ui-kit/src/lib/components/organisms/dialog/index.ts
@@ -2,3 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export * from './Dialog';
+export * from './dialog.enums';
diff --git a/apps/ui-kit/src/storybook/stories/organisms/Dialog.stories.tsx b/apps/ui-kit/src/storybook/stories/organisms/Dialog.stories.tsx
index 39c4f0da22d..d3e3317c39f 100644
--- a/apps/ui-kit/src/storybook/stories/organisms/Dialog.stories.tsx
+++ b/apps/ui-kit/src/storybook/stories/organisms/Dialog.stories.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
-import { ButtonSize } from '@/lib/components';
+import { ButtonSize, DialogPosition } from '@/lib/components';
 
 import type { Meta, StoryObj } from '@storybook/react';
 
@@ -54,3 +54,50 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};
+
+export const RightDialog: Story = {
+    render: () => {
+        const [open, setOpen] = useState(false);
+        return (
+            <div className="flex">
+                <Button size={ButtonSize.Small} text="Open Dialog" onClick={() => setOpen(true)} />
+                <Dialog open={open} onOpenChange={setOpen}>
+                    <DialogContent showCloseOnOverlay position={DialogPosition.Right}>
+                        <div className="h-full w-full">
+                            <Header
+                                title="Connect Ledger Wallet"
+                                titleCentered
+                                onClose={() => setOpen(false)}
+                                onBack={() => setOpen(false)}
+                            />
+                            <div className="flex h-full w-full flex-col items-center justify-center">
+                                <DialogBody>
+                                    <div className="flex flex-col items-center gap-2">
+                                        <div className="mt-4.5">Logo</div>
+                                        <div className="mt-4.5 break-words text-center">
+                                            Connect your ledger to your computer, unlock it, and
+                                            launch the IOTA app. Click Continue when done.
+                                        </div>
+                                        <div className="mt-4.5">
+                                            {' '}
+                                            Need more help? View tutorial.
+                                        </div>
+                                    </div>
+                                </DialogBody>
+                                <div className="flex w-full flex-row justify-center gap-2 px-md--rs pb-md--rs pt-sm--rs">
+                                    <Button
+                                        size={ButtonSize.Small}
+                                        type={ButtonType.Outlined}
+                                        text="Cancel"
+                                        onClick={() => setOpen(false)}
+                                    />
+                                    <Button size={ButtonSize.Small} text="Connect" />
+                                </div>
+                            </div>
+                        </div>
+                    </DialogContent>
+                </Dialog>
+            </div>
+        );
+    },
+};
diff --git a/apps/wallet-dashboard/app/dashboard/activity/page.tsx b/apps/wallet-dashboard/app/(protected)/activity/page.tsx
similarity index 100%
rename from apps/wallet-dashboard/app/dashboard/activity/page.tsx
rename to apps/wallet-dashboard/app/(protected)/activity/page.tsx
diff --git a/apps/wallet-dashboard/app/dashboard/assets/everything-else/page.tsx b/apps/wallet-dashboard/app/(protected)/assets/everything-else/page.tsx
similarity index 100%
rename from apps/wallet-dashboard/app/dashboard/assets/everything-else/page.tsx
rename to apps/wallet-dashboard/app/(protected)/assets/everything-else/page.tsx
diff --git a/apps/wallet-dashboard/app/dashboard/assets/layout.tsx b/apps/wallet-dashboard/app/(protected)/assets/layout.tsx
similarity index 74%
rename from apps/wallet-dashboard/app/dashboard/assets/layout.tsx
rename to apps/wallet-dashboard/app/(protected)/assets/layout.tsx
index 2ace7b31545..b579dfae131 100644
--- a/apps/wallet-dashboard/app/dashboard/assets/layout.tsx
+++ b/apps/wallet-dashboard/app/(protected)/assets/layout.tsx
@@ -3,12 +3,13 @@
 'use client';
 
 import { RouteLink } from '@/components/index';
+import { ASSETS_ROUTE } from '@/lib/constants/routes.constants';
 import React, { type PropsWithChildren } from 'react';
 
 function AssetsLayout({ children }: PropsWithChildren): JSX.Element {
     const routes = [
-        { title: 'Visual Assets', path: '/dashboard/assets/visual-assets' },
-        { title: 'Everything Else', path: '/dashboard/assets/everything-else' },
+        { title: 'Visual Assets', path: ASSETS_ROUTE.path + '/visual-assets' },
+        { title: 'Everything Else', path: ASSETS_ROUTE.path + '/everything-else' },
     ];
 
     return (
diff --git a/apps/wallet-dashboard/app/dashboard/assets/page.tsx b/apps/wallet-dashboard/app/(protected)/assets/page.tsx
similarity index 100%
rename from apps/wallet-dashboard/app/dashboard/assets/page.tsx
rename to apps/wallet-dashboard/app/(protected)/assets/page.tsx
diff --git a/apps/wallet-dashboard/app/dashboard/assets/visual-assets/[objectId]/page.tsx b/apps/wallet-dashboard/app/(protected)/assets/visual-assets/[objectId]/page.tsx
similarity index 90%
rename from apps/wallet-dashboard/app/dashboard/assets/visual-assets/[objectId]/page.tsx
rename to apps/wallet-dashboard/app/(protected)/assets/visual-assets/[objectId]/page.tsx
index 587d2ccce03..e9fe1e9146c 100644
--- a/apps/wallet-dashboard/app/dashboard/assets/visual-assets/[objectId]/page.tsx
+++ b/apps/wallet-dashboard/app/(protected)/assets/visual-assets/[objectId]/page.tsx
@@ -9,6 +9,7 @@ import { AssetCard, Button, RouteLink, SendAssetPopup } from '@/components';
 import { isAssetTransferable, useGetObject } from '@iota/core';
 import { usePopups } from '@/hooks';
 import { useCurrentAccount } from '@iota/dapp-kit';
+import { ASSETS_ROUTE } from '@/lib/constants/routes.constants';
 
 const VisualAssetDetailPage = () => {
     const params = useParams();
@@ -28,7 +29,7 @@ const VisualAssetDetailPage = () => {
 
     return (
         <div className="flex h-full w-full flex-col space-y-4 px-40">
-            <RouteLink path="/dashboard/assets/visual-assets" title="Back" />
+            <RouteLink path={ASSETS_ROUTE.path + '/visual-assets'} title="Back" />
             {asset?.data ? (
                 <AssetCard key={asset.data.objectId} asset={asset.data} />
             ) : (
diff --git a/apps/wallet-dashboard/app/dashboard/assets/visual-assets/page.tsx b/apps/wallet-dashboard/app/(protected)/assets/visual-assets/page.tsx
similarity index 92%
rename from apps/wallet-dashboard/app/dashboard/assets/visual-assets/page.tsx
rename to apps/wallet-dashboard/app/(protected)/assets/visual-assets/page.tsx
index fe08f79fdfd..2819bb4bfd3 100644
--- a/apps/wallet-dashboard/app/dashboard/assets/visual-assets/page.tsx
+++ b/apps/wallet-dashboard/app/(protected)/assets/visual-assets/page.tsx
@@ -9,6 +9,7 @@ import { AssetCard, VirtualList } from '@/components/index';
 import { useCurrentAccount } from '@iota/dapp-kit';
 import { hasDisplayData, useGetOwnedObjects } from '@iota/core';
 import { useRouter } from 'next/navigation';
+import { ASSETS_ROUTE } from '@/lib/constants/routes.constants';
 
 function VisualAssetsPage(): JSX.Element {
     const account = useCurrentAccount();
@@ -29,7 +30,7 @@ function VisualAssetsPage(): JSX.Element {
     const virtualItem = (asset: IotaObjectData): JSX.Element => <AssetCard asset={asset} />;
 
     const handleClick = (objectId: string) => {
-        router.push(`/dashboard/assets/visual-assets/${objectId}`);
+        router.push(ASSETS_ROUTE.path + `/visual-assets/${objectId}`);
     };
 
     return (
diff --git a/apps/wallet-dashboard/app/(protected)/components/index.ts b/apps/wallet-dashboard/app/(protected)/components/index.ts
new file mode 100644
index 00000000000..b4406b11a68
--- /dev/null
+++ b/apps/wallet-dashboard/app/(protected)/components/index.ts
@@ -0,0 +1,4 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export * from './sidebar/Sidebar';
diff --git a/apps/wallet-dashboard/app/(protected)/components/sidebar/Sidebar.tsx b/apps/wallet-dashboard/app/(protected)/components/sidebar/Sidebar.tsx
new file mode 100644
index 00000000000..0f49225192d
--- /dev/null
+++ b/apps/wallet-dashboard/app/(protected)/components/sidebar/Sidebar.tsx
@@ -0,0 +1,19 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { PROTECTED_ROUTES } from '@/lib/constants/routes.constants';
+import { IotaLogoMark } from '@iota/ui-icons';
+import { SidebarItem } from './SidebarItem';
+
+export function Sidebar() {
+    return (
+        <nav className="flex h-screen flex-col items-center gap-y-2xl bg-neutral-100 py-xl dark:bg-neutral-6">
+            <IotaLogoMark className="h-10 w-10 text-neutral-10 dark:text-neutral-92" />
+            <div className="flex flex-col gap-y-xs">
+                {PROTECTED_ROUTES.map((route) => (
+                    <SidebarItem key={route.path} {...route} />
+                ))}
+            </div>
+        </nav>
+    );
+}
diff --git a/apps/wallet-dashboard/app/(protected)/components/sidebar/SidebarItem.tsx b/apps/wallet-dashboard/app/(protected)/components/sidebar/SidebarItem.tsx
new file mode 100644
index 00000000000..e81e6da5b66
--- /dev/null
+++ b/apps/wallet-dashboard/app/(protected)/components/sidebar/SidebarItem.tsx
@@ -0,0 +1,22 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+'use client';
+
+import type { ProtectedRoute } from '@/lib/interfaces';
+import { NavbarItem, Tooltip, TooltipPosition } from '@iota/apps-ui-kit';
+import { usePathname } from 'next/navigation';
+import Link from 'next/link';
+
+export function SidebarItem({ icon, title, path }: ProtectedRoute) {
+    const pathname = usePathname();
+    const RouteIcon = icon;
+    const isActive = pathname === path;
+    return (
+        <Tooltip text={title} position={TooltipPosition.Right}>
+            <Link href={path} className="relative px-sm py-xxs">
+                <NavbarItem isSelected={isActive} icon={<RouteIcon />} />
+            </Link>
+        </Tooltip>
+    );
+}
diff --git a/apps/wallet-dashboard/app/(protected)/components/top-nav/TopNav.tsx b/apps/wallet-dashboard/app/(protected)/components/top-nav/TopNav.tsx
new file mode 100644
index 00000000000..8dd5f01ca2b
--- /dev/null
+++ b/apps/wallet-dashboard/app/(protected)/components/top-nav/TopNav.tsx
@@ -0,0 +1,16 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { Badge, BadgeType, Button, ButtonType } from '@iota/apps-ui-kit';
+import { ConnectButton } from '@iota/dapp-kit';
+import { Settings } from '@iota/ui-icons';
+
+export function TopNav() {
+    return (
+        <div className="flex w-full flex-row items-center justify-end gap-md py-xs--rs">
+            <Badge label="Mainnet" type={BadgeType.PrimarySoft} />
+            <ConnectButton size="md" />
+            <Button icon={<Settings />} type={ButtonType.Ghost} />
+        </div>
+    );
+}
diff --git a/apps/wallet-dashboard/app/dashboard/home/page.tsx b/apps/wallet-dashboard/app/(protected)/home/page.tsx
similarity index 93%
rename from apps/wallet-dashboard/app/dashboard/home/page.tsx
rename to apps/wallet-dashboard/app/(protected)/home/page.tsx
index f862e2ffc03..53c3d8433b3 100644
--- a/apps/wallet-dashboard/app/dashboard/home/page.tsx
+++ b/apps/wallet-dashboard/app/(protected)/home/page.tsx
@@ -16,7 +16,7 @@ function HomeDashboardPage(): JSX.Element {
     };
 
     return (
-        <main className="flex min-h-screen flex-col items-center space-y-8 p-24">
+        <main className="flex flex-1 flex-col items-center space-y-8 p-24">
             <p>Connection status: {connectionStatus}</p>
             {connectionStatus === 'connected' && account && (
                 <div className="flex flex-col items-center justify-center space-y-2">
diff --git a/apps/wallet-dashboard/app/(protected)/layout.tsx b/apps/wallet-dashboard/app/(protected)/layout.tsx
new file mode 100644
index 00000000000..18168a98870
--- /dev/null
+++ b/apps/wallet-dashboard/app/(protected)/layout.tsx
@@ -0,0 +1,55 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+'use client';
+
+import { Notifications } from '@/components/index';
+import React, { useEffect, useState, type PropsWithChildren } from 'react';
+import { useCurrentAccount, useCurrentWallet } from '@iota/dapp-kit';
+import { Button } from '@iota/apps-ui-kit';
+import { redirect } from 'next/navigation';
+import { Sidebar } from './components';
+import { TopNav } from './components/top-nav/TopNav';
+
+function DashboardLayout({ children }: PropsWithChildren): JSX.Element {
+    const [isDarkMode, setIsDarkMode] = useState(false);
+    const { connectionStatus } = useCurrentWallet();
+    const account = useCurrentAccount();
+
+    const toggleDarkMode = () => {
+        setIsDarkMode(!isDarkMode);
+        if (isDarkMode) {
+            document.documentElement.classList.remove('dark');
+        } else {
+            document.documentElement.classList.add('dark');
+        }
+    };
+
+    useEffect(() => {
+        if (connectionStatus !== 'connected' && !account) {
+            redirect('/');
+        }
+    }, [connectionStatus, account]);
+
+    return (
+        <div className="h-full">
+            <div className="fixed left-0 top-0 z-50 h-full">
+                <Sidebar />
+            </div>
+
+            <div className="container relative min-h-screen">
+                <div className="sticky top-0">
+                    <TopNav />
+                </div>
+                <div>{children}</div>
+            </div>
+
+            <div className="fixed bottom-5 right-5">
+                <Button onClick={toggleDarkMode} text={isDarkMode ? 'Light Mode' : 'Dark Mode'} />
+            </div>
+
+            <Notifications />
+        </div>
+    );
+}
+
+export default DashboardLayout;
diff --git a/apps/wallet-dashboard/app/dashboard/migrations/page.tsx b/apps/wallet-dashboard/app/(protected)/migrations/page.tsx
similarity index 100%
rename from apps/wallet-dashboard/app/dashboard/migrations/page.tsx
rename to apps/wallet-dashboard/app/(protected)/migrations/page.tsx
diff --git a/apps/wallet-dashboard/app/dashboard/staking/page.tsx b/apps/wallet-dashboard/app/(protected)/staking/page.tsx
similarity index 100%
rename from apps/wallet-dashboard/app/dashboard/staking/page.tsx
rename to apps/wallet-dashboard/app/(protected)/staking/page.tsx
diff --git a/apps/wallet-dashboard/app/dashboard/vesting/page.tsx b/apps/wallet-dashboard/app/(protected)/vesting/page.tsx
similarity index 100%
rename from apps/wallet-dashboard/app/dashboard/vesting/page.tsx
rename to apps/wallet-dashboard/app/(protected)/vesting/page.tsx
diff --git a/apps/wallet-dashboard/app/dashboard/apps/page.tsx b/apps/wallet-dashboard/app/dashboard/apps/page.tsx
deleted file mode 100644
index cb6c956a6a4..00000000000
--- a/apps/wallet-dashboard/app/dashboard/apps/page.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-'use client';
-
-import { AppList } from '@/components';
-
-function AppsPage(): JSX.Element {
-    return (
-        <div className="flex items-center justify-center pt-12">
-            <h1>APPS</h1>
-            <AppList />
-        </div>
-    );
-}
-
-export default AppsPage;
diff --git a/apps/wallet-dashboard/app/dashboard/layout.tsx b/apps/wallet-dashboard/app/dashboard/layout.tsx
deleted file mode 100644
index 7db89a819c7..00000000000
--- a/apps/wallet-dashboard/app/dashboard/layout.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-'use client';
-
-import { Notifications, RouteLink } from '@/components/index';
-import React, { useEffect, useState, type PropsWithChildren } from 'react';
-import { ConnectButton, useCurrentAccount, useCurrentWallet } from '@iota/dapp-kit';
-import { Button } from '@iota/apps-ui-kit';
-import { useRouter } from 'next/navigation';
-
-const routes = [
-    { title: 'Home', path: '/dashboard/home' },
-    { title: 'Assets', path: '/dashboard/assets' },
-    { title: 'Staking', path: '/dashboard/staking' },
-    { title: 'Apps', path: '/dashboard/apps' },
-    { title: 'Activity', path: '/dashboard/activity' },
-    { title: 'Migrations', path: '/dashboard/migrations' },
-    { title: 'Vesting', path: '/dashboard/vesting' },
-];
-
-function DashboardLayout({ children }: PropsWithChildren): JSX.Element {
-    const [isDarkMode, setIsDarkMode] = useState(false);
-    const { connectionStatus } = useCurrentWallet();
-    const account = useCurrentAccount();
-
-    const router = useRouter();
-    const toggleDarkMode = () => {
-        setIsDarkMode(!isDarkMode);
-        if (isDarkMode) {
-            document.documentElement.classList.remove('dark');
-        } else {
-            document.documentElement.classList.add('dark');
-        }
-    };
-
-    useEffect(() => {
-        if (connectionStatus !== 'connected' && !account) {
-            router.push('/');
-        }
-    }, [connectionStatus, account, router]);
-
-    return (
-        <>
-            <section className="flex flex-row items-center justify-around pt-12">
-                <Notifications />
-                {routes.map((route) => {
-                    return <RouteLink key={route.title} {...route} />;
-                })}
-                <Button onClick={toggleDarkMode} text={isDarkMode ? 'Light Mode' : 'Dark Mode'} />
-                <ConnectButton />
-            </section>
-            <div>{children}</div>
-        </>
-    );
-}
-
-export default DashboardLayout;
diff --git a/apps/wallet-dashboard/app/layout.tsx b/apps/wallet-dashboard/app/layout.tsx
index badfa837057..dadbd552dbf 100644
--- a/apps/wallet-dashboard/app/layout.tsx
+++ b/apps/wallet-dashboard/app/layout.tsx
@@ -6,7 +6,7 @@ import { Inter } from 'next/font/google';
 
 import './globals.css';
 
-import { IotaClientProvider, WalletProvider } from '@iota/dapp-kit';
+import { IotaClientProvider, lightTheme, darkTheme, WalletProvider } from '@iota/dapp-kit';
 import { getAllNetworks, getDefaultNetwork } from '@iota/iota-sdk/client';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import React from 'react';
@@ -22,16 +22,27 @@ export default function RootLayout({
     children: React.ReactNode;
 }>) {
     const [queryClient] = React.useState(() => new QueryClient());
+    const bodyRef = React.useRef<HTMLBodyElement>(null);
 
     const allNetworks = getAllNetworks();
     const defaultNetwork = getDefaultNetwork();
 
     return (
         <html lang="en">
-            <body className={inter.className}>
+            <body className={inter.className} ref={bodyRef}>
                 <QueryClientProvider client={queryClient}>
                     <IotaClientProvider networks={allNetworks} defaultNetwork={defaultNetwork}>
-                        <WalletProvider>
+                        <WalletProvider
+                            theme={[
+                                {
+                                    variables: lightTheme,
+                                },
+                                {
+                                    selector: '.dark',
+                                    variables: darkTheme,
+                                },
+                            ]}
+                        >
                             <PopupProvider>
                                 {children}
                                 <Popup />
diff --git a/apps/wallet-dashboard/app/page.tsx b/apps/wallet-dashboard/app/page.tsx
index e0940c12afe..38001d4b184 100644
--- a/apps/wallet-dashboard/app/page.tsx
+++ b/apps/wallet-dashboard/app/page.tsx
@@ -5,21 +5,21 @@
 
 import { ConnectButton, useCurrentAccount, useCurrentWallet } from '@iota/dapp-kit';
 import { useEffect } from 'react';
-import { useRouter } from 'next/navigation';
+import { redirect } from 'next/navigation';
 import { IotaLogoWeb } from '@iota/ui-icons';
+import { HOMEPAGE_ROUTE } from '@/lib/constants/routes.constants';
 
 function HomeDashboardPage(): JSX.Element {
     const { connectionStatus } = useCurrentWallet();
     const account = useCurrentAccount();
-    const router = useRouter();
 
     const CURRENT_YEAR = new Date().getFullYear();
 
     useEffect(() => {
         if (connectionStatus === 'connected' && account) {
-            router.push('/dashboard/home');
+            redirect(HOMEPAGE_ROUTE.path);
         }
-    }, [connectionStatus, account, router]);
+    }, [connectionStatus, account]);
 
     return (
         <main className="flex h-screen">
diff --git a/apps/wallet-dashboard/components/Popup/Popups/SendAssetPopup.tsx b/apps/wallet-dashboard/components/Popup/Popups/SendAssetPopup.tsx
index 305476e73f7..8dbcf912276 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/SendAssetPopup.tsx
+++ b/apps/wallet-dashboard/components/Popup/Popups/SendAssetPopup.tsx
@@ -12,6 +12,7 @@ import { useRouter } from 'next/navigation';
 import { useNotifications } from '@/hooks';
 import { NotificationType } from '@/stores/notificationStore';
 import { useCreateSendAssetTransaction } from '@/hooks';
+import { ASSETS_ROUTE } from '@/lib/constants/routes.constants';
 
 interface SendAssetPopupProps {
     asset: IotaObjectData;
@@ -48,7 +49,7 @@ export default function SendAssetPopup({ asset, onClose }: SendAssetPopupProps):
     function onSendAssetSuccess() {
         addNotification('Transfer transaction successful', NotificationType.Success);
         onClose?.();
-        router.push('/dashboard/assets/visual-assets');
+        router.push(ASSETS_ROUTE.path + '/visual-assets');
     }
 
     function onSendAssetError() {
diff --git a/apps/wallet-dashboard/lib/constants/routes.constants.ts b/apps/wallet-dashboard/lib/constants/routes.constants.ts
new file mode 100644
index 00000000000..246be3eb40e
--- /dev/null
+++ b/apps/wallet-dashboard/lib/constants/routes.constants.ts
@@ -0,0 +1,49 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ProtectedRoute } from '../interfaces';
+import { ProtectedRouteTitle } from '../enums';
+import { Activity, Assets, Calendar, Home, Migration, Tokens } from '@iota/ui-icons';
+
+export const HOMEPAGE_ROUTE: ProtectedRoute = {
+    title: ProtectedRouteTitle.Home,
+    path: '/home',
+    icon: Home,
+};
+
+export const ASSETS_ROUTE: ProtectedRoute = {
+    title: ProtectedRouteTitle.Assets,
+    path: '/assets',
+    icon: Assets,
+};
+
+export const STAKING_ROUTE: ProtectedRoute = {
+    title: ProtectedRouteTitle.Staking,
+    path: '/staking',
+    icon: Activity,
+};
+
+export const ACTIVITY_ROUTE: ProtectedRoute = {
+    title: ProtectedRouteTitle.Activity,
+    path: '/activity',
+    icon: Tokens,
+};
+export const MIGRATIONS_ROUTE: ProtectedRoute = {
+    title: ProtectedRouteTitle.Migrations,
+    path: '/migrations',
+    icon: Calendar,
+};
+export const VESTING_ROUTE: ProtectedRoute = {
+    title: ProtectedRouteTitle.Vesting,
+    path: '/vesting',
+    icon: Migration,
+};
+
+export const PROTECTED_ROUTES = [
+    HOMEPAGE_ROUTE,
+    ASSETS_ROUTE,
+    STAKING_ROUTE,
+    ACTIVITY_ROUTE,
+    MIGRATIONS_ROUTE,
+    VESTING_ROUTE,
+] as const satisfies ProtectedRoute[];
diff --git a/apps/wallet-dashboard/lib/enums/index.ts b/apps/wallet-dashboard/lib/enums/index.ts
new file mode 100644
index 00000000000..a9ebb8b34ad
--- /dev/null
+++ b/apps/wallet-dashboard/lib/enums/index.ts
@@ -0,0 +1,4 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export * from './protectedRouteTitle.enum';
diff --git a/apps/wallet-dashboard/lib/enums/protectedRouteTitle.enum.ts b/apps/wallet-dashboard/lib/enums/protectedRouteTitle.enum.ts
new file mode 100644
index 00000000000..a25fbd825a4
--- /dev/null
+++ b/apps/wallet-dashboard/lib/enums/protectedRouteTitle.enum.ts
@@ -0,0 +1,11 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export enum ProtectedRouteTitle {
+    Home = 'Home',
+    Assets = 'Assets',
+    Staking = 'Staking',
+    Activity = 'Activity',
+    Migrations = 'Migrations',
+    Vesting = 'Vesting',
+}
diff --git a/apps/wallet-dashboard/lib/interfaces/appRoute.interface.ts b/apps/wallet-dashboard/lib/interfaces/appRoute.interface.ts
new file mode 100644
index 00000000000..c661dce5598
--- /dev/null
+++ b/apps/wallet-dashboard/lib/interfaces/appRoute.interface.ts
@@ -0,0 +1,8 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export interface ProtectedRoute {
+    title: string;
+    path: string;
+    icon: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
+}
diff --git a/apps/wallet-dashboard/lib/interfaces/index.ts b/apps/wallet-dashboard/lib/interfaces/index.ts
index b00df15b193..eeab2cb4f5c 100644
--- a/apps/wallet-dashboard/lib/interfaces/index.ts
+++ b/apps/wallet-dashboard/lib/interfaces/index.ts
@@ -4,3 +4,4 @@
 export * from './transactions.interface';
 export * from './timelock.interface';
 export * from './vesting.interface';
+export * from './appRoute.interface';
diff --git a/apps/wallet-dashboard/package.json b/apps/wallet-dashboard/package.json
index 1398daf9a87..6807f6fda94 100644
--- a/apps/wallet-dashboard/package.json
+++ b/apps/wallet-dashboard/package.json
@@ -22,6 +22,7 @@
         "@iota/ui-icons": "workspace:*",
         "@tanstack/react-query": "^5.50.1",
         "@tanstack/react-virtual": "^3.5.0",
+        "clsx": "^2.1.1",
         "next": "14.2.10",
         "react": "^18.3.1",
         "zustand": "^4.4.1"
diff --git a/apps/wallet-dashboard/tsconfig.json b/apps/wallet-dashboard/tsconfig.json
index 2e42283cc00..d452a8afa13 100644
--- a/apps/wallet-dashboard/tsconfig.json
+++ b/apps/wallet-dashboard/tsconfig.json
@@ -20,6 +20,7 @@
         ],
         "paths": {
             "@/*": ["./*"],
+            "@/lib/*": ["./lib/*"],
             "@/app/*": ["./app/*"],
             "@/components/*": ["./components/*"],
             "@/hooks/*": ["./hooks/*"],
diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs
index 9542d7d6f70..7eee6f5e8eb 100644
--- a/crates/iota-core/src/authority.rs
+++ b/crates/iota-core/src/authority.rs
@@ -89,7 +89,7 @@ use iota_types::{
         CheckpointSummaryResponse, CheckpointTimestamp, ECMHLiveObjectSetDigest,
         VerifiedCheckpoint,
     },
-    messages_consensus::{AuthorityCapabilitiesV1, AuthorityCapabilitiesV2},
+    messages_consensus::AuthorityCapabilitiesV1,
     messages_grpc::{
         HandleTransactionResponse, LayoutGenerationOption, ObjectInfoRequest,
         ObjectInfoRequestKind, ObjectInfoResponse, TransactionInfoRequest, TransactionInfoResponse,
@@ -4321,7 +4321,6 @@ impl AuthorityState {
         Some(res)
     }
 
-    // TODO: delete once authority_capabilities_v2 is deployed everywhere
     /// Returns the new protocol version and system packages that the network
     /// has voted to upgrade to. If the proposed protocol version is not
     /// supported, None is returned.
@@ -4336,86 +4335,6 @@ impl AuthorityState {
             buffer_stake_bps = 10000;
         }
 
-        // For each validator, gather the protocol version and system packages that it
-        // would like to upgrade to in the next epoch.
-        let mut desired_upgrades: Vec<_> = capabilities
-            .into_iter()
-            .filter_map(|mut cap| {
-                // A validator that lists no packages is voting against any change at all.
-                if cap.available_system_packages.is_empty() {
-                    return None;
-                }
-
-                cap.available_system_packages.sort();
-
-                info!(
-                    "validator {:?} supports {:?} with system packages: {:?}",
-                    cap.authority.concise(),
-                    cap.supported_protocol_versions,
-                    cap.available_system_packages,
-                );
-
-                // A validator that only supports the current protocol version is also voting
-                // against any change, because framework upgrades always require a protocol
-                // version bump.
-                cap.supported_protocol_versions
-                    .is_version_supported(proposed_protocol_version)
-                    .then_some((cap.available_system_packages, cap.authority))
-            })
-            .collect();
-
-        // There can only be one set of votes that have a majority, find one if it
-        // exists.
-        desired_upgrades.sort();
-        desired_upgrades
-            .into_iter()
-            .chunk_by(|(packages, _authority)| packages.clone())
-            .into_iter()
-            .find_map(|(packages, group)| {
-                // should have been filtered out earlier.
-                assert!(!packages.is_empty());
-
-                let mut stake_aggregator: StakeAggregator<(), true> =
-                    StakeAggregator::new(Arc::new(committee.clone()));
-
-                for (_, authority) in group {
-                    stake_aggregator.insert_generic(authority, ());
-                }
-
-                let total_votes = stake_aggregator.total_votes();
-                let quorum_threshold = committee.quorum_threshold();
-                let f = committee.total_votes() - committee.quorum_threshold();
-
-                // multiple by buffer_stake_bps / 10000, rounded up.
-                let buffer_stake = (f * buffer_stake_bps + 9999) / 10000;
-                let effective_threshold = quorum_threshold + buffer_stake;
-
-                info!(
-                    ?total_votes,
-                    ?quorum_threshold,
-                    ?buffer_stake_bps,
-                    ?effective_threshold,
-                    ?proposed_protocol_version,
-                    ?packages,
-                    "support for upgrade"
-                );
-
-                let has_support = total_votes >= effective_threshold;
-                has_support.then_some((proposed_protocol_version, packages))
-            })
-    }
-
-    fn is_protocol_version_supported_v2(
-        proposed_protocol_version: ProtocolVersion,
-        committee: &Committee,
-        capabilities: Vec<AuthorityCapabilitiesV2>,
-        mut buffer_stake_bps: u64,
-    ) -> Option<(ProtocolVersion, Vec<ObjectRef>)> {
-        if buffer_stake_bps > 10000 {
-            warn!("clamping buffer_stake_bps to 10000");
-            buffer_stake_bps = 10000;
-        }
-
         // For each validator, gather the protocol version and system packages that it
         // would like to upgrade to in the next epoch.
         let mut desired_upgrades: Vec<_> = capabilities
@@ -4486,7 +4405,6 @@ impl AuthorityState {
             })
     }
 
-    // TODO: delete once authority_capabilities_v2 is deployed everywhere
     /// Selects the highest supported protocol version and system packages that
     /// the network has voted to upgrade to. If no upgrade is supported,
     /// returns the current protocol version and system packages.
@@ -4499,32 +4417,10 @@ impl AuthorityState {
         let mut next_protocol_version = current_protocol_version;
         let mut system_packages = vec![];
 
-        while let Some((version, packages)) = Self::is_protocol_version_supported_v1(
-            next_protocol_version + 1,
-            committee,
-            capabilities.clone(),
-            buffer_stake_bps,
-        ) {
-            next_protocol_version = version;
-            system_packages = packages;
-        }
-
-        (next_protocol_version, system_packages)
-    }
-
-    fn choose_protocol_version_and_system_packages_v2(
-        current_protocol_version: ProtocolVersion,
-        committee: &Committee,
-        capabilities: Vec<AuthorityCapabilitiesV2>,
-        buffer_stake_bps: u64,
-    ) -> (ProtocolVersion, Vec<ObjectRef>) {
-        let mut next_protocol_version = current_protocol_version;
-        let mut system_packages = vec![];
-
         // Finds the highest supported protocol version and system packages by
         // incrementing the proposed protocol version by one until no further
         // upgrades are supported.
-        while let Some((version, packages)) = Self::is_protocol_version_supported_v2(
+        while let Some((version, packages)) = Self::is_protocol_version_supported_v1(
             next_protocol_version + 1,
             committee,
             capabilities.clone(),
@@ -4661,25 +4557,14 @@ impl AuthorityState {
         let buffer_stake_bps = epoch_store.get_effective_buffer_stake_bps();
 
         let (next_epoch_protocol_version, next_epoch_system_packages) =
-            if epoch_store.protocol_config().authority_capabilities_v2() {
-                Self::choose_protocol_version_and_system_packages_v2(
-                    epoch_store.protocol_version(),
-                    epoch_store.committee(),
-                    epoch_store
-                        .get_capabilities_v2()
-                        .expect("read capabilities from db cannot fail"),
-                    buffer_stake_bps,
-                )
-            } else {
-                Self::choose_protocol_version_and_system_packages_v1(
-                    epoch_store.protocol_version(),
-                    epoch_store.committee(),
-                    epoch_store
-                        .get_capabilities_v1()
-                        .expect("read capabilities from db cannot fail"),
-                    buffer_stake_bps,
-                )
-            };
+            Self::choose_protocol_version_and_system_packages_v1(
+                epoch_store.protocol_version(),
+                epoch_store.committee(),
+                epoch_store
+                    .get_capabilities_v1()
+                    .expect("read capabilities from db cannot fail"),
+                buffer_stake_bps,
+            );
 
         // since system packages are created during the current epoch, they should abide
         // by the rules of the current epoch, including the current epoch's max
diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs
index 75c501b40df..c0d016458f8 100644
--- a/crates/iota-core/src/authority/authority_per_epoch_store.rs
+++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs
@@ -49,9 +49,8 @@ use iota_types::{
         CheckpointContents, CheckpointSequenceNumber, CheckpointSignatureMessage, CheckpointSummary,
     },
     messages_consensus::{
-        AuthorityCapabilitiesV1, AuthorityCapabilitiesV2, ConsensusTransaction,
-        ConsensusTransactionKey, ConsensusTransactionKind, VersionedDkgConfirmation,
-        check_total_jwk_size,
+        AuthorityCapabilitiesV1, ConsensusTransaction, ConsensusTransactionKey,
+        ConsensusTransactionKind, VersionedDkgConfirmation, check_total_jwk_size,
     },
     signature::GenericSignature,
     storage::{BackingPackageStore, GetSharedLocks, InputKey, ObjectStore},
@@ -550,8 +549,7 @@ pub struct AuthorityEpochTables {
     pub running_root_accumulators: DBMap<CheckpointSequenceNumber, Accumulator>,
 
     /// Record of the capabilities advertised by each authority.
-    authority_capabilities: DBMap<AuthorityName, AuthorityCapabilitiesV1>,
-    authority_capabilities_v2: DBMap<AuthorityName, AuthorityCapabilitiesV2>,
+    authority_capabilities_v1: DBMap<AuthorityName, AuthorityCapabilitiesV1>,
 
     /// Contains a single key, which overrides the value of
     /// ProtocolConfig::buffer_stake_for_protocol_upgrade_bps
@@ -2057,37 +2055,14 @@ impl AuthorityPerEpochStore {
     }
 
     /// Record most recently advertised capabilities of all authorities
-    pub fn record_capabilities(&self, capabilities: &AuthorityCapabilitiesV1) -> IotaResult {
-        info!("received capabilities {:?}", capabilities);
-        let authority = &capabilities.authority;
-        let tables = self.tables()?;
-
-        // Read-compare-write pattern assumes we are only called from the consensus
-        // handler task.
-        if let Some(cap) = tables.authority_capabilities.get(authority)? {
-            if cap.generation >= capabilities.generation {
-                debug!(
-                    "ignoring new capabilities {:?} in favor of previous capabilities {:?}",
-                    capabilities, cap
-                );
-                return Ok(());
-            }
-        }
-        tables
-            .authority_capabilities
-            .insert(authority, capabilities)?;
-        Ok(())
-    }
-
-    /// Record most recently advertised capabilities of all authorities
-    pub fn record_capabilities_v2(&self, capabilities: &AuthorityCapabilitiesV2) -> IotaResult {
+    pub fn record_capabilities_v1(&self, capabilities: &AuthorityCapabilitiesV1) -> IotaResult {
         info!("received capabilities v2 {:?}", capabilities);
         let authority = &capabilities.authority;
         let tables = self.tables()?;
 
         // Read-compare-write pattern assumes we are only called from the consensus
         // handler task.
-        if let Some(cap) = tables.authority_capabilities_v2.get(authority)? {
+        if let Some(cap) = tables.authority_capabilities_v1.get(authority)? {
             if cap.generation >= capabilities.generation {
                 debug!(
                     "ignoring new capabilities {:?} in favor of previous capabilities {:?}",
@@ -2097,27 +2072,15 @@ impl AuthorityPerEpochStore {
             }
         }
         tables
-            .authority_capabilities_v2
+            .authority_capabilities_v1
             .insert(authority, capabilities)?;
         Ok(())
     }
 
     pub fn get_capabilities_v1(&self) -> IotaResult<Vec<AuthorityCapabilitiesV1>> {
-        assert!(!self.protocol_config.authority_capabilities_v2());
         let result: Result<Vec<AuthorityCapabilitiesV1>, TypedStoreError> = self
             .tables()?
-            .authority_capabilities
-            .values()
-            .map_into()
-            .collect();
-        Ok(result?)
-    }
-
-    pub fn get_capabilities_v2(&self) -> IotaResult<Vec<AuthorityCapabilitiesV2>> {
-        assert!(self.protocol_config.authority_capabilities_v2());
-        let result: Result<Vec<AuthorityCapabilitiesV2>, TypedStoreError> = self
-            .tables()?
-            .authority_capabilities_v2
+            .authority_capabilities_v1
             .values()
             .map_into()
             .collect();
@@ -2387,15 +2350,7 @@ impl AuthorityPerEpochStore {
             }
             SequencedConsensusTransactionKind::External(ConsensusTransaction {
                 kind:
-                    ConsensusTransactionKind::CapabilityNotification(AuthorityCapabilitiesV1 {
-                        authority,
-                        ..
-                    }),
-                ..
-            })
-            | SequencedConsensusTransactionKind::External(ConsensusTransaction {
-                kind:
-                    ConsensusTransactionKind::CapabilityNotificationV2(AuthorityCapabilitiesV2 {
+                    ConsensusTransactionKind::CapabilityNotificationV1(AuthorityCapabilitiesV1 {
                         authority,
                         ..
                     }),
@@ -2403,7 +2358,7 @@ impl AuthorityPerEpochStore {
             }) => {
                 if transaction.sender_authority() != *authority {
                     warn!(
-                        "CapabilityNotification authority {} does not match its author from consensus {}",
+                        "CapabilityNotificationV1 authority {} does not match its author from consensus {}",
                         authority, transaction.certificate_author_index
                     );
                     return None;
@@ -3427,7 +3382,7 @@ impl AuthorityPerEpochStore {
                 panic!("process_consensus_transaction called with end-of-publish transaction");
             }
             SequencedConsensusTransactionKind::External(ConsensusTransaction {
-                kind: ConsensusTransactionKind::CapabilityNotification(capabilities),
+                kind: ConsensusTransactionKind::CapabilityNotificationV1(capabilities),
                 ..
             }) => {
                 // Records capabilities for the authority.
@@ -3437,35 +3392,13 @@ impl AuthorityPerEpochStore {
                     .should_accept_consensus_certs()
                 {
                     debug!(
-                        "Received CapabilityNotification from {:?}",
-                        authority.concise()
-                    );
-                    self.record_capabilities(capabilities)?;
-                } else {
-                    debug!(
-                        "Ignoring CapabilityNotification from {:?} because of end of epoch",
-                        authority.concise()
-                    );
-                }
-                Ok(ConsensusCertificateResult::ConsensusMessage)
-            }
-            SequencedConsensusTransactionKind::External(ConsensusTransaction {
-                kind: ConsensusTransactionKind::CapabilityNotificationV2(capabilities),
-                ..
-            }) => {
-                let authority = capabilities.authority;
-                if self
-                    .get_reconfig_state_read_lock_guard()
-                    .should_accept_consensus_certs()
-                {
-                    debug!(
-                        "Received CapabilityNotificationV2 from {:?}",
+                        "Received CapabilityNotificationV1 from {:?}",
                         authority.concise()
                     );
-                    self.record_capabilities_v2(capabilities)?;
+                    self.record_capabilities_v1(capabilities)?;
                 } else {
                     debug!(
-                        "Ignoring CapabilityNotificationV2 from {:?} because of end of epoch",
+                        "Ignoring CapabilityNotificationV1 from {:?} because of end of epoch",
                         authority.concise()
                     );
                 }
diff --git a/crates/iota-core/src/consensus_adapter.rs b/crates/iota-core/src/consensus_adapter.rs
index de3318ce93d..c9076f677a4 100644
--- a/crates/iota-core/src/consensus_adapter.rs
+++ b/crates/iota-core/src/consensus_adapter.rs
@@ -689,8 +689,7 @@ impl ConsensusAdapter {
             && matches!(
                 transactions[0].kind,
                 ConsensusTransactionKind::EndOfPublish(_)
-                    | ConsensusTransactionKind::CapabilityNotification(_)
-                    | ConsensusTransactionKind::CapabilityNotificationV2(_)
+                    | ConsensusTransactionKind::CapabilityNotificationV1(_)
                     | ConsensusTransactionKind::RandomnessDkgMessage(_, _)
                     | ConsensusTransactionKind::RandomnessDkgConfirmation(_, _)
             ) {
diff --git a/crates/iota-core/src/consensus_handler.rs b/crates/iota-core/src/consensus_handler.rs
index de40d9523fa..cc2119cb189 100644
--- a/crates/iota-core/src/consensus_handler.rs
+++ b/crates/iota-core/src/consensus_handler.rs
@@ -539,8 +539,7 @@ pub(crate) fn classify(transaction: &ConsensusTransaction) -> &'static str {
         }
         ConsensusTransactionKind::CheckpointSignature(_) => "checkpoint_signature",
         ConsensusTransactionKind::EndOfPublish(_) => "end_of_publish",
-        ConsensusTransactionKind::CapabilityNotification(_) => "capability_notification",
-        ConsensusTransactionKind::CapabilityNotificationV2(_) => "capability_notification_v2",
+        ConsensusTransactionKind::CapabilityNotificationV1(_) => "capability_notification_v1",
         ConsensusTransactionKind::NewJWKFetched(_, _, _) => "new_jwk_fetched",
         ConsensusTransactionKind::RandomnessStateUpdate(_, _) => "randomness_state_update",
         ConsensusTransactionKind::RandomnessDkgMessage(_, _) => "randomness_dkg_message",
@@ -807,7 +806,7 @@ mod tests {
     use consensus_core::{
         BlockAPI, CommitDigest, CommitRef, CommittedSubDag, TestBlock, Transaction, VerifiedBlock,
     };
-    use iota_protocol_config::ConsensusTransactionOrdering;
+    use iota_protocol_config::{Chain, ConsensusTransactionOrdering};
     use iota_types::{
         base_types::{AuthorityName, IotaAddress, random_object_ref},
         committee::Committee,
@@ -815,7 +814,9 @@ mod tests {
             AuthorityCapabilitiesV1, ConsensusTransaction, ConsensusTransactionKind,
         },
         object::Object,
-        supported_protocol_versions::SupportedProtocolVersions,
+        supported_protocol_versions::{
+            SupportedProtocolVersions, SupportedProtocolVersionsWithHashes,
+        },
         transaction::{
             CertifiedTransaction, SenderSignedData, TransactionData, TransactionDataAPI,
         },
@@ -960,7 +961,13 @@ mod tests {
 
     #[test]
     fn test_order_by_gas_price() {
-        let mut v = vec![cap_txn(10), user_txn(42), user_txn(100), cap_txn(1)];
+        let chain = Chain::Unknown;
+        let mut v = vec![
+            cap_txn(10, chain),
+            user_txn(42),
+            user_txn(100),
+            cap_txn(1, chain),
+        ];
         PostConsensusTxReorder::reorder(&mut v, ConsensusTransactionOrdering::ByGasPrice);
         assert_eq!(extract(v), vec![
             "cap(10)".to_string(),
@@ -971,12 +978,12 @@ mod tests {
 
         let mut v = vec![
             user_txn(1200),
-            cap_txn(10),
+            cap_txn(10, chain),
             user_txn(12),
             user_txn(1000),
             user_txn(42),
             user_txn(100),
-            cap_txn(1),
+            cap_txn(1, chain),
             user_txn(1000),
         ];
         PostConsensusTxReorder::reorder(&mut v, ConsensusTransactionOrdering::ByGasPrice);
@@ -993,10 +1000,10 @@ mod tests {
 
         // If there are no user transactions, the order should be preserved.
         let mut v = vec![
-            cap_txn(10),
+            cap_txn(10, chain),
             eop_txn(12),
             eop_txn(10),
-            cap_txn(1),
+            cap_txn(1, chain),
             eop_txn(11),
         ];
         PostConsensusTxReorder::reorder(&mut v, ConsensusTransactionOrdering::ByGasPrice);
@@ -1019,7 +1026,7 @@ mod tests {
                 ConsensusTransactionKind::EndOfPublish(authority) => {
                     format!("eop({})", authority.0[0])
                 }
-                ConsensusTransactionKind::CapabilityNotification(cap) => {
+                ConsensusTransactionKind::CapabilityNotificationV1(cap) => {
                     format!("cap({})", cap.generation)
                 }
                 ConsensusTransactionKind::UserTransaction(txn) => {
@@ -1037,12 +1044,17 @@ mod tests {
         txn(ConsensusTransactionKind::EndOfPublish(authority))
     }
 
-    fn cap_txn(generation: u64) -> VerifiedSequencedConsensusTransaction {
-        txn(ConsensusTransactionKind::CapabilityNotification(
+    fn cap_txn(generation: u64, chain: Chain) -> VerifiedSequencedConsensusTransaction {
+        txn(ConsensusTransactionKind::CapabilityNotificationV1(
+            // we don't use the "new" constructor because we need to set the generation
             AuthorityCapabilitiesV1 {
                 authority: Default::default(),
                 generation,
-                supported_protocol_versions: SupportedProtocolVersions::SYSTEM_DEFAULT,
+                supported_protocol_versions:
+                    SupportedProtocolVersionsWithHashes::from_supported_versions(
+                        SupportedProtocolVersions::SYSTEM_DEFAULT,
+                        chain,
+                    ),
                 available_system_packages: vec![],
             },
         ))
diff --git a/crates/iota-core/src/consensus_validator.rs b/crates/iota-core/src/consensus_validator.rs
index a691493c51b..4962bb0b2f5 100644
--- a/crates/iota-core/src/consensus_validator.rs
+++ b/crates/iota-core/src/consensus_validator.rs
@@ -86,11 +86,9 @@ impl IotaTxValidator {
                     }
                 }
 
-                ConsensusTransactionKind::CapabilityNotification(_) => {}
-
                 ConsensusTransactionKind::EndOfPublish(_)
                 | ConsensusTransactionKind::NewJWKFetched(_, _, _)
-                | ConsensusTransactionKind::CapabilityNotificationV2(_)
+                | ConsensusTransactionKind::CapabilityNotificationV1(_)
                 | ConsensusTransactionKind::RandomnessStateUpdate(_, _) => {}
             }
         }
diff --git a/crates/iota-core/src/mysticeti_adapter.rs b/crates/iota-core/src/mysticeti_adapter.rs
index c555d8299ef..38912cb46ae 100644
--- a/crates/iota-core/src/mysticeti_adapter.rs
+++ b/crates/iota-core/src/mysticeti_adapter.rs
@@ -117,8 +117,7 @@ impl SubmitToConsensus for LazyMysticetiClient {
             && matches!(
                 transactions[0].kind,
                 ConsensusTransactionKind::EndOfPublish(_)
-                    | ConsensusTransactionKind::CapabilityNotification(_)
-                    | ConsensusTransactionKind::CapabilityNotificationV2(_)
+                    | ConsensusTransactionKind::CapabilityNotificationV1(_)
                     | ConsensusTransactionKind::RandomnessDkgMessage(_, _)
                     | ConsensusTransactionKind::RandomnessDkgConfirmation(_, _)
             )
diff --git a/crates/iota-core/src/unit_tests/authority_tests.rs b/crates/iota-core/src/unit_tests/authority_tests.rs
index a0ba25284db..e586e571822 100644
--- a/crates/iota-core/src/unit_tests/authority_tests.rs
+++ b/crates/iota-core/src/unit_tests/authority_tests.rs
@@ -30,7 +30,7 @@ use iota_types::{
     execution_status::{ExecutionFailureStatus, ExecutionStatus},
     gas_coin::GasCoin,
     iota_system_state::IotaSystemStateWrapper,
-    messages_consensus::{AuthorityCapabilitiesV2, ConsensusDeterminedVersionAssignments},
+    messages_consensus::{AuthorityCapabilitiesV1, ConsensusDeterminedVersionAssignments},
     object::{Data, GAS_VALUE_FOR_TESTING, OBJECT_START_VERSION, Owner},
     programmable_transaction_builder::ProgrammableTransactionBuilder,
     randomness_state::get_randomness_state_obj_initial_shared_version,
@@ -4993,7 +4993,7 @@ async fn test_choose_next_system_packages() {
 
     macro_rules! make_capabilities {
         ($v: expr, $name: expr, $packages: expr) => {
-            AuthorityCapabilitiesV2::new(
+            AuthorityCapabilitiesV1::new(
                 $name,
                 Chain::Unknown,
                 SupportedProtocolVersions::new_for_testing(1, $v),
@@ -5002,7 +5002,7 @@ async fn test_choose_next_system_packages() {
         };
 
         ($v: expr, $name: expr, $packages: expr, $digest: expr) => {{
-            let mut cap = AuthorityCapabilitiesV2::new(
+            let mut cap = AuthorityCapabilitiesV1::new(
                 $name,
                 Chain::Unknown,
                 SupportedProtocolVersions::new_for_testing(1, $v),
@@ -5035,7 +5035,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(1), vec![]),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5053,7 +5053,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(1), vec![]),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities.clone(),
@@ -5066,7 +5066,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(2), sort(vec![o1, o2])),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5084,7 +5084,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(1), vec![]),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5102,7 +5102,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(2), sort(vec![o1, o2])),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5120,7 +5120,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(1), vec![]),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5138,7 +5138,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(3), sort(vec![o1, o2])),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5156,7 +5156,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(1), vec![]),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5175,7 +5175,7 @@ async fn test_choose_next_system_packages() {
     // upgrade to 3 which is the highest supported version
     assert_eq!(
         (ver(3), sort(vec![o1, o2])),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5196,7 +5196,7 @@ async fn test_choose_next_system_packages() {
     // won't happen until everyone moves to 3.
     assert_eq!(
         (ver(1), sort(vec![])),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
@@ -5217,7 +5217,7 @@ async fn test_choose_next_system_packages() {
 
     assert_eq!(
         (ver(1), sort(vec![])),
-        AuthorityState::choose_protocol_version_and_system_packages_v2(
+        AuthorityState::choose_protocol_version_and_system_packages_v1(
             ProtocolVersion::MIN,
             &committee,
             capabilities,
diff --git a/crates/iota-cost/tests/empirical_transaction_cost.rs b/crates/iota-cost/tests/empirical_transaction_cost.rs
index 69f0536a500..da6183eadc6 100644
--- a/crates/iota-cost/tests/empirical_transaction_cost.rs
+++ b/crates/iota-cost/tests/empirical_transaction_cost.rs
@@ -13,7 +13,7 @@ use iota_test_transaction_builder::{
 use iota_types::{
     IOTA_FRAMEWORK_PACKAGE_ID,
     base_types::{IotaAddress, ObjectRef},
-    coin::{PAY_JOIN_FUNC_NAME, PAY_MODULE_NAME, PAY_SPLIT_VEC_FUNC_NAME},
+    coin::{COIN_JOIN_FUNC_NAME, COIN_MODULE_NAME, PAY_MODULE_NAME, PAY_SPLIT_VEC_FUNC_NAME},
     gas::GasCostSummary,
     gas_coin::GAS,
     transaction::{CallArg, ObjectArg, TransactionData},
@@ -150,8 +150,8 @@ async fn create_txes(
     let merge_tx = TestTransactionBuilder::new(sender, gas_objects.pop().unwrap(), gas_price)
         .move_call(
             IOTA_FRAMEWORK_PACKAGE_ID,
-            PAY_MODULE_NAME.as_str(),
-            PAY_JOIN_FUNC_NAME.as_str(),
+            COIN_MODULE_NAME.as_str(),
+            COIN_JOIN_FUNC_NAME.as_str(),
             vec![
                 CallArg::Object(ObjectArg::ImmOrOwnedObject(c1)),
                 CallArg::Object(ObjectArg::ImmOrOwnedObject(gas_objects.pop().unwrap())),
diff --git a/crates/iota-e2e-tests/tests/apy_test.rs b/crates/iota-e2e-tests/tests/apy_test.rs
index 1d5607226fd..63660264dfb 100644
--- a/crates/iota-e2e-tests/tests/apy_test.rs
+++ b/crates/iota-e2e-tests/tests/apy_test.rs
@@ -41,6 +41,7 @@ use test_cluster::TestClusterBuilder;
 /// calculate APY from epoch 1 and 2. Since we need epoch 0 to start staking
 /// anyway, and only have the stake of the pool at the expected number (a
 /// quarter of 3.5B IOTAs) starting from epoch 1, this is totally fine.
+#[ignore = "https://github.com/iotaledger/iota/issues/3552"]
 #[sim_test]
 async fn test_apy() {
     // We need a large stake for low enough APY values such that they are not
diff --git a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp
index 72c268bd59b..40c2a903d2e 100644
--- a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp
+++ b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp
@@ -6,20 +6,20 @@ Response: {
   "data": {
     "availableRange": {
       "first": {
-        "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd",
+        "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
         "sequenceNumber": 0
       },
       "last": {
-        "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd",
+        "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
         "sequenceNumber": 0
       }
     },
     "first": {
-      "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd",
+      "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
       "sequenceNumber": 0
     },
     "last": {
-      "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd",
+      "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
       "sequenceNumber": 0
     }
   }
@@ -39,20 +39,20 @@ Response: {
   "data": {
     "availableRange": {
       "first": {
-        "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd",
+        "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
         "sequenceNumber": 0
       },
       "last": {
-        "digest": "3L1P3y1CaxBwfBnGUurLVuC1iMUGrsAbE4hrizUMLsV2",
+        "digest": "FubeYRn3Re3g8nR9jbf955Jd6GjqpzxubbfGaSV3XC8C",
         "sequenceNumber": 2
       }
     },
     "first": {
-      "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd",
+      "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
       "sequenceNumber": 0
     },
     "last": {
-      "digest": "3L1P3y1CaxBwfBnGUurLVuC1iMUGrsAbE4hrizUMLsV2",
+      "digest": "FubeYRn3Re3g8nR9jbf955Jd6GjqpzxubbfGaSV3XC8C",
       "sequenceNumber": 2
     }
   }
diff --git a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp
index ac5febe53b2..5c9a41bfce7 100644
--- a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp
+++ b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp
@@ -41,10 +41,10 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "bool"
+                "repr": "vector<u8>"
               },
               "data": {
-                "Bool": false
+                "Vector": []
               },
               "bcs": "AA=="
             },
@@ -55,12 +55,12 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "vector<u8>"
+                "repr": "u64"
               },
               "data": {
-                "Vector": []
+                "Number": "0"
               },
-              "bcs": "AA=="
+              "bcs": "AAAAAAAAAAA="
             },
             "value": {
               "__typename": "MoveValue"
@@ -69,15 +69,15 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "u64"
+                "repr": "bool"
               },
               "data": {
-                "Number": "0"
+                "Bool": false
               },
-              "bcs": "AAAAAAAAAAA="
+              "bcs": "AA=="
             },
             "value": {
-              "__typename": "MoveObject"
+              "__typename": "MoveValue"
             }
           },
           {
@@ -91,7 +91,7 @@ Response: {
               "bcs": "AAAAAAAAAAA="
             },
             "value": {
-              "__typename": "MoveValue"
+              "__typename": "MoveObject"
             }
           }
         ]
@@ -121,10 +121,10 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "bool"
+                "repr": "vector<u8>"
               },
               "data": {
-                "Bool": false
+                "Vector": []
               },
               "bcs": "AA=="
             },
@@ -135,12 +135,12 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "vector<u8>"
+                "repr": "u64"
               },
               "data": {
-                "Vector": []
+                "Number": "0"
               },
-              "bcs": "AA=="
+              "bcs": "AAAAAAAAAAA="
             },
             "value": {
               "__typename": "MoveValue"
@@ -149,15 +149,15 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "u64"
+                "repr": "bool"
               },
               "data": {
-                "Number": "0"
+                "Bool": false
               },
-              "bcs": "AAAAAAAAAAA="
+              "bcs": "AA=="
             },
             "value": {
-              "__typename": "MoveObject"
+              "__typename": "MoveValue"
             }
           },
           {
@@ -171,7 +171,7 @@ Response: {
               "bcs": "AAAAAAAAAAA="
             },
             "value": {
-              "__typename": "MoveValue"
+              "__typename": "MoveObject"
             }
           }
         ]
@@ -190,17 +190,17 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "bool"
+                "repr": "vector<u8>"
               },
               "data": {
-                "Bool": false
+                "Vector": []
               },
               "bcs": "AA=="
             },
             "value": {
-              "bcs": "AgAAAAAAAAA=",
+              "bcs": "AQAAAAAAAAA=",
               "data": {
-                "Number": "2"
+                "Number": "1"
               },
               "__typename": "MoveValue"
             }
@@ -208,17 +208,17 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "vector<u8>"
+                "repr": "u64"
               },
               "data": {
-                "Vector": []
+                "Number": "0"
               },
-              "bcs": "AA=="
+              "bcs": "AAAAAAAAAAA="
             },
             "value": {
-              "bcs": "AQAAAAAAAAA=",
+              "bcs": "AAAAAAAAAAA=",
               "data": {
-                "Number": "1"
+                "Number": "0"
               },
               "__typename": "MoveValue"
             }
@@ -226,15 +226,19 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "u64"
+                "repr": "bool"
               },
               "data": {
-                "Number": "0"
+                "Bool": false
               },
-              "bcs": "AAAAAAAAAAA="
+              "bcs": "AA=="
             },
             "value": {
-              "__typename": "MoveObject"
+              "bcs": "AgAAAAAAAAA=",
+              "data": {
+                "Number": "2"
+              },
+              "__typename": "MoveValue"
             }
           },
           {
@@ -248,11 +252,7 @@ Response: {
               "bcs": "AAAAAAAAAAA="
             },
             "value": {
-              "bcs": "AAAAAAAAAAA=",
-              "data": {
-                "Number": "0"
-              },
-              "__typename": "MoveValue"
+              "__typename": "MoveObject"
             }
           }
         ]
diff --git a/crates/iota-graphql-e2e-tests/tests/call/simple.exp b/crates/iota-graphql-e2e-tests/tests/call/simple.exp
index 79734bb008c..678ef0975b9 100644
--- a/crates/iota-graphql-e2e-tests/tests/call/simple.exp
+++ b/crates/iota-graphql-e2e-tests/tests/call/simple.exp
@@ -32,7 +32,7 @@ Contents: iota::coin::Coin<iota::iota::IOTA> {
         },
     },
     balance: iota::balance::Balance<iota::iota::IOTA> {
-        value: 30000000000000000u64,
+        value: 300000000000000u64,
     },
 }
 
@@ -77,7 +77,7 @@ Epoch advanced: 5
 
 task 10, line 44:
 //# view-checkpoint
-CheckpointSummary { epoch: 5, seq: 10, content_digest: 8C7boJBvJAis4x87RcLdUwsotz5nszRSDKNqwSRBrJ2X,
+CheckpointSummary { epoch: 5, seq: 10, content_digest: Eju9TRhUamcNqTaaEhENsRpfV6qpU6bttXAi5sfGKvh2,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 0, storage_cost: 0, storage_rebate: 0, non_refundable_storage_fee: 0 }}
 
 task 11, lines 46-51:
@@ -155,8 +155,8 @@ Response: {
         "edges": [
           {
             "node": {
-              "address": "0xc2e5075e25108da183a2ba97812d32c6d0a4793ec67bc5db94d90047a0f70a3d",
-              "digest": "AFarGPHjHVA9txUxCPKeoZtESimtPcN3nymwVYYWwBwJ",
+              "address": "0x7741a1a8bc15c0fdcebb352e4233d00647522bd6014df10a62fd2050146000e3",
+              "digest": "87Wr994JipCDohN1vezxW8Ws2a1oq7L1dT5EP4uvpgJe",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -182,8 +182,8 @@ Response: {
         "edges": [
           {
             "node": {
-              "address": "0xc2e5075e25108da183a2ba97812d32c6d0a4793ec67bc5db94d90047a0f70a3d",
-              "digest": "AFarGPHjHVA9txUxCPKeoZtESimtPcN3nymwVYYWwBwJ",
+              "address": "0x7741a1a8bc15c0fdcebb352e4233d00647522bd6014df10a62fd2050146000e3",
+              "digest": "87Wr994JipCDohN1vezxW8Ws2a1oq7L1dT5EP4uvpgJe",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -197,8 +197,8 @@ Response: {
         "edges": [
           {
             "node": {
-              "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2",
-              "digest": "3gSuJbZMZS3HxsjwJqf1mmxmuqJJ97DYD1HEmahVJwhH",
+              "address": "0x18311564e7d246714fe61c222dcf06191a32be6987657415f567b246ba4b0190",
+              "digest": "8XZJNdvuUjjRUJJdEY2w4QuBRG8vtkVBYF9nTwbcL9pL",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -206,8 +206,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31",
-              "digest": "9qvFEYrKWnQKp7pVwQwgRs4wr1JpUYjQG4rUT631cXzh",
+              "address": "0x20d0758c2ad7be5bc2ff7723ed76529e3825c6c3162fb6d802d8886083c566e2",
+              "digest": "3sj6vJDpzZ69FaVVg9BT4MH7mX3DBubSJGHnsWxqtVqi",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -215,8 +215,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461",
-              "digest": "9N3zxpXit5LCm3V9rbBxH4z1UBRw9ra1gdzwDW9aHs3i",
+              "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2",
+              "digest": "J2Wf9FftEG2ngUz2D1PinpdyGuXdrrzaKTAexL7v8Ebz",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -224,8 +224,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x5d9ebd2a8afda720f1e14510e836f0a7f2d06721edbe2dc17f1da09f8e041102",
-              "digest": "BiyEUGtqjGUiTvS4cGqdEmY2Nux8PDRN92DixGRjjKav",
+              "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31",
+              "digest": "4tRTWcKZPKebceeC9ixgfvtGnMg2p6o7oEoVqTHjKka2",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -233,8 +233,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x631e1039ece5a1cfba91d8cacc6db672855259d30f4a9f26f6f9fa27779579a3",
-              "digest": "D8nTeQxbVWB5T6e7aUeFEkeg1YMt9joWfGhdHArfR9KD",
+              "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461",
+              "digest": "Dhh9gQqBrMPL5sSW1enjqfRZvTAY3bzBpbWvDSg7dbXG",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -242,8 +242,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x6793f0b1d3e3dc874b493df636a05bf09df73c97e0d796c2bac680e91b6e9fbd",
-              "digest": "FUn7hApxv3ufm1oZPg6JWsLKT8N8oKbZftDzTvqPXDZd",
+              "address": "0x7161ad34bf2e56d7a1952793661902460eeb2c2ecf1df755a1fc2a7bf4caa592",
+              "digest": "PRcvwJcwqneJazSXZ4QsBZ7CDYScEYKhvxX8mtoN7xQ",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -251,8 +251,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x7a5b205a60f96c06d4022771144ab858b04002a51918285efa6002f9533326e3",
-              "digest": "69sGWwst8WwiRh5Ne8cwC9LS1dYFoWUf6y1vLsszLccr",
+              "address": "0x7bb5eac6aca46ca1cc81fd5cb7330463717f4927006721f3b14981e7abc83c34",
+              "digest": "7uL5wZ82tPiNba7uJDeSc5jJj1sFfyraBtjcWVwEBtB2",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -261,7 +261,7 @@ Response: {
           {
             "node": {
               "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97",
-              "digest": "H2hX9mXEsdhvE3JB5js15D37uMthdFiTiL8DMcFrXnKZ",
+              "digest": "HeGByH3KwRn41yndqdkQ8srWg32VSpouDNNw1sbELNAP",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -270,7 +270,7 @@ Response: {
           {
             "node": {
               "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056",
-              "digest": "GnUXZGtU8tSukrAnZs8s3uLPJQbDGbU9LNLhQHWzodDw",
+              "digest": "8TELkyo6p1Gmz2Sqcg9916XqYh8uvxzGXTnKJJUp3u5o",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -279,7 +279,7 @@ Response: {
           {
             "node": {
               "address": "0xac9c2e11aebecd35b4cb15802ca6ad5e64d320204149187ba646a16d07a4934d",
-              "digest": "9bFmqesBC3jaAcnXiFcuhrp5JJXKo76RShWxKuYBEepy",
+              "digest": "71eF11kEmB71xCf52tnp12xvPrnsRLzavNv5hpmP12XB",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -287,8 +287,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0xaed211bdefe57090cd0f243a9c4b3c4c0f7838304362250da740665cca37de18",
-              "digest": "35iGwEYbKF8QURtt7poLvhP4gvYdnNsGg2VZ7fSAGBrB",
+              "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8",
+              "digest": "AJDc4yJ87DGq9uqzxf38nMBQfkTYyp9AVfQowbMgtcfq",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -296,8 +296,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8",
-              "digest": "D5fLc9Yevxrr2SKRFZsM43zLXG4vuH3VGdXwGdx5ScaT",
+              "address": "0xc7b24c1c7a130e6cb6d04da824676db33f0ee59ddd5051d8e05bd0eac83fc112",
+              "digest": "FeQ25RQGfqpHHJPZmw3W3gEpsnN8abk88Si3yQKuyvLz",
               "owner": {
                 "__typename": "AddressOwner"
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp
index 7bb6a6e629c..a7a7cdff255 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp
@@ -80,7 +80,7 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE"
+                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
                   },
                   "coinObjectCount": 3,
                   "totalBalance": "700"
@@ -103,7 +103,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "600"
+              "totalBalance": "500"
             },
             "allBalances": {
               "nodes": [
@@ -116,10 +116,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE"
+                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
                   },
                   "coinObjectCount": 2,
-                  "totalBalance": "600"
+                  "totalBalance": "500"
                 }
               ]
             }
@@ -139,7 +139,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "300"
+              "totalBalance": "400"
             },
             "allBalances": {
               "nodes": [
@@ -152,10 +152,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE"
+                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
                   },
                   "coinObjectCount": 1,
-                  "totalBalance": "300"
+                  "totalBalance": "400"
                 }
               ]
             }
@@ -196,7 +196,7 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE"
+                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
                   },
                   "coinObjectCount": 3,
                   "totalBalance": "700"
@@ -219,7 +219,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "600"
+              "totalBalance": "500"
             },
             "allBalances": {
               "nodes": [
@@ -232,10 +232,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE"
+                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
                   },
                   "coinObjectCount": 2,
-                  "totalBalance": "600"
+                  "totalBalance": "500"
                 }
               ]
             }
@@ -255,7 +255,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "300"
+              "totalBalance": "400"
             },
             "allBalances": {
               "nodes": [
@@ -268,10 +268,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE"
+                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
                   },
                   "coinObjectCount": 1,
-                  "totalBalance": "300"
+                  "totalBalance": "400"
                 }
               ]
             }
@@ -334,7 +334,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "600"
+              "totalBalance": "500"
             },
             "allBalances": {
               "nodes": [
@@ -347,10 +347,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE"
+                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
                   },
                   "coinObjectCount": 2,
-                  "totalBalance": "600"
+                  "totalBalance": "500"
                 }
               ]
             }
@@ -370,7 +370,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "300"
+              "totalBalance": "400"
             },
             "allBalances": {
               "nodes": [
@@ -383,10 +383,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE"
+                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
                   },
                   "coinObjectCount": 1,
-                  "totalBalance": "300"
+                  "totalBalance": "400"
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
index 7cf21dbc53d..5400d2590e2 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
@@ -94,12 +94,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB",
+                  "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -109,12 +109,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1",
+                  "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -124,12 +124,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG",
+                  "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -139,12 +139,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg",
+                  "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -161,12 +161,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "5mUu9bxNaotcEsssawXpQWZ5Rd2RkjbssbZHy4YqP6jj",
+                  "digest": "75rRkUvMDa7YshVPFCbbAtaMghmFy57QtfZ5LL4JF5SB",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -176,12 +176,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD",
+                  "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -191,12 +191,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP",
+                  "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -213,12 +213,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "2RUSFSVNTC7FniEbnzm3g97tp3hbypt5GGWmJGFPnmDV",
+                  "digest": "g1WhQn8u5xCQH4Dyb9D9FvWrUTKJyZxuKNmN8Je8xii",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -228,12 +228,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
                 "node": {
-                  "digest": "3E7sv74JFwPZziRo1JykjSBZ6TG2FNGZGdTqRwbWSust",
+                  "digest": "Gk9Y9dzHQvbR4USt6kFaAS3tqGvH51wB6D3rSjwtH5G3",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA="
+                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
                         }
                       ]
                     }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp
index b5156d37581..a9cb912e9e3 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp
@@ -33,7 +33,7 @@ Response: {
     "queryCoinsAtLatest": {
       "edges": [
         {
-          "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=",
+          "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -41,39 +41,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=",
+                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                             "balance": {
-                              "value": "100200"
+                              "value": "100300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -85,16 +85,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                 "balance": {
-                  "value": "100200"
+                  "value": "100300"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=",
+          "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -102,39 +102,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=",
+                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                             "balance": {
-                              "value": "100200"
+                              "value": "100300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -146,16 +146,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                 "balance": {
-                  "value": "100"
+                  "value": "200"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=",
+          "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -163,39 +163,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=",
+                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                             "balance": {
-                              "value": "100200"
+                              "value": "100300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -207,9 +207,9 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                 "balance": {
-                  "value": "300"
+                  "value": "100"
                 }
               }
             }
@@ -221,39 +221,39 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=",
+            "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                  "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                   "balance": {
-                    "value": "100200"
+                    "value": "100300"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=",
+            "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                  "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                   "balance": {
-                    "value": "100"
+                    "value": "200"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=",
+            "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                  "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                   "balance": {
-                    "value": "300"
+                    "value": "100"
                   }
                 }
               }
@@ -272,7 +272,7 @@ Response: {
     "queryCoinsAtChkpt1": {
       "edges": [
         {
-          "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=",
+          "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -280,39 +280,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=",
+                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAQAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -324,16 +324,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                 "balance": {
-                  "value": "200"
+                  "value": "300"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=",
+          "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -341,39 +341,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=",
+                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAQAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -385,9 +385,9 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                 "balance": {
-                  "value": "100"
+                  "value": "200"
                 }
               }
             }
@@ -399,26 +399,26 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=",
+            "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                  "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                   "balance": {
-                    "value": "200"
+                    "value": "300"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=",
+            "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                  "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                   "balance": {
-                    "value": "100"
+                    "value": "200"
                   }
                 }
               }
@@ -453,7 +453,7 @@ Response: {
     "queryCoins": {
       "edges": [
         {
-          "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AwAAAAAAAAA=",
+          "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAwAAAAAAAAA=",
           "node": {
             "owner": {
               "owner": {
@@ -461,13 +461,13 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AwAAAAAAAAA=",
+                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                             "balance": {
-                              "value": "100200"
+                              "value": "100300"
                             }
                           }
                         }
@@ -479,16 +479,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                 "balance": {
-                  "value": "100200"
+                  "value": "100300"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAwAAAAAAAAA=",
+          "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAwAAAAAAAAA=",
           "node": {
             "owner": {
               "owner": {
@@ -496,26 +496,26 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAwAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAwAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -527,16 +527,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                 "balance": {
-                  "value": "100"
+                  "value": "200"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAwAAAAAAAAA=",
+          "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAwAAAAAAAAA=",
           "node": {
             "owner": {
               "owner": {
@@ -544,26 +544,26 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAwAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAwAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -575,9 +575,9 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                 "balance": {
-                  "value": "300"
+                  "value": "100"
                 }
               }
             }
@@ -589,13 +589,13 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AwAAAAAAAAA=",
+            "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAwAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                  "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                   "balance": {
-                    "value": "100200"
+                    "value": "100300"
                   }
                 }
               }
@@ -608,26 +608,26 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAwAAAAAAAAA=",
+            "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAwAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                  "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                   "balance": {
-                    "value": "100"
+                    "value": "200"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAwAAAAAAAAA=",
+            "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAwAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                  "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                   "balance": {
-                    "value": "300"
+                    "value": "100"
                   }
                 }
               }
@@ -658,7 +658,7 @@ Response: {
     "queryCoinsAtChkpt1BeforeSnapshotCatchup": {
       "edges": [
         {
-          "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=",
+          "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -666,39 +666,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=",
+                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAQAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -710,16 +710,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                 "balance": {
-                  "value": "200"
+                  "value": "300"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=",
+          "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -727,39 +727,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=",
+                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=",
+                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAQAAAAAAAAA=",
+                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e",
+                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
@@ -771,9 +771,9 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                 "balance": {
-                  "value": "100"
+                  "value": "200"
                 }
               }
             }
@@ -785,26 +785,26 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=",
+            "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9",
+                  "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
                   "balance": {
-                    "value": "200"
+                    "value": "300"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=",
+            "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7",
+                  "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
                   "balance": {
-                    "value": "100"
+                    "value": "200"
                   }
                 }
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp
index 59f391792b2..c711c23961c 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp
@@ -90,29 +90,29 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFeBXm4vjap9M5dVNXzXVaTHhuhTRg2+xYogFuZZLxPuAQAAAAAAAAA=",
+            "cursor": "IEFpKGimJTXfu4K2buCNDYZ0ahvsBfVsyrFfwj3HY/RSAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ=="
+                "bcs": "A2RmNA=="
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
               }
             }
           },
           {
-            "cursor": "IH8ALtE7vSZE3UtPP9JRPluBoy8YqFRWE3q+E/oWrlCkAQAAAAAAAAA=",
+            "cursor": "IHHdqaltVCBIzG7FbNTzlV5l2vXKxrmbz1icNABQonU5AQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA=="
+                "bcs": "A2RmNQ=="
               },
               "value": {
-                "json": "df4"
+                "json": "df5"
               }
             }
           },
           {
-            "cursor": "II67/lXdHT9zp83rSD1Zh3kBQnXOJcQpHN4ARyucBl77AQAAAAAAAAA=",
+            "cursor": "IKmVQJJoNKIRBeIAQszU5tVjlAOMkELOdpLEy45/zgW1AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg=="
@@ -139,29 +139,29 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFeBXm4vjap9M5dVNXzXVaTHhuhTRg2+xYogFuZZLxPuAQAAAAAAAAA=",
+            "cursor": "IEFpKGimJTXfu4K2buCNDYZ0ahvsBfVsyrFfwj3HY/RSAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ=="
+                "bcs": "A2RmNA=="
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
               }
             }
           },
           {
-            "cursor": "IH8ALtE7vSZE3UtPP9JRPluBoy8YqFRWE3q+E/oWrlCkAQAAAAAAAAA=",
+            "cursor": "IHHdqaltVCBIzG7FbNTzlV5l2vXKxrmbz1icNABQonU5AQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA=="
+                "bcs": "A2RmNQ=="
               },
               "value": {
-                "json": "df4"
+                "json": "df5"
               }
             }
           },
           {
-            "cursor": "II67/lXdHT9zp83rSD1Zh3kBQnXOJcQpHN4ARyucBl77AQAAAAAAAAA=",
+            "cursor": "IKmVQJJoNKIRBeIAQszU5tVjlAOMkELOdpLEy45/zgW1AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg=="
@@ -188,40 +188,40 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IBXEM7sfiif6smxgIJmBWkxMn6US7z34TC/rW+NOXQmaAQAAAAAAAAA=",
+            "cursor": "IBLJs8Pi9k9t4wRdY9AgeWbly1WW8h//8yF/EFIYHE4YAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg=="
+                "bcs": "A2RmMQ=="
               },
               "value": {
-                "json": "df2"
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "IFeBXm4vjap9M5dVNXzXVaTHhuhTRg2+xYogFuZZLxPuAQAAAAAAAAA=",
+            "cursor": "IEFpKGimJTXfu4K2buCNDYZ0ahvsBfVsyrFfwj3HY/RSAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ=="
+                "bcs": "A2RmNA=="
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
               }
             }
           },
           {
-            "cursor": "IH8ALtE7vSZE3UtPP9JRPluBoy8YqFRWE3q+E/oWrlCkAQAAAAAAAAA=",
+            "cursor": "IHHdqaltVCBIzG7FbNTzlV5l2vXKxrmbz1icNABQonU5AQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA=="
+                "bcs": "A2RmNQ=="
               },
               "value": {
-                "json": "df4"
+                "json": "df5"
               }
             }
           },
           {
-            "cursor": "IIKVY5ECiDNemkTq/lVCwzDt44fZpeAIK+iQ+EcwQygTAQAAAAAAAAA=",
+            "cursor": "IKbD5vH9q3Fz2cc0iMym+8S4c50k7zbG3sQk293/o3WBAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMw=="
@@ -232,7 +232,7 @@ Response: {
             }
           },
           {
-            "cursor": "II67/lXdHT9zp83rSD1Zh3kBQnXOJcQpHN4ARyucBl77AQAAAAAAAAA=",
+            "cursor": "IKmVQJJoNKIRBeIAQszU5tVjlAOMkELOdpLEy45/zgW1AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg=="
@@ -243,13 +243,13 @@ Response: {
             }
           },
           {
-            "cursor": "INUppr40jINpPev9/A4UIbKtREBWW8h1nMw6NQk1U8xnAQAAAAAAAAA=",
+            "cursor": "ILQkBdmgGlsflcYrZYOUeRezOrkHL9s+vfsXWAsxs2C7AQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ=="
+                "bcs": "A2RmMg=="
               },
               "value": {
-                "json": "df1"
+                "json": "df2"
               }
             }
           }
@@ -283,29 +283,29 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFeBXm4vjap9M5dVNXzXVaTHhuhTRg2+xYogFuZZLxPuAQAAAAAAAAA=",
+            "cursor": "IEFpKGimJTXfu4K2buCNDYZ0ahvsBfVsyrFfwj3HY/RSAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ=="
+                "bcs": "A2RmNA=="
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
               }
             }
           },
           {
-            "cursor": "IH8ALtE7vSZE3UtPP9JRPluBoy8YqFRWE3q+E/oWrlCkAQAAAAAAAAA=",
+            "cursor": "IHHdqaltVCBIzG7FbNTzlV5l2vXKxrmbz1icNABQonU5AQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA=="
+                "bcs": "A2RmNQ=="
               },
               "value": {
-                "json": "df4"
+                "json": "df5"
               }
             }
           },
           {
-            "cursor": "II67/lXdHT9zp83rSD1Zh3kBQnXOJcQpHN4ARyucBl77AQAAAAAAAAA=",
+            "cursor": "IKmVQJJoNKIRBeIAQszU5tVjlAOMkELOdpLEy45/zgW1AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg=="
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp
index 522210a7f7b..9f019ec3ea4 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp
@@ -41,7 +41,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IHwP9laGJmLOj7bHnxSoHMm/rKzHL1L8QMdX0Ybot758AQAAAAAAAAA=",
+            "cursor": "IA1EhBl4bAMRpwBAfspMUlheMXDdRpPabFf5kYVo0f0iAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -49,7 +49,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223",
+                    "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
                     "count": "0"
                   }
                 }
@@ -65,7 +65,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223",
+              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
               "count": "0"
             }
           }
@@ -77,7 +77,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IHwP9laGJmLOj7bHnxSoHMm/rKzHL1L8QMdX0Ybot758AQAAAAAAAAA=",
+            "cursor": "IA1EhBl4bAMRpwBAfspMUlheMXDdRpPabFf5kYVo0f0iAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -85,7 +85,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223",
+                    "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
                     "count": "0"
                   }
                 }
@@ -101,7 +101,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223",
+              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
               "count": "0"
             }
           }
@@ -117,7 +117,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223",
+              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
               "count": "0"
             }
           }
@@ -168,7 +168,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223",
+              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
               "count": "0"
             }
           }
@@ -222,7 +222,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223",
+              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp
index 1132de246a4..8b31f6f2e23 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp
@@ -36,7 +36,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IHXw7HKd1+5wVviB/aZV3hOHElzvVHueTKMKQQ7bL6+bAQAAAAAAAAA=",
+            "cursor": "IPL2mUHNZndi8KKb0BbJ5okrrA2Sd7Pjqoc54aexBMrqAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -44,7 +44,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9",
+                    "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
                     "count": "0"
                   }
                 }
@@ -60,7 +60,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9",
+              "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
               "count": "0"
             }
           }
@@ -71,7 +71,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IHXw7HKd1+5wVviB/aZV3hOHElzvVHueTKMKQQ7bL6+bAQAAAAAAAAA=",
+            "cursor": "IPL2mUHNZndi8KKb0BbJ5okrrA2Sd7Pjqoc54aexBMrqAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -79,7 +79,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9",
+                    "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
                     "count": "0"
                   }
                 }
@@ -95,7 +95,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9",
+              "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
               "count": "0"
             }
           }
@@ -107,7 +107,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IHXw7HKd1+5wVviB/aZV3hOHElzvVHueTKMKQQ7bL6+bAQAAAAAAAAA=",
+            "cursor": "IPL2mUHNZndi8KKb0BbJ5okrrA2Sd7Pjqoc54aexBMrqAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -115,7 +115,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9",
+                    "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
                     "count": "0"
                   }
                 }
@@ -131,7 +131,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9",
+              "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
               "count": "0"
             }
           }
@@ -184,7 +184,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9",
+              "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp
index ba1d2bc19e7..6d27abdcdf6 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp
@@ -61,7 +61,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFqAyNNcnwwa40SuWqyr9JjpRb1PDilkP9QiOeS0oCqcAQAAAAAAAAA=",
+            "cursor": "IEpDqte8MMXm9D9sJX7qPeGTan9IQM30pQBRTbguUkS8AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -69,7 +69,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9",
+                    "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
                     "count": "0"
                   }
                 }
@@ -85,7 +85,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9",
+              "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
               "count": "0"
             }
           }
@@ -96,7 +96,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFqAyNNcnwwa40SuWqyr9JjpRb1PDilkP9QiOeS0oCqcAQAAAAAAAAA=",
+            "cursor": "IEpDqte8MMXm9D9sJX7qPeGTan9IQM30pQBRTbguUkS8AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -104,7 +104,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9",
+                    "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
                     "count": "0"
                   }
                 }
@@ -120,7 +120,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9",
+              "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
               "count": "0"
             }
           }
@@ -139,7 +139,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFqAyNNcnwwa40SuWqyr9JjpRb1PDilkP9QiOeS0oCqcAQAAAAAAAAA=",
+            "cursor": "IEpDqte8MMXm9D9sJX7qPeGTan9IQM30pQBRTbguUkS8AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -147,7 +147,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9",
+                    "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
                     "count": "0"
                   }
                 }
@@ -163,7 +163,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9",
+              "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
               "count": "0"
             }
           }
@@ -182,7 +182,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFqAyNNcnwwa40SuWqyr9JjpRb1PDilkP9QiOeS0oCqcAQAAAAAAAAA=",
+            "cursor": "IEpDqte8MMXm9D9sJX7qPeGTan9IQM30pQBRTbguUkS8AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -190,7 +190,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9",
+                    "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
                     "count": "0"
                   }
                 }
@@ -206,7 +206,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9",
+              "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
index fdcd9547df5..39494890eb5 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
@@ -84,7 +84,7 @@ task 9, lines 103-165:
 Response: {
   "data": {
     "parent_version_2_no_dof": {
-      "address": "0x01b231aeb199e96f501fb02e027a6436108904302fd085ccdddf78eb880149d0",
+      "address": "0x60be7a7f1da5091f6e4ddb12a79b5856bdddbc028d44d93d233c6e7629620394",
       "dynamicFields": {
         "edges": []
       }
@@ -93,7 +93,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAQAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -104,7 +104,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
                     "count": "1"
                   }
                 }
@@ -115,13 +115,13 @@ Response: {
       }
     },
     "child_version_2_no_parent": {
-      "address": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+      "address": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
       "owner": {}
     },
     "child_version_3_has_parent": {
       "owner": {
         "parent": {
-          "address": "0x53033762c1ef1e0ede2da1f858ef77910e8bd8581969aecb4c28681388f627a2"
+          "address": "0xd8572dd4abdf75099835ec3b50a736b19a03aaae5ebf8d61ca67c1b25e147919"
         }
       }
     }
@@ -173,7 +173,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IClawurZkDgT+lOfghnjBHn+PLUx66DXjrgRHFWlMokIAgAAAAAAAAA=",
+            "cursor": "IDzEFN9B3ECkQG8K2yQKsifDsla6P7K4kFscyi2JgF+rAgAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMQ==",
@@ -187,21 +187,21 @@ Response: {
             }
           },
           {
-            "cursor": "IEka7584A4U5vrD9MH0Sfiqot3d9S1fFF1xTWGGMOaEkAgAAAAAAAAA=",
+            "cursor": "IEwGDnUGIlCGANYOgL6XOH2RuA/hlonX4jZQbJ8RchihAgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMw==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df3"
               }
             }
           },
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAgAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAgAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -212,7 +212,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
                     "count": "2"
                   }
                 }
@@ -220,16 +220,16 @@ Response: {
             }
           },
           {
-            "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAgAAAAAAAAA=",
+            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df2"
               }
             }
           }
@@ -240,7 +240,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAgAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAgAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -251,7 +251,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
                     "count": "1"
                   }
                 }
@@ -270,16 +270,16 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAgAAAAAAAAA=",
+            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df2"
               }
             }
           }
@@ -314,7 +314,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+              "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
               "count": "1"
             }
           }
@@ -333,7 +333,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+              "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
               "count": "2"
             }
           }
@@ -398,7 +398,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IClawurZkDgT+lOfghnjBHn+PLUx66DXjrgRHFWlMokIAwAAAAAAAAA=",
+            "cursor": "IDzEFN9B3ECkQG8K2yQKsifDsla6P7K4kFscyi2JgF+rAwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMQ==",
@@ -412,21 +412,21 @@ Response: {
             }
           },
           {
-            "cursor": "IEka7584A4U5vrD9MH0Sfiqot3d9S1fFF1xTWGGMOaEkAwAAAAAAAAA=",
+            "cursor": "IEwGDnUGIlCGANYOgL6XOH2RuA/hlonX4jZQbJ8RchihAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMw==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df3"
               }
             }
           },
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAwAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -437,7 +437,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
                     "count": "2"
                   }
                 }
@@ -445,16 +445,16 @@ Response: {
             }
           },
           {
-            "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAwAAAAAAAAA=",
+            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df2"
               }
             }
           }
@@ -465,16 +465,16 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAgAAAAAAAAA=",
+            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df2"
               }
             }
           }
@@ -485,54 +485,49 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IClawurZkDgT+lOfghnjBHn+PLUx66DXjrgRHFWlMokIAwAAAAAAAAA=",
+            "cursor": "IB9QurFrTWzZVemvNjgfBkIBf6HE3l1NNXL3eJc63v/DAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ==",
+                "bcs": "A2RmNA==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df1"
+                "json": "df4"
               }
             }
           },
           {
-            "cursor": "IEka7584A4U5vrD9MH0Sfiqot3d9S1fFF1xTWGGMOaEkAwAAAAAAAAA=",
+            "cursor": "IDzEFN9B3ECkQG8K2yQKsifDsla6P7K4kFscyi2JgF+rAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAwAAAAAAAAA=",
+            "cursor": "IEwGDnUGIlCGANYOgL6XOH2RuA/hlonX4jZQbJ8RchihAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "pAEAAAAAAAA=",
+                "bcs": "A2RmMw==",
                 "type": {
-                  "repr": "u64"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "contents": {
-                  "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
-                    "count": "2"
-                  }
-                }
+                "json": "df3"
               }
             }
           },
           {
-            "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9AwAAAAAAAAA=",
+            "cursor": "IMFZpg+IfFUNghSJHk2PR5wzAvgmr2XPePnUl6zF0FHsAwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg==",
@@ -546,35 +541,40 @@ Response: {
             }
           },
           {
-            "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isAwAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA==",
+                "bcs": "pAEAAAAAAAA=",
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                  "repr": "u64"
                 }
               },
               "value": {
-                "json": "df4"
+                "contents": {
+                  "json": {
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "count": "2"
+                  }
+                }
               }
             }
           },
           {
-            "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAwAAAAAAAAA=",
+            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df2"
               }
             }
           },
           {
-            "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaAwAAAAAAAAA=",
+            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2AwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ==",
@@ -594,49 +594,21 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9AwAAAAAAAAA=",
-            "node": {
-              "name": {
-                "bcs": "A2RmNg==",
-                "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
-                }
-              },
-              "value": {
-                "json": "df6"
-              }
-            }
-          },
-          {
-            "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isAwAAAAAAAAA=",
+            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA==",
-                "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
-                }
-              },
-              "value": {
-                "json": "df4"
-              }
-            }
-          },
-          {
-            "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAwAAAAAAAAA=",
-            "node": {
-              "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df2"
               }
             }
           },
           {
-            "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaAwAAAAAAAAA=",
+            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2AwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ==",
@@ -699,7 +671,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IClawurZkDgT+lOfghnjBHn+PLUx66DXjrgRHFWlMokIBAAAAAAAAAA=",
+            "cursor": "IDzEFN9B3ECkQG8K2yQKsifDsla6P7K4kFscyi2JgF+rBAAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMQ==",
@@ -713,21 +685,21 @@ Response: {
             }
           },
           {
-            "cursor": "IEka7584A4U5vrD9MH0Sfiqot3d9S1fFF1xTWGGMOaEkBAAAAAAAAAA=",
+            "cursor": "IEwGDnUGIlCGANYOgL6XOH2RuA/hlonX4jZQbJ8RchihBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMw==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df3"
               }
             }
           },
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiBAAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZBAAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -738,7 +710,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
                     "count": "2"
                   }
                 }
@@ -746,16 +718,16 @@ Response: {
             }
           },
           {
-            "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGBAAAAAAAAAA=",
+            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+BAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df2"
               }
             }
           }
@@ -766,16 +738,16 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAgAAAAAAAAA=",
+            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df2"
               }
             }
           }
@@ -786,26 +758,21 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiBAAAAAAAAAA=",
+            "cursor": "IB9QurFrTWzZVemvNjgfBkIBf6HE3l1NNXL3eJc63v/DBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "pAEAAAAAAAA=",
+                "bcs": "A2RmNA==",
                 "type": {
-                  "repr": "u64"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "contents": {
-                  "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
-                    "count": "2"
-                  }
-                }
+                "json": "df4"
               }
             }
           },
           {
-            "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9BAAAAAAAAAA=",
+            "cursor": "IMFZpg+IfFUNghSJHk2PR5wzAvgmr2XPePnUl6zF0FHsBAAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg==",
@@ -819,21 +786,26 @@ Response: {
             }
           },
           {
-            "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isBAAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA==",
+                "bcs": "pAEAAAAAAAA=",
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                  "repr": "u64"
                 }
               },
               "value": {
-                "json": "df4"
+                "contents": {
+                  "json": {
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "count": "2"
+                  }
+                }
               }
             }
           },
           {
-            "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaBAAAAAAAAAA=",
+            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2BAAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ==",
@@ -853,35 +825,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9BAAAAAAAAAA=",
-            "node": {
-              "name": {
-                "bcs": "A2RmNg==",
-                "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
-                }
-              },
-              "value": {
-                "json": "df6"
-              }
-            }
-          },
-          {
-            "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isBAAAAAAAAAA=",
-            "node": {
-              "name": {
-                "bcs": "A2RmNA==",
-                "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
-                }
-              },
-              "value": {
-                "json": "df4"
-              }
-            }
-          },
-          {
-            "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaBAAAAAAAAAA=",
+            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2BAAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ==",
@@ -947,7 +891,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiBwAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZBwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -958,7 +902,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
                     "count": "2"
                   }
                 }
@@ -973,26 +917,21 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiBwAAAAAAAAA=",
+            "cursor": "IB9QurFrTWzZVemvNjgfBkIBf6HE3l1NNXL3eJc63v/DBwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "pAEAAAAAAAA=",
+                "bcs": "A2RmNA==",
                 "type": {
-                  "repr": "u64"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "contents": {
-                  "json": {
-                    "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b",
-                    "count": "2"
-                  }
-                }
+                "json": "df4"
               }
             }
           },
           {
-            "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9BwAAAAAAAAA=",
+            "cursor": "IMFZpg+IfFUNghSJHk2PR5wzAvgmr2XPePnUl6zF0FHsBwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg==",
@@ -1006,21 +945,26 @@ Response: {
             }
           },
           {
-            "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isBwAAAAAAAAA=",
+            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZBwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA==",
+                "bcs": "pAEAAAAAAAA=",
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                  "repr": "u64"
                 }
               },
               "value": {
-                "json": "df4"
+                "contents": {
+                  "json": {
+                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "count": "2"
+                  }
+                }
               }
             }
           },
           {
-            "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaBwAAAAAAAAA=",
+            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2BwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ==",
@@ -1040,35 +984,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9BAAAAAAAAAA=",
-            "node": {
-              "name": {
-                "bcs": "A2RmNg==",
-                "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
-                }
-              },
-              "value": {
-                "json": "df6"
-              }
-            }
-          },
-          {
-            "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isBAAAAAAAAAA=",
-            "node": {
-              "name": {
-                "bcs": "A2RmNA==",
-                "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
-                }
-              },
-              "value": {
-                "json": "df4"
-              }
-            }
-          },
-          {
-            "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaBAAAAAAAAAA=",
+            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2BAAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ==",
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp
index 0af1dde53cf..f3d90d2efc7 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp
@@ -58,11 +58,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xaff6dda50b5130810c03f46780c788a2a7cd585ee4581f95987b935927d1fe1f",
+              "address": "0x08c10075296bcba84370c1799c63e11e7f73cf4a96a244ea7a0cfe8e51c45e49",
               "version": 5,
               "contents": {
                 "json": {
-                  "id": "0xaff6dda50b5130810c03f46780c788a2a7cd585ee4581f95987b935927d1fe1f",
+                  "id": "0x08c10075296bcba84370c1799c63e11e7f73cf4a96a244ea7a0cfe8e51c45e49",
                   "count": "0"
                 }
               },
@@ -86,11 +86,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xaff6dda50b5130810c03f46780c788a2a7cd585ee4581f95987b935927d1fe1f",
+              "address": "0x08c10075296bcba84370c1799c63e11e7f73cf4a96a244ea7a0cfe8e51c45e49",
               "version": 5,
               "contents": {
                 "json": {
-                  "id": "0xaff6dda50b5130810c03f46780c788a2a7cd585ee4581f95987b935927d1fe1f",
+                  "id": "0x08c10075296bcba84370c1799c63e11e7f73cf4a96a244ea7a0cfe8e51c45e49",
                   "count": "0"
                 }
               },
@@ -98,11 +98,11 @@ Response: {
                 "nodes": [
                   {
                     "value": {
-                      "address": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62",
+                      "address": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
                       "version": 6,
                       "contents": {
                         "json": {
-                          "id": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62",
+                          "id": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
                           "count": "0"
                         }
                       }
@@ -145,7 +145,7 @@ Response: {
     "object": {
       "owner": {
         "parent": {
-          "address": "0x1de03df5ffee42e90111e8d70c09bcb730067c0454de43126b4268a3d52ce49d"
+          "address": "0x7c3dc401104116ddde6c75b8862a97b87af54b531a17c640a4153fd9f3c83c9b"
         }
       },
       "dynamicFields": {
@@ -175,11 +175,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62",
+              "address": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
               "version": 6,
               "contents": {
                 "json": {
-                  "id": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62",
+                  "id": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
                   "count": "0"
                 }
               }
@@ -203,11 +203,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62",
+              "address": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
               "version": 6,
               "contents": {
                 "json": {
-                  "id": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62",
+                  "id": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
                   "count": "0"
                 }
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp
index 7ac216366d3..ce7edf0cfdb 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp
@@ -78,7 +78,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IELBJuoqbljOwtDZvYNmHAhFckzJMAyIckHHx4VWEQmAAQAAAAAAAAA=",
+            "cursor": "ICe/3d5bmdNSWm8HQp4OxIS7myv6vR81PK4q+d/aVCarAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMw=="
@@ -89,7 +89,7 @@ Response: {
             }
           },
           {
-            "cursor": "IE50PYtWegIrApc+e7eCSzFWzucYLDr5EFXOGSku7+5JAQAAAAAAAAA=",
+            "cursor": "INHtV7blivGUlH8ge+Ot0HNdhxQmu6S1+isPP7QdqKAWAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMg=="
@@ -100,7 +100,7 @@ Response: {
             }
           },
           {
-            "cursor": "IHV1hfusMCdIxYwdoOX894dzfghsSphPFaIm4ekstxexAQAAAAAAAAA=",
+            "cursor": "IOcMMTSl7NjohGrXGa14tjW96DwzsRpcYL1M8mD9D1HHAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMQ=="
@@ -201,7 +201,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IELBJuoqbljOwtDZvYNmHAhFckzJMAyIckHHx4VWEQmAAgAAAAAAAAA=",
+            "cursor": "ICe/3d5bmdNSWm8HQp4OxIS7myv6vR81PK4q+d/aVCarAgAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMw=="
@@ -212,7 +212,7 @@ Response: {
             }
           },
           {
-            "cursor": "IE50PYtWegIrApc+e7eCSzFWzucYLDr5EFXOGSku7+5JAgAAAAAAAAA=",
+            "cursor": "INHtV7blivGUlH8ge+Ot0HNdhxQmu6S1+isPP7QdqKAWAgAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMg=="
@@ -223,7 +223,7 @@ Response: {
             }
           },
           {
-            "cursor": "IHV1hfusMCdIxYwdoOX894dzfghsSphPFaIm4ekstxexAgAAAAAAAAA=",
+            "cursor": "IOcMMTSl7NjohGrXGa14tjW96DwzsRpcYL1M8mD9D1HHAgAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMQ=="
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp
index 609ba4609fe..ecb76d12619 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp
@@ -41,7 +41,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IILk4DoK3o6yrxAwN0nWEvtu/px9bonymP5hhiRzZimMAQAAAAAAAAA=",
+            "cursor": "IAkFcqaAXUWzkycpRLV7Z8BH6EenW5e+vB8/QtNZB+11AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -49,7 +49,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+                    "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
                     "count": "0"
                   }
                 }
@@ -65,7 +65,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
               "count": "0"
             }
           }
@@ -77,7 +77,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IILk4DoK3o6yrxAwN0nWEvtu/px9bonymP5hhiRzZimMAQAAAAAAAAA=",
+            "cursor": "IAkFcqaAXUWzkycpRLV7Z8BH6EenW5e+vB8/QtNZB+11AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -85,7 +85,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+                    "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
                     "count": "0"
                   }
                 }
@@ -101,7 +101,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
               "count": "0"
             }
           }
@@ -117,7 +117,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
               "count": "0"
             }
           }
@@ -168,7 +168,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
               "count": "0"
             }
           }
@@ -202,7 +202,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IILk4DoK3o6yrxAwN0nWEvtu/px9bonymP5hhiRzZimMAwAAAAAAAAA=",
+            "cursor": "IAkFcqaAXUWzkycpRLV7Z8BH6EenW5e+vB8/QtNZB+11AwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -210,7 +210,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+                    "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
                     "count": "1"
                   }
                 }
@@ -226,7 +226,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
               "count": "1"
             }
           }
@@ -238,7 +238,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IILk4DoK3o6yrxAwN0nWEvtu/px9bonymP5hhiRzZimMAwAAAAAAAAA=",
+            "cursor": "IAkFcqaAXUWzkycpRLV7Z8BH6EenW5e+vB8/QtNZB+11AwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -246,7 +246,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+                    "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
                     "count": "1"
                   }
                 }
@@ -262,7 +262,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
               "count": "1"
             }
           }
@@ -283,7 +283,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1",
+              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp
index d3d313eded0..6349cba3f17 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp
@@ -62,11 +62,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622",
+              "address": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
               "version": 5,
               "contents": {
                 "json": {
-                  "id": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622",
+                  "id": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
                   "count": "0"
                 }
               },
@@ -90,11 +90,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622",
+              "address": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
               "version": 5,
               "contents": {
                 "json": {
-                  "id": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622",
+                  "id": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
                   "count": "0"
                 }
               },
@@ -102,11 +102,11 @@ Response: {
                 "nodes": [
                   {
                     "value": {
-                      "address": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300",
+                      "address": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
                       "version": 6,
                       "contents": {
                         "json": {
-                          "id": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300",
+                          "id": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
                           "count": "0"
                         }
                       }
@@ -131,11 +131,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622",
+              "address": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
               "version": 7,
               "contents": {
                 "json": {
-                  "id": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622",
+                  "id": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
                   "count": "1"
                 }
               },
@@ -143,11 +143,11 @@ Response: {
                 "nodes": [
                   {
                     "value": {
-                      "address": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300",
+                      "address": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
                       "version": 6,
                       "contents": {
                         "json": {
-                          "id": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300",
+                          "id": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
                           "count": "0"
                         }
                       }
@@ -172,11 +172,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622",
+              "address": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
               "version": 7,
               "contents": {
                 "json": {
-                  "id": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622",
+                  "id": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
                   "count": "1"
                 }
               },
@@ -184,11 +184,11 @@ Response: {
                 "nodes": [
                   {
                     "value": {
-                      "address": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300",
+                      "address": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
                       "version": 8,
                       "contents": {
                         "json": {
-                          "id": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300",
+                          "id": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
                           "count": "1"
                         }
                       }
@@ -233,11 +233,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300",
+              "address": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
               "version": 6,
               "contents": {
                 "json": {
-                  "id": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300",
+                  "id": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
                   "count": "0"
                 }
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
index 3c0d96d8629..839c1846d40 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
@@ -41,19 +41,19 @@ Response: {
           {
             "cursor": "eyJjIjozLCJ0IjowLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V"
+              "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
             }
           },
           {
             "cursor": "eyJjIjozLCJ0IjoxLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc"
+              "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
             }
           },
           {
             "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB"
+              "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
             }
           },
           {
@@ -154,19 +154,19 @@ Response: {
           {
             "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V"
+              "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc"
+              "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB"
+              "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
             }
           },
           {
@@ -183,19 +183,19 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjowLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V"
+            "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
           }
         },
         {
           "cursor": "eyJjIjo0LCJ0IjoxLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc"
+            "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
           }
         },
         {
           "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB"
+            "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
           }
         }
       ]
@@ -207,19 +207,19 @@ Response: {
           {
             "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1"
+              "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG"
+              "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg"
+              "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
             }
           },
           {
@@ -236,19 +236,19 @@ Response: {
         {
           "cursor": "eyJjIjo4LCJ0IjowLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V"
+            "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
           }
         },
         {
           "cursor": "eyJjIjo4LCJ0IjoxLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc"
+            "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
           }
         },
         {
           "cursor": "eyJjIjo4LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB"
+            "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
           }
         },
         {
@@ -260,19 +260,19 @@ Response: {
         {
           "cursor": "eyJjIjo4LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1"
+            "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG"
           }
         },
         {
           "cursor": "eyJjIjo4LCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG"
+            "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53"
           }
         },
         {
           "cursor": "eyJjIjo4LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg"
+            "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
           }
         }
       ]
@@ -284,19 +284,19 @@ Response: {
           {
             "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "5mUu9bxNaotcEsssawXpQWZ5Rd2RkjbssbZHy4YqP6jj"
+              "digest": "75rRkUvMDa7YshVPFCbbAtaMghmFy57QtfZ5LL4JF5SB"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD"
+              "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
-              "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP"
+              "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke"
             }
           },
           {
@@ -313,19 +313,19 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V"
+            "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc"
+            "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB"
+            "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
           }
         },
         {
@@ -337,19 +337,19 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1"
+            "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG"
+            "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg"
+            "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
           }
         },
         {
@@ -361,19 +361,19 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "5mUu9bxNaotcEsssawXpQWZ5Rd2RkjbssbZHy4YqP6jj"
+            "digest": "75rRkUvMDa7YshVPFCbbAtaMghmFy57QtfZ5LL4JF5SB"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD"
+            "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
           "node": {
-            "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP"
+            "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke"
           }
         }
       ]
@@ -395,13 +395,13 @@ Response: {
           {
             "cursor": "eyJjIjo3LCJ0IjoxLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc"
+              "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
             }
           },
           {
             "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB"
+              "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
             }
           },
           {
@@ -420,13 +420,13 @@ Response: {
           {
             "cursor": "eyJjIjoxMSwidCI6NSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG"
+              "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53"
             }
           },
           {
             "cursor": "eyJjIjoxMSwidCI6NiwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg"
+              "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
             }
           },
           {
@@ -445,13 +445,13 @@ Response: {
           {
             "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD"
+              "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
-              "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP"
+              "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke"
             }
           },
           {
@@ -480,7 +480,7 @@ Response: {
           {
             "cursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB"
+              "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
             }
           }
         ]
@@ -493,7 +493,7 @@ Response: {
           {
             "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0",
             "node": {
-              "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg"
+              "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
             }
           }
         ]
@@ -506,7 +506,7 @@ Response: {
           {
             "cursor": "eyJjIjoxMCwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
-              "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP"
+              "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke"
             }
           }
         ]
@@ -527,24 +527,24 @@ Response: {
         {
           "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg",
+            "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TBgAAAAAAAAA="
+                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuBgAAAAAAAAA="
                   },
                   {
-                    "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsBgAAAAAAAAA="
+                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeBgAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsBgAAAAAAAAA="
+                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEBgAAAAAAAAA="
                   },
                   {
-                    "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtBgAAAAAAAAA="
+                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8BgAAAAAAAAA="
                   },
                   {
-                    "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSBgAAAAAAAAA="
+                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/BgAAAAAAAAA="
                   }
                 ]
               }
@@ -558,33 +558,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB",
+            "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA="
+                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA="
+                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA="
+                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA="
+                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA="
+                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA="
+                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA="
+                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA="
+                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
                   }
                 ]
               }
@@ -594,33 +594,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1",
+            "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA="
+                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA="
+                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA="
+                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA="
+                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA="
+                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA="
+                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA="
+                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA="
+                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
                   }
                 ]
               }
@@ -630,33 +630,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG",
+            "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA="
+                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA="
+                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA="
+                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA="
+                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA="
+                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA="
+                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA="
+                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA="
+                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
                   }
                 ]
               }
@@ -666,33 +666,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg",
+            "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA="
+                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA="
+                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA="
+                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA="
+                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA="
+                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA="
+                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA="
+                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA="
+                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
                   }
                 ]
               }
@@ -702,33 +702,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "5mUu9bxNaotcEsssawXpQWZ5Rd2RkjbssbZHy4YqP6jj",
+            "digest": "75rRkUvMDa7YshVPFCbbAtaMghmFy57QtfZ5LL4JF5SB",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA="
+                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA="
+                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA="
+                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA="
+                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA="
+                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA="
+                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA="
+                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA="
+                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
                   }
                 ]
               }
@@ -738,33 +738,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD",
+            "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA="
+                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA="
+                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA="
+                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA="
+                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA="
+                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA="
+                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA="
+                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA="
+                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
                   }
                 ]
               }
@@ -774,33 +774,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
           "node": {
-            "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP",
+            "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA="
+                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA="
+                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA="
+                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA="
+                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA="
+                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA="
+                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA="
+                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA="
+                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
                   }
                 ]
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp
index 74fdc1870f4..641b1fba51c 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp
@@ -29,7 +29,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da",
+            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
             "value": "0"
           }
         }
@@ -57,7 +57,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da",
+            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
             "value": "1"
           }
         }
@@ -69,7 +69,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da",
+            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
             "value": "0"
           }
         }
@@ -104,7 +104,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da",
+            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
             "value": "1"
           }
         }
@@ -134,7 +134,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da",
+            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
             "value": "1"
           }
         }
@@ -151,7 +151,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da",
+            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
             "value": "0"
           }
         }
@@ -205,7 +205,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da",
+            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
             "value": "1"
           }
         }
@@ -222,7 +222,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da",
+            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
             "value": "0"
           }
         }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp
index 8d1ce341b94..8d9f57fcc14 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp
@@ -31,26 +31,24 @@ Response: {
   "data": {
     "one_of_these_will_yield_an_object": {
       "objects": {
-        "nodes": []
-      }
-    },
-    "if_the_other_does_not": {
-      "nodes": [
-        {
-          "version": 3,
-          "asMoveObject": {
+        "nodes": [
+          {
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                "value": "0"
+                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                "value": "1"
               }
             }
           }
-        }
-      ]
+        ]
+      }
+    },
+    "if_the_other_does_not": {
+      "nodes": []
     }
   }
 }
@@ -77,26 +75,24 @@ Response: {
   "data": {
     "paginating_on_checkpoint_1": {
       "objects": {
-        "nodes": []
-      }
-    },
-    "should_not_have_more_than_one_result": {
-      "nodes": [
-        {
-          "version": 3,
-          "asMoveObject": {
+        "nodes": [
+          {
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                "value": "0"
+                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                "value": "1"
               }
             }
           }
-        }
-      ]
+        ]
+      }
+    },
+    "should_not_have_more_than_one_result": {
+      "nodes": []
     }
   }
 }
@@ -109,50 +105,50 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 5,
+            "version": 3,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409",
-                "value": "2"
+                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
+                "value": "0"
               }
             }
           },
           {
-            "version": 4,
+            "version": 5,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315",
-                "value": "1"
+                "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                "value": "2"
               }
             }
           },
           {
-            "version": 3,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                "value": "0"
+                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
+                "value": "3"
               }
             }
           },
           {
-            "version": 6,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604",
-                "value": "3"
+                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                "value": "1"
               }
             }
           }
@@ -170,50 +166,50 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 5,
+            "version": 3,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409",
-                "value": "2"
+                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
+                "value": "0"
               }
             }
           },
           {
-            "version": 4,
+            "version": 5,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315",
-                "value": "1"
+                "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                "value": "2"
               }
             }
           },
           {
-            "version": 3,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                "value": "0"
+                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
+                "value": "3"
               }
             }
           },
           {
-            "version": 6,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604",
-                "value": "3"
+                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                "value": "1"
               }
             }
           }
@@ -241,14 +237,14 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 4,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315",
-                "value": "1"
+                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
+                "value": "3"
               }
             },
             "owner_at_latest_state_has_iota_only": {
@@ -256,16 +252,14 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 1,
+                      "version": 3,
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53",
-                          "balance": {
-                            "value": "300000000000000"
-                          }
+                          "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
+                          "value": "0"
                         }
                       }
                     },
@@ -273,47 +267,49 @@ Response: {
                       "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409",
+                          "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
                           "value": "2"
                         }
                       }
                     },
                     {
-                      "version": 4,
+                      "version": 6,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315",
-                          "value": "1"
+                          "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
+                          "value": "3"
                         }
                       }
                     },
                     {
-                      "version": 3,
+                      "version": 1,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                          "value": "0"
+                          "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
+                          "balance": {
+                            "value": "300000000000000"
+                          }
                         }
                       }
                     },
                     {
-                      "version": 6,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604",
-                          "value": "3"
+                          "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                          "value": "1"
                         }
                       }
                     }
@@ -323,14 +319,14 @@ Response: {
             }
           },
           {
-            "version": 3,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                "value": "0"
+                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                "value": "1"
               }
             },
             "owner_at_latest_state_has_iota_only": {
@@ -338,16 +334,14 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 1,
+                      "version": 3,
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53",
-                          "balance": {
-                            "value": "300000000000000"
-                          }
+                          "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
+                          "value": "0"
                         }
                       }
                     },
@@ -355,47 +349,49 @@ Response: {
                       "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409",
+                          "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
                           "value": "2"
                         }
                       }
                     },
                     {
-                      "version": 4,
+                      "version": 6,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315",
-                          "value": "1"
+                          "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
+                          "value": "3"
                         }
                       }
                     },
                     {
-                      "version": 3,
+                      "version": 1,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                          "value": "0"
+                          "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
+                          "balance": {
+                            "value": "300000000000000"
+                          }
                         }
                       }
                     },
                     {
-                      "version": 6,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604",
-                          "value": "3"
+                          "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                          "value": "1"
                         }
                       }
                     }
@@ -403,33 +399,37 @@ Response: {
                 }
               }
             }
-          },
-          {
-            "version": 6,
+          }
+        ]
+      }
+    },
+    "before_obj_6_0_at_checkpoint_2": {
+      "nodes": [
+        {
+          "version": 3,
+          "asMoveObject": {
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604",
-                "value": "3"
+                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
+                "value": "0"
               }
             },
-            "owner_at_latest_state_has_iota_only": {
+            "note_that_owner_result_should_reflect_latest_state": {
               "owner": {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 1,
+                      "version": 3,
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53",
-                          "balance": {
-                            "value": "300000000000000"
-                          }
+                          "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
+                          "value": "0"
                         }
                       }
                     },
@@ -437,47 +437,49 @@ Response: {
                       "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409",
+                          "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
                           "value": "2"
                         }
                       }
                     },
                     {
-                      "version": 4,
+                      "version": 6,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315",
-                          "value": "1"
+                          "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
+                          "value": "3"
                         }
                       }
                     },
                     {
-                      "version": 3,
+                      "version": 1,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                          "value": "0"
+                          "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
+                          "balance": {
+                            "value": "300000000000000"
+                          }
                         }
                       }
                     },
                     {
-                      "version": 6,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
                         },
                         "json": {
-                          "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604",
-                          "value": "3"
+                          "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                          "value": "1"
                         }
                       }
                     }
@@ -486,11 +488,8 @@ Response: {
               }
             }
           }
-        ]
-      }
-    },
-    "before_obj_6_0_at_checkpoint_2": {
-      "nodes": []
+        }
+      ]
     }
   }
 }
@@ -545,11 +544,11 @@ Response: {
             "version": 7,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409",
-                "value": "2"
+                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
+                "value": "0"
               }
             }
           },
@@ -557,11 +556,11 @@ Response: {
             "version": 7,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315",
-                "value": "1"
+                "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                "value": "2"
               }
             }
           },
@@ -569,11 +568,11 @@ Response: {
             "version": 7,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                "value": "0"
+                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
+                "value": "3"
               }
             }
           },
@@ -581,11 +580,11 @@ Response: {
             "version": 7,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604",
-                "value": "3"
+                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                "value": "1"
               }
             }
           }
@@ -603,50 +602,50 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 5,
+            "version": 3,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409",
-                "value": "2"
+                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
+                "value": "0"
               }
             }
           },
           {
-            "version": 4,
+            "version": 5,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315",
-                "value": "1"
+                "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                "value": "2"
               }
             }
           },
           {
-            "version": 3,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a",
-                "value": "0"
+                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
+                "value": "3"
               }
             }
           },
           {
-            "version": 6,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object"
+                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
               },
               "json": {
-                "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604",
-                "value": "3"
+                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
+                "value": "1"
               }
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp
index e916dfe4b80..64f2d52a2ac 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp
@@ -35,27 +35,27 @@ task 6, lines 38-66:
 Response: {
   "data": {
     "after_obj_3_0": {
-      "objects": {
-        "nodes": []
-      }
-    },
-    "before_obj_3_0": {
       "objects": {
         "nodes": [
           {
             "version": 4,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
+                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
                 "value": "100"
               }
             }
           }
         ]
       }
+    },
+    "before_obj_3_0": {
+      "objects": {
+        "nodes": []
+      }
     }
   }
 }
@@ -74,27 +74,27 @@ task 9, lines 72-101:
 Response: {
   "data": {
     "after_obj_3_0_chkpt_1": {
-      "objects": {
-        "nodes": []
-      }
-    },
-    "before_obj_3_0_chkpt_1": {
       "objects": {
         "nodes": [
           {
             "version": 4,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
+                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
                 "value": "100"
               }
             }
           }
         ]
       }
+    },
+    "before_obj_3_0_chkpt_1": {
+      "objects": {
+        "nodes": []
+      }
     }
   }
 }
@@ -107,26 +107,26 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 5,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
-                "value": "200"
+                "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
+                "value": "1"
               }
             }
           },
           {
-            "version": 4,
+            "version": 5,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4",
-                "value": "1"
+                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                "value": "200"
               }
             }
           }
@@ -134,21 +134,16 @@ Response: {
       }
     },
     "after_obj_3_0_chkpt_2": {
-      "consistent_with_above": {
-        "nodes": []
-      }
-    },
-    "before_obj_3_0_chkpt_2": {
       "consistent_with_above": {
         "nodes": [
           {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
+                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
                 "value": "200"
               }
             },
@@ -157,26 +152,26 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 5,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
                         },
                         "json": {
-                          "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
-                          "value": "200"
+                          "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
+                          "value": "1"
                         }
                       }
                     },
                     {
-                      "version": 4,
+                      "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
                         },
                         "json": {
-                          "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4",
-                          "value": "1"
+                          "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                          "value": "200"
                         }
                       }
                     }
@@ -187,6 +182,11 @@ Response: {
           }
         ]
       }
+    },
+    "before_obj_3_0_chkpt_2": {
+      "consistent_with_above": {
+        "nodes": []
+      }
     }
   }
 }
@@ -205,21 +205,16 @@ task 13, lines 184-247:
 Response: {
   "data": {
     "after_obj_3_0_chkpt_2": {
-      "objects": {
-        "nodes": []
-      }
-    },
-    "before_obj_3_0_chkpt_2": {
       "objects": {
         "nodes": [
           {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
+                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
                 "value": "200"
               }
             },
@@ -228,26 +223,26 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 5,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
                         },
                         "json": {
-                          "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
-                          "value": "200"
+                          "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
+                          "value": "1"
                         }
                       }
                     },
                     {
-                      "version": 4,
+                      "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
                         },
                         "json": {
-                          "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4",
-                          "value": "1"
+                          "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                          "value": "200"
                         }
                       }
                     }
@@ -258,6 +253,11 @@ Response: {
           }
         ]
       }
+    },
+    "before_obj_3_0_chkpt_2": {
+      "objects": {
+        "nodes": []
+      }
     }
   }
 }
@@ -270,26 +270,26 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 5,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
-                "value": "200"
+                "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
+                "value": "300"
               }
             }
           },
           {
-            "version": 6,
+            "version": 5,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4",
-                "value": "300"
+                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                "value": "200"
               }
             }
           }
@@ -297,21 +297,16 @@ Response: {
       }
     },
     "after_obj_3_0_chkpt_3": {
-      "consistent_with_above": {
-        "nodes": []
-      }
-    },
-    "before_obj_3_0_chkpt_3": {
       "consistent_with_above": {
         "nodes": [
           {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
               },
               "json": {
-                "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
+                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
                 "value": "200"
               }
             },
@@ -320,26 +315,26 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 5,
+                      "version": 6,
                       "contents": {
                         "type": {
-                          "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
                         },
                         "json": {
-                          "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c",
-                          "value": "200"
+                          "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
+                          "value": "300"
                         }
                       }
                     },
                     {
-                      "version": 6,
+                      "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object"
+                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
                         },
                         "json": {
-                          "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4",
-                          "value": "300"
+                          "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                          "value": "200"
                         }
                       }
                     }
@@ -350,6 +345,11 @@ Response: {
           }
         ]
       }
+    },
+    "before_obj_3_0_chkpt_3": {
+      "consistent_with_above": {
+        "nodes": []
+      }
     }
   }
 }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp
index 825fcaf6369..7f4171d7f4e 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp
@@ -35,11 +35,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3",
-                "value": "225"
+                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
+                "value": "375"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -54,11 +54,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a",
-                "value": "385"
+                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
+                "value": "122"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -76,11 +76,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfea66842c8932937f3017932a529561aee49bc62a64338bb0b1b6cc6f27bb8d0",
-                "value": "189"
+                "id": "0xfb7c7cef2cb5913912cd2e6a285b0c6d42e54dc6d78a5f10253b83deb36efd03",
+                "value": "193"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           },
@@ -92,11 +92,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a",
-                "value": "108"
+                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
+                "value": "290"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           },
@@ -108,11 +108,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3",
-                "value": "225"
+                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
+                "value": "375"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           },
@@ -124,11 +124,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a",
-                "value": "385"
+                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
+                "value": "122"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -163,7 +163,7 @@ Contents: Test::M1::Object {
             bytes: fake(2,498),
         },
     },
-    value: 225u64,
+    value: 375u64,
 }
 
 task 9, line 93:
@@ -176,7 +176,7 @@ Contents: Test::M1::Object {
             bytes: fake(2,497),
         },
     },
-    value: 108u64,
+    value: 290u64,
 }
 
 task 10, line 95:
@@ -199,11 +199,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a",
-                "value": "108"
+                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
+                "value": "290"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -218,11 +218,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3",
-                "value": "225"
+                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
+                "value": "375"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -237,11 +237,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a",
-                "value": "385"
+                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
+                "value": "122"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -260,11 +260,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfea66842c8932937f3017932a529561aee49bc62a64338bb0b1b6cc6f27bb8d0",
-                "value": "189"
+                "id": "0xfb7c7cef2cb5913912cd2e6a285b0c6d42e54dc6d78a5f10253b83deb36efd03",
+                "value": "193"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -287,11 +287,11 @@ Response: {
         },
         "contents": {
           "json": {
-            "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a",
-            "value": "385"
+            "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
+            "value": "122"
           },
           "type": {
-            "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+            "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
           }
         }
       }
@@ -305,11 +305,11 @@ Response: {
         },
         "contents": {
           "json": {
-            "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a",
-            "value": "385"
+            "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
+            "value": "122"
           },
           "type": {
-            "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+            "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
           }
         }
       }
@@ -325,11 +325,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a",
-                "value": "108"
+                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
+                "value": "290"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -343,11 +343,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3",
-                "value": "225"
+                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
+                "value": "375"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -361,11 +361,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a",
-                "value": "385"
+                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
+                "value": "122"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -383,11 +383,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a",
-                "value": "108"
+                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
+                "value": "290"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -401,11 +401,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3",
-                "value": "225"
+                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
+                "value": "375"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -419,11 +419,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a",
-                "value": "385"
+                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
+                "value": "122"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
@@ -442,7 +442,7 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x6214297c96396ed233024d61f0b882a1b3a3da30abc8ea6e234d93b7c2a0c6ae",
+                "id": "0xbbaf7071fac8234841e340556e61315e7a2cfeab104b247c00ece6c4b61f91cc",
                 "balance": {
                   "value": "300000000000000"
                 }
@@ -461,11 +461,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a",
-                "value": "108"
+                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
+                "value": "290"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           },
@@ -478,11 +478,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3",
-                "value": "225"
+                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
+                "value": "375"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           },
@@ -495,11 +495,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a",
-                "value": "385"
+                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
+                "value": "122"
               },
               "type": {
-                "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object"
+                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
               }
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp
index 0ab08a229ba..5df7931c6c7 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp
@@ -25,7 +25,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 3, line 25:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(3,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(2,0)
@@ -49,7 +49,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 7, line 35:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(6,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(7,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(6,0)
@@ -109,13 +109,13 @@ Response: {
       "stakedIotas": {
         "edges": [
           {
-            "cursor": "IBI4Fo2NYBQFmwjdXvYZPRT977qOK/lqUGGG1hDgb5pdBAAAAAAAAAA=",
+            "cursor": "IB4nCdY4SKIGpX9OX6BoEseOb5Di70Ir4QOHIZ6Hlv2bBAAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
           },
           {
-            "cursor": "IKp2oYTL+6GLcESjpGjrpK2DOI3ytxsbPpDzuODNkWkaBAAAAAAAAAA=",
+            "cursor": "IPZBsCp9CdP9iBWQhFfN6A2fcDP34decXACxmwerwQnGBAAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
@@ -158,15 +158,10 @@ task 14, lines 105-148:
 Response: {
   "data": {
     "coins_after_obj_3_0_chkpt_3": {
-      "stakedIotas": {
-        "edges": []
-      }
-    },
-    "coins_before_obj_3_0_chkpt_3": {
       "stakedIotas": {
         "edges": [
           {
-            "cursor": "IBI4Fo2NYBQFmwjdXvYZPRT977qOK/lqUGGG1hDgb5pdAwAAAAAAAAA=",
+            "cursor": "IPZBsCp9CdP9iBWQhFfN6A2fcDP34decXACxmwerwQnGAwAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
@@ -174,22 +169,27 @@ Response: {
         ]
       }
     },
+    "coins_before_obj_3_0_chkpt_3": {
+      "stakedIotas": {
+        "edges": []
+      }
+    },
     "coins_after_obj_7_0_chkpt_3": {
+      "stakedIotas": {
+        "edges": []
+      }
+    },
+    "coins_before_obj_7_0_chkpt_3": {
       "stakedIotas": {
         "edges": [
           {
-            "cursor": "IKp2oYTL+6GLcESjpGjrpK2DOI3ytxsbPpDzuODNkWkaAwAAAAAAAAA=",
+            "cursor": "IB4nCdY4SKIGpX9OX6BoEseOb5Di70Ir4QOHIZ6Hlv2bAwAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
           }
         ]
       }
-    },
-    "coins_before_obj_7_0_chkpt_3": {
-      "stakedIotas": {
-        "edges": []
-      }
     }
   }
 }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp
index 12640d34fb8..98dd88779da 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp
@@ -61,66 +61,66 @@ Response: {
           {
             "contents": {
               "json": {
-                "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                 "value": "4"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                 "value": "5"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                 "value": "3"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                 "value": "200"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                "value": "6"
+                "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                "value": "2"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                "value": "2"
+                "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                "value": "6"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           }
@@ -136,66 +136,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                       "value": "4"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                       "value": "5"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                       "value": "3"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                       "value": "200"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                      "value": "6"
+                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                      "value": "2"
+                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 }
@@ -209,66 +209,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                         "value": "4"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                         "value": "5"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                         "value": "3"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                         "value": "200"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                        "value": "6"
+                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                        "value": "2"
+                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   }
@@ -284,7 +284,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53",
+                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
                         "balance": {
                           "value": "299999993067600"
                         }
@@ -306,66 +306,66 @@ Response: {
               {
                 "contents": {
                   "json": {
-                    "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                    "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                     "value": "4"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                    "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                     "value": "5"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                    "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                     "value": "3"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                    "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                     "value": "200"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                    "value": "6"
+                    "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                    "value": "2"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                    "value": "2"
+                    "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                    "value": "6"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               }
@@ -390,66 +390,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                       "value": "4"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                       "value": "5"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                       "value": "3"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                       "value": "200"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                      "value": "6"
+                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                      "value": "2"
+                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 }
@@ -463,66 +463,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                         "value": "4"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                         "value": "5"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                         "value": "3"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                         "value": "200"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                        "value": "6"
+                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                        "value": "2"
+                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   }
@@ -538,7 +538,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53",
+                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
                         "balance": {
                           "value": "300000000000000"
                         }
@@ -557,66 +557,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                       "value": "4"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                       "value": "5"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                       "value": "3"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                       "value": "200"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                      "value": "6"
+                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                      "value": "2"
+                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 }
@@ -630,66 +630,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                         "value": "4"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                         "value": "5"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                         "value": "3"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                         "value": "200"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                        "value": "6"
+                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                        "value": "2"
+                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   }
@@ -705,7 +705,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53",
+                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
                         "balance": {
                           "value": "299999996697200"
                         }
@@ -724,66 +724,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                       "value": "4"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                       "value": "5"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                       "value": "3"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                       "value": "200"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                      "value": "6"
+                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                      "value": "2"
+                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 }
@@ -797,66 +797,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                         "value": "4"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                         "value": "5"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                         "value": "3"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                         "value": "200"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                        "value": "6"
+                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                        "value": "2"
+                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   }
@@ -872,7 +872,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53",
+                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
                         "balance": {
                           "value": "299999993067600"
                         }
@@ -907,66 +907,66 @@ Response: {
           {
             "contents": {
               "json": {
-                "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                 "value": "4"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                 "value": "5"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                 "value": "3"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                 "value": "200"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                "value": "6"
+                "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                "value": "2"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                "value": "2"
+                "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                "value": "6"
               },
               "type": {
-                "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
               }
             }
           }
@@ -982,66 +982,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                       "value": "4"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                       "value": "5"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                       "value": "3"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                       "value": "200"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                      "value": "6"
+                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                      "value": "2"
+                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 }
@@ -1055,66 +1055,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                         "value": "4"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                         "value": "5"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                         "value": "3"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                         "value": "200"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                        "value": "6"
+                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                        "value": "2"
+                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   }
@@ -1130,7 +1130,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53",
+                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
                         "balance": {
                           "value": "299999993067600"
                         }
@@ -1152,66 +1152,66 @@ Response: {
               {
                 "contents": {
                   "json": {
-                    "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                    "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                     "value": "4"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                    "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                     "value": "5"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                    "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                     "value": "3"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                    "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                     "value": "200"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                    "value": "6"
+                    "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                    "value": "2"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                    "value": "2"
+                    "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                    "value": "6"
                   },
                   "type": {
-                    "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                   }
                 }
               }
@@ -1240,66 +1240,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                       "value": "4"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                       "value": "5"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                       "value": "3"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                       "value": "200"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                      "value": "6"
+                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                      "value": "2"
+                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 }
@@ -1313,66 +1313,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                         "value": "4"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                         "value": "5"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                         "value": "3"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                         "value": "200"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                        "value": "6"
+                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                        "value": "2"
+                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   }
@@ -1388,66 +1388,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                       "value": "4"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                       "value": "5"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                       "value": "3"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                       "value": "200"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                      "value": "6"
+                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                      "value": "2"
+                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 }
@@ -1461,66 +1461,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                         "value": "4"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                         "value": "5"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                         "value": "3"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                         "value": "200"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                        "value": "6"
+                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                        "value": "2"
+                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   }
@@ -1536,66 +1536,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                       "value": "4"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                       "value": "5"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                       "value": "3"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                       "value": "200"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                      "value": "6"
+                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                      "value": "2"
+                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                     }
                   }
                 }
@@ -1609,66 +1609,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586",
+                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
                         "value": "4"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160",
+                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
                         "value": "5"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6",
+                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
                         "value": "3"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e",
+                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
                         "value": "200"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9",
-                        "value": "6"
+                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c",
-                        "value": "2"
+                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object"
+                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
                       }
                     }
                   }
diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp
index 5053dbae825..b39d16de5ae 100644
--- a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp
+++ b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp
@@ -11,6 +11,6 @@ task 2, lines 10-13:
 //# run-graphql
 Response: {
   "data": {
-    "chainIdentifier": "e50daeb7"
+    "chainIdentifier": "498fc7b7"
   }
 }
diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp
index 9877e3587b3..bdaf4103ec1 100644
--- a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp
+++ b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp
@@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 4, lines 17-19:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(4,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(3,0)
@@ -67,7 +67,7 @@ Response: {
           ]
         },
         "validatorCandidatesSize": 0,
-        "inactivePoolsId": "0x847b4f25419bcc012e269b2586a54b663d563de25024075481eb96e3ee8c3e0d"
+        "inactivePoolsId": "0x25f932331484290d3a7a9d1969b2a8179ab1856a3f2537c08a8f00065b0fff42"
       },
       "totalGasFees": "1000000",
       "totalStakeRewards": "767000000000000",
@@ -81,7 +81,7 @@ Response: {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
             },
-            "digest": "93Nc7AV6A8XVKLh2r9VPCjAQwoVbuiEGSqUwGBCAKee5"
+            "digest": "HG2EFvhhYApKyYKztCN2gz7VYne4SzpZUJhkHYJrqDrM"
           },
           {
             "kind": {
diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp
index 37638f48051..12625db6f11 100644
--- a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp
+++ b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp
@@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 4, line 19:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [205, 123, 84, 147, 81, 17, 130, 7, 90, 160, 180, 5, 78, 14, 89, 255, 128, 163, 195, 96, 66, 172, 246, 192, 149, 249, 164, 137, 55, 137, 167, 163, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [33, 207, 79, 188, 228, 111, 5, 28, 153, 171, 107, 187, 220, 163, 119, 157, 232, 0, 111, 197, 115, 2, 188, 216, 234, 10, 144, 127, 229, 209, 251, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(4,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(3,0)
@@ -61,7 +61,7 @@ Epoch advanced: 3
 
 task 12, line 37:
 //# run 0x3::iota_system::request_withdraw_stake --args object(0x5) object(4,0) --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [205, 123, 84, 147, 81, 17, 130, 7, 90, 160, 180, 5, 78, 14, 89, 255, 128, 163, 195, 96, 66, 172, 246, 192, 149, 249, 164, 137, 55, 137, 167, 163, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [33, 207, 79, 188, 228, 111, 5, 28, 153, 171, 107, 187, 220, 163, 119, 157, 232, 0, 111, 197, 115, 2, 188, 216, 234, 10, 144, 127, 229, 209, 251, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] }
 created: object(12,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(4,0)
diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp
index bc31e0d2577..a3bae6617ee 100644
--- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp
+++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp
@@ -77,67 +77,67 @@ Response: {
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU8' (line 30), abort 'ImAU8': 0"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU8' (line 30), abort 'ImAU8': 0"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU16' (line 33), abort 'ImAU16': 1"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU16' (line 33), abort 'ImAU16': 1"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU32' (line 36), abort 'ImAU32': 2"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU32' (line 36), abort 'ImAU32': 2"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU64' (line 39), abort 'ImAU64': 3"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU64' (line 39), abort 'ImAU64': 3"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU128' (line 42), abort 'ImAU128': 4"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU128' (line 42), abort 'ImAU128': 4"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU256' (line 45), abort 'ImAU256': 5"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU256' (line 45), abort 'ImAU256': 5"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callString' (line 51), abort 'ImAString': This is a string"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callString' (line 51), abort 'ImAString': This is a string"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA="
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA="
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::normalAbort' (instruction 1), abort code: 0"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::normalAbort' (instruction 1), abort code: 0"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::assertLineNo' (line 60)"
+            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::assertLineNo' (line 60)"
           }
         }
       ]
@@ -248,7 +248,7 @@ Response: {
   },
   "errors": [
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
@@ -264,7 +264,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
@@ -280,7 +280,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
@@ -296,7 +296,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
@@ -312,7 +312,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
@@ -328,7 +328,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
@@ -344,7 +344,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
@@ -360,7 +360,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
@@ -376,7 +376,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
       "locations": [
         {
           "line": 6,
diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp
index eb63fd74a73..8a2f319a681 100644
--- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp
+++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp
@@ -37,19 +37,19 @@ Response: {
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0xf986879d81b7d0b4f49b825917bd6a5b38f9764b5d1aebc2186f279b2427f3d8::m::t_a' (line 21)"
+            "errors": "Error in 1st command, from '0xeb106ad70b9acf80d3e9f6c5f743121eb49d466dd80d22b55dffbde7efdd78cb::m::t_a' (line 21)"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0xf986879d81b7d0b4f49b825917bd6a5b38f9764b5d1aebc2186f279b2427f3d8::m::t_calls_a' (line 24)"
+            "errors": "Error in 1st command, from '0xeb106ad70b9acf80d3e9f6c5f743121eb49d466dd80d22b55dffbde7efdd78cb::m::t_calls_a' (line 24)"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0xf986879d81b7d0b4f49b825917bd6a5b38f9764b5d1aebc2186f279b2427f3d8::m::t_const_assert' (line 10), abort 'EMsg': This is a string"
+            "errors": "Error in 1st command, from '0xeb106ad70b9acf80d3e9f6c5f743121eb49d466dd80d22b55dffbde7efdd78cb::m::t_const_assert' (line 10), abort 'EMsg': This is a string"
           }
         }
       ]
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp
index f75860547fe..9d9836f26c1 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp
@@ -62,7 +62,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventA"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -80,7 +80,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::Object>"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -98,7 +98,7 @@ Response: {
               "name": "M2"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::EventA"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -116,7 +116,7 @@ Response: {
               "name": "M2"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::Object>"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -145,7 +145,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventA"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -163,7 +163,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::Object>"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -181,7 +181,7 @@ Response: {
               "name": "M2"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::EventA"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -199,7 +199,7 @@ Response: {
               "name": "M2"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::Object>"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -228,7 +228,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventA"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -246,7 +246,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::Object>"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -275,7 +275,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventA"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -304,7 +304,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::Object>"
+              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp
index 00f41ed55ae..0860ad4e755 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp
@@ -30,7 +30,7 @@ Response: {
             "name": "M3"
           },
           "type": {
-            "repr": "0xd2f29f7361ce369a36924576b23440a0a3b81ab975c44c7e837e6d74ff0e4a51::M1::EventA"
+            "repr": "0xe669e19726574786da1e6d1f4dccdd53ed82531033eedd54fdbf7b18413eb4e5::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -56,7 +56,7 @@ Response: {
             "name": "M3"
           },
           "type": {
-            "repr": "0xd2f29f7361ce369a36924576b23440a0a3b81ab975c44c7e837e6d74ff0e4a51::M1::EventA"
+            "repr": "0xe669e19726574786da1e6d1f4dccdd53ed82531033eedd54fdbf7b18413eb4e5::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -102,7 +102,7 @@ Response: {
             "name": "M3"
           },
           "type": {
-            "repr": "0xd2f29f7361ce369a36924576b23440a0a3b81ab975c44c7e837e6d74ff0e4a51::M1::EventA"
+            "repr": "0xe669e19726574786da1e6d1f4dccdd53ed82531033eedd54fdbf7b18413eb4e5::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp
index 17d9efd6aa0..4883dc9faea 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp
@@ -33,12 +33,12 @@ Response: {
       "nodes": [
         {
           "json": {
-            "id": "0x9a734cbfbfeed77d0efa6574430f2ebae3c84c16a81f4cf11e4fa101ed54baa3"
+            "id": "0x5d8d5aba4c9f2a7f2b1aec08255c1218349dd40d72385152f22419a5550dde6d"
           }
         },
         {
           "json": {
-            "id": "0x9a734cbfbfeed77d0efa6574430f2ebae3c84c16a81f4cf11e4fa101ed54baa3",
+            "id": "0x5d8d5aba4c9f2a7f2b1aec08255c1218349dd40d72385152f22419a5550dde6d",
             "version": 1,
             "fields": {
               "contents": [
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp
index 0c54da135ec..f988c8ec9a1 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp
@@ -42,7 +42,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -60,7 +60,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -78,7 +78,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -111,7 +111,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -129,7 +129,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -162,7 +162,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -180,7 +180,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -213,7 +213,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -231,7 +231,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA"
+              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp
index 48cb46c959c..adab78103cb 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp
@@ -37,19 +37,19 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V"
+          "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
         },
         {
-          "digest": "ErvTYR6mPWiZYePpStGyH6Nw8ckgpSzrPgGw7Vkdw6JK"
+          "digest": "GS1LUR1UjD8peuQQh48Nwz8typs5zgKKc98nKMruXyWM"
         },
         {
-          "digest": "FN7PLE3HgySgBBAoFSxAjnoDk6iuXBoREtCwT8VHErcT"
+          "digest": "69jE7Qho2T86X2SV89rF1esL9kM62eiTnuKADDmtThHT"
         },
         {
-          "digest": "3KCnLq3sQtjsuxxQahpwYzGE5SwKbYFM4qXAjKDjc2QB"
+          "digest": "5pbswh7EYi78wk6TQSWZ1v2vPrxnmHLbzGEK7UZ2wKJs"
         },
         {
-          "digest": "F3rgBaRQZ6Fjyw1YS2LFjyc4WzbTAKWzev2atucRxMGa"
+          "digest": "sywyCLK4TcmA9BVQtTjoqUdBAErTELaMhDL5bt7ALcb"
         }
       ]
     }
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp
index fc1c99398df..3906f8ebf7c 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp
@@ -30,7 +30,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M1::EventA"
+            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -72,7 +72,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M1::EventA"
+            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -98,7 +98,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M2::EventB"
+            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M2::EventB"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -124,7 +124,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M1::EventA"
+            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -139,7 +139,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M2::EventB"
+            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M2::EventB"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -165,7 +165,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M1::EventA"
+            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -180,7 +180,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M2::EventB"
+            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M2::EventB"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -195,7 +195,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M2::EventB"
+            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M2::EventB"
           },
           "sender": {
             "address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp
index 38b26be0442..4a907d85fff 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp
@@ -38,19 +38,19 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V"
+          "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
         },
         {
-          "digest": "5g71h54kuLvR1x5RBRZFHeqUjyx7o7DhxFvHzu9BVbMA"
+          "digest": "2BkQ3DT8voU6VpD8Z14HUc8pBWg4Lp1BAxHgWHr3Wzw9"
         },
         {
-          "digest": "HB6E8FBSJw7ViXKkqmZTAgY5t4E5uainW5BtWSbbWfTu"
+          "digest": "3NfqshRsCameiFzacuNTCeZuCPdXreAPnoYUZaHGBKcu"
         },
         {
-          "digest": "4Aa1YhftZmqnzDfvMk2oTatJjvYY2PVtne7FchQXfgTU"
+          "digest": "9rnY4B22nCrQvmhtcD1M3iqT8YHHiJgX4TzXMB2PLu71"
         },
         {
-          "digest": "4LHstjfZQD885Hedg7trd3JZRLomEp1kg1XYrrG8J62L"
+          "digest": "Gz7VG7NigsGxm8Jzve4t1CC8ioTd3XKU5H2d2hBXBoGq"
         }
       ]
     }
@@ -65,7 +65,7 @@ Response: {
       "nodes": [
         {
           "type": {
-            "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T1>"
+            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T1>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -78,7 +78,7 @@ Response: {
         },
         {
           "type": {
-            "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T2>"
+            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T2>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -91,7 +91,7 @@ Response: {
         },
         {
           "type": {
-            "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T1>"
+            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T1>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -104,7 +104,7 @@ Response: {
         },
         {
           "type": {
-            "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T2>"
+            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T2>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -128,7 +128,7 @@ Response: {
       "nodes": [
         {
           "type": {
-            "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T1>"
+            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T1>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -141,7 +141,7 @@ Response: {
         },
         {
           "type": {
-            "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T1>"
+            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T1>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
diff --git a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp
index 3a26175bed6..17d543837fd 100644
--- a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp
+++ b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp
@@ -73,7 +73,7 @@ task 5, lines 59-63:
 //# run-graphql
 Response: {
   "data": {
-    "chainIdentifier": "e50daeb7"
+    "chainIdentifier": "498fc7b7"
   }
 }
 
@@ -81,7 +81,7 @@ task 6, lines 65-69:
 //# run-graphql
 Response: {
   "data": {
-    "chainIdentifier": "e50daeb7"
+    "chainIdentifier": "498fc7b7"
   }
 }
 
diff --git a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp
index 3df92edd511..840343a950c 100644
--- a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp
+++ b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp
@@ -30,7 +30,7 @@ Response: {
       "edges": [
         {
           "node": {
-            "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
           }
         }
       ]
@@ -59,7 +59,7 @@ Response: {
             "edges": [
               {
                 "txns": {
-                  "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
                 }
               }
             ]
@@ -91,7 +91,7 @@ Response: {
             "edges": [
               {
                 "txns": {
-                  "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
                 }
               }
             ]
@@ -100,7 +100,7 @@ Response: {
             "edges": [
               {
                 "txns": {
-                  "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
                 }
               }
             ]
@@ -132,7 +132,7 @@ Response: {
             "edges": [
               {
                 "txns": {
-                  "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
                 }
               }
             ]
@@ -164,7 +164,7 @@ Response: {
       "edges": [
         {
           "txns": {
-            "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
           }
         }
       ]
@@ -190,7 +190,7 @@ Response: {
       "edges": [
         {
           "txns": {
-            "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
           }
         }
       ]
@@ -216,7 +216,7 @@ Response: {
       "edges": [
         {
           "txns": {
-            "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q",
+            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
             "first": null,
             "last": null
           }
@@ -243,7 +243,7 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q",
+          "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
           "first": null,
           "last": null
         }
@@ -270,7 +270,7 @@ Response: {
       "edges": [
         {
           "txns": {
-            "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q",
+            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
             "a": null,
             "b": null
           }
@@ -324,7 +324,7 @@ Response: {
       "edges": [
         {
           "node": {
-            "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q",
+            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
             "a": null
           }
         }
@@ -350,14 +350,14 @@ Response: {
     "fragmentSpread": {
       "nodes": [
         {
-          "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+          "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
         }
       ]
     },
     "inlineFragment": {
       "nodes": [
         {
-          "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+          "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
         }
       ]
     }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp
index 4b469acf639..f2b3fa94e47 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp
@@ -21,9 +21,9 @@ Response: {
     "iotaCoins": {
       "edges": [
         {
-          "cursor": "IDejnNtJDt+1jyfOdjn/AmGFmbJKC5F0/KuBPLyO8udXAQAAAAAAAAA=",
+          "cursor": "IFWIszDYouqyV5FHmkjHL8VomWv4zfT9PeNSxpAcCjH7AQAAAAAAAAA=",
           "node": {
-            "coinBalance": "300000000000000",
+            "coinBalance": "299999983336400",
             "contents": {
               "type": {
                 "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
@@ -32,7 +32,7 @@ Response: {
           }
         },
         {
-          "cursor": "IDgbuPdj3DERVIhMGJwCcgQoCE4bFkx+/qB1PI67n6GpAQAAAAAAAAA=",
+          "cursor": "IKAh5Dwcyc/kwt5ZIi7j9i0+5VOEhni5CiLnWNgvOlisAQAAAAAAAAA=",
           "node": {
             "coinBalance": "30000000000000000",
             "contents": {
@@ -43,9 +43,9 @@ Response: {
           }
         },
         {
-          "cursor": "IFwSkvmC5PQWLWvaf5IXfTXG0M+7W1MXqRJp0GD7eqevAQAAAAAAAAA=",
+          "cursor": "ILvZCg1Mz3zj3t29+KJ3JJdhvtfE79wdbj6VlrZgQ21OAQAAAAAAAAA=",
           "node": {
-            "coinBalance": "299999983336400",
+            "coinBalance": "300000000000000",
             "contents": {
               "type": {
                 "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
@@ -58,34 +58,34 @@ Response: {
     "fakeCoins": {
       "edges": [
         {
-          "cursor": "IFCto+HqZV+CA8GBbQb2iMg8le5if61nfX42FTETumcCAQAAAAAAAAA=",
+          "cursor": "IMylKIZ2RJ3yz2r1X/fRLN00OhpfEv4x/ZFhIG+/fMpQAQAAAAAAAAA=",
           "node": {
             "coinBalance": "2",
             "contents": {
               "type": {
-                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x2caad413fb46e9995cb54309ae71b27542e9b488bee334ef06b4c7b55f428244::fake::FAKE>"
+                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xfc060d55fe18ece1944ee4395008a9c09d893dbb30880052acf23d3d1ffb56b5::fake::FAKE>"
               }
             }
           }
         },
         {
-          "cursor": "IFV0yl/uDtBt31BwG5TvuT3wC39K/QLYZR8CY2zz6fWiAQAAAAAAAAA=",
+          "cursor": "IN/u1Oaq78H+r+vyT7pKHqY/K3Zp47bishEsQXymiGE5AQAAAAAAAAA=",
           "node": {
-            "coinBalance": "3",
+            "coinBalance": "1",
             "contents": {
               "type": {
-                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x2caad413fb46e9995cb54309ae71b27542e9b488bee334ef06b4c7b55f428244::fake::FAKE>"
+                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xfc060d55fe18ece1944ee4395008a9c09d893dbb30880052acf23d3d1ffb56b5::fake::FAKE>"
               }
             }
           }
         },
         {
-          "cursor": "IGoY5Cxim76LrxXqiV10mZkP90+uEwSgkekjLUCbpHwbAQAAAAAAAAA=",
+          "cursor": "IPRYQvyvi5GnfnmpWB0yjvjM9PWhmsPGIMIBKJKhr1XgAQAAAAAAAAA=",
           "node": {
-            "coinBalance": "1",
+            "coinBalance": "3",
             "contents": {
               "type": {
-                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x2caad413fb46e9995cb54309ae71b27542e9b488bee334ef06b4c7b55f428244::fake::FAKE>"
+                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xfc060d55fe18ece1944ee4395008a9c09d893dbb30880052acf23d3d1ffb56b5::fake::FAKE>"
               }
             }
           }
@@ -96,7 +96,7 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "IFwSkvmC5PQWLWvaf5IXfTXG0M+7W1MXqRJp0GD7eqevAQAAAAAAAAA=",
+            "cursor": "IFWIszDYouqyV5FHmkjHL8VomWv4zfT9PeNSxpAcCjH7AQAAAAAAAAA=",
             "node": {
               "coinBalance": "299999983336400",
               "contents": {
@@ -121,10 +121,10 @@ Response: {
             }
           },
           {
-            "cursor": "eyJ0IjoiMHgyY2FhZDQxM2ZiNDZlOTk5NWNiNTQzMDlhZTcxYjI3NTQyZTliNDg4YmVlMzM0ZWYwNmI0YzdiNTVmNDI4MjQ0OjpmYWtlOjpGQUtFIiwiYyI6MX0",
+            "cursor": "eyJ0IjoiMHhmYzA2MGQ1NWZlMThlY2UxOTQ0ZWU0Mzk1MDA4YTljMDlkODkzZGJiMzA4ODAwNTJhY2YyM2QzZDFmZmI1NmI1OjpmYWtlOjpGQUtFIiwiYyI6MX0",
             "node": {
               "coinType": {
-                "repr": "0x2caad413fb46e9995cb54309ae71b27542e9b488bee334ef06b4c7b55f428244::fake::FAKE"
+                "repr": "0xfc060d55fe18ece1944ee4395008a9c09d893dbb30880052acf23d3d1ffb56b5::fake::FAKE"
               },
               "coinObjectCount": 3,
               "totalBalance": "6"
@@ -142,7 +142,7 @@ Response: {
       "lastBalance": {
         "edges": [
           {
-            "cursor": "eyJ0IjoiMHgyY2FhZDQxM2ZiNDZlOTk5NWNiNTQzMDlhZTcxYjI3NTQyZTliNDg4YmVlMzM0ZWYwNmI0YzdiNTVmNDI4MjQ0OjpmYWtlOjpGQUtFIiwiYyI6MX0"
+            "cursor": "eyJ0IjoiMHhmYzA2MGQ1NWZlMThlY2UxOTQ0ZWU0Mzk1MDA4YTljMDlkODkzZGJiMzA4ODAwNTJhY2YyM2QzZDFmZmI1NmI1OjpmYWtlOjpGQUtFIiwiYyI6MX0"
           }
         ]
       }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/data.exp b/crates/iota-graphql-e2e-tests/tests/objects/data.exp
index 1f0d46d93da..033c0567460 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/data.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/data.exp
@@ -36,7 +36,7 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0x978be5e7629f7d75c29b5b62ad5f84689df6bd5732710db5f5536675bcaa5d18::m::Foo"
                         },
                         "data": {
                           "Struct": [
@@ -44,111 +44,38 @@ Response: {
                               "name": "id",
                               "value": {
                                 "UID": [
-                                  55,
-                                  163,
-                                  156,
-                                  219,
-                                  73,
-                                  14,
-                                  223,
-                                  181,
-                                  143,
-                                  39,
-                                  206,
-                                  118,
-                                  57,
-                                  255,
-                                  2,
                                   97,
-                                  133,
-                                  153,
-                                  178,
-                                  74,
-                                  11,
-                                  145,
-                                  116,
-                                  252,
-                                  171,
-                                  129,
-                                  60,
-                                  188,
-                                  142,
-                                  242,
-                                  231,
-                                  87
-                                ]
-                              }
-                            },
-                            {
-                              "name": "balance",
-                              "value": {
-                                "Struct": [
-                                  {
-                                    "name": "value",
-                                    "value": {
-                                      "Number": "299999988454400"
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                          ]
-                        },
-                        "json": {
-                          "id": "0x37a39cdb490edfb58f27ce7639ff02618599b24a0b9174fcab813cbc8ef2e757",
-                          "balance": {
-                            "value": "299999988454400"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                {
-                  "outputState": {
-                    "asMoveObject": {
-                      "contents": {
-                        "type": {
-                          "repr": "0xc215a5eb339690806ff0ed48ab6a08e3378593c49d809b4cbdaaadab8ce089e2::m::Foo"
-                        },
-                        "data": {
-                          "Struct": [
-                            {
-                              "name": "id",
-                              "value": {
-                                "UID": [
-                                  170,
-                                  104,
-                                  165,
-                                  190,
-                                  189,
-                                  12,
+                                  93,
+                                  215,
+                                  24,
+                                  228,
+                                  168,
+                                  1,
+                                  172,
+                                  56,
+                                  40,
                                   236,
-                                  125,
-                                  250,
-                                  29,
-                                  35,
-                                  7,
-                                  134,
-                                  66,
-                                  125,
-                                  140,
-                                  205,
-                                  66,
-                                  59,
-                                  114,
-                                  206,
-                                  204,
-                                  177,
-                                  155,
-                                  246,
-                                  42,
-                                  111,
-                                  233,
-                                  169,
-                                  83,
-                                  26,
-                                  154
+                                  236,
+                                  19,
+                                  138,
+                                  18,
+                                  164,
+                                  226,
+                                  88,
+                                  41,
+                                  39,
+                                  189,
+                                  180,
+                                  87,
+                                  193,
+                                  70,
+                                  75,
+                                  211,
+                                  210,
+                                  3,
+                                  175,
+                                  61,
+                                  213
                                 ]
                               }
                             },
@@ -156,38 +83,38 @@ Response: {
                               "name": "f0",
                               "value": {
                                 "ID": [
-                                  170,
-                                  104,
-                                  165,
-                                  190,
-                                  189,
-                                  12,
+                                  97,
+                                  93,
+                                  215,
+                                  24,
+                                  228,
+                                  168,
+                                  1,
+                                  172,
+                                  56,
+                                  40,
                                   236,
-                                  125,
-                                  250,
-                                  29,
-                                  35,
-                                  7,
-                                  134,
-                                  66,
-                                  125,
-                                  140,
-                                  205,
-                                  66,
-                                  59,
-                                  114,
-                                  206,
-                                  204,
-                                  177,
-                                  155,
-                                  246,
-                                  42,
-                                  111,
-                                  233,
-                                  169,
-                                  83,
-                                  26,
-                                  154
+                                  236,
+                                  19,
+                                  138,
+                                  18,
+                                  164,
+                                  226,
+                                  88,
+                                  41,
+                                  39,
+                                  189,
+                                  180,
+                                  87,
+                                  193,
+                                  70,
+                                  75,
+                                  211,
+                                  210,
+                                  3,
+                                  175,
+                                  61,
+                                  213
                                 ]
                               }
                             },
@@ -227,38 +154,38 @@ Response: {
                                 "Vector": [
                                   {
                                     "Address": [
-                                      170,
-                                      104,
-                                      165,
-                                      190,
-                                      189,
-                                      12,
+                                      97,
+                                      93,
+                                      215,
+                                      24,
+                                      228,
+                                      168,
+                                      1,
+                                      172,
+                                      56,
+                                      40,
                                       236,
-                                      125,
-                                      250,
-                                      29,
-                                      35,
-                                      7,
-                                      134,
-                                      66,
-                                      125,
-                                      140,
-                                      205,
-                                      66,
-                                      59,
-                                      114,
-                                      206,
-                                      204,
-                                      177,
-                                      155,
-                                      246,
-                                      42,
-                                      111,
-                                      233,
-                                      169,
-                                      83,
-                                      26,
-                                      154
+                                      236,
+                                      19,
+                                      138,
+                                      18,
+                                      164,
+                                      226,
+                                      88,
+                                      41,
+                                      39,
+                                      189,
+                                      180,
+                                      87,
+                                      193,
+                                      70,
+                                      75,
+                                      211,
+                                      210,
+                                      3,
+                                      175,
+                                      61,
+                                      213
                                     ]
                                   }
                                 ]
@@ -275,21 +202,94 @@ Response: {
                           ]
                         },
                         "json": {
-                          "id": "0xaa68a5bebd0cec7dfa1d230786427d8ccd423b72ceccb19bf62a6fe9a9531a9a",
-                          "f0": "0xaa68a5bebd0cec7dfa1d230786427d8ccd423b72ceccb19bf62a6fe9a9531a9a",
+                          "id": "0x615dd718e4a801ac3828ecec138a12a4e2582927bdb457c1464bd3d203af3dd5",
+                          "f0": "0x615dd718e4a801ac3828ecec138a12a4e2582927bdb457c1464bd3d203af3dd5",
                           "f1": true,
                           "f2": 42,
                           "f3": "43",
                           "f4": "hello",
                           "f5": "world",
                           "f6": [
-                            "0xaa68a5bebd0cec7dfa1d230786427d8ccd423b72ceccb19bf62a6fe9a9531a9a"
+                            "0x615dd718e4a801ac3828ecec138a12a4e2582927bdb457c1464bd3d203af3dd5"
                           ],
                           "f7": 44
                         }
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "asMoveObject": {
+                      "contents": {
+                        "type": {
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                        },
+                        "data": {
+                          "Struct": [
+                            {
+                              "name": "id",
+                              "value": {
+                                "UID": [
+                                  187,
+                                  217,
+                                  10,
+                                  13,
+                                  76,
+                                  207,
+                                  124,
+                                  227,
+                                  222,
+                                  221,
+                                  189,
+                                  248,
+                                  162,
+                                  119,
+                                  36,
+                                  151,
+                                  97,
+                                  190,
+                                  215,
+                                  196,
+                                  239,
+                                  220,
+                                  29,
+                                  110,
+                                  62,
+                                  149,
+                                  150,
+                                  182,
+                                  96,
+                                  67,
+                                  109,
+                                  78
+                                ]
+                              }
+                            },
+                            {
+                              "name": "balance",
+                              "value": {
+                                "Struct": [
+                                  {
+                                    "name": "value",
+                                    "value": {
+                                      "Number": "299999988454400"
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        },
+                        "json": {
+                          "id": "0xbbd90a0d4ccf7ce3deddbdf8a277249761bed7c4efdc1d6e3e9596b660436d4e",
+                          "balance": {
+                            "value": "299999988454400"
+                          }
+                        }
+                      }
+                    }
+                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/display.exp b/crates/iota-graphql-e2e-tests/tests/objects/display.exp
index 7941b8b3129..04143a4282a 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/display.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/display.exp
@@ -5,7 +5,7 @@ A: object(0,0)
 
 task 1, lines 7-131:
 //# publish --sender A
-events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [200, 150, 132, 71, 202, 137, 3, 87, 222, 224, 67, 232, 54, 156, 171, 125, 11, 72, 193, 0, 129, 141, 189, 40, 19, 179, 119, 175, 62, 234, 214, 245] }
+events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [236, 49, 20, 90, 216, 179, 253, 28, 186, 3, 190, 176, 113, 62, 87, 240, 200, 160, 158, 204, 33, 110, 243, 45, 230, 44, 226, 250, 87, 246, 187, 236] }
 created: object(1,0), object(1,1), object(1,2)
 mutated: object(0,0)
 gas summary: computation_cost: 1000000, storage_cost: 21470000,  storage_rebate: 0, non_refundable_storage_fee: 0
@@ -16,7 +16,7 @@ Checkpoint created: 1
 
 task 3, line 135:
 //# view-checkpoint
-CheckpointSummary { epoch: 0, seq: 1, content_digest: DxfuAPNDXR3iEjnafeAcqMdMmZaUKvkpomSmuuWYyE4o,
+CheckpointSummary { epoch: 0, seq: 1, content_digest: 5nziQdp2tLxVAj5j7iXTyrYz7Hstn5Zh5iqLAd7TaxLt,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 1000000, storage_cost: 21470000, storage_rebate: 0, non_refundable_storage_fee: 0 }}
 
 task 4, line 137:
@@ -27,7 +27,7 @@ gas summary: computation_cost: 1000000, storage_cost: 3556800,  storage_rebate:
 
 task 5, line 139:
 //# run Test::boars::update_display_faulty --sender A --args object(1,1)
-events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [200, 150, 132, 71, 202, 137, 3, 87, 222, 224, 67, 232, 54, 156, 171, 125, 11, 72, 193, 0, 129, 141, 189, 40, 19, 179, 119, 175, 62, 234, 214, 245, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] }
+events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [236, 49, 20, 90, 216, 179, 253, 28, 186, 3, 190, 176, 113, 62, 87, 240, 200, 160, 158, 204, 33, 110, 243, 45, 230, 44, 226, 250, 87, 246, 187, 236, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] }
 mutated: object(0,0), object(1,1)
 gas summary: computation_cost: 1000000, storage_cost: 2941200,  storage_rebate: 2652400, non_refundable_storage_fee: 0
 
@@ -37,7 +37,7 @@ Checkpoint created: 2
 
 task 7, line 143:
 //# view-checkpoint
-CheckpointSummary { epoch: 0, seq: 2, content_digest: 2Q2Sh3RdhFkt4XKHPSMoX4ZUfVyY7eFdJuAi6HJHgcUf,
+CheckpointSummary { epoch: 0, seq: 2, content_digest: DVQKDwtJsrqwugyr2EP4UCAKw1RRVVapnPADhXTs5vaX,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 3000000, storage_cost: 27968000, storage_rebate: 3640400, non_refundable_storage_fee: 0 }}
 
 task 8, lines 145-158:
@@ -74,7 +74,7 @@ Response: {
 
 task 9, line 160:
 //# run Test::boars::single_add --sender A --args object(1,1)
-events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [200, 150, 132, 71, 202, 137, 3, 87, 222, 224, 67, 232, 54, 156, 171, 125, 11, 72, 193, 0, 129, 141, 189, 40, 19, 179, 119, 175, 62, 234, 214, 245, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] }
+events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [236, 49, 20, 90, 216, 179, 253, 28, 186, 3, 190, 176, 113, 62, 87, 240, 200, 160, 158, 204, 33, 110, 243, 45, 230, 44, 226, 250, 87, 246, 187, 236, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] }
 mutated: object(0,0), object(1,1)
 gas summary: computation_cost: 1000000, storage_cost: 3032400,  storage_rebate: 2941200, non_refundable_storage_fee: 0
 
@@ -84,7 +84,7 @@ Checkpoint created: 3
 
 task 11, line 164:
 //# view-checkpoint
-CheckpointSummary { epoch: 0, seq: 3, content_digest: ApFyo1y4BfPaE3yHs2oSoCTgzUxmyAuzENCud6jPRvm6,
+CheckpointSummary { epoch: 0, seq: 3, content_digest: C7sxx5GSvnuc5RNaYkToaPRVoBxctRgY3ZNGkyZWGYSe,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 4000000, storage_cost: 31000400, storage_rebate: 6581600, non_refundable_storage_fee: 0 }}
 
 task 12, lines 166-179:
@@ -126,7 +126,7 @@ Response: {
 
 task 13, line 181:
 //# run Test::boars::multi_add --sender A --args object(1,1)
-events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [200, 150, 132, 71, 202, 137, 3, 87, 222, 224, 67, 232, 54, 156, 171, 125, 11, 72, 193, 0, 129, 141, 189, 40, 19, 179, 119, 175, 62, 234, 214, 245, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] }
+events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [236, 49, 20, 90, 216, 179, 253, 28, 186, 3, 190, 176, 113, 62, 87, 240, 200, 160, 158, 204, 33, 110, 243, 45, 230, 44, 226, 250, 87, 246, 187, 236, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] }
 mutated: object(0,0), object(1,1)
 gas summary: computation_cost: 1000000, storage_cost: 5236400,  storage_rebate: 3032400, non_refundable_storage_fee: 0
 
@@ -136,7 +136,7 @@ Checkpoint created: 4
 
 task 15, line 185:
 //# view-checkpoint
-CheckpointSummary { epoch: 0, seq: 4, content_digest: 6fCKEnhwLRw8bcXBko1NumBU4z5ngG7Xtx5LXMTe8yY5,
+CheckpointSummary { epoch: 0, seq: 4, content_digest: 9CyEjTU1BKFkS61qtauKTbtPRYTZ2AtWaBNYq2unhxhU,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 5000000, storage_cost: 36236800, storage_rebate: 9614000, non_refundable_storage_fee: 0 }}
 
 task 16, lines 187-200:
@@ -195,7 +195,7 @@ Response: {
               },
               {
                 "key": "project_url",
-                "value": "Unique Boar from the Boars collection with First Boar and 0x9fdaf1c274354cbe0b3a6e0a13aa73c31941f73a54fbe72e84a077ddac456063",
+                "value": "Unique Boar from the Boars collection with First Boar and 0xa4526250ab04115ddb2e91d45acfca1625ad309af01eb66867f3d5859a5a598c",
                 "error": null
               },
               {
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp
index e6a8ee29748..fbe60c1bbc6 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp
@@ -36,7 +36,7 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0x06a6545ddc2d380720e3639a402b1deb624dbd229a48c24d4054cf8997caac4f::m::Foo"
                         },
                         "data": {
                           "Struct": [
@@ -44,111 +44,38 @@ Response: {
                               "name": "id",
                               "value": {
                                 "UID": [
-                                  55,
-                                  163,
-                                  156,
-                                  219,
-                                  73,
-                                  14,
-                                  223,
-                                  181,
-                                  143,
-                                  39,
-                                  206,
-                                  118,
-                                  57,
-                                  255,
-                                  2,
-                                  97,
-                                  133,
-                                  153,
-                                  178,
-                                  74,
-                                  11,
-                                  145,
-                                  116,
-                                  252,
-                                  171,
-                                  129,
-                                  60,
-                                  188,
-                                  142,
+                                  75,
+                                  194,
+                                  4,
+                                  128,
+                                  167,
+                                  122,
+                                  247,
+                                  88,
+                                  165,
+                                  245,
                                   242,
+                                  89,
+                                  22,
+                                  223,
+                                  140,
+                                  40,
+                                  224,
+                                  148,
+                                  248,
+                                  115,
+                                  33,
                                   231,
-                                  87
-                                ]
-                              }
-                            },
-                            {
-                              "name": "balance",
-                              "value": {
-                                "Struct": [
-                                  {
-                                    "name": "value",
-                                    "value": {
-                                      "Number": "299999995967600"
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                          ]
-                        },
-                        "json": {
-                          "id": "0x37a39cdb490edfb58f27ce7639ff02618599b24a0b9174fcab813cbc8ef2e757",
-                          "balance": {
-                            "value": "299999995967600"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                {
-                  "outputState": {
-                    "asMoveObject": {
-                      "contents": {
-                        "type": {
-                          "repr": "0xc169e760953e68805694f335ddbbfed580aa64864113acd7c81f9f4e34975ab6::m::Foo"
-                        },
-                        "data": {
-                          "Struct": [
-                            {
-                              "name": "id",
-                              "value": {
-                                "UID": [
-                                  126,
-                                  19,
                                   31,
-                                  228,
-                                  156,
-                                  97,
-                                  224,
-                                  21,
-                                  90,
-                                  63,
-                                  185,
-                                  127,
-                                  37,
-                                  209,
-                                  203,
-                                  64,
-                                  51,
-                                  51,
-                                  124,
-                                  104,
-                                  128,
-                                  92,
-                                  101,
-                                  126,
-                                  85,
-                                  214,
-                                  252,
-                                  96,
-                                  203,
-                                  24,
-                                  107,
-                                  104
+                                  43,
+                                  201,
+                                  8,
+                                  74,
+                                  123,
+                                  42,
+                                  129,
+                                  91,
+                                  146
                                 ]
                               }
                             },
@@ -156,38 +83,38 @@ Response: {
                               "name": "f0",
                               "value": {
                                 "ID": [
-                                  126,
-                                  19,
-                                  31,
-                                  228,
-                                  156,
-                                  97,
-                                  224,
-                                  21,
-                                  90,
-                                  63,
-                                  185,
-                                  127,
-                                  37,
-                                  209,
-                                  203,
-                                  64,
-                                  51,
-                                  51,
-                                  124,
-                                  104,
+                                  75,
+                                  194,
+                                  4,
                                   128,
-                                  92,
-                                  101,
-                                  126,
-                                  85,
-                                  214,
-                                  252,
-                                  96,
-                                  203,
-                                  24,
-                                  107,
-                                  104
+                                  167,
+                                  122,
+                                  247,
+                                  88,
+                                  165,
+                                  245,
+                                  242,
+                                  89,
+                                  22,
+                                  223,
+                                  140,
+                                  40,
+                                  224,
+                                  148,
+                                  248,
+                                  115,
+                                  33,
+                                  231,
+                                  31,
+                                  43,
+                                  201,
+                                  8,
+                                  74,
+                                  123,
+                                  42,
+                                  129,
+                                  91,
+                                  146
                                 ]
                               }
                             },
@@ -227,38 +154,38 @@ Response: {
                                 "Vector": [
                                   {
                                     "Address": [
-                                      126,
-                                      19,
-                                      31,
-                                      228,
-                                      156,
-                                      97,
-                                      224,
-                                      21,
-                                      90,
-                                      63,
-                                      185,
-                                      127,
-                                      37,
-                                      209,
-                                      203,
-                                      64,
-                                      51,
-                                      51,
-                                      124,
-                                      104,
+                                      75,
+                                      194,
+                                      4,
                                       128,
-                                      92,
-                                      101,
-                                      126,
-                                      85,
-                                      214,
-                                      252,
-                                      96,
-                                      203,
-                                      24,
-                                      107,
-                                      104
+                                      167,
+                                      122,
+                                      247,
+                                      88,
+                                      165,
+                                      245,
+                                      242,
+                                      89,
+                                      22,
+                                      223,
+                                      140,
+                                      40,
+                                      224,
+                                      148,
+                                      248,
+                                      115,
+                                      33,
+                                      231,
+                                      31,
+                                      43,
+                                      201,
+                                      8,
+                                      74,
+                                      123,
+                                      42,
+                                      129,
+                                      91,
+                                      146
                                     ]
                                   }
                                 ]
@@ -325,15 +252,15 @@ Response: {
                           ]
                         },
                         "json": {
-                          "id": "0x7e131fe49c61e0155a3fb97f25d1cb4033337c68805c657e55d6fc60cb186b68",
-                          "f0": "0x7e131fe49c61e0155a3fb97f25d1cb4033337c68805c657e55d6fc60cb186b68",
+                          "id": "0x4bc20480a77af758a5f5f25916df8c28e094f87321e71f2bc9084a7b2a815b92",
+                          "f0": "0x4bc20480a77af758a5f5f25916df8c28e094f87321e71f2bc9084a7b2a815b92",
                           "f1": true,
                           "f2": 42,
                           "f3": "43",
                           "f4": "hello",
                           "f5": "world",
                           "f6": [
-                            "0x7e131fe49c61e0155a3fb97f25d1cb4033337c68805c657e55d6fc60cb186b68"
+                            "0x4bc20480a77af758a5f5f25916df8c28e094f87321e71f2bc9084a7b2a815b92"
                           ],
                           "f7": 44,
                           "f8": {
@@ -356,6 +283,79 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "asMoveObject": {
+                      "contents": {
+                        "type": {
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                        },
+                        "data": {
+                          "Struct": [
+                            {
+                              "name": "id",
+                              "value": {
+                                "UID": [
+                                  187,
+                                  217,
+                                  10,
+                                  13,
+                                  76,
+                                  207,
+                                  124,
+                                  227,
+                                  222,
+                                  221,
+                                  189,
+                                  248,
+                                  162,
+                                  119,
+                                  36,
+                                  151,
+                                  97,
+                                  190,
+                                  215,
+                                  196,
+                                  239,
+                                  220,
+                                  29,
+                                  110,
+                                  62,
+                                  149,
+                                  150,
+                                  182,
+                                  96,
+                                  67,
+                                  109,
+                                  78
+                                ]
+                              }
+                            },
+                            {
+                              "name": "balance",
+                              "value": {
+                                "Struct": [
+                                  {
+                                    "name": "value",
+                                    "value": {
+                                      "Number": "299999995967600"
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        },
+                        "json": {
+                          "id": "0xbbd90a0d4ccf7ce3deddbdf8a277249761bed7c4efdc1d6e3e9596b660436d4e",
+                          "balance": {
+                            "value": "299999995967600"
+                          }
+                        }
+                      }
+                    }
+                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp
index f77876181b8..5d81642f530 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp
@@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 4, lines 16-18:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(4,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(3,0)
@@ -167,7 +167,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<vector<u8>,0x0000000000000000000000000000000000000000000000000000000000000002::timelock::SystemTimelockCap>"
                 }
               }
             }
@@ -178,7 +178,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<vector<u8>,0x0000000000000000000000000000000000000000000000000000000000000002::timelock::SystemTimelockCap>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>"
                 }
               }
             }
@@ -189,7 +189,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::iota_system_state_inner::IotaSystemStateV1>"
                 }
               }
             }
@@ -200,7 +200,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000002::random::RandomInner>"
                 }
               }
             }
@@ -211,7 +211,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::iota_system_state_inner::IotaSystemStateV1>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
@@ -222,7 +222,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000002::random::RandomInner>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::PoolTokenExchangeRate>"
                 }
               }
             }
@@ -233,7 +233,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
@@ -244,7 +244,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::PoolTokenExchangeRate>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp
index 4da0d38ba55..3631a202d72 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp
@@ -48,19 +48,19 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "ICz5IIuKI6+mzOyxS7vkE/oGAnCaqEDXuBATCd5LC5QvAQAAAAAAAAA="
+            "cursor": "IEtMi4tntPtNHNRt+TFKFSRhjlir2kBMxXfCP/qp/3fRAQAAAAAAAAA="
           },
           {
-            "cursor": "IE/xhbQKpM+NlTQZ438Fzeh/2sIYYDkqr2aI4OBK3c4xAQAAAAAAAAA="
+            "cursor": "IFBTD0mWDzKij0QXlnOXZUh52Hks6/mOfGXkA2MUNl9SAQAAAAAAAAA="
           },
           {
-            "cursor": "IGHtIXjzidfc4B0Zn7TKECtr9BEfkMb34vC1w8RZgbDxAQAAAAAAAAA="
+            "cursor": "IJ78fny4yh0J9RkYpz6YU4eZGVnPrs8xvf2tkle0s2mUAQAAAAAAAAA="
           },
           {
-            "cursor": "IGxlkgg1Xn7VdPx43tX0JtmWgR+IlR9iL4dsHRBli/wmAQAAAAAAAAA="
+            "cursor": "ILsFOC6XyAclBKv7f3GiZyFx/ybpxfYB7Qtz9r8b394EAQAAAAAAAAA="
           },
           {
-            "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA="
+            "cursor": "IP4kc9X8JMvd+74NpCI8f4Z7iHX+i24f+Aw4oAchY2ZeAQAAAAAAAAA="
           }
         ]
       }
@@ -76,10 +76,10 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "ICz5IIuKI6+mzOyxS7vkE/oGAnCaqEDXuBATCd5LC5QvAQAAAAAAAAA="
+            "cursor": "IEtMi4tntPtNHNRt+TFKFSRhjlir2kBMxXfCP/qp/3fRAQAAAAAAAAA="
           },
           {
-            "cursor": "IE/xhbQKpM+NlTQZ438Fzeh/2sIYYDkqr2aI4OBK3c4xAQAAAAAAAAA="
+            "cursor": "IFBTD0mWDzKij0QXlnOXZUh52Hks6/mOfGXkA2MUNl9SAQAAAAAAAAA="
           }
         ]
       }
@@ -95,52 +95,52 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "ICz5IIuKI6+mzOyxS7vkE/oGAnCaqEDXuBATCd5LC5QvAQAAAAAAAAA=",
+            "cursor": "IEtMi4tntPtNHNRt+TFKFSRhjlir2kBMxXfCP/qp/3fRAQAAAAAAAAA=",
             "node": {
-              "address": "0x2cf9208b8a23afa6ccecb14bbbe413fa0602709aa840d7b8101309de4b0b942f"
+              "address": "0x4b4c8b8b67b4fb4d1cd46df9314a1524618e58abda404cc577c23ffaa9ff77d1"
             }
           },
           {
-            "cursor": "IE/xhbQKpM+NlTQZ438Fzeh/2sIYYDkqr2aI4OBK3c4xAQAAAAAAAAA=",
+            "cursor": "IFBTD0mWDzKij0QXlnOXZUh52Hks6/mOfGXkA2MUNl9SAQAAAAAAAAA=",
             "node": {
-              "address": "0x4ff185b40aa4cf8d953419e37f05cde87fdac21860392aaf6688e0e04addce31"
+              "address": "0x50530f49960f32a28f4417967397654879d8792cebf98e7c65e4036314365f52"
             }
           },
           {
-            "cursor": "IGHtIXjzidfc4B0Zn7TKECtr9BEfkMb34vC1w8RZgbDxAQAAAAAAAAA=",
+            "cursor": "IJ78fny4yh0J9RkYpz6YU4eZGVnPrs8xvf2tkle0s2mUAQAAAAAAAAA=",
             "node": {
-              "address": "0x61ed2178f389d7dce01d199fb4ca102b6bf4111f90c6f7e2f0b5c3c45981b0f1"
+              "address": "0x9efc7e7cb8ca1d09f51918a73e985387991959cfaecf31bdfdad9257b4b36994"
             }
           },
           {
-            "cursor": "IGxlkgg1Xn7VdPx43tX0JtmWgR+IlR9iL4dsHRBli/wmAQAAAAAAAAA=",
+            "cursor": "ILsFOC6XyAclBKv7f3GiZyFx/ybpxfYB7Qtz9r8b394EAQAAAAAAAAA=",
             "node": {
-              "address": "0x6c659208355e7ed574fc78ded5f426d996811f88951f622f876c1d10658bfc26"
+              "address": "0xbb05382e97c8072504abfb7f71a2672171ff26e9c5f601ed0b73f6bf1bdfde04"
             }
           },
           {
-            "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA=",
+            "cursor": "IP4kc9X8JMvd+74NpCI8f4Z7iHX+i24f+Aw4oAchY2ZeAQAAAAAAAAA=",
             "node": {
-              "address": "0xa88ee17fe99416a40062c1f45e6dc621a7fc7489198e57484451f11ef1f23913"
+              "address": "0xfe2473d5fc24cbddfbbe0da4223c7f867b8875fe8b6e1ff80c38a0072163665e"
             }
           }
         ]
       }
     },
     "obj_3_0": {
-      "address": "0x2cf9208b8a23afa6ccecb14bbbe413fa0602709aa840d7b8101309de4b0b942f"
+      "address": "0x9efc7e7cb8ca1d09f51918a73e985387991959cfaecf31bdfdad9257b4b36994"
     },
     "obj_5_0": {
-      "address": "0x61ed2178f389d7dce01d199fb4ca102b6bf4111f90c6f7e2f0b5c3c45981b0f1"
+      "address": "0x50530f49960f32a28f4417967397654879d8792cebf98e7c65e4036314365f52"
     },
     "obj_6_0": {
-      "address": "0x4ff185b40aa4cf8d953419e37f05cde87fdac21860392aaf6688e0e04addce31"
+      "address": "0xfe2473d5fc24cbddfbbe0da4223c7f867b8875fe8b6e1ff80c38a0072163665e"
     },
     "obj_4_0": {
-      "address": "0x6c659208355e7ed574fc78ded5f426d996811f88951f622f876c1d10658bfc26"
+      "address": "0xbb05382e97c8072504abfb7f71a2672171ff26e9c5f601ed0b73f6bf1bdfde04"
     },
     "obj_2_0": {
-      "address": "0xa88ee17fe99416a40062c1f45e6dc621a7fc7489198e57484451f11ef1f23913"
+      "address": "0x4b4c8b8b67b4fb4d1cd46df9314a1524618e58abda404cc577c23ffaa9ff77d1"
     }
   }
 }
@@ -153,10 +153,10 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IGxlkgg1Xn7VdPx43tX0JtmWgR+IlR9iL4dsHRBli/wmAQAAAAAAAAA="
+            "cursor": "IJ78fny4yh0J9RkYpz6YU4eZGVnPrs8xvf2tkle0s2mUAQAAAAAAAAA="
           },
           {
-            "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA="
+            "cursor": "ILsFOC6XyAclBKv7f3GiZyFx/ybpxfYB7Qtz9r8b394EAQAAAAAAAAA="
           }
         ]
       }
@@ -172,7 +172,7 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA="
+            "cursor": "IP4kc9X8JMvd+74NpCI8f4Z7iHX+i24f+Aw4oAchY2ZeAQAAAAAAAAA="
           }
         ]
       }
@@ -186,7 +186,14 @@ Response: {
   "data": {
     "address": {
       "objects": {
-        "edges": []
+        "edges": [
+          {
+            "cursor": "IEtMi4tntPtNHNRt+TFKFSRhjlir2kBMxXfCP/qp/3fRAQAAAAAAAAA="
+          },
+          {
+            "cursor": "IFBTD0mWDzKij0QXlnOXZUh52Hks6/mOfGXkA2MUNl9SAQAAAAAAAAA="
+          }
+        ]
       }
     }
   }
@@ -200,15 +207,15 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IGxlkgg1Xn7VdPx43tX0JtmWgR+IlR9iL4dsHRBli/wmAQAAAAAAAAA=",
+            "cursor": "ILsFOC6XyAclBKv7f3GiZyFx/ybpxfYB7Qtz9r8b394EAQAAAAAAAAA=",
             "node": {
-              "address": "0x6c659208355e7ed574fc78ded5f426d996811f88951f622f876c1d10658bfc26"
+              "address": "0xbb05382e97c8072504abfb7f71a2672171ff26e9c5f601ed0b73f6bf1bdfde04"
             }
           },
           {
-            "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA=",
+            "cursor": "IP4kc9X8JMvd+74NpCI8f4Z7iHX+i24f+Aw4oAchY2ZeAQAAAAAAAAA=",
             "node": {
-              "address": "0xa88ee17fe99416a40062c1f45e6dc621a7fc7489198e57484451f11ef1f23913"
+              "address": "0xfe2473d5fc24cbddfbbe0da4223c7f867b8875fe8b6e1ff80c38a0072163665e"
             }
           }
         ]
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp
index 8a47d32ffcf..24598318d86 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp
@@ -37,10 +37,10 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0xe5b2eaebcea299e2a55ee5d2daebb15e71f47ed83ea0e9702359e55f26a6da0d::m::Bar"
+                          "repr": "0x9675aabf28cc532b860b087a1faad53eb993a3ddffb4f1a2db4fb5d97d7bfbe2::m::Foo"
                         }
                       },
-                      "hasPublicTransfer": false
+                      "hasPublicTransfer": true
                     }
                   }
                 },
@@ -49,10 +49,10 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0x9675aabf28cc532b860b087a1faad53eb993a3ddffb4f1a2db4fb5d97d7bfbe2::m::Bar"
                         }
                       },
-                      "hasPublicTransfer": true
+                      "hasPublicTransfer": false
                     }
                   }
                 },
@@ -61,7 +61,7 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0xe5b2eaebcea299e2a55ee5d2daebb15e71f47ed83ea0e9702359e55f26a6da0d::m::Foo"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         }
                       },
                       "hasPublicTransfer": true
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/received.exp b/crates/iota-graphql-e2e-tests/tests/objects/received.exp
index 649207f54ac..bb44ca58c92 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/received.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/received.exp
@@ -30,7 +30,7 @@ Response: {
       "receivedTransactionBlocks": {
         "nodes": [
           {
-            "digest": "BpQiF9UpsqLzSanNFGVvRXjcn5nPVUukaiQiRZFKXkEn"
+            "digest": "Fb2wDmqir1tAnHNmBbfUcDSX1FBgCkCGLWD3h3t3a8xs"
           }
         ]
       }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp
index 5656d2d4726..048fe7abd23 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp
@@ -10,7 +10,7 @@ Response: {
     "objects": {
       "edges": [
         {
-          "cursor": "IFH/uNA0p9hgv8vtgPYPhPx5vPpLjK+laCIv3sJLgxmZAAAAAAAAAAA=",
+          "cursor": "IGKt/jr0fh7rcbg4aVomqFmmaPEUDMoBUVZYdSQmBy3UAAAAAAAAAAA=",
           "node": {
             "asMoveObject": {
               "asStakedIota": {
@@ -39,7 +39,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 3, line 38:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(3,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(2,0)
@@ -60,34 +60,34 @@ Response: {
     "objects": {
       "edges": [
         {
-          "cursor": "IBI4Fo2NYBQFmwjdXvYZPRT977qOK/lqUGGG1hDgb5pdAgAAAAAAAAA=",
+          "cursor": "IGKt/jr0fh7rcbg4aVomqFmmaPEUDMoBUVZYdSQmBy3UAgAAAAAAAAA=",
           "node": {
             "asMoveObject": {
               "asStakedIota": {
-                "principal": "10000000000",
-                "poolId": "0x87d5e0205bcf00bb22b70e29a74e4d4b8a59ada7aa0b26642db2f5a27148b1f0"
+                "principal": "1500000000000000",
+                "poolId": "0x910fa4548e0bcfd971f3b198624c334d5f6db49f558009a85b78e3f08e215909"
               }
             }
           }
         },
         {
-          "cursor": "IFH/uNA0p9hgv8vtgPYPhPx5vPpLjK+laCIv3sJLgxmZAgAAAAAAAAA=",
+          "cursor": "ILVYziRMbmfeQ0alyypl2nA4gTpsnVI0/mNu+O2M0UcwAgAAAAAAAAA=",
           "node": {
             "asMoveObject": {
               "asStakedIota": {
-                "principal": "1500000000000000",
-                "poolId": "0x87d5e0205bcf00bb22b70e29a74e4d4b8a59ada7aa0b26642db2f5a27148b1f0"
+                "principal": "15340000000000",
+                "poolId": "0x910fa4548e0bcfd971f3b198624c334d5f6db49f558009a85b78e3f08e215909"
               }
             }
           }
         },
         {
-          "cursor": "ILVYziRMbmfeQ0alyypl2nA4gTpsnVI0/mNu+O2M0UcwAgAAAAAAAAA=",
+          "cursor": "IPZBsCp9CdP9iBWQhFfN6A2fcDP34decXACxmwerwQnGAgAAAAAAAAA=",
           "node": {
             "asMoveObject": {
               "asStakedIota": {
-                "principal": "15340000000000",
-                "poolId": "0x87d5e0205bcf00bb22b70e29a74e4d4b8a59ada7aa0b26642db2f5a27148b1f0"
+                "principal": "10000000000",
+                "poolId": "0x910fa4548e0bcfd971f3b198624c334d5f6db49f558009a85b78e3f08e215909"
               }
             }
           }
@@ -98,7 +98,7 @@ Response: {
       "stakedIotas": {
         "edges": [
           {
-            "cursor": "IBI4Fo2NYBQFmwjdXvYZPRT977qOK/lqUGGG1hDgb5pdAgAAAAAAAAA=",
+            "cursor": "IPZBsCp9CdP9iBWQhFfN6A2fcDP34decXACxmwerwQnGAgAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp
index 29fa37b8ea8..f950481b7a1 100644
--- a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp
+++ b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp
@@ -24,7 +24,7 @@ Response: {
     },
     "coin": {
       "asObject": {
-        "digest": "DFtexsvNVh4PmwAiXnx9kSN976yuTwfcScCVFSWttNpb"
+        "digest": "AyDrhU7FR64WMxA9fahP9vssJvwGGBXZ7H1yBEc6Gdb6"
       }
     }
   }
diff --git a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp
index 2b944182393..aeac5f10dc9 100644
--- a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp
+++ b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp
@@ -124,10 +124,10 @@ Response: {
           "version": 11,
           "contents": {
             "json": {
-              "id": "0xdadd6b40653df07306e4bbd806c5d91cdfd309e195e5c4247e8583dafd5d4887",
+              "id": "0x98ecb1d1d13658931c7d73d5df50b180bab96b01a671a4d7b8634a2265099987",
               "count": "1",
               "wrapped": {
-                "id": "0x5d4aba4106cbb800784bc62b281859da27d7f76dc232970dc09af09773b146f8",
+                "id": "0x415422d960969cb63f25ca6d955c5b085af3bd02c7ff5370c699cd06ce13de49",
                 "count": "1"
               }
             }
@@ -141,10 +141,10 @@ Response: {
           "version": 10,
           "contents": {
             "json": {
-              "id": "0xdadd6b40653df07306e4bbd806c5d91cdfd309e195e5c4247e8583dafd5d4887",
+              "id": "0x98ecb1d1d13658931c7d73d5df50b180bab96b01a671a4d7b8634a2265099987",
               "count": "1",
               "wrapped": {
-                "id": "0x5d4aba4106cbb800784bc62b281859da27d7f76dc232970dc09af09773b146f8",
+                "id": "0x415422d960969cb63f25ca6d955c5b085af3bd02c7ff5370c699cd06ce13de49",
                 "count": "1"
               }
             }
@@ -158,10 +158,10 @@ Response: {
           "version": 8,
           "contents": {
             "json": {
-              "id": "0xdadd6b40653df07306e4bbd806c5d91cdfd309e195e5c4247e8583dafd5d4887",
+              "id": "0x98ecb1d1d13658931c7d73d5df50b180bab96b01a671a4d7b8634a2265099987",
               "count": "1",
               "wrapped": {
-                "id": "0x5d4aba4106cbb800784bc62b281859da27d7f76dc232970dc09af09773b146f8",
+                "id": "0x415422d960969cb63f25ca6d955c5b085af3bd02c7ff5370c699cd06ce13de49",
                 "count": "0"
               }
             }
@@ -175,10 +175,10 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0xdadd6b40653df07306e4bbd806c5d91cdfd309e195e5c4247e8583dafd5d4887",
+              "id": "0x98ecb1d1d13658931c7d73d5df50b180bab96b01a671a4d7b8634a2265099987",
               "count": "0",
               "wrapped": {
-                "id": "0x5d4aba4106cbb800784bc62b281859da27d7f76dc232970dc09af09773b146f8",
+                "id": "0x415422d960969cb63f25ca6d955c5b085af3bd02c7ff5370c699cd06ce13de49",
                 "count": "0"
               }
             }
@@ -199,7 +199,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c",
+              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
               "count": "0"
             }
           }
@@ -212,7 +212,7 @@ Response: {
           "version": 10,
           "contents": {
             "json": {
-              "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c",
+              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
               "count": "1"
             }
           }
@@ -225,7 +225,7 @@ Response: {
           "version": 10,
           "contents": {
             "json": {
-              "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c",
+              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
               "count": "1"
             }
           }
@@ -238,7 +238,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c",
+              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
               "count": "0"
             }
           }
@@ -251,7 +251,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c",
+              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
               "count": "0"
             }
           }
@@ -271,7 +271,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0xe29b50f8b9200699909adda56f8879b2423ccd71f8ce52834b5f411d07245094",
+              "id": "0xc9d26b088c736cf6b9a23ca96b42a9286033aff111d8a55a2f24baf8370c734d",
               "count": "0"
             }
           }
@@ -284,7 +284,7 @@ Response: {
           "version": 11,
           "contents": {
             "json": {
-              "id": "0xe29b50f8b9200699909adda56f8879b2423ccd71f8ce52834b5f411d07245094",
+              "id": "0xc9d26b088c736cf6b9a23ca96b42a9286033aff111d8a55a2f24baf8370c734d",
               "count": "1"
             }
           }
@@ -297,7 +297,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0xe29b50f8b9200699909adda56f8879b2423ccd71f8ce52834b5f411d07245094",
+              "id": "0xc9d26b088c736cf6b9a23ca96b42a9286033aff111d8a55a2f24baf8370c734d",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp
index 1344bdab0eb..1bf65ad85f7 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp
@@ -155,7 +155,7 @@ task 5, lines 73-97:
 Response: {
   "data": {
     "object": {
-      "address": "0x84bade4e1affc5ca662106640dd8d01946dc34586f44685ee43bb9e8f7745491",
+      "address": "0x24b8c04b40a6b2edc6e1e63bc8e542b20550d54bedd0560345623e4ae92e5e9b",
       "asMovePackage": {
         "module": {
           "datatypes": {
@@ -190,7 +190,7 @@ task 6, lines 99-144:
 Response: {
   "data": {
     "object": {
-      "address": "0x84bade4e1affc5ca662106640dd8d01946dc34586f44685ee43bb9e8f7745491",
+      "address": "0x24b8c04b40a6b2edc6e1e63bc8e542b20550d54bedd0560345623e4ae92e5e9b",
       "asMovePackage": {
         "module": {
           "datatypes": {
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp
index 817b0132c97..e027e68e398 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp
@@ -25,19 +25,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x5c053df0f3ff451996d97f922275b6b12236fbb823340f82c46a83bd7ecc32ac",
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0",
+                    "address": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0",
                     "asMovePackage": {
                       "module": {
                         "enum": {
@@ -93,6 +87,12 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "address": "0xd4ed56ea8f35cba56cf2b495b9876631989ca8547d9035971c29072d9b074f46",
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
@@ -125,13 +125,19 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x249e61be7cd170f441f4496b19a5c5fe6ba62c2da158d464822c736f48c30b13",
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0x9e9c3691ade23e01a325d6c1d2174b26361948cdeeccec93f792ed47dd25737d",
                     "asMovePackage": {
                       "module": {
                         "s": {
                           "module": {
                             "package": {
-                              "address": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0"
+                              "address": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0"
                             }
                           },
                           "name": "S",
@@ -186,7 +192,7 @@ Response: {
                         "t": {
                           "module": {
                             "package": {
-                              "address": "0x249e61be7cd170f441f4496b19a5c5fe6ba62c2da158d464822c736f48c30b13"
+                              "address": "0x9e9c3691ade23e01a325d6c1d2174b26361948cdeeccec93f792ed47dd25737d"
                             }
                           },
                           "name": "T",
@@ -216,12 +222,12 @@ Response: {
                                 {
                                   "name": "s",
                                   "type": {
-                                    "repr": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0::m::S",
+                                    "repr": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0::m::S",
                                     "signature": {
                                       "ref": null,
                                       "body": {
                                         "datatype": {
-                                          "package": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0",
+                                          "package": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0",
                                           "module": "m",
                                           "type": "S",
                                           "typeParameters": []
@@ -255,7 +261,7 @@ Response: {
                                 {
                                   "name": "t",
                                   "type": {
-                                    "repr": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0::m::T<0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0::m::S>"
+                                    "repr": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0::m::T<0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0::m::S>"
                                   }
                                 }
                               ]
@@ -268,13 +274,7 @@ Response: {
                 },
                 {
                   "outputState": {
-                    "address": "0x5c053df0f3ff451996d97f922275b6b12236fbb823340f82c46a83bd7ecc32ac",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
+                    "address": "0xd4ed56ea8f35cba56cf2b495b9876631989ca8547d9035971c29072d9b074f46",
                     "asMovePackage": null
                   }
                 }
@@ -297,6 +297,11 @@ Response: {
           "effects": {
             "objectChanges": {
               "nodes": [
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
+                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -317,11 +322,6 @@ Response: {
                     }
                   }
                 },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
                 {
                   "outputState": {
                     "asMovePackage": null
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp
index 579783ff716..b19c3041ef6 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp
@@ -23,6 +23,16 @@ Response: {
           "effects": {
             "objectChanges": {
               "nodes": [
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
+                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -96,16 +106,6 @@ Response: {
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
                 }
               ]
             }
@@ -128,9 +128,7 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "asMovePackage": {
-                      "module": null
-                    }
+                    "asMovePackage": null
                   }
                 },
                 {
@@ -140,7 +138,9 @@ Response: {
                 },
                 {
                   "outputState": {
-                    "asMovePackage": null
+                    "asMovePackage": {
+                      "module": null
+                    }
                   }
                 }
               ]
@@ -166,7 +166,7 @@ Response: {
         "effects",
         "objectChanges",
         "nodes",
-        0,
+        2,
         "outputState",
         "asMovePackage",
         "module",
@@ -189,6 +189,16 @@ Response: {
           "effects": {
             "objectChanges": {
               "nodes": [
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
+                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -264,16 +274,6 @@ Response: {
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
                 }
               ]
             }
@@ -304,6 +304,16 @@ Response: {
           "effects": {
             "objectChanges": {
               "nodes": [
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
+                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -339,16 +349,6 @@ Response: {
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp
index 7c560a5a2be..f9a1ca1af80 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp
@@ -95,13 +95,25 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x143c64eb9d9ba9a32499ffa73ffd8da7d72b21706889c058ca4f71e0d30f2e1f",
+                    "address": "0x462392358fee51d4653c111fe4d925f59a4371b00af01679a8a7cc228fc3382a",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0xfa3b856a3aa0073d07706f12a8d2556ecbd67085073e265470915a6f2d222117",
                     "asMovePackage": {
                       "module": {
                         "function": {
                           "module": {
                             "package": {
-                              "address": "0x143c64eb9d9ba9a32499ffa73ffd8da7d72b21706889c058ca4f71e0d30f2e1f"
+                              "address": "0xfa3b856a3aa0073d07706f12a8d2556ecbd67085073e265470915a6f2d222117"
                             }
                           },
                           "name": "f",
@@ -131,18 +143,6 @@ Response: {
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x96f187369f9ad2d57c174ff79d8f830291b8e0288ac452c880366143fd1a69b8",
-                    "asMovePackage": null
-                  }
                 }
               ]
             }
@@ -175,25 +175,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x96f187369f9ad2d57c174ff79d8f830291b8e0288ac452c880366143fd1a69b8",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0xac73467442fd42c2afe65f52bc3011c63f887fbbe0d41ce241c5b5be43c706b2",
+                    "address": "0x3551d97f7156dbe2f0bdc7f3f1aca8a169bce95dfbdb3410e37ac3ddb40e0c12",
                     "asMovePackage": {
                       "module": {
                         "f": {
                           "module": {
                             "package": {
-                              "address": "0xac73467442fd42c2afe65f52bc3011c63f887fbbe0d41ce241c5b5be43c706b2"
+                              "address": "0x3551d97f7156dbe2f0bdc7f3f1aca8a169bce95dfbdb3410e37ac3ddb40e0c12"
                             }
                           },
                           "name": "f",
@@ -223,7 +211,7 @@ Response: {
                         "g": {
                           "module": {
                             "package": {
-                              "address": "0xac73467442fd42c2afe65f52bc3011c63f887fbbe0d41ce241c5b5be43c706b2"
+                              "address": "0x3551d97f7156dbe2f0bdc7f3f1aca8a169bce95dfbdb3410e37ac3ddb40e0c12"
                             }
                           },
                           "name": "g",
@@ -240,6 +228,18 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "address": "0x462392358fee51d4653c111fe4d925f59a4371b00af01679a8a7cc228fc3382a",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp
index 18857f26ed4..d957a5c7b44 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp
@@ -22,25 +22,25 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20",
+                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0xe31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e",
                     "asMovePackage": {
                       "module": {
                         "name": "m",
                         "package": {
-                          "address": "0x71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20"
+                          "address": "0xe31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e"
                         },
                         "fileFormatVersion": 6,
-                        "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVlccnKvJNsOo9NcTV1wkVZgsA+W/Cs0fay7mS++s9mniAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=",
-                        "disassembly": "// Move bytecode v6\nmodule 71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo<Ty0: drop>(Arg0: u64, Arg1: &Coin<Ty0>): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin<Ty0>)\n\t1: Call coin::value<Ty0>(&Coin<Ty0>): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin<IOTA>): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin<IOTA>)\n\t2: Call foo<IOTA>(u64, &Coin<IOTA>): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin<IOTA>)\n\t5: Call foo<IOTA>(u64, &Coin<IOTA>): u64\n\t6: Mul\n\t7: Ret\n\n}\n}"
+                        "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVl4xF5vxjXWi3YKNOH8Pn8ZOeyP5wu4ebkwHeurPonQm4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=",
+                        "disassembly": "// Move bytecode v6\nmodule e31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo<Ty0: drop>(Arg0: u64, Arg1: &Coin<Ty0>): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin<Ty0>)\n\t1: Call coin::value<Ty0>(&Coin<Ty0>): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin<IOTA>): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin<IOTA>)\n\t2: Call foo<IOTA>(u64, &Coin<IOTA>): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin<IOTA>)\n\t5: Call foo<IOTA>(u64, &Coin<IOTA>): u64\n\t6: Mul\n\t7: Ret\n\n}\n}"
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8",
-                    "asMovePackage": null
-                  }
                 }
               ]
             }
@@ -63,7 +63,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20",
+                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0xe31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e",
                     "asMovePackage": {
                       "all": {
                         "edges": [
@@ -133,12 +139,6 @@ Response: {
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8",
-                    "asMovePackage": null
-                  }
                 }
               ]
             }
@@ -161,7 +161,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20",
+                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0xe31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e",
                     "asMovePackage": {
                       "prefix": {
                         "edges": [
@@ -273,12 +279,6 @@ Response: {
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8",
-                    "asMovePackage": null
-                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp
index 1144928ab75..71276e75a46 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp
@@ -154,19 +154,7 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x1b2bdfde845714fd97810ccbf2f1395b476c4aee939e3f34d2f2e62e20804ed4",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4",
+                    "address": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031",
                     "asMovePackage": {
                       "module": {
                         "struct": {
@@ -192,6 +180,18 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0x8607c0c5eed96e3779f0946da7b802a3ceaa1c91b0f4f1ab6b2cce69c2c01a3c",
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
@@ -224,25 +224,25 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x1b2bdfde845714fd97810ccbf2f1395b476c4aee939e3f34d2f2e62e20804ed4",
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
+                    "address": "0x8607c0c5eed96e3779f0946da7b802a3ceaa1c91b0f4f1ab6b2cce69c2c01a3c",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0x68b559ac138602d697ab1e4122fbcf6a915990ab97383551b2d182118ac39274",
+                    "address": "0xfd3b093e8412e789e3eec6e372a7ba0a77f529970288961bfe2e8469430f656b",
                     "asMovePackage": {
                       "module": {
                         "s": {
                           "module": {
                             "package": {
-                              "address": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4"
+                              "address": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031"
                             }
                           },
                           "name": "S",
@@ -267,7 +267,7 @@ Response: {
                         "t": {
                           "module": {
                             "package": {
-                              "address": "0x68b559ac138602d697ab1e4122fbcf6a915990ab97383551b2d182118ac39274"
+                              "address": "0xfd3b093e8412e789e3eec6e372a7ba0a77f529970288961bfe2e8469430f656b"
                             }
                           },
                           "name": "T",
@@ -294,12 +294,12 @@ Response: {
                             {
                               "name": "s",
                               "type": {
-                                "repr": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4::m::S",
+                                "repr": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031::m::S",
                                 "signature": {
                                   "ref": null,
                                   "body": {
                                     "datatype": {
-                                      "package": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4",
+                                      "package": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031",
                                       "module": "m",
                                       "type": "S",
                                       "typeParameters": []
@@ -328,7 +328,7 @@ Response: {
                             {
                               "name": "t",
                               "type": {
-                                "repr": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4::m::T<0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4::m::S>"
+                                "repr": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031::m::T<0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031::m::S>"
                               }
                             }
                           ]
@@ -462,17 +462,6 @@ Response: {
                   }
                 ]
               },
-              {
-                "name": "CurrencyCreated",
-                "fields": [
-                  {
-                    "name": "decimals",
-                    "type": {
-                      "repr": "u8"
-                    }
-                  }
-                ]
-              },
               {
                 "name": "DenyCapV1",
                 "fields": [
@@ -544,12 +533,6 @@ Response: {
                   "name": "CoinMetadata"
                 }
               },
-              {
-                "cursor": "eyJuIjoiQ3VycmVuY3lDcmVhdGVkIiwiYyI6Mn0",
-                "node": {
-                  "name": "CurrencyCreated"
-                }
-              },
               {
                 "cursor": "eyJuIjoiRGVueUNhcFYxIiwiYyI6Mn0",
                 "node": {
@@ -588,12 +571,6 @@ Response: {
                   "name": "CoinMetadata"
                 }
               },
-              {
-                "cursor": "eyJuIjoiQ3VycmVuY3lDcmVhdGVkIiwiYyI6Mn0",
-                "node": {
-                  "name": "CurrencyCreated"
-                }
-              },
               {
                 "cursor": "eyJuIjoiRGVueUNhcFYxIiwiYyI6Mn0",
                 "node": {
@@ -634,9 +611,9 @@ Response: {
                 }
               },
               {
-                "cursor": "eyJuIjoiQ3VycmVuY3lDcmVhdGVkIiwiYyI6Mn0",
+                "cursor": "eyJuIjoiRGVueUNhcFYxIiwiYyI6Mn0",
                 "node": {
-                  "name": "CurrencyCreated"
+                  "name": "DenyCapV1"
                 }
               }
             ],
@@ -654,15 +631,15 @@ Response: {
                 }
               },
               {
-                "cursor": "eyJuIjoiQ3VycmVuY3lDcmVhdGVkIiwiYyI6Mn0",
+                "cursor": "eyJuIjoiRGVueUNhcFYxIiwiYyI6Mn0",
                 "node": {
-                  "name": "CurrencyCreated"
+                  "name": "DenyCapV1"
                 }
               },
               {
-                "cursor": "eyJuIjoiRGVueUNhcFYxIiwiYyI6Mn0",
+                "cursor": "eyJuIjoiUmVndWxhdGVkQ29pbk1ldGFkYXRhIiwiYyI6Mn0",
                 "node": {
-                  "name": "DenyCapV1"
+                  "name": "RegulatedCoinMetadata"
                 }
               }
             ],
@@ -679,12 +656,6 @@ Response: {
                   "name": "CoinMetadata"
                 }
               },
-              {
-                "cursor": "eyJuIjoiQ3VycmVuY3lDcmVhdGVkIiwiYyI6Mn0",
-                "node": {
-                  "name": "CurrencyCreated"
-                }
-              },
               {
                 "cursor": "eyJuIjoiRGVueUNhcFYxIiwiYyI6Mn0",
                 "node": {
@@ -732,9 +703,9 @@ Response: {
           "suffixAll": {
             "edges": [
               {
-                "cursor": "eyJuIjoiQ3VycmVuY3lDcmVhdGVkIiwiYyI6Mn0",
+                "cursor": "eyJuIjoiQ29pbk1ldGFkYXRhIiwiYyI6Mn0",
                 "node": {
-                  "name": "CurrencyCreated"
+                  "name": "CoinMetadata"
                 }
               },
               {
@@ -769,12 +740,6 @@ Response: {
                   "name": "CoinMetadata"
                 }
               },
-              {
-                "cursor": "eyJuIjoiQ3VycmVuY3lDcmVhdGVkIiwiYyI6Mn0",
-                "node": {
-                  "name": "CurrencyCreated"
-                }
-              },
               {
                 "cursor": "eyJuIjoiRGVueUNhcFYxIiwiYyI6Mn0",
                 "node": {
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/types.exp b/crates/iota-graphql-e2e-tests/tests/packages/types.exp
index a1f6e28517d..00b98646d8f 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/types.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/types.exp
@@ -275,7 +275,7 @@ Response: {
   "data": null,
   "errors": [
     {
-      "message": "Internal error occurred while processing request: Error calculating layout for 0x317d8c42fd69e52da8a784d535b1cf53b9de0f7ec68ca200743d9a31e47f4771::m::S1<u32>: Type layout nesting exceeded limit of 128",
+      "message": "Internal error occurred while processing request: Error calculating layout for 0x86b00ba6b96afd850ab1f922fbbb2f2cfb13af2768146e4d4300e7595a3f1650::m::S1<u32>: Type layout nesting exceeded limit of 128",
       "locations": [
         {
           "line": 4,
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp
index f3a09bea180..7c5d3e69cf5 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp
@@ -31,14 +31,14 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
             "version": 1
           }
         ]
       }
     },
     "firstPackage": {
-      "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+      "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
       "version": 1,
       "module": {
         "functions": {
@@ -52,7 +52,7 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
             "version": 1
           }
         ]
@@ -81,7 +81,7 @@ Response: {
           "version": 1
         },
         {
-          "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
           "version": 1
         }
       ]
@@ -120,18 +120,18 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
             "version": 1
           },
           {
-            "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+            "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
             "version": 2
           }
         ]
       }
     },
     "firstPackage": {
-      "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+      "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
       "version": 1,
       "module": {
         "functions": {
@@ -145,11 +145,11 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
             "version": 1
           },
           {
-            "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+            "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
             "version": 2
           }
         ]
@@ -178,11 +178,11 @@ Response: {
           "version": 1
         },
         {
-          "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
           "version": 1
         },
         {
-          "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
           "version": 2
         }
       ]
@@ -224,22 +224,22 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
             "version": 1
           },
           {
-            "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+            "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
             "version": 2
           },
           {
-            "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853",
+            "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
             "version": 3
           }
         ]
       }
     },
     "firstPackage": {
-      "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+      "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
       "version": 1,
       "module": {
         "functions": {
@@ -253,15 +253,15 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
             "version": 1
           },
           {
-            "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+            "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
             "version": 2
           },
           {
-            "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853",
+            "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
             "version": 3
           }
         ]
@@ -290,15 +290,15 @@ Response: {
           "version": 1
         },
         {
-          "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
           "version": 1
         },
         {
-          "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
           "version": 2
         },
         {
-          "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853",
+          "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
           "version": 3
         }
       ]
@@ -715,7 +715,7 @@ Response: {
     "after": {
       "nodes": [
         {
-          "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
           "version": 2,
           "previousTransactionBlock": {
             "effects": {
@@ -726,7 +726,7 @@ Response: {
           }
         },
         {
-          "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853",
+          "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
           "version": 3,
           "previousTransactionBlock": {
             "effects": {
@@ -741,7 +741,7 @@ Response: {
     "between": {
       "nodes": [
         {
-          "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
           "version": 2,
           "previousTransactionBlock": {
             "effects": {
@@ -763,15 +763,15 @@ Response: {
     "packageVersions": {
       "nodes": [
         {
-          "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
           "version": 1
         },
         {
-          "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
           "version": 2
         },
         {
-          "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853",
+          "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
           "version": 3
         }
       ]
@@ -779,11 +779,11 @@ Response: {
     "after": {
       "nodes": [
         {
-          "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
           "version": 2
         },
         {
-          "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853",
+          "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
           "version": 3
         }
       ]
@@ -791,11 +791,11 @@ Response: {
     "before": {
       "nodes": [
         {
-          "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773",
+          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
           "version": 1
         },
         {
-          "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
           "version": 2
         }
       ]
@@ -803,7 +803,7 @@ Response: {
     "between": {
       "nodes": [
         {
-          "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82",
+          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
           "version": 2
         }
       ]
diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp
index 58869ad01d0..bdf5150c3c1 100644
--- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp
@@ -48,13 +48,13 @@ Response: {
                 "edges": [
                   {
                     "node": {
-                      "amount": "4000"
+                      "amount": "3000"
                     },
                     "cursor": "eyJpIjowLCJjIjoyfQ"
                   },
                   {
                     "node": {
-                      "amount": "1000"
+                      "amount": "5000"
                     },
                     "cursor": "eyJpIjoxLCJjIjoyfQ"
                   },
@@ -66,19 +66,19 @@ Response: {
                   },
                   {
                     "node": {
-                      "amount": "2000"
+                      "amount": "1000"
                     },
                     "cursor": "eyJpIjozLCJjIjoyfQ"
                   },
                   {
                     "node": {
-                      "amount": "5000"
+                      "amount": "4000"
                     },
                     "cursor": "eyJpIjo0LCJjIjoyfQ"
                   },
                   {
                     "node": {
-                      "amount": "3000"
+                      "amount": "2000"
                     },
                     "cursor": "eyJpIjo1LCJjIjoyfQ"
                   }
@@ -111,13 +111,13 @@ Response: {
                 "edges": [
                   {
                     "node": {
-                      "amount": "2000"
+                      "amount": "1000"
                     },
                     "cursor": "eyJpIjozLCJjIjoxfQ"
                   },
                   {
                     "node": {
-                      "amount": "5000"
+                      "amount": "4000"
                     },
                     "cursor": "eyJpIjo0LCJjIjoxfQ"
                   }
@@ -150,13 +150,13 @@ Response: {
                 "edges": [
                   {
                     "node": {
-                      "amount": "4000"
+                      "amount": "3000"
                     },
                     "cursor": "eyJpIjowLCJjIjoxfQ"
                   },
                   {
                     "node": {
-                      "amount": "1000"
+                      "amount": "5000"
                     },
                     "cursor": "eyJpIjoxLCJjIjoxfQ"
                   },
diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp
index 8498f8bf4d7..845e5172804 100644
--- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp
@@ -65,7 +65,7 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "9pCyhXkr2tCkQh57rhbAEgELoLvUiiSN9M8gPqnn724p",
+          "digest": "6xEQFCm27zfeWp5oqLAkeZxrUeMTVY3SLqcVdTYvBR2f",
           "effects": {
             "dependencies": {
               "pageInfo": {
@@ -78,25 +78,7 @@ Response: {
                 {
                   "cursor": "eyJpIjowLCJjIjoxfQ",
                   "node": {
-                    "digest": "C3fuzD6g6RtyaXcFfGepQcgNy5a2rxpLcepvvGbYKVVA",
-                    "kind": {
-                      "__typename": "ProgrammableTransactionBlock",
-                      "transactions": {
-                        "nodes": [
-                          {},
-                          {
-                            "module": "package",
-                            "functionName": "make_immutable"
-                          }
-                        ]
-                      }
-                    }
-                  }
-                },
-                {
-                  "cursor": "eyJpIjoxLCJjIjoxfQ",
-                  "node": {
-                    "digest": "FpvfXRTXL67N8gJukHxVLVBJ45ao2ZCgyNLbMZQgvWeh",
+                    "digest": "3kQVhcCx8LdZKbsgAHdGfGZtAJzTcWe7gktakzXweCAW",
                     "kind": {
                       "__typename": "ProgrammableTransactionBlock",
                       "transactions": {
@@ -121,6 +103,24 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "cursor": "eyJpIjoxLCJjIjoxfQ",
+                  "node": {
+                    "digest": "9u2qUK8xcpUd5Xy59cDTRZugjwETWrVvKFgBpPDrpnDy",
+                    "kind": {
+                      "__typename": "ProgrammableTransactionBlock",
+                      "transactions": {
+                        "nodes": [
+                          {},
+                          {
+                            "module": "package",
+                            "functionName": "make_immutable"
+                          }
+                        ]
+                      }
+                    }
+                  }
                 }
               ]
             }
@@ -138,7 +138,7 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "9pCyhXkr2tCkQh57rhbAEgELoLvUiiSN9M8gPqnn724p",
+          "digest": "6xEQFCm27zfeWp5oqLAkeZxrUeMTVY3SLqcVdTYvBR2f",
           "effects": {
             "dependencies": {
               "pageInfo": {
@@ -151,26 +151,15 @@ Response: {
                 {
                   "cursor": "eyJpIjoxLCJjIjoxfQ",
                   "node": {
-                    "digest": "FpvfXRTXL67N8gJukHxVLVBJ45ao2ZCgyNLbMZQgvWeh",
+                    "digest": "9u2qUK8xcpUd5Xy59cDTRZugjwETWrVvKFgBpPDrpnDy",
                     "kind": {
                       "__typename": "ProgrammableTransactionBlock",
                       "transactions": {
                         "nodes": [
+                          {},
                           {
-                            "module": "M1",
-                            "functionName": "sum"
-                          },
-                          {
-                            "module": "M1",
-                            "functionName": "sum"
-                          },
-                          {
-                            "module": "M1",
-                            "functionName": "sum"
-                          },
-                          {
-                            "module": "M1",
-                            "functionName": "create"
+                            "module": "package",
+                            "functionName": "make_immutable"
                           }
                         ]
                       }
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp
index 88d6cb566fd..9e307aa9214 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp
@@ -30,7 +30,7 @@ Response: {
     "c0": {
       "nodes": [
         {
-          "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm",
+          "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND",
           "kind": {
             "__typename": "GenesisTransaction"
           }
@@ -46,7 +46,7 @@ Response: {
           }
         },
         {
-          "digest": "BVMk8VzSAJQwwW57SCSRdSBFxHPjbsLLzRw4ynJj2gLF",
+          "digest": "8T9Mk4z2HuVb8bFtgVEXhqCemFRGxG1Fh6qhHe4j4cZ4",
           "kind": {
             "__typename": "ProgrammableTransactionBlock"
           }
@@ -87,7 +87,7 @@ Response: {
       "transactionBlocks": {
         "nodes": [
           {
-            "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm",
+            "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND",
             "kind": {
               "__typename": "GenesisTransaction"
             }
@@ -105,7 +105,7 @@ Response: {
             }
           },
           {
-            "digest": "BVMk8VzSAJQwwW57SCSRdSBFxHPjbsLLzRw4ynJj2gLF",
+            "digest": "8T9Mk4z2HuVb8bFtgVEXhqCemFRGxG1Fh6qhHe4j4cZ4",
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
             }
@@ -154,7 +154,7 @@ Response: {
           "transactionBlocks": {
             "nodes": [
               {
-                "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm",
+                "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND",
                 "kind": {
                   "__typename": "GenesisTransaction"
                 }
@@ -172,7 +172,7 @@ Response: {
                 }
               },
               {
-                "digest": "BVMk8VzSAJQwwW57SCSRdSBFxHPjbsLLzRw4ynJj2gLF",
+                "digest": "8T9Mk4z2HuVb8bFtgVEXhqCemFRGxG1Fh6qhHe4j4cZ4",
                 "kind": {
                   "__typename": "ProgrammableTransactionBlock"
                 }
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp
index c9a9b9ab924..0da5cd18e7e 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp
@@ -25,7 +25,7 @@ Response: {
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0xba8d4a8da99b1a4d634efec621be8572f2ef2ef03409d2b673e58c7b9c7691de::m::boom' (instruction 1), abort code: 42"
+            "errors": "Error in 1st command, from '0xf06caa78e7bd429d6a61227617f2ee14062dfdfac7e493dddffdf03bbd9f33e5::m::boom' (instruction 1), abort code: 42"
           }
         }
       ]
@@ -54,7 +54,7 @@ Response: {
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 3rd command, from '0xba8d4a8da99b1a4d634efec621be8572f2ef2ef03409d2b673e58c7b9c7691de::m::boom' (instruction 1), abort code: 42"
+            "errors": "Error in 3rd command, from '0xf06caa78e7bd429d6a61227617f2ee14062dfdfac7e493dddffdf03bbd9f33e5::m::boom' (instruction 1), abort code: 42"
           }
         }
       ]
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp
index 272ac52ad2c..5b2368faee8 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp
@@ -60,7 +60,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "E3fHXmQFb8QHghYBJse4k4F2HLEZTACD2XMGw7UHec1p",
+          "digest": "5quwPQw3bKJhepq8SRWrsBjHB5YUMdzDg66tqzHxoLrS",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -68,7 +68,7 @@ Response: {
           }
         },
         {
-          "digest": "D5fnktTARqHzLNYKKpFN7K3U1VbEGNDjWo5vDy7NT14p",
+          "digest": "C5Dy4KHYBJLfCA9BHt6JjtAQMTR2dtfueJX4QQk1Utjk",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -76,7 +76,7 @@ Response: {
           }
         },
         {
-          "digest": "7yrviMHuiaKBmDxqyb7Byzh4Tv735x4GDRA1i5NtcjpN",
+          "digest": "72NoXbuc6fNyU1bavVaBgnQXQmXEXErAaRRQ26R5nj8M",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -84,7 +84,7 @@ Response: {
           }
         },
         {
-          "digest": "D9nqoByPvocsTQonrtydYMZrUSH75qB7ro2k3oGP4Huo",
+          "digest": "2jdSf9oiVKpnXnBHStYRGN9MPV9RwjSuBCCuwKQpxmm1",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -92,7 +92,7 @@ Response: {
           }
         },
         {
-          "digest": "DsgWBPabTgUShBimgoTSF1s41NGpMr4r5YTHps7Hdhv5",
+          "digest": "5pT9hzbvWygWkrK39tEQxzEMqrAxi7ev3H5TQHSt4R5n",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -117,7 +117,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "E3fHXmQFb8QHghYBJse4k4F2HLEZTACD2XMGw7UHec1p",
+          "digest": "5quwPQw3bKJhepq8SRWrsBjHB5YUMdzDg66tqzHxoLrS",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -142,7 +142,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "D5fnktTARqHzLNYKKpFN7K3U1VbEGNDjWo5vDy7NT14p",
+          "digest": "C5Dy4KHYBJLfCA9BHt6JjtAQMTR2dtfueJX4QQk1Utjk",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -167,7 +167,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "7yrviMHuiaKBmDxqyb7Byzh4Tv735x4GDRA1i5NtcjpN",
+          "digest": "72NoXbuc6fNyU1bavVaBgnQXQmXEXErAaRRQ26R5nj8M",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -192,7 +192,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "D9nqoByPvocsTQonrtydYMZrUSH75qB7ro2k3oGP4Huo",
+          "digest": "2jdSf9oiVKpnXnBHStYRGN9MPV9RwjSuBCCuwKQpxmm1",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -217,7 +217,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "DsgWBPabTgUShBimgoTSF1s41NGpMr4r5YTHps7Hdhv5",
+          "digest": "5pT9hzbvWygWkrK39tEQxzEMqrAxi7ev3H5TQHSt4R5n",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp
index 7673cae8f34..1607085f928 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp
@@ -20,12 +20,12 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "EEvFNycnDYWz8o7ekDmsGLj3BHnXndRaMguMbRA1x1Qb",
+          "digest": "xoNEJra4pzubo6ZshKbmatUNdtQw5yodm3MiVwrdreL",
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
           },
           "signatures": [
-            "ANWEFJzs360MMlnYx5pPnDzQ1CM1NGfyatQVhLLCQ7QIAK781x1TUi3558YCbamgg/hVy6RYmEnDX40u0PsxJQB/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
+            "ABtRRE4LuNY/vOLaj9XJcjv8vV8aucqvALmYFf60tNVL20nikRfk30gr9gsSx8ivFmqhekz/Wz5r5wJtILY39gp/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
           ],
           "gasInput": {
             "gasSponsor": {
@@ -34,7 +34,7 @@ Response: {
             "gasPayment": {
               "nodes": [
                 {
-                  "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af"
+                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
                 }
               ]
             },
@@ -96,7 +96,7 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm"
+                  "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND"
                 }
               ]
             },
@@ -116,37 +116,37 @@ Response: {
             "objectChanges": {
               "nodes": [
                 {
-                  "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                  "idCreated": false,
+                  "address": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1",
+                  "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                    "digest": "5KGPZwdxn3xtGaHjyTW2Pp2jRsfdPL75MWxWFgNUQ3S7"
+                    "address": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1",
+                    "digest": "3A77Cb2xTX17JubEAtjvWnAZkgKjEZexvEWtic7yh1nM"
                   }
                 },
                 {
-                  "address": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1",
+                  "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1",
-                    "digest": "AWnh5JWaCiBBLzYrHDydq7muhGxyvCrx8qXAVwAiGuFW"
+                    "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
+                    "digest": "ABaZCf831Gr3LoXf7QNrYvNN5wsTvXqsu9BLpfgUsXu4"
                   }
                 },
                 {
-                  "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5",
-                  "idCreated": true,
+                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                  "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5",
-                    "digest": "9L69ChGvUnBAkhxeYJrfrBKTvh6KYxzu4MSvLDxwHtJB"
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "digest": "5fGzTnViPxa9jSN8P1Hzn3Xbno2tSDY4K15anXeNCDxb"
                   }
                 }
               ]
             },
             "gasEffects": {
               "gasObject": {
-                "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af"
+                "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
               },
               "gasSummary": {
                 "computationCost": "1000000",
@@ -163,7 +163,7 @@ Response: {
               "sequenceNumber": 1
             },
             "transactionBlock": {
-              "digest": "EEvFNycnDYWz8o7ekDmsGLj3BHnXndRaMguMbRA1x1Qb"
+              "digest": "xoNEJra4pzubo6ZshKbmatUNdtQw5yodm3MiVwrdreL"
             }
           },
           "expiration": null
@@ -190,12 +190,12 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "9XhEpQ8YEnaHJiYBmTdVaHH1kHBCuv5Nn9gH6MNQhZQW",
+          "digest": "AgH8BgGusBWwE1jYfd1btoSW2PU6w45x39F9xHZo3GJt",
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
           },
           "signatures": [
-            "AKWRFhFX5MsJsB24J2geLc5QYCeBO8AwcMdKyb48mSPKaQKMbsEZ2Y9xTLmgVPHU4S7/SlEzrSviJUXPHTNBdwZ/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
+            "AJN75/ODnrUhvaFqCM1wJLZ1z0veccwmyF4ocgAFhw6wCDv3iBIHVq4p6NZp3unUhZHc+6B10iTEJfHA1lzCQg9/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
           ],
           "gasInput": {
             "gasSponsor": {
@@ -204,7 +204,7 @@ Response: {
             "gasPayment": {
               "nodes": [
                 {
-                  "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af"
+                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
                 }
               ]
             },
@@ -219,21 +219,21 @@ Response: {
                   "cursor": "eyJpIjowLCJjIjoyfQ",
                   "node": {
                     "__typename": "OwnedOrImmutable",
-                    "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5",
+                    "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
                     "version": 2,
-                    "digest": "9L69ChGvUnBAkhxeYJrfrBKTvh6KYxzu4MSvLDxwHtJB",
+                    "digest": "ABaZCf831Gr3LoXf7QNrYvNN5wsTvXqsu9BLpfgUsXu4",
                     "object": {
-                      "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5",
+                      "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
                       "version": 2,
-                      "digest": "9L69ChGvUnBAkhxeYJrfrBKTvh6KYxzu4MSvLDxwHtJB",
+                      "digest": "ABaZCf831Gr3LoXf7QNrYvNN5wsTvXqsu9BLpfgUsXu4",
                       "asMoveObject": {
                         "contents": {
                           "type": {
                             "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::package::UpgradeCap"
                           },
                           "json": {
-                            "id": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5",
-                            "package": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1",
+                            "id": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
+                            "package": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1",
                             "version": "1",
                             "policy": 0
                           }
@@ -315,7 +315,7 @@ Response: {
                       "0x0000000000000000000000000000000000000000000000000000000000000001",
                       "0x0000000000000000000000000000000000000000000000000000000000000002"
                     ],
-                    "currentPackage": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1",
+                    "currentPackage": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1",
                     "upgradeTicket": {
                       "__typename": "Result",
                       "cmd": 0,
@@ -367,10 +367,10 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm"
+                  "digest": "xoNEJra4pzubo6ZshKbmatUNdtQw5yodm3MiVwrdreL"
                 },
                 {
-                  "digest": "EEvFNycnDYWz8o7ekDmsGLj3BHnXndRaMguMbRA1x1Qb"
+                  "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND"
                 }
               ]
             },
@@ -390,37 +390,37 @@ Response: {
             "objectChanges": {
               "nodes": [
                 {
-                  "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
+                  "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
                   "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                    "digest": "GZ919iJ6Gwv6XsyWzTh9uHbwWTHz7XeJ2uMfYHe5D5HP"
+                    "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
+                    "digest": "8rbnRGi5fYy4s7VfnxcqzyMCu3vF55zxZNn5Y3h4Csn4"
                   }
                 },
                 {
-                  "address": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434",
-                  "idCreated": true,
+                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                  "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434",
-                    "digest": "5vGPcn2fi3JKnAcU4SY3CcaSRQn3ydaHKPJd37T8vE8Q"
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "digest": "2uCSchvi68T8Hw3xdwCeFZYtfeMyxjnhtbdioRzpiRv8"
                   }
                 },
                 {
-                  "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5",
-                  "idCreated": false,
+                  "address": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
+                  "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5",
-                    "digest": "F8bm8Wy2a1cVmrksJ8pTi2puh1xQeu7JWPeqjVQ3CkvK"
+                    "address": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
+                    "digest": "9qsKsqZojAuvxNn9xZEeMsCgWQou8hERMoUxhSkG9uCR"
                   }
                 }
               ]
             },
             "gasEffects": {
               "gasObject": {
-                "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af"
+                "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
               },
               "gasSummary": {
                 "computationCost": "1000000",
@@ -437,7 +437,7 @@ Response: {
               "sequenceNumber": 2
             },
             "transactionBlock": {
-              "digest": "9XhEpQ8YEnaHJiYBmTdVaHH1kHBCuv5Nn9gH6MNQhZQW"
+              "digest": "AgH8BgGusBWwE1jYfd1btoSW2PU6w45x39F9xHZo3GJt"
             }
           },
           "expiration": null
@@ -482,12 +482,12 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "7ScQwMi7B9V5EgXAZMJpmTWztT4fZJN7BFWStEkW69Cr",
+          "digest": "2WYXjpnUP16xACgtrwK93dQUb1f3aLkXAKHmwcnzKhi4",
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
           },
           "signatures": [
-            "ACZTcpYTyN06yg++IS64MJ/VfRGE1mRSQRa43uCpXP+U6c0mgtyl/dvFVeeUOPMd5XroJVJhzNs/ZBxfPdS+6AZ/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
+            "ADkuCJnIE99Yo9aIJMUSzk8CYbu4wL/4vnbx6au/xbLcbcPzaC0TbXdSnkK4eucH1DH2Kn8J8eCy+41j0n2fQwJ/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
           ],
           "gasInput": {
             "gasSponsor": {
@@ -496,7 +496,7 @@ Response: {
             "gasPayment": {
               "nodes": [
                 {
-                  "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af"
+                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
                 }
               ]
             },
@@ -591,7 +591,7 @@ Response: {
                   "cursor": "eyJpIjozLCJjIjozfQ",
                   "node": {
                     "__typename": "MoveCallTransaction",
-                    "package": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434",
+                    "package": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
                     "module": "m",
                     "functionName": "new",
                     "typeArguments": [],
@@ -615,7 +615,7 @@ Response: {
                       ],
                       "return": [
                         {
-                          "repr": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1::m::Foo"
+                          "repr": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1::m::Foo"
                         }
                       ]
                     }
@@ -642,7 +642,7 @@ Response: {
                   "cursor": "eyJpIjo1LCJjIjozfQ",
                   "node": {
                     "__typename": "MoveCallTransaction",
-                    "package": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434",
+                    "package": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
                     "module": "m",
                     "functionName": "new",
                     "typeArguments": [],
@@ -666,7 +666,7 @@ Response: {
                       ],
                       "return": [
                         {
-                          "repr": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1::m::Foo"
+                          "repr": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1::m::Foo"
                         }
                       ]
                     }
@@ -676,7 +676,7 @@ Response: {
                   "cursor": "eyJpIjo2LCJjIjozfQ",
                   "node": {
                     "__typename": "MoveCallTransaction",
-                    "package": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434",
+                    "package": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
                     "module": "m",
                     "functionName": "burn",
                     "typeArguments": [],
@@ -692,7 +692,7 @@ Response: {
                       "typeParameters": [],
                       "parameters": [
                         {
-                          "repr": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1::m::Foo"
+                          "repr": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1::m::Foo"
                         }
                       ],
                       "return": []
@@ -744,10 +744,10 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "5yUiJzLrCmBipGvjVBovnEGgXF29jwam3JYhnYtkPEsy"
+                  "digest": "AgH8BgGusBWwE1jYfd1btoSW2PU6w45x39F9xHZo3GJt"
                 },
                 {
-                  "digest": "9XhEpQ8YEnaHJiYBmTdVaHH1kHBCuv5Nn9gH6MNQhZQW"
+                  "digest": "Ca4s1y2HfEqRZx1BQjxXFJGcWPunaq2yNHH7G7fKk4Hs"
                 }
               ]
             },
@@ -767,21 +767,21 @@ Response: {
             "objectChanges": {
               "nodes": [
                 {
-                  "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                  "idCreated": false,
+                  "address": "0x1090fa87714553c0f9854ef242a19aa66369c8a8dbae99e5c6dfb5095094386f",
+                  "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                    "digest": "HFmgTgnCkfsPBjztNYZfFrb1RMGGoq14RQH2zzd17Y8D",
+                    "address": "0x1090fa87714553c0f9854ef242a19aa66369c8a8dbae99e5c6dfb5095094386f",
+                    "digest": "6r8rQxWAASxqD2zK8aqH9EfiHQ3NgDBVbYxMSnG8nSDj",
                     "asMoveObject": {
                       "contents": {
                         "type": {
                           "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
+                          "id": "0x1090fa87714553c0f9854ef242a19aa66369c8a8dbae99e5c6dfb5095094386f",
                           "balance": {
-                            "value": "299999982082400"
+                            "value": "2000"
                           }
                         }
                       }
@@ -789,21 +789,21 @@ Response: {
                   }
                 },
                 {
-                  "address": "0xb076b3d51ddcb3c3bfa23c0d3ee2f1cca08e77c2546d2057c82275dbbc8dffff",
-                  "idCreated": true,
+                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                  "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xb076b3d51ddcb3c3bfa23c0d3ee2f1cca08e77c2546d2057c82275dbbc8dffff",
-                    "digest": "BkvCYiVf16JB68DSUSD2Q9WnxAxZKzVv1akmhS2S7rMd",
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "digest": "AwMT3FfsuMbK9MrC8j1C6hkNgpMHPcLcL5ohft7xG9cC",
                     "asMoveObject": {
                       "contents": {
                         "type": {
                           "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0xb076b3d51ddcb3c3bfa23c0d3ee2f1cca08e77c2546d2057c82275dbbc8dffff",
+                          "id": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
                           "balance": {
-                            "value": "2000"
+                            "value": "299999982082400"
                           }
                         }
                       }
@@ -811,19 +811,19 @@ Response: {
                   }
                 },
                 {
-                  "address": "0xfc0517b5eab059e852955967e0fd4fd317548abc3c0aaed13a339ef1d883748f",
+                  "address": "0xab4d6ae2184cbeb7110e0ece9e0124e1376d165325e83c16bb7452f5e8bded22",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xfc0517b5eab059e852955967e0fd4fd317548abc3c0aaed13a339ef1d883748f",
-                    "digest": "4yQEGwrULKp2tW4My8idvVNE9ZjPwbqGXB78LZZzzmLK",
+                    "address": "0xab4d6ae2184cbeb7110e0ece9e0124e1376d165325e83c16bb7452f5e8bded22",
+                    "digest": "7MMd2gCVXjGwXoT1nGjrAo6bxGtc3HYwBVFAMRZE3eMo",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1::m::Foo"
+                          "repr": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1::m::Foo"
                         },
                         "json": {
-                          "id": "0xfc0517b5eab059e852955967e0fd4fd317548abc3c0aaed13a339ef1d883748f",
+                          "id": "0xab4d6ae2184cbeb7110e0ece9e0124e1376d165325e83c16bb7452f5e8bded22",
                           "xs": [
                             "42",
                             "43"
@@ -837,7 +837,7 @@ Response: {
             },
             "gasEffects": {
               "gasObject": {
-                "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af"
+                "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
               },
               "gasSummary": {
                 "computationCost": "1000000",
@@ -854,7 +854,7 @@ Response: {
               "sequenceNumber": 3
             },
             "transactionBlock": {
-              "digest": "7ScQwMi7B9V5EgXAZMJpmTWztT4fZJN7BFWStEkW69Cr"
+              "digest": "2WYXjpnUP16xACgtrwK93dQUb1f3aLkXAKHmwcnzKhi4"
             }
           },
           "expiration": null
@@ -881,12 +881,12 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "7dyDFF4HApyHC4NUYRykLWRBGcZkEBJPFKTWR7NGnqbf",
+          "digest": "EJbEqDkN7RC4r4L1pLgDaRtQson6iLErFyhzPiqeLjp9",
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
           },
           "signatures": [
-            "APsRYujXA9MTo750KANcVG2sEvE+mMWhO0AMmgUmPXykaI8LSKjfTyg1dkdpGbRIMviGdNH6EjFt4JK87KDIywR/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
+            "ANoL0Is/qSCuhtKASy5T+CuiJHI7C7SvGbEDyJXJHQjFGHRigrkf3L05lzQZdupY8rgF6gcs8T0Naa28fI2Uigl/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
           ],
           "gasInput": {
             "gasSponsor": {
@@ -895,7 +895,7 @@ Response: {
             "gasPayment": {
               "nodes": [
                 {
-                  "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af"
+                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
                 }
               ]
             },
@@ -942,7 +942,7 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "7ScQwMi7B9V5EgXAZMJpmTWztT4fZJN7BFWStEkW69Cr"
+                  "digest": "2WYXjpnUP16xACgtrwK93dQUb1f3aLkXAKHmwcnzKhi4"
                 }
               ]
             },
@@ -962,19 +962,19 @@ Response: {
             "objectChanges": {
               "nodes": [
                 {
-                  "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
+                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
                   "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af",
-                    "digest": "8cZJp6TcRA3d36RZYYAAayxEkrvkafwzC5FQsX6gxZUr"
+                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "digest": "HUSswFqFi6NnnmWmBK8c7x4Cbps4Gq9GetTszchYqqjt"
                   }
                 }
               ]
             },
             "gasEffects": {
               "gasObject": {
-                "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af"
+                "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
               },
               "gasSummary": {
                 "computationCost": "1000000",
@@ -991,7 +991,7 @@ Response: {
               "sequenceNumber": 4
             },
             "transactionBlock": {
-              "digest": "7dyDFF4HApyHC4NUYRykLWRBGcZkEBJPFKTWR7NGnqbf"
+              "digest": "EJbEqDkN7RC4r4L1pLgDaRtQson6iLErFyhzPiqeLjp9"
             }
           },
           "expiration": null
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp
index ea36ea21514..275bd73f6cf 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp
@@ -19,7 +19,7 @@ Response: {
           "json": {
             "id": "0x0000000000000000000000000000000000000000000000000000000000000008",
             "inner": {
-              "id": "0x3ea5f6c162a25be99c5853e0d393a986af600b290c1c48ce6896602d36115385",
+              "id": "0xeff71a60350f0dfb07d6197495db2804e7fee007f96fbeb2843c9b153fe7443c",
               "version": "1"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp
index b6339352d48..0c7ece3e80a 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -124,7 +124,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH",
+            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -135,7 +135,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj",
+            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -163,7 +163,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH",
+            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -191,7 +191,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy",
+            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -219,7 +219,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj",
+            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -230,7 +230,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy",
+            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -258,7 +258,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T",
+            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -286,7 +286,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T",
+            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp
index 5db8f2df403..c9e0a9a0332 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "CG7koKCHyRYi8AFPnKoKVBQkM8MJzSmCnWwM2XGRCbab",
+            "digest": "Gk2mn6MiSwKWaRE66dW97XVto1tzxLFDQ3enrv9Ybzqv",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -124,7 +124,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "CG7koKCHyRYi8AFPnKoKVBQkM8MJzSmCnWwM2XGRCbab",
+            "digest": "Gk2mn6MiSwKWaRE66dW97XVto1tzxLFDQ3enrv9Ybzqv",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -135,7 +135,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7ym2EAwHQ6uwKP6Kf8gvmo8oJGoGvaiNKNH9iQdAHUmq",
+            "digest": "6awQiVBXfkr37BbH5qJj6nioXbKeeNKYLp71UYfrPNbp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -163,7 +163,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "4sC14KitR3PTk2aGHS8zdGRTZcruQSweWXY1P7mfYTLW",
+            "digest": "AsNZ5f3WM33YGoERq1UiHKT4JdDxsjhHFzgbUXfu1Fjp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp
index a7fc41d8452..c3ea27dcc1b 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -107,7 +107,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "CG7koKCHyRYi8AFPnKoKVBQkM8MJzSmCnWwM2XGRCbab",
+            "digest": "Gk2mn6MiSwKWaRE66dW97XVto1tzxLFDQ3enrv9Ybzqv",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7ym2EAwHQ6uwKP6Kf8gvmo8oJGoGvaiNKNH9iQdAHUmq",
+            "digest": "6awQiVBXfkr37BbH5qJj6nioXbKeeNKYLp71UYfrPNbp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -129,7 +129,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "2A5RGEPYgUn7GbamdVBXWLzokKQStup1DNzqkxQqqmgW",
+            "digest": "9V6jsMK9XLyNRZP2FibbzyRKWEcY4Tt65h8agoWzHRZP",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -140,7 +140,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "7WTn3jXerZU2jTq9JWjgS75U2w4ayK5eNzUxegW4qpTq",
+            "digest": "H8KAyZZPYaCek4Re3qMhEEnU3y4B9zY7Lp37wvLEWEGb",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -168,7 +168,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -196,7 +196,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "CG7koKCHyRYi8AFPnKoKVBQkM8MJzSmCnWwM2XGRCbab",
+            "digest": "Gk2mn6MiSwKWaRE66dW97XVto1tzxLFDQ3enrv9Ybzqv",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -224,7 +224,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7ym2EAwHQ6uwKP6Kf8gvmo8oJGoGvaiNKNH9iQdAHUmq",
+            "digest": "6awQiVBXfkr37BbH5qJj6nioXbKeeNKYLp71UYfrPNbp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -268,7 +268,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "2A5RGEPYgUn7GbamdVBXWLzokKQStup1DNzqkxQqqmgW",
+            "digest": "9V6jsMK9XLyNRZP2FibbzyRKWEcY4Tt65h8agoWzHRZP",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -279,7 +279,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "7WTn3jXerZU2jTq9JWjgS75U2w4ayK5eNzUxegW4qpTq",
+            "digest": "H8KAyZZPYaCek4Re3qMhEEnU3y4B9zY7Lp37wvLEWEGb",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -333,7 +333,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "2A5RGEPYgUn7GbamdVBXWLzokKQStup1DNzqkxQqqmgW",
+            "digest": "9V6jsMK9XLyNRZP2FibbzyRKWEcY4Tt65h8agoWzHRZP",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -344,7 +344,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "7WTn3jXerZU2jTq9JWjgS75U2w4ayK5eNzUxegW4qpTq",
+            "digest": "H8KAyZZPYaCek4Re3qMhEEnU3y4B9zY7Lp37wvLEWEGb",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp
index 3bad80a971e..3917861451d 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -107,7 +107,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29",
+            "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "5ijxkCKmY5GhbDpZ8EUT5cEHCPrhSxmySCsy9P7hdnav",
+            "digest": "Fz84MVS4TX8jF6Wi77gnsBPwTMtKyzAKYkgaeY1MKGiu",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -129,7 +129,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "GL1RzmY36Heq6Ep8b3TB8gggSPJfDXHXHLG1cEMpeiaQ",
+            "digest": "3gLQv5PABHiHhejxdMS7Them5adUNu4mXN4eGr8XMCEt",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -140,7 +140,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "8gsWcWUrsfT2XoA1sztv3dLLM6h47ZqiMf2VPutUrt33",
+            "digest": "23jNXYb2S5zUPRBnyCVij3g8N63QKfjPZKAk9tYvg9Js",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -168,7 +168,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "8gsWcWUrsfT2XoA1sztv3dLLM6h47ZqiMf2VPutUrt33",
+            "digest": "23jNXYb2S5zUPRBnyCVij3g8N63QKfjPZKAk9tYvg9Js",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -196,7 +196,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo5LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "GL1RzmY36Heq6Ep8b3TB8gggSPJfDXHXHLG1cEMpeiaQ",
+            "digest": "3gLQv5PABHiHhejxdMS7Them5adUNu4mXN4eGr8XMCEt",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -224,7 +224,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo3LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "5ijxkCKmY5GhbDpZ8EUT5cEHCPrhSxmySCsy9P7hdnav",
+            "digest": "Fz84MVS4TX8jF6Wi77gnsBPwTMtKyzAKYkgaeY1MKGiu",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -268,7 +268,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -279,7 +279,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29",
+            "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp
index 4cccc349430..e7048205795 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp
@@ -164,7 +164,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -175,7 +175,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6y9UF1snskP2LXvGksRVjXJqTaNS7ADtizyQaVXSVn16",
+            "digest": "5emM1KVTcfuVTqbdsPAixpo5iYy5Mmw7rTAPwJHK3hfP",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -186,7 +186,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9",
           "node": {
-            "digest": "nxC5491CFRQaXhrs1YfTj9hqGg4apLs8aLrWDY1xxu3",
+            "digest": "4KZdypaLVFszpbFKsSh5iXoEQ1mV5TttqKAhaCx2XViA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -197,7 +197,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoxOCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "D9bZNc9AmSiAMDE5kJTxgQqhQcstsokmBA4Mq4QqQGUx",
+            "digest": "5TFPabtfYgxhCT7d254rxdEg3XpUMaKGZ16W5r1yf3t2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -208,7 +208,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "BBZrmvswLx4LbYNzKZAH5bGFp8PihXWvNLnaBZNLN6kZ",
+            "digest": "9P3GrKJpBJPXALT9QtxpsF4WrMjSru2QX1scXTboTG6H",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -236,7 +236,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -264,7 +264,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6y9UF1snskP2LXvGksRVjXJqTaNS7ADtizyQaVXSVn16",
+            "digest": "5emM1KVTcfuVTqbdsPAixpo5iYy5Mmw7rTAPwJHK3hfP",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -308,7 +308,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9",
           "node": {
-            "digest": "nxC5491CFRQaXhrs1YfTj9hqGg4apLs8aLrWDY1xxu3",
+            "digest": "4KZdypaLVFszpbFKsSh5iXoEQ1mV5TttqKAhaCx2XViA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -336,7 +336,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoxOCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "D9bZNc9AmSiAMDE5kJTxgQqhQcstsokmBA4Mq4QqQGUx",
+            "digest": "5TFPabtfYgxhCT7d254rxdEg3XpUMaKGZ16W5r1yf3t2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -364,7 +364,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoyMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "BBZrmvswLx4LbYNzKZAH5bGFp8PihXWvNLnaBZNLN6kZ",
+            "digest": "9P3GrKJpBJPXALT9QtxpsF4WrMjSru2QX1scXTboTG6H",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp
index ef9a1dd3b8c..33063e79c4b 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp
@@ -164,7 +164,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -175,7 +175,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6y9UF1snskP2LXvGksRVjXJqTaNS7ADtizyQaVXSVn16",
+            "digest": "5emM1KVTcfuVTqbdsPAixpo5iYy5Mmw7rTAPwJHK3hfP",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -186,7 +186,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9",
           "node": {
-            "digest": "nxC5491CFRQaXhrs1YfTj9hqGg4apLs8aLrWDY1xxu3",
+            "digest": "4KZdypaLVFszpbFKsSh5iXoEQ1mV5TttqKAhaCx2XViA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -197,7 +197,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "78XKtEqaRGRjsrF8PEBRpcJ22AmzaZtat3NmeCwc2kpD",
+            "digest": "4v2Kr8JpC1gapTNqCWzb8xMLgttat7TYkUeqU2SH7uFF",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -225,7 +225,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "78XKtEqaRGRjsrF8PEBRpcJ22AmzaZtat3NmeCwc2kpD",
+            "digest": "4v2Kr8JpC1gapTNqCWzb8xMLgttat7TYkUeqU2SH7uFF",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -253,7 +253,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9",
           "node": {
-            "digest": "nxC5491CFRQaXhrs1YfTj9hqGg4apLs8aLrWDY1xxu3",
+            "digest": "4KZdypaLVFszpbFKsSh5iXoEQ1mV5TttqKAhaCx2XViA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -313,7 +313,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6y9UF1snskP2LXvGksRVjXJqTaNS7ADtizyQaVXSVn16",
+            "digest": "5emM1KVTcfuVTqbdsPAixpo5iYy5Mmw7rTAPwJHK3hfP",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -341,7 +341,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp
index f147fc6aa7e..b3ba63e8df5 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -107,7 +107,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2Ti9BKLVNTkifpJUXhXtYRe4o4HM1Hnsv977TXgxtnbP",
+            "digest": "4X34W4QU7n7JCUEqdfwziv5Qq5djmR3jcGZfjhSkXwj2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH",
+            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -129,7 +129,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "BHxSqDRAs12PCjUVE8Xxrmq8ddhL8RLW1EnqJipprim",
+            "digest": "8Jw58Jdr5uZTjhxmGPz9osQ6vZDY9dCZpqtUHSrJvvhj",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -140,7 +140,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj",
+            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -151,7 +151,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Dqpsd6xzFPoLC6iKK2kyYZmfuAnaDkUKa4QaWBTA9DUk",
+            "digest": "AwWpjWNvy45DgiXspMC23gN729QDnukv2DV3gy1wauT4",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -162,7 +162,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy",
+            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -173,7 +173,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6VJkYFBeAe8PydrD4BFcdKEGCMjzePgPViRzBzPydyMT",
+            "digest": "3w7HnpjLC7JpPiBJRKfxW54Sc6Kbm8NgZJg9zxtHW99x",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -184,7 +184,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T",
+            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -195,7 +195,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "G4ETt5JzNXD4KgULBkhVEPN3p2qcneov6idAVXtFEk7g",
+            "digest": "FQwNLf2bx29xVeShDyueB7QVyQz1hnMxtLNG51pbFix5",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -223,7 +223,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -251,7 +251,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH",
+            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -279,7 +279,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj",
+            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -290,7 +290,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy",
+            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -318,7 +318,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T",
+            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp
index 4b01bc01e9b..50f3c894caa 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -107,7 +107,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2Ti9BKLVNTkifpJUXhXtYRe4o4HM1Hnsv977TXgxtnbP",
+            "digest": "4X34W4QU7n7JCUEqdfwziv5Qq5djmR3jcGZfjhSkXwj2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH",
+            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -129,7 +129,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "BHxSqDRAs12PCjUVE8Xxrmq8ddhL8RLW1EnqJipprim",
+            "digest": "8Jw58Jdr5uZTjhxmGPz9osQ6vZDY9dCZpqtUHSrJvvhj",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -140,7 +140,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj",
+            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -151,7 +151,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Dqpsd6xzFPoLC6iKK2kyYZmfuAnaDkUKa4QaWBTA9DUk",
+            "digest": "AwWpjWNvy45DgiXspMC23gN729QDnukv2DV3gy1wauT4",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -162,7 +162,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy",
+            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -173,7 +173,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6VJkYFBeAe8PydrD4BFcdKEGCMjzePgPViRzBzPydyMT",
+            "digest": "3w7HnpjLC7JpPiBJRKfxW54Sc6Kbm8NgZJg9zxtHW99x",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -184,7 +184,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T",
+            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -195,7 +195,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "G4ETt5JzNXD4KgULBkhVEPN3p2qcneov6idAVXtFEk7g",
+            "digest": "FQwNLf2bx29xVeShDyueB7QVyQz1hnMxtLNG51pbFix5",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -223,7 +223,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T",
+            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -251,7 +251,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy",
+            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -279,7 +279,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj",
+            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -307,7 +307,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH",
+            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -335,7 +335,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU",
+            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp
index 0c424b3061c..41a716db47f 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp
@@ -94,7 +94,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+          "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -102,7 +102,7 @@ Response: {
           }
         },
         {
-          "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29",
+          "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -110,7 +110,7 @@ Response: {
           }
         },
         {
-          "digest": "FSFfAaccXApG4NNDNwsvfeWqzZx7WHBtssn7yCpKF7w1",
+          "digest": "J5TzJqBopvv8AEmUxf6bk54RYBkse1dRXffiw77BSWUP",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
           }
         },
         {
-          "digest": "432fq3xpYtMXxVMuNcBzPK4ikrpFTEVGEiKLNsjpmczY",
+          "digest": "CEfMtnw1KxwGv3RCJWL2X38p9PaPyHHEdGBvXLJQa5gx",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -126,7 +126,7 @@ Response: {
           }
         },
         {
-          "digest": "oBvYm41RTyB7u5HGE91QdKNNRw5AYXBrFEDLJTXnN9F",
+          "digest": "HkWA3sZ33dVTGdjG8sRbuoYceqC8GY2HhL2i5d4yrD6U",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -134,7 +134,7 @@ Response: {
           }
         },
         {
-          "digest": "GQEae2TqUmShfWdHzyTieg8MPGeFzbdfHyAA94mKzkd6",
+          "digest": "28YNVNZsP2edJ6PvbuAPJ4dbCBg8oAgNea3Nf23BjudJ",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -142,7 +142,7 @@ Response: {
           }
         },
         {
-          "digest": "CTghAa6p4x2gFzMkJV8b4TVeBbHtkGoXaeZ1Vzh3y5ut",
+          "digest": "GuqxX5BWTTVxYKf89NmjSMP92fZR85eMcmcx3ru8Tfm3",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -150,7 +150,7 @@ Response: {
           }
         },
         {
-          "digest": "87KM1JvWfHMoYiFeasoiLWPVL2PxBjTgYtuTf8Lk21CT",
+          "digest": "BnEDqYveFTrSUCM5FFBwo3m27QDsW1mDsNkEjc2cN9NH",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -158,7 +158,7 @@ Response: {
           }
         },
         {
-          "digest": "FvRkrmggzayGPtrvGT6AGS8Jm7os61CCcG6N2BthoLQ3",
+          "digest": "CwXj6FRoCyGEuJmm2SdSTJU1TWpcoDns1nsSGAWaMJke",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -166,7 +166,7 @@ Response: {
           }
         },
         {
-          "digest": "86ABFdM2RxENvN1biiiUNv7T4nCayFkjELaz4MKwNguF",
+          "digest": "8k6GFRmxfkFeS12mwhZyoo5G3oAcQqVLLYzxM6sJHGRT",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -191,7 +191,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+          "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -199,7 +199,7 @@ Response: {
           }
         },
         {
-          "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29",
+          "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -207,7 +207,7 @@ Response: {
           }
         },
         {
-          "digest": "FSFfAaccXApG4NNDNwsvfeWqzZx7WHBtssn7yCpKF7w1",
+          "digest": "J5TzJqBopvv8AEmUxf6bk54RYBkse1dRXffiw77BSWUP",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -215,7 +215,7 @@ Response: {
           }
         },
         {
-          "digest": "432fq3xpYtMXxVMuNcBzPK4ikrpFTEVGEiKLNsjpmczY",
+          "digest": "CEfMtnw1KxwGv3RCJWL2X38p9PaPyHHEdGBvXLJQa5gx",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -223,7 +223,7 @@ Response: {
           }
         },
         {
-          "digest": "oBvYm41RTyB7u5HGE91QdKNNRw5AYXBrFEDLJTXnN9F",
+          "digest": "HkWA3sZ33dVTGdjG8sRbuoYceqC8GY2HhL2i5d4yrD6U",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -231,7 +231,7 @@ Response: {
           }
         },
         {
-          "digest": "GQEae2TqUmShfWdHzyTieg8MPGeFzbdfHyAA94mKzkd6",
+          "digest": "28YNVNZsP2edJ6PvbuAPJ4dbCBg8oAgNea3Nf23BjudJ",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -239,7 +239,7 @@ Response: {
           }
         },
         {
-          "digest": "CTghAa6p4x2gFzMkJV8b4TVeBbHtkGoXaeZ1Vzh3y5ut",
+          "digest": "GuqxX5BWTTVxYKf89NmjSMP92fZR85eMcmcx3ru8Tfm3",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -247,7 +247,7 @@ Response: {
           }
         },
         {
-          "digest": "87KM1JvWfHMoYiFeasoiLWPVL2PxBjTgYtuTf8Lk21CT",
+          "digest": "BnEDqYveFTrSUCM5FFBwo3m27QDsW1mDsNkEjc2cN9NH",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -255,7 +255,7 @@ Response: {
           }
         },
         {
-          "digest": "FvRkrmggzayGPtrvGT6AGS8Jm7os61CCcG6N2BthoLQ3",
+          "digest": "CwXj6FRoCyGEuJmm2SdSTJU1TWpcoDns1nsSGAWaMJke",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -263,7 +263,7 @@ Response: {
           }
         },
         {
-          "digest": "86ABFdM2RxENvN1biiiUNv7T4nCayFkjELaz4MKwNguF",
+          "digest": "8k6GFRmxfkFeS12mwhZyoo5G3oAcQqVLLYzxM6sJHGRT",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -311,7 +311,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+          "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -319,7 +319,7 @@ Response: {
           }
         },
         {
-          "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29",
+          "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -327,7 +327,7 @@ Response: {
           }
         },
         {
-          "digest": "FSFfAaccXApG4NNDNwsvfeWqzZx7WHBtssn7yCpKF7w1",
+          "digest": "J5TzJqBopvv8AEmUxf6bk54RYBkse1dRXffiw77BSWUP",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -335,7 +335,7 @@ Response: {
           }
         },
         {
-          "digest": "432fq3xpYtMXxVMuNcBzPK4ikrpFTEVGEiKLNsjpmczY",
+          "digest": "CEfMtnw1KxwGv3RCJWL2X38p9PaPyHHEdGBvXLJQa5gx",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -343,7 +343,7 @@ Response: {
           }
         },
         {
-          "digest": "oBvYm41RTyB7u5HGE91QdKNNRw5AYXBrFEDLJTXnN9F",
+          "digest": "HkWA3sZ33dVTGdjG8sRbuoYceqC8GY2HhL2i5d4yrD6U",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -351,7 +351,7 @@ Response: {
           }
         },
         {
-          "digest": "GQEae2TqUmShfWdHzyTieg8MPGeFzbdfHyAA94mKzkd6",
+          "digest": "28YNVNZsP2edJ6PvbuAPJ4dbCBg8oAgNea3Nf23BjudJ",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -359,7 +359,7 @@ Response: {
           }
         },
         {
-          "digest": "CTghAa6p4x2gFzMkJV8b4TVeBbHtkGoXaeZ1Vzh3y5ut",
+          "digest": "GuqxX5BWTTVxYKf89NmjSMP92fZR85eMcmcx3ru8Tfm3",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -367,7 +367,7 @@ Response: {
           }
         },
         {
-          "digest": "87KM1JvWfHMoYiFeasoiLWPVL2PxBjTgYtuTf8Lk21CT",
+          "digest": "BnEDqYveFTrSUCM5FFBwo3m27QDsW1mDsNkEjc2cN9NH",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -375,7 +375,7 @@ Response: {
           }
         },
         {
-          "digest": "FvRkrmggzayGPtrvGT6AGS8Jm7os61CCcG6N2BthoLQ3",
+          "digest": "CwXj6FRoCyGEuJmm2SdSTJU1TWpcoDns1nsSGAWaMJke",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -383,7 +383,7 @@ Response: {
           }
         },
         {
-          "digest": "86ABFdM2RxENvN1biiiUNv7T4nCayFkjELaz4MKwNguF",
+          "digest": "8k6GFRmxfkFeS12mwhZyoo5G3oAcQqVLLYzxM6sJHGRT",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -431,7 +431,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+          "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -439,7 +439,7 @@ Response: {
           }
         },
         {
-          "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29",
+          "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -447,7 +447,7 @@ Response: {
           }
         },
         {
-          "digest": "FSFfAaccXApG4NNDNwsvfeWqzZx7WHBtssn7yCpKF7w1",
+          "digest": "J5TzJqBopvv8AEmUxf6bk54RYBkse1dRXffiw77BSWUP",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -455,7 +455,7 @@ Response: {
           }
         },
         {
-          "digest": "432fq3xpYtMXxVMuNcBzPK4ikrpFTEVGEiKLNsjpmczY",
+          "digest": "CEfMtnw1KxwGv3RCJWL2X38p9PaPyHHEdGBvXLJQa5gx",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -463,7 +463,7 @@ Response: {
           }
         },
         {
-          "digest": "oBvYm41RTyB7u5HGE91QdKNNRw5AYXBrFEDLJTXnN9F",
+          "digest": "HkWA3sZ33dVTGdjG8sRbuoYceqC8GY2HhL2i5d4yrD6U",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -471,7 +471,7 @@ Response: {
           }
         },
         {
-          "digest": "GQEae2TqUmShfWdHzyTieg8MPGeFzbdfHyAA94mKzkd6",
+          "digest": "28YNVNZsP2edJ6PvbuAPJ4dbCBg8oAgNea3Nf23BjudJ",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -479,7 +479,7 @@ Response: {
           }
         },
         {
-          "digest": "CTghAa6p4x2gFzMkJV8b4TVeBbHtkGoXaeZ1Vzh3y5ut",
+          "digest": "GuqxX5BWTTVxYKf89NmjSMP92fZR85eMcmcx3ru8Tfm3",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -487,7 +487,7 @@ Response: {
           }
         },
         {
-          "digest": "87KM1JvWfHMoYiFeasoiLWPVL2PxBjTgYtuTf8Lk21CT",
+          "digest": "BnEDqYveFTrSUCM5FFBwo3m27QDsW1mDsNkEjc2cN9NH",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -495,7 +495,7 @@ Response: {
           }
         },
         {
-          "digest": "FvRkrmggzayGPtrvGT6AGS8Jm7os61CCcG6N2BthoLQ3",
+          "digest": "CwXj6FRoCyGEuJmm2SdSTJU1TWpcoDns1nsSGAWaMJke",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -503,7 +503,7 @@ Response: {
           }
         },
         {
-          "digest": "86ABFdM2RxENvN1biiiUNv7T4nCayFkjELaz4MKwNguF",
+          "digest": "8k6GFRmxfkFeS12mwhZyoo5G3oAcQqVLLYzxM6sJHGRT",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -592,7 +592,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD",
+            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp
index d14d150ad15..71b1a673a30 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp
@@ -42,7 +42,7 @@ Response: {
             "transactions": {
               "nodes": [
                 {
-                  "package": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1",
+                  "package": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe",
                   "module": "m",
                   "functionName": "get"
                 }
@@ -55,17 +55,17 @@ Response: {
               "nodes": [
                 {
                   "__typename": "SharedObjectRead",
-                  "address": "0x66fe37423f804cff0e56178a0cab944ca04c468d6a1f32cc003f380d3b97e5fe",
+                  "address": "0x003e9261fcd0f64b951a21ae77f470803b0e801a350e7a8934165b2201052f1c",
                   "version": 2,
-                  "digest": "3xuze1PbHS7BukpEDvhHuB5vs9m1DmRve76xUaeN9M1t",
+                  "digest": "GfMkk6R7jooB9pyD6kUGHEpK66By21gpKrTAPZxkFSMS",
                   "object": {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1::m::Foo"
+                          "repr": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe::m::Foo"
                         },
                         "json": {
-                          "id": "0x66fe37423f804cff0e56178a0cab944ca04c468d6a1f32cc003f380d3b97e5fe",
+                          "id": "0x003e9261fcd0f64b951a21ae77f470803b0e801a350e7a8934165b2201052f1c",
                           "x": "0"
                         }
                       }
@@ -82,7 +82,7 @@ Response: {
             "transactions": {
               "nodes": [
                 {
-                  "package": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1",
+                  "package": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe",
                   "module": "m",
                   "functionName": "inc"
                 }
@@ -102,12 +102,12 @@ Response: {
             "transactions": {
               "nodes": [
                 {
-                  "package": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1",
+                  "package": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe",
                   "module": "m",
                   "functionName": "get"
                 },
                 {
-                  "package": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1",
+                  "package": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe",
                   "module": "m",
                   "functionName": "inc"
                 }
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp
index 02fd27d573e..afe2c45bad0 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp
@@ -7,7 +7,7 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q",
+          "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
           "sender": null,
           "signatures": [
             "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="
@@ -407,7 +407,7 @@ Response: {
                         "json": {
                           "id": "0x0000000000000000000000000000000000000000000000000000000000000008",
                           "inner": {
-                            "id": "0x3ea5f6c162a25be99c5853e0d393a986af600b290c1c48ce6896602d36115385",
+                            "id": "0xeff71a60350f0dfb07d6197495db2804e7fee007f96fbeb2843c9b153fe7443c",
                             "version": "1"
                           }
                         }
@@ -489,7 +489,7 @@ Response: {
                         "json": {
                           "id": "0x0000000000000000000000000000000000000000000000000000000000000403",
                           "lists": {
-                            "id": "0x68c6e7ce3c1cc8d9740b644a374a43ab37106afa81f5f863abbea3128d3be410",
+                            "id": "0xe2c5af93c4d2edbd6e26ef598a34ea99b26a8c158db803486334b172ec18b135",
                             "size": "0"
                           }
                         }
@@ -586,51 +586,19 @@ Response: {
                 {
                   "cursor": "eyJpIjo5LCJjIjowfQ",
                   "node": {
-                    "address": "0x4209edfee0c6722b4b85e7a15111755c97bc1a8fba7977645cbfa07792b077a3",
+                    "address": "0x0ca370d53d314d37a60c552eaa74bad5de28b2b04788a65f9baf5db044f25c49",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::PoolTokenExchangeRate>"
                         },
                         "json": {
-                          "id": "0x4209edfee0c6722b4b85e7a15111755c97bc1a8fba7977645cbfa07792b077a3",
-                          "fields": {
-                            "contents": [
-                              {
-                                "key": "name",
-                                "value": "{immutable_metadata.name}"
-                              },
-                              {
-                                "key": "image_url",
-                                "value": "{immutable_metadata.uri}"
-                              },
-                              {
-                                "key": "description",
-                                "value": "{immutable_metadata.description}"
-                              },
-                              {
-                                "key": "creator",
-                                "value": "{immutable_metadata.issuer_name}"
-                              },
-                              {
-                                "key": "version",
-                                "value": "{immutable_metadata.version}"
-                              },
-                              {
-                                "key": "media_type",
-                                "value": "{immutable_metadata.media_type}"
-                              },
-                              {
-                                "key": "collection_name",
-                                "value": "{immutable_metadata.collection_name}"
-                              },
-                              {
-                                "key": "immutable_issuer",
-                                "value": "{immutable_issuer}"
-                              }
-                            ]
-                          },
-                          "version": 1
+                          "id": "0x0ca370d53d314d37a60c552eaa74bad5de28b2b04788a65f9baf5db044f25c49",
+                          "name": "0",
+                          "value": {
+                            "iota_amount": "0",
+                            "pool_token_amount": "0"
+                          }
                         }
                       }
                     },
@@ -639,6 +607,26 @@ Response: {
                 },
                 {
                   "cursor": "eyJpIjoxMCwiYyI6MH0",
+                  "node": {
+                    "address": "0x19ab66c40622ca2999a2308fb9111c1bb547716a10680dcaabaced9c11573641",
+                    "asMoveObject": {
+                      "contents": {
+                        "type": {
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                        },
+                        "json": {
+                          "id": "0x19ab66c40622ca2999a2308fb9111c1bb547716a10680dcaabaced9c11573641",
+                          "balance": {
+                            "value": "30000000000000000"
+                          }
+                        }
+                      }
+                    },
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "cursor": "eyJpIjoxMSwiYyI6MH0",
                   "node": {
                     "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
                     "asMoveObject": {
@@ -675,24 +663,6 @@ Response: {
                     "asMovePackage": null
                   }
                 },
-                {
-                  "cursor": "eyJpIjoxMSwiYyI6MH0",
-                  "node": {
-                    "address": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a",
-                    "asMoveObject": {
-                      "contents": {
-                        "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap"
-                        },
-                        "json": {
-                          "id": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a",
-                          "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
-                        }
-                      }
-                    },
-                    "asMovePackage": null
-                  }
-                },
                 {
                   "cursor": "eyJpIjoxMiwiYyI6MH0",
                   "node": {
@@ -711,7 +681,7 @@ Response: {
                             "system_state_version": "1",
                             "iota_treasury_cap": {
                               "inner": {
-                                "id": "0xccac92582a6d7c09456cc24b9c75416411abd4b02a1bfceda7f521aa439e3a8d",
+                                "id": "0xd87d1c70d3f36d3912eeafb2b89de980c025f8ac27304970d40d967a8f644c51",
                                 "total_supply": {
                                   "value": "31800000000000000"
                                 }
@@ -958,15 +928,15 @@ Response: {
                                     "next_epoch_p2p_address": null,
                                     "next_epoch_primary_address": null,
                                     "extra_fields": {
-                                      "id": "0xdc02ba5b963a4abfa19d98d5fa26b403e524459578a26a38ba34fae89fd2b66c",
+                                      "id": "0x7f2747bc0e903a3ab338e9d23700c47a23bfc548a2c7dffe73174920651b1570",
                                       "size": "0"
                                     }
                                   },
                                   "voting_power": "10000",
-                                  "operation_cap_id": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a",
+                                  "operation_cap_id": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
                                   "gas_price": "1000",
                                   "staking_pool": {
-                                    "id": "0x73877815d01eb79ccc8d3936b33dd91c9776b70a9a972a245dd0348278dd34fe",
+                                    "id": "0x16b972ce1279bef7cacd98dfcf1fd772372691c3cb6e76223110427ced478bb1",
                                     "activation_epoch": "0",
                                     "deactivation_epoch": null,
                                     "iota_balance": "1500000000000000",
@@ -975,14 +945,14 @@ Response: {
                                     },
                                     "pool_token_balance": "1500000000000000",
                                     "exchange_rates": {
-                                      "id": "0xb9b7eef578fca16ef4a12c18c5c2ba34e02456c143e1200a77b3ed4343542cce",
+                                      "id": "0x9a6e4b74d4ed125463ed75ec0b57d06294db02ca3c1dd1d6eb237d50cc04203f",
                                       "size": "1"
                                     },
                                     "pending_stake": "0",
                                     "pending_total_iota_withdraw": "0",
                                     "pending_pool_token_withdraw": "0",
                                     "extra_fields": {
-                                      "id": "0xd77de5a6f0cd42d4af49f6e1026fac1d903bdec27b7d7db1655d4bae7fc0da91",
+                                      "id": "0xdb91a1ca84cb97608d2039ec37d9c285c222bf088a5ba67944854df85552b4f4",
                                       "size": "0"
                                     }
                                   },
@@ -991,35 +961,35 @@ Response: {
                                   "next_epoch_gas_price": "1000",
                                   "next_epoch_commission_rate": "200",
                                   "extra_fields": {
-                                    "id": "0xe39145cecdb319f4011b183f128d6c1ea7297e1368b585fe153725e5cda8a3cf",
+                                    "id": "0xaf820673e6cf9a525396c41b4d08b74f0eb1fa72f293a1eddbf5af9ab789352a",
                                     "size": "0"
                                   }
                                 }
                               ],
                               "pending_active_validators": {
                                 "contents": {
-                                  "id": "0x74f4b1b3b2e4743f69de0d1f1c70c2dd93148306666afc9b72bdcc15b35c219f",
+                                  "id": "0x4e0f38d679fe3b1a282f518dd46894ef8d39888c1134f08270617049720e2c4a",
                                   "size": "0"
                                 }
                               },
                               "pending_removals": [],
                               "staking_pool_mappings": {
-                                "id": "0x915b7f830ca364410ce070137b5b9fe609ac5a7d08320090484bec44110c42a1",
+                                "id": "0x1f972b0e26bc450e0dd88c8e98eec553fe754c85ae8be5e5e04b63b79ee9ea42",
                                 "size": "1"
                               },
                               "inactive_validators": {
-                                "id": "0xcf0642d199c09a72bad034a642765769a95a7c146fd026a9edf8a63fa7b223b1",
+                                "id": "0xe5a457d193b836a33cc1270724d4e557b05bc0dca26461fac76d0ef72cec306d",
                                 "size": "0"
                               },
                               "validator_candidates": {
-                                "id": "0x67ff1104032b479598188affaf00529afbcdd1b1e90ce583020c6bfab657b4a9",
+                                "id": "0x2e35182d0661c6dc3d609229621a1dee7db613dd593cc2f692320b4cfa67bc77",
                                 "size": "0"
                               },
                               "at_risk_validators": {
                                 "contents": []
                               },
                               "extra_fields": {
-                                "id": "0x5abbfe1fc28887ee84063b633ed935d4020dda7c660c3eea33fd7322146766a7",
+                                "id": "0xde53e411b6ee688b1ee9d3ce9bff0afc82361ecf78294025b3ff6da25f9b8cbe",
                                 "size": "0"
                               }
                             },
@@ -1040,7 +1010,7 @@ Response: {
                               "validator_very_low_stake_threshold": "1000000000000000",
                               "validator_low_stake_grace_period": "7",
                               "extra_fields": {
-                                "id": "0x3198c51012892833039e0c4bc592c2f965d592d6a8d762564cbf3011b3478a2d",
+                                "id": "0xb07aa05e7324b4d49ba5e245c07c8103bd4d11aef35eb02b8533c1bc86617885",
                                 "size": "0"
                               }
                             },
@@ -1059,7 +1029,7 @@ Response: {
                             "safe_mode_non_refundable_storage_fee": "0",
                             "epoch_start_timestamp_ms": "0",
                             "extra_fields": {
-                              "id": "0xb5a0ba748635636e6234143857cd292ede2d029680d5d31e85edf6b07dd642d2",
+                              "id": "0x9dd139455d75b077cd130a346bc30de90710fa9b24ec892d07f56215c1ac27b3",
                               "size": "0"
                             }
                           }
@@ -1072,18 +1042,16 @@ Response: {
                 {
                   "cursor": "eyJpIjoxMywiYyI6MH0",
                   "node": {
-                    "address": "0x6e7a627fd970b3b88fca49b258fd01ee48509b2b9a35a6d2fc496d62b7feff44",
+                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::PoolTokenExchangeRate>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x6e7a627fd970b3b88fca49b258fd01ee48509b2b9a35a6d2fc496d62b7feff44",
-                          "name": "0",
-                          "value": {
-                            "iota_amount": "0",
-                            "pool_token_amount": "0"
+                          "id": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                          "balance": {
+                            "value": "300000000000000"
                           }
                         }
                       }
@@ -1094,15 +1062,15 @@ Response: {
                 {
                   "cursor": "eyJpIjoxNCwiYyI6MH0",
                   "node": {
-                    "address": "0x9c800dae0d735e34c71f729420132d502854f801f4585606f03455e375f1bc69",
+                    "address": "0x84c9a12296be175e98b5364aa5b7a41b47787def054ff96d9ad6138815ffd31c",
                     "asMoveObject": {
                       "contents": {
                         "type": {
                           "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>"
                         },
                         "json": {
-                          "id": "0x9c800dae0d735e34c71f729420132d502854f801f4585606f03455e375f1bc69",
-                          "name": "0x73877815d01eb79ccc8d3936b33dd91c9776b70a9a972a245dd0348278dd34fe",
+                          "id": "0x84c9a12296be175e98b5364aa5b7a41b47787def054ff96d9ad6138815ffd31c",
+                          "name": "0x16b972ce1279bef7cacd98dfcf1fd772372691c3cb6e76223110427ced478bb1",
                           "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
                         }
                       }
@@ -1113,20 +1081,20 @@ Response: {
                 {
                   "cursor": "eyJpIjoxNSwiYyI6MH0",
                   "node": {
-                    "address": "0x9ce49a5c6edce2595528dd97fe8cbd53138a8dbee20810d941a396bfb915b9f9",
+                    "address": "0x92e176f0a5af3b6158b54b3c86a024490f609b4bb469c4f453b2c3d81682f400",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000002::random::RandomInner>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x9ce49a5c6edce2595528dd97fe8cbd53138a8dbee20810d941a396bfb915b9f9",
-                          "name": "1",
-                          "value": {
-                            "version": "1",
-                            "epoch": "0",
-                            "randomness_round": "0",
-                            "random_bytes": []
+                          "id": "0x92e176f0a5af3b6158b54b3c86a024490f609b4bb469c4f453b2c3d81682f400",
+                          "decimals": 9,
+                          "name": "IOTA",
+                          "symbol": "IOTA",
+                          "description": "The main (gas)token of the IOTA Network.",
+                          "icon_url": {
+                            "url": "https://iota.org/logo.png"
                           }
                         }
                       }
@@ -1137,16 +1105,20 @@ Response: {
                 {
                   "cursor": "eyJpIjoxNiwiYyI6MH0",
                   "node": {
-                    "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8",
+                    "address": "0xbd145529aeb51f47417e9e41eaa1a05bab36796cf9a98454485a656cecf2bc82",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000002::random::RandomInner>"
                         },
                         "json": {
-                          "id": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8",
-                          "balance": {
-                            "value": "300000000000000"
+                          "id": "0xbd145529aeb51f47417e9e41eaa1a05bab36796cf9a98454485a656cecf2bc82",
+                          "name": "1",
+                          "value": {
+                            "version": "1",
+                            "epoch": "0",
+                            "randomness_round": "0",
+                            "random_bytes": []
                           }
                         }
                       }
@@ -1157,17 +1129,15 @@ Response: {
                 {
                   "cursor": "eyJpIjoxNywiYyI6MH0",
                   "node": {
-                    "address": "0xab8b65fa8ccce42a31f28133855ce3e84f5bf316b15b8177c1a81a0b3c524faa",
+                    "address": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap"
                         },
                         "json": {
-                          "id": "0xab8b65fa8ccce42a31f28133855ce3e84f5bf316b15b8177c1a81a0b3c524faa",
-                          "balance": {
-                            "value": "30000000000000000"
-                          }
+                          "id": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
+                          "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
                         }
                       }
                     },
@@ -1177,19 +1147,51 @@ Response: {
                 {
                   "cursor": "eyJpIjoxOCwiYyI6MH0",
                   "node": {
-                    "address": "0xaf0555cf30fe85c731be9c7feac04bd88ceab245d36fc6952ce1c7ad662e032b",
+                    "address": "0xcf3a6620131a625ddf3ba1446ad827508b809bd210aca8d8351d134339622c5d",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>"
                         },
                         "json": {
-                          "id": "0xaf0555cf30fe85c731be9c7feac04bd88ceab245d36fc6952ce1c7ad662e032b",
-                          "pool_id": "0x73877815d01eb79ccc8d3936b33dd91c9776b70a9a972a245dd0348278dd34fe",
-                          "stake_activation_epoch": "0",
-                          "principal": {
-                            "value": "1500000000000000"
-                          }
+                          "id": "0xcf3a6620131a625ddf3ba1446ad827508b809bd210aca8d8351d134339622c5d",
+                          "fields": {
+                            "contents": [
+                              {
+                                "key": "name",
+                                "value": "{immutable_metadata.name}"
+                              },
+                              {
+                                "key": "image_url",
+                                "value": "{immutable_metadata.uri}"
+                              },
+                              {
+                                "key": "description",
+                                "value": "{immutable_metadata.description}"
+                              },
+                              {
+                                "key": "creator",
+                                "value": "{immutable_metadata.issuer_name}"
+                              },
+                              {
+                                "key": "version",
+                                "value": "{immutable_metadata.version}"
+                              },
+                              {
+                                "key": "media_type",
+                                "value": "{immutable_metadata.media_type}"
+                              },
+                              {
+                                "key": "collection_name",
+                                "value": "{immutable_metadata.collection_name}"
+                              },
+                              {
+                                "key": "immutable_issuer",
+                                "value": "{immutable_issuer}"
+                              }
+                            ]
+                          },
+                          "version": 1
                         }
                       }
                     },
@@ -1199,20 +1201,18 @@ Response: {
                 {
                   "cursor": "eyJpIjoxOSwiYyI6MH0",
                   "node": {
-                    "address": "0xc04784618c2abcf1a672b8eed0b32b0c82399a1949449fa1780894d96947112c",
+                    "address": "0xfb80af4784e2346ff2b17c1ab41c34accf15da72bcaa0202347e96e9614692ac",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota"
                         },
                         "json": {
-                          "id": "0xc04784618c2abcf1a672b8eed0b32b0c82399a1949449fa1780894d96947112c",
-                          "decimals": 9,
-                          "name": "IOTA",
-                          "symbol": "IOTA",
-                          "description": "The main (gas)token of the IOTA Network.",
-                          "icon_url": {
-                            "url": "https://iota.org/logo.png"
+                          "id": "0xfb80af4784e2346ff2b17c1ab41c34accf15da72bcaa0202347e96e9614692ac",
+                          "pool_id": "0x16b972ce1279bef7cacd98dfcf1fd772372691c3cb6e76223110427ced478bb1",
+                          "stake_activation_epoch": "0",
+                          "principal": {
+                            "value": "1500000000000000"
                           }
                         }
                       }
@@ -1260,7 +1260,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000001",
-                    "digest": "H5sXqQ1xWAnDFG5s5jAXvhJcjwPamEaEMWPrZ85BqohT"
+                    "digest": "BHXUvAh7hYCQzY9pXTDzJU4jT4PCaLuKbzutM1a6NQ7G"
                   }
                 },
                 {
@@ -1269,7 +1269,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000002",
-                    "digest": "CtqfTgZVZ4ZnQzZHKg7aBVrCWDdQKTHQhadcd2XmdA9y"
+                    "digest": "G4CV5cYWz5MXjXepwJuE81izouheg4hwxDJGGLTAtyRL"
                   }
                 },
                 {
@@ -1278,7 +1278,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000003",
-                    "digest": "DaBy9yCgTn37Ppv4fikHLqPdqV8F7kJf7URfxCtF2e9j"
+                    "digest": "5aBdUWwW1kBBvxLLE7iGn96DnytxWCXtvxNy3NrhkrL1"
                   }
                 },
                 {
@@ -1287,7 +1287,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000005",
-                    "digest": "2V6tZ9pU4S3NsRdULriF7GydGmp457uSo2ty4ymB8VXY"
+                    "digest": "7FDKFZKceck6AxmF5xeMK4EckmhHfrH3uHadHmoXHiti"
                   }
                 },
                 {
@@ -1296,7 +1296,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000006",
-                    "digest": "GqqdRNHyEjeByAbjVkot27KpXPiaJEWZem6dnK2x5rV7"
+                    "digest": "HnEMRhnAJTBKY5Bs9Ttf7TfwQsYpx74Msxm4RfUsGf9j"
                   }
                 },
                 {
@@ -1305,7 +1305,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000008",
-                    "digest": "GxD19fC6Py3PdLE53C5QXaHgnabfWSnMcmasRjreF5RY"
+                    "digest": "GsUwMPdSsvukXKNtgsCXX5eX6PQUHDcRBs8cfAzE42u9"
                   }
                 },
                 {
@@ -1314,7 +1314,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x000000000000000000000000000000000000000000000000000000000000000b",
-                    "digest": "6wVDVa1i8WYteTiiE3bPziuY56LBv7Pwc4ji8bqWT7aN"
+                    "digest": "8Dup19gmKiRuUc53Eh9sniHMjbCkboj4XKSkQ1GzbLWa"
                   }
                 },
                 {
@@ -1323,7 +1323,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000403",
-                    "digest": "65TQgghKFiqF7tVcNmkH9TWYzN97WztTBSSsp4WvPrrw"
+                    "digest": "siUHSwsqoELCtazBk1VaLMgPcRsTJ982s5vjSFKKhSm"
                   }
                 },
                 {
@@ -1332,34 +1332,34 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x000000000000000000000000000000000000000000000000000000000000107a",
-                    "digest": "67XCsKueapC65naS4Lq7a9a8WkzoKEmzWGsYz9vAenzc"
+                    "digest": "CKJxYaDyWRK7Va9waEu6B595S23GhRrxuPhchvR1Lkmc"
                   }
                 },
                 {
-                  "address": "0x4209edfee0c6722b4b85e7a15111755c97bc1a8fba7977645cbfa07792b077a3",
+                  "address": "0x0ca370d53d314d37a60c552eaa74bad5de28b2b04788a65f9baf5db044f25c49",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x4209edfee0c6722b4b85e7a15111755c97bc1a8fba7977645cbfa07792b077a3",
-                    "digest": "FeZa7xVC7qyZFN8GXCtJXXSyesfFBC5AUjF2dAHePsnr"
+                    "address": "0x0ca370d53d314d37a60c552eaa74bad5de28b2b04788a65f9baf5db044f25c49",
+                    "digest": "ELrW4C23Ud266o1ZUxPZVh9ajxrAtvsburCxP4GcJgcz"
                   }
                 },
                 {
-                  "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
+                  "address": "0x19ab66c40622ca2999a2308fb9111c1bb547716a10680dcaabaced9c11573641",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
-                    "digest": "89TEkZDyktBqQQM3ZGZUAKJX6NetVgcY1yzdro4WopPg"
+                    "address": "0x19ab66c40622ca2999a2308fb9111c1bb547716a10680dcaabaced9c11573641",
+                    "digest": "4bWifTnxhYCDpE65oEAAfsuHAc17Q8enG8VD7VfczQXv"
                   }
                 },
                 {
-                  "address": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a",
+                  "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a",
-                    "digest": "8UAy9EsUau2MkqGAPHDgvf8yzPJzPD21yx8LSgFpuu8N"
+                    "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
+                    "digest": "JBDd6Gjr51BN8SLo3LDVPhLAR8ncpHFrbnH8oAy2Uxd3"
                   }
                 },
                 {
@@ -1368,70 +1368,70 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
-                    "digest": "3NNP2MZAhHjVhW6FUkczN9FjkBgoMFb3D3aBoqrzFaWW"
+                    "digest": "7enzmuzCQ3ithH7SaLcGQvAuuTHf8UihGn9yi45cYSTw"
                   }
                 },
                 {
-                  "address": "0x6e7a627fd970b3b88fca49b258fd01ee48509b2b9a35a6d2fc496d62b7feff44",
+                  "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x6e7a627fd970b3b88fca49b258fd01ee48509b2b9a35a6d2fc496d62b7feff44",
-                    "digest": "JBCMmBnr6HvySXPCx3tgUYfAe64poHAD9NzMDW2MAw1s"
+                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                    "digest": "8rsaeQm5puatrV9hRkxjcao6YM7Vr4UC25fdFSqAR9K6"
                   }
                 },
                 {
-                  "address": "0x9c800dae0d735e34c71f729420132d502854f801f4585606f03455e375f1bc69",
+                  "address": "0x84c9a12296be175e98b5364aa5b7a41b47787def054ff96d9ad6138815ffd31c",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x9c800dae0d735e34c71f729420132d502854f801f4585606f03455e375f1bc69",
-                    "digest": "Cg7vTwxEaCQykuxHDhTWU2T1TMP2xa8fKnEM4vJ3XL1z"
+                    "address": "0x84c9a12296be175e98b5364aa5b7a41b47787def054ff96d9ad6138815ffd31c",
+                    "digest": "6tsDB9sYSnpXce4QqKjHvgp7kigAqztaAjoJiw2C9Aqq"
                   }
                 },
                 {
-                  "address": "0x9ce49a5c6edce2595528dd97fe8cbd53138a8dbee20810d941a396bfb915b9f9",
+                  "address": "0x92e176f0a5af3b6158b54b3c86a024490f609b4bb469c4f453b2c3d81682f400",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x9ce49a5c6edce2595528dd97fe8cbd53138a8dbee20810d941a396bfb915b9f9",
-                    "digest": "Fe5D4zYiUR4u9uYB9cAWXr2HRSV92bL3BUAw2vA8SH33"
+                    "address": "0x92e176f0a5af3b6158b54b3c86a024490f609b4bb469c4f453b2c3d81682f400",
+                    "digest": "5s5huBUuDJ7KAthLvCXowws61uJhnv8hp9TYSz1SF3Ds"
                   }
                 },
                 {
-                  "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8",
+                  "address": "0xbd145529aeb51f47417e9e41eaa1a05bab36796cf9a98454485a656cecf2bc82",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8",
-                    "digest": "8DSGgS8szoRftGiFFtdqgWNB2XmaF6qtczRKgj1Zkenn"
+                    "address": "0xbd145529aeb51f47417e9e41eaa1a05bab36796cf9a98454485a656cecf2bc82",
+                    "digest": "J4Lt8oHPX1Uuw4YN4eW96fU6SG4qGH9DUDxxkQ6Rody2"
                   }
                 },
                 {
-                  "address": "0xab8b65fa8ccce42a31f28133855ce3e84f5bf316b15b8177c1a81a0b3c524faa",
+                  "address": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xab8b65fa8ccce42a31f28133855ce3e84f5bf316b15b8177c1a81a0b3c524faa",
-                    "digest": "Gaf625KrgvnGquoHpLnu9V4PxCPLrXjaPAj6TNUoAi9i"
+                    "address": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
+                    "digest": "AuUEqY6mbzRuUxmVZAnmpovu7uAcV9r4y6c12wbyAdYL"
                   }
                 },
                 {
-                  "address": "0xaf0555cf30fe85c731be9c7feac04bd88ceab245d36fc6952ce1c7ad662e032b",
+                  "address": "0xcf3a6620131a625ddf3ba1446ad827508b809bd210aca8d8351d134339622c5d",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xaf0555cf30fe85c731be9c7feac04bd88ceab245d36fc6952ce1c7ad662e032b",
-                    "digest": "FW486vMb4Q85vApfnZqm85zay37DDwMq5xpJnEQrduo3"
+                    "address": "0xcf3a6620131a625ddf3ba1446ad827508b809bd210aca8d8351d134339622c5d",
+                    "digest": "5PztXDWAHp7XSBFEVr3vWftqvrkhFzcVnJX8QSf11vZN"
                   }
                 },
                 {
-                  "address": "0xc04784618c2abcf1a672b8eed0b32b0c82399a1949449fa1780894d96947112c",
+                  "address": "0xfb80af4784e2346ff2b17c1ab41c34accf15da72bcaa0202347e96e9614692ac",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xc04784618c2abcf1a672b8eed0b32b0c82399a1949449fa1780894d96947112c",
-                    "digest": "DygRNA82cC3hz4NnVnneEWu1VVkCbbVdspUJq8renRpv"
+                    "address": "0xfb80af4784e2346ff2b17c1ab41c34accf15da72bcaa0202347e96e9614692ac",
+                    "digest": "Hk4SpKWiMaDHphMphU15n3wHJUdZbBGGU9QjAcy3iEgs"
                   }
                 }
               ]
@@ -1453,7 +1453,7 @@ Response: {
               "sequenceNumber": 0
             },
             "transactionBlock": {
-              "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+              "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
             }
           },
           "expiration": null
@@ -1505,7 +1505,7 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
                 }
               ]
             },
@@ -1605,7 +1605,7 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q"
+                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
                 }
               ]
             },
@@ -1624,21 +1624,21 @@ Response: {
                   }
                 },
                 {
-                  "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d",
+                  "address": "0x3a69e1bb454153b51392ff79244336e7ae899a1d2dad79f0b42c4fac2a101136",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d",
-                    "digest": "BSa7PKAWVFZob5cE6nN1JWtoG5v45m2w8WVTQ8SxMxeY"
+                    "address": "0x3a69e1bb454153b51392ff79244336e7ae899a1d2dad79f0b42c4fac2a101136",
+                    "digest": "D1Y1Jn2RRL237YSrVGT5xhP2bM8SuQobSahg85jwNtee"
                   }
                 },
                 {
-                  "address": "0x68eb1d10bdcf35211aafe684fe3568824238bdee9ec5e350c69990bb6d2d8c1d",
+                  "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x68eb1d10bdcf35211aafe684fe3568824238bdee9ec5e350c69990bb6d2d8c1d",
-                    "digest": "FZvmYvoCZAtb7pk1EDNGMzN7rFiSRGu9zrYnYFZVMRJm"
+                    "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d",
+                    "digest": "4bQjJGGLQX2bufG22m3hFYeiM7Y5RuMgF1CTeLdxvQES"
                   }
                 },
                 {
@@ -1647,7 +1647,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
-                    "digest": "33Bg8QUCxGNcSJ5xCZ1wVEWrFomUAyANogxuJYvnKjAB"
+                    "digest": "FTLRpX3Lki5326Y265NpgZbTGiSu75bCMHoxPhwDHavd"
                   }
                 }
               ]
diff --git a/crates/iota-move/src/new.rs b/crates/iota-move/src/new.rs
index 92f834d36db..cc4ae3a721d 100644
--- a/crates/iota-move/src/new.rs
+++ b/crates/iota-move/src/new.rs
@@ -12,7 +12,7 @@ const IOTA_PKG_NAME: &str = "Iota";
 
 // Use testnet by default. Probably want to add options to make this
 // configurable later
-const IOTA_PKG_PATH: &str = "{ git = \"https://github.com/iotaledger/iota.git\", subdir = \"crates/iota-framework/packages/iota-framework\", rev = \"framework/testnet\" }";
+const IOTA_PKG_PATH: &str = "{ git = \"https://github.com/iotaledger/iota.git\", subdir = \"crates/iota-framework/packages/iota-framework\", rev = \"testnet\" }";
 
 #[derive(Parser)]
 #[group(id = "iota-move-new")]
diff --git a/crates/iota-node/src/admin.rs b/crates/iota-node/src/admin.rs
index 7bd974e63f4..c0c05901232 100644
--- a/crates/iota-node/src/admin.rs
+++ b/crates/iota-node/src/admin.rs
@@ -243,14 +243,8 @@ async fn set_filter(
 async fn capabilities(State(state): State<Arc<AppState>>) -> (StatusCode, String) {
     let epoch_store = state.node.state().load_epoch_store_one_call_per_task();
 
-    // Only one of v1 or v2 will be populated at a time
-    let capabilities = epoch_store.get_capabilities_v1();
     let mut output = String::new();
-    for capability in capabilities.unwrap_or_default() {
-        output.push_str(&format!("{:?}\n", capability));
-    }
-
-    let capabilities = epoch_store.get_capabilities_v2();
+    let capabilities = epoch_store.get_capabilities_v1();
     for capability in capabilities.unwrap_or_default() {
         output.push_str(&format!("{:?}\n", capability));
     }
diff --git a/crates/iota-node/src/lib.rs b/crates/iota-node/src/lib.rs
index a76819def65..005e687902c 100644
--- a/crates/iota-node/src/lib.rs
+++ b/crates/iota-node/src/lib.rs
@@ -104,10 +104,7 @@ use iota_types::{
         IotaSystemState, IotaSystemStateTrait,
         epoch_start_iota_system_state::{EpochStartSystemState, EpochStartSystemStateTrait},
     },
-    messages_consensus::{
-        AuthorityCapabilitiesV1, AuthorityCapabilitiesV2, ConsensusTransaction,
-        check_total_jwk_size,
-    },
+    messages_consensus::{AuthorityCapabilitiesV1, ConsensusTransaction, check_total_jwk_size},
     quorum_driver_types::QuorumDriverEffectsQueueResult,
     supported_protocol_versions::SupportedProtocolVersions,
     transaction::Transaction,
@@ -1541,32 +1538,20 @@ impl IotaNode {
 
                 let config = cur_epoch_store.protocol_config();
                 let binary_config = to_binary_config(config);
-                let transaction = if config.authority_capabilities_v2() {
-                    ConsensusTransaction::new_capability_notification_v2(
-                        AuthorityCapabilitiesV2::new(
-                            self.state.name,
-                            cur_epoch_store.get_chain_identifier().chain(),
-                            self.config
-                                .supported_protocol_versions
-                                .expect("Supported versions should be populated")
-                                // no need to send digests of versions less than the current version
-                                .truncate_below(config.version),
-                            self.state
-                                .get_available_system_packages(&binary_config)
-                                .await,
-                        ),
-                    )
-                } else {
-                    ConsensusTransaction::new_capability_notification(AuthorityCapabilitiesV1::new(
+                let transaction = ConsensusTransaction::new_capability_notification_v1(
+                    AuthorityCapabilitiesV1::new(
                         self.state.name,
+                        cur_epoch_store.get_chain_identifier().chain(),
                         self.config
                             .supported_protocol_versions
-                            .expect("Supported versions should be populated"),
+                            .expect("Supported versions should be populated")
+                            // no need to send digests of versions less than the current version
+                            .truncate_below(config.version),
                         self.state
                             .get_available_system_packages(&binary_config)
                             .await,
-                    ))
-                };
+                    ),
+                );
                 info!(?transaction, "submitting capabilities to consensus");
                 components
                     .consensus_adapter
diff --git a/crates/iota-open-rpc/spec/openrpc.json b/crates/iota-open-rpc/spec/openrpc.json
index f9fd7ae2d7e..10d0f8d5f34 100644
--- a/crates/iota-open-rpc/spec/openrpc.json
+++ b/crates/iota-open-rpc/spec/openrpc.json
@@ -1297,7 +1297,6 @@
               "protocolVersion": "1",
               "featureFlags": {
                 "accept_zklogin_in_multisig": false,
-                "authority_capabilities_v2": true,
                 "bridge": false,
                 "disable_invariant_violation_check_in_swap_loc": true,
                 "enable_group_ops_native_function_msm": true,
@@ -8310,6 +8309,7 @@
           "iotaTotalSupply",
           "iotaTreasuryCapId",
           "maxValidatorCount",
+          "minValidatorCount",
           "minValidatorJoiningStake",
           "pendingActiveValidatorsId",
           "pendingActiveValidatorsSize",
@@ -8423,6 +8423,14 @@
               }
             ]
           },
+          "minValidatorCount": {
+            "description": "Minimum number of active validators at any moment. We do not allow the number of validators in any epoch to go under this.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BigInt_for_uint64"
+              }
+            ]
+          },
           "minValidatorJoiningStake": {
             "description": "Lower-bound on the amount of stake required to become a validator.",
             "allOf": [
diff --git a/crates/iota-protocol-config/src/lib.rs b/crates/iota-protocol-config/src/lib.rs
index 7659fd85068..8b2f8cd07d7 100644
--- a/crates/iota-protocol-config/src/lib.rs
+++ b/crates/iota-protocol-config/src/lib.rs
@@ -114,6 +114,7 @@ struct FeatureFlags {
     // This flag is used to provide the correct MoveVM configuration for clients.
     #[serde(skip_serializing_if = "is_true")]
     disable_invariant_violation_check_in_swap_loc: bool,
+
     // If true, checks no extra bytes in a compiled module
     // This flag is used to provide the correct MoveVM configuration for clients.
     #[serde(skip_serializing_if = "is_true")]
@@ -122,6 +123,7 @@ struct FeatureFlags {
     // Enable zklogin auth
     #[serde(skip_serializing_if = "is_false")]
     zklogin_auth: bool,
+
     // How we order transactions coming out of consensus before sending to execution.
     #[serde(skip_serializing_if = "ConsensusTransactionOrdering::is_none")]
     consensus_transaction_ordering: ConsensusTransactionOrdering,
@@ -174,10 +176,6 @@ struct FeatureFlags {
     #[serde(skip_serializing_if = "is_false")]
     passkey_auth: bool,
 
-    // Use AuthorityCapabilitiesV2
-    #[serde(skip_serializing_if = "is_false")]
-    authority_capabilities_v2: bool,
-
     // Rethrow type layout errors during serialization instead of trying to convert them.
     // This flag is used to provide the correct MoveVM configuration for clients.
     #[serde(skip_serializing_if = "is_true")]
@@ -1041,10 +1039,6 @@ impl ProtocolConfig {
         self.feature_flags.passkey_auth
     }
 
-    pub fn authority_capabilities_v2(&self) -> bool {
-        self.feature_flags.authority_capabilities_v2
-    }
-
     pub fn max_transaction_size_bytes(&self) -> u64 {
         // Provide a default value if protocol config version is too low.
         self.consensus_max_transaction_size_bytes
@@ -1644,8 +1638,6 @@ impl ProtocolConfig {
             cfg.vdf_hash_to_input_cost = Some(100);
 
             cfg.feature_flags.passkey_auth = true;
-
-            cfg.feature_flags.authority_capabilities_v2 = true;
         }
 
         // Ignore this check for the fake versions for
diff --git a/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__version_1.snap b/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__version_1.snap
index 2a22e37ff45..1863f2f5d1d 100644
--- a/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__version_1.snap
+++ b/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__version_1.snap
@@ -11,7 +11,6 @@ feature_flags:
   zklogin_max_epoch_upper_bound_delta: 30
   enable_vdf: true
   passkey_auth: true
-  authority_capabilities_v2: true
 max_tx_size_bytes: 131072
 max_input_objects: 2048
 max_size_written_objects: 5000000
diff --git a/crates/iota-rest-api/openapi/openapi.json b/crates/iota-rest-api/openapi/openapi.json
index a04cc963c4a..96c8711cd78 100644
--- a/crates/iota-rest-api/openapi/openapi.json
+++ b/crates/iota-rest-api/openapi/openapi.json
@@ -3940,6 +3940,7 @@
           "iota_total_supply",
           "iota_treasury_cap_id",
           "max_validator_count",
+          "min_validator_count",
           "min_validator_joining_stake",
           "pending_active_validators_id",
           "pending_active_validators_size",
@@ -4037,6 +4038,11 @@
             "type": "string",
             "format": "u64"
           },
+          "min_validator_count": {
+            "description": "Minimum number of active validators at any moment. We do not allow the number of validators in any epoch to go under this.",
+            "type": "string",
+            "format": "u64"
+          },
           "min_validator_joining_stake": {
             "description": "Lower-bound on the amount of stake required to become a validator.",
             "type": "string",
diff --git a/crates/iota-rest-api/src/system.rs b/crates/iota-rest-api/src/system.rs
index f64c0ddd7c0..bc667dcc51e 100644
--- a/crates/iota-rest-api/src/system.rs
+++ b/crates/iota-rest-api/src/system.rs
@@ -142,6 +142,12 @@ pub struct SystemStateSummary {
     #[schemars(with = "crate::_schemars::U64")]
     pub epoch_duration_ms: u64,
 
+    /// Minimum number of active validators at any moment.
+    /// We do not allow the number of validators in any epoch to go under this.
+    #[serde_as(as = "iota_types::iota_serde::BigInt<u64>")]
+    #[schemars(with = "crate::_schemars::U64")]
+    pub min_validator_count: u64,
+
     /// Maximum number of active validators at any moment.
     /// We do not allow the number of validators in any epoch to go above this.
     #[serde_as(as = "iota_types::iota_serde::BigInt<u64>")]
@@ -442,6 +448,7 @@ impl From<iota_types::iota_system_state::iota_system_state_summary::IotaSystemSt
             safe_mode_non_refundable_storage_fee,
             epoch_start_timestamp_ms,
             epoch_duration_ms,
+            min_validator_count,
             max_validator_count,
             min_validator_joining_stake,
             validator_low_stake_threshold,
@@ -478,6 +485,7 @@ impl From<iota_types::iota_system_state::iota_system_state_summary::IotaSystemSt
             safe_mode_non_refundable_storage_fee,
             epoch_start_timestamp_ms,
             epoch_duration_ms,
+            min_validator_count,
             max_validator_count,
             min_validator_joining_stake,
             validator_low_stake_threshold,
diff --git a/crates/iota-source-validation-service/README.md b/crates/iota-source-validation-service/README.md
index f9ff95e04d0..b316bb2ad91 100644
--- a/crates/iota-source-validation-service/README.md
+++ b/crates/iota-source-validation-service/README.md
@@ -29,7 +29,7 @@ A sample configuration entry is as follows:
 source = "Repository"
 [packages.values]
 repository = "https://github.com/iotaledger/iota"
-branch = "framework/mainnet"
+branch = "mainnet"
 network = "mainnet"
 packages = [
   { path = "crates/iota-framework/packages/move-stdlib", watch = "0x1" },
diff --git a/crates/iota-source-validation-service/config.toml b/crates/iota-source-validation-service/config.toml
index 1815a8e68aa..8d75f8a6d72 100644
--- a/crates/iota-source-validation-service/config.toml
+++ b/crates/iota-source-validation-service/config.toml
@@ -4,7 +4,7 @@ source = "Repository"
 repository = "https://github.com/iotaledger/iota"
 network = "mainnet"
 [[packages.values.branches]]
-branch = "framework/mainnet"
+branch = "mainnet"
 paths = [
   { path = "crates/iota-framework/packages/move-stdlib", watch = "0x1" },
   { path = "crates/iota-framework/packages/iota-framework", watch = "0x2" },
@@ -17,7 +17,7 @@ source = "Repository"
 repository = "https://github.com/iotaledger/iota"
 network = "testnet"
 [[packages.values.branches]]
-branch = "framework/testnet"
+branch = "testnet"
 paths = [
   { path = "crates/iota-framework/packages/move-stdlib", watch = "0x1" },
   { path = "crates/iota-framework/packages/iota-framework", watch = "0x2" },
@@ -30,7 +30,7 @@ source = "Repository"
 repository = "https://github.com/iotaledger/iota"
 network = "devnet"
 [[packages.values.branches]]
-branch = "framework/devnet"
+branch = "devnet"
 paths = [
   { path = "crates/iota-framework/packages/move-stdlib", watch = "0x1" },
   { path = "crates/iota-framework/packages/iota-framework", watch = "0x2" },
diff --git a/crates/iota-source-validation/fixture/z/sources/a.move b/crates/iota-source-validation/fixture/z/sources/a.move
index e3a47049afd..d5dcfc7ce7f 100644
--- a/crates/iota-source-validation/fixture/z/sources/a.move
+++ b/crates/iota-source-validation/fixture/z/sources/a.move
@@ -4,6 +4,6 @@
 
 module z::a {
     public fun bar(x: u64): u64 {
-        z::b::foo(iota::math::max(x, 42))
+        z::b::foo(std::u64::max(x, 42))
     }
 }
diff --git a/crates/iota-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap b/crates/iota-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
index 2e9909ef31f..315553572f5 100644
--- a/crates/iota-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
+++ b/crates/iota-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
@@ -8,7 +8,7 @@ system_state_version: 1
 iota_treasury_cap:
   inner:
     id:
-      id: "0x7ba2382d99d4d34f39d55677d3cf8bace68ff9b414395e823f4b3b1f5b8779a9"
+      id: "0xe331a811670a6d6a1b460031cf1b5d4d4932e49c7f518847c0983036800ff005"
     total_supply:
       value: "751500000000000000"
 validators:
@@ -244,13 +244,13 @@ validators:
         next_epoch_primary_address: ~
         extra_fields:
           id:
-            id: "0x97c484626382f82340e8e1c6989a57d5ffd3471dadcb3d5405453f93f43cc9b0"
+            id: "0x7b07cffe62f4aa8e9085d92a9d323db680a71946a4f617150f94630e1d3ea7fd"
           size: 0
       voting_power: 10000
-      operation_cap_id: "0x12c601377e08b9b1a4fc1eabbbd20e34f665b8a8d123c4ae0006afbdff96933b"
+      operation_cap_id: "0x5d385e19014eb37a0ce095545d9c4cee77722eb2d650b04895dabcb99ff0dbed"
       gas_price: 1000
       staking_pool:
-        id: "0x4aaac511139597b1acd68475f3cf9a40a261d026db793d9bb9213228a6bc3a24"
+        id: "0x17d69dd78398cdcbe8f96cc66f3e85913bbbec5c3d5a477edd5d79d78f275330"
         activation_epoch: 0
         deactivation_epoch: ~
         iota_balance: 1500000000000000
@@ -258,14 +258,14 @@ validators:
           value: 0
         pool_token_balance: 1500000000000000
         exchange_rates:
-          id: "0x358794a785d7ea4e4b953814e677ad1d3d580e480d99ee32fe7133f1aad50d8b"
+          id: "0xf6c3a2556d9d3845c6f68e4e94f9af2f59f78062785be394760458ba02680701"
           size: 1
         pending_stake: 0
         pending_total_iota_withdraw: 0
         pending_pool_token_withdraw: 0
         extra_fields:
           id:
-            id: "0x215369ce1b8cd5ae13d92e7466d6448898f63362e92c22db9ed671bee1fd6e37"
+            id: "0x5b33caef1881418752c23068d1c38a676331f399391e851ab38edcdc0298dddd"
           size: 0
       commission_rate: 200
       next_epoch_stake: 1500000000000000
@@ -273,27 +273,27 @@ validators:
       next_epoch_commission_rate: 200
       extra_fields:
         id:
-          id: "0xb124b29bc0bb01f4ba0833d2c52c860614def31cbe0cb6bb2500d20a2ef518aa"
+          id: "0xb7c793e75a4f00ba939b873936a617e3b4e9879e8f5bbd2b4241841d57561ab2"
         size: 0
   pending_active_validators:
     contents:
-      id: "0x894ec4c364d05c6d7b8c65d791261efe8c07a1c38ba843a3a37df40536cc2c6f"
+      id: "0xf8a031f43a0542aefa7ebc136d0299f326cd255951e05cbf3c1d4fc9f8a2212a"
       size: 0
   pending_removals: []
   staking_pool_mappings:
-    id: "0x81109e3abf78a50ba7f74a043049c5a3df88c848e929913da5c287e5f0e1de86"
+    id: "0x593f187df19dee94ae17e86d84dce09d08489107da36465aa3c7805e2fbcbe81"
     size: 1
   inactive_validators:
-    id: "0xed8eaac07f4ccec9088a814ec9169a8ec87586f15797ff6d4b80d089a95c724c"
+    id: "0x84cad02db4e97444516fb5f74c21e9a0e3f8dd78789664fc993f40427260d20e"
     size: 0
   validator_candidates:
-    id: "0x9c0ce6b24517363f21e543c12a51ed36ff4a252d9446ec6aaffc9074faed79ff"
+    id: "0xbc952765f05c93713d482040e82e48dc5072550e5e27d8e5a676b2c7f7469850"
     size: 0
   at_risk_validators:
     contents: []
   extra_fields:
     id:
-      id: "0xf8f51ed1b0cc6fbe3a803637728dd8e21f07f90eb3a5acde5ae2f9df3a0f222e"
+      id: "0x2f3767021062064e4df4dc570ae94c4346868b5b603159be59168a76a3d456c9"
     size: 0
 storage_fund:
   total_object_storage_rebates:
@@ -310,7 +310,7 @@ parameters:
   validator_low_stake_grace_period: 7
   extra_fields:
     id:
-      id: "0x552e25d51ce8d5164c92471ac952a46a93645fa8337f00abe6cec8a87e89423c"
+      id: "0x6f4aaf0d4e11391a7b418bc1b428e088a27f6ea3b7a4a5b3ba6250fca99ae6a9"
     size: 0
 reference_gas_price: 1000
 validator_report_records:
@@ -325,5 +325,5 @@ safe_mode_non_refundable_storage_fee: 0
 epoch_start_timestamp_ms: 10
 extra_fields:
   id:
-    id: "0xfc995fb81559a3d5e8e8e186bb6fc16a906e2b789ecb032e977003f3498f49b7"
+    id: "0xd6fd25d4433d7392eb6634bf8f22b1a9604721a4574326f638d2806d26326892"
   size: 0
diff --git a/crates/iota-transaction-builder/src/lib.rs b/crates/iota-transaction-builder/src/lib.rs
index aee4e28e506..67da55f5ffa 100644
--- a/crates/iota-transaction-builder/src/lib.rs
+++ b/crates/iota-transaction-builder/src/lib.rs
@@ -889,8 +889,8 @@ impl TransactionBuilder {
         let coin: Object = coin.try_into()?;
         let type_arguments = vec![coin.get_move_template_type()?];
         let package = IOTA_FRAMEWORK_PACKAGE_ID;
-        let module = coin::PAY_MODULE_NAME.to_owned();
-        let function = coin::PAY_JOIN_FUNC_NAME.to_owned();
+        let module = coin::COIN_MODULE_NAME.to_owned();
+        let function = coin::COIN_JOIN_FUNC_NAME.to_owned();
         let arguments = vec![
             CallArg::Object(ObjectArg::ImmOrOwnedObject(primary_coin_ref)),
             CallArg::Object(ObjectArg::ImmOrOwnedObject(coin_to_merge_ref)),
@@ -936,8 +936,8 @@ impl TransactionBuilder {
         TransactionData::new_move_call(
             signer,
             IOTA_FRAMEWORK_PACKAGE_ID,
-            coin::PAY_MODULE_NAME.to_owned(),
-            coin::PAY_JOIN_FUNC_NAME.to_owned(),
+            coin::COIN_MODULE_NAME.to_owned(),
+            coin::COIN_JOIN_FUNC_NAME.to_owned(),
             type_args,
             gas,
             vec![
diff --git a/crates/iota-types/src/coin.rs b/crates/iota-types/src/coin.rs
index 081fcd3e5c3..6336c75168c 100644
--- a/crates/iota-types/src/coin.rs
+++ b/crates/iota-types/src/coin.rs
@@ -24,9 +24,9 @@ pub const COIN_MODULE_NAME: &IdentStr = ident_str!("coin");
 pub const COIN_STRUCT_NAME: &IdentStr = ident_str!("Coin");
 pub const COIN_METADATA_STRUCT_NAME: &IdentStr = ident_str!("CoinMetadata");
 pub const COIN_TREASURE_CAP_NAME: &IdentStr = ident_str!("TreasuryCap");
+pub const COIN_JOIN_FUNC_NAME: &IdentStr = ident_str!("join");
 
 pub const PAY_MODULE_NAME: &IdentStr = ident_str!("pay");
-pub const PAY_JOIN_FUNC_NAME: &IdentStr = ident_str!("join");
 pub const PAY_SPLIT_N_FUNC_NAME: &IdentStr = ident_str!("divide_and_keep");
 pub const PAY_SPLIT_VEC_FUNC_NAME: &IdentStr = ident_str!("split_vec");
 
diff --git a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs
index d373cdbbd01..cd5f6ba87ef 100644
--- a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs
+++ b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs
@@ -609,7 +609,7 @@ impl IotaSystemStateTrait for IotaSystemStateV1 {
             parameters:
                 SystemParametersV1 {
                     epoch_duration_ms,
-                    min_validator_count: _, /* TODO: Add it to RPC layer in the future https://github.com/iotaledger/iota/issues/3232. */
+                    min_validator_count,
                     max_validator_count,
                     min_validator_joining_stake,
                     validator_low_stake_threshold,
@@ -670,6 +670,7 @@ impl IotaSystemStateTrait for IotaSystemStateV1 {
                 .into_iter()
                 .map(|e| (e.key, e.value.contents))
                 .collect(),
+            min_validator_count,
             max_validator_count,
             min_validator_joining_stake,
             validator_low_stake_threshold,
diff --git a/crates/iota-types/src/iota_system_state/iota_system_state_summary.rs b/crates/iota-types/src/iota_system_state/iota_system_state_summary.rs
index bfa25a83156..466218970c0 100644
--- a/crates/iota-types/src/iota_system_state/iota_system_state_summary.rs
+++ b/crates/iota-types/src/iota_system_state/iota_system_state_summary.rs
@@ -96,6 +96,12 @@ pub struct IotaSystemStateSummary {
     #[serde_as(as = "Readable<BigInt<u64>, _>")]
     pub epoch_duration_ms: u64,
 
+    /// Minimum number of active validators at any moment.
+    /// We do not allow the number of validators in any epoch to go under this.
+    #[schemars(with = "BigInt<u64>")]
+    #[serde_as(as = "Readable<BigInt<u64>, _>")]
+    pub min_validator_count: u64,
+
     /// Maximum number of active validators at any moment.
     /// We do not allow the number of validators in any epoch to go above this.
     #[schemars(with = "BigInt<u64>")]
@@ -327,6 +333,7 @@ impl Default for IotaSystemStateSummary {
             safe_mode_non_refundable_storage_fee: 0,
             epoch_start_timestamp_ms: 0,
             epoch_duration_ms: 0,
+            min_validator_count: 0,
             max_validator_count: 0,
             min_validator_joining_stake: 0,
             validator_low_stake_threshold: 0,
diff --git a/crates/iota-types/src/messages_consensus.rs b/crates/iota-types/src/messages_consensus.rs
index c03e46eec42..4c0efa531ec 100644
--- a/crates/iota-types/src/messages_consensus.rs
+++ b/crates/iota-types/src/messages_consensus.rs
@@ -126,64 +126,6 @@ impl Debug for ConsensusTransactionKey {
 /// validators to negotiate the creation of the ChangeEpoch transaction.
 #[derive(Serialize, Deserialize, Clone, Hash)]
 pub struct AuthorityCapabilitiesV1 {
-    /// Originating authority - must match consensus transaction source.
-    pub authority: AuthorityName,
-    /// Generation number set by sending authority. Used to determine which of
-    /// multiple AuthorityCapabilities messages from the same authority is
-    /// the most recent.
-    ///
-    /// (Currently, we just set this to the current time in milliseconds since
-    /// the epoch, but this should not be interpreted as a timestamp.)
-    pub generation: u64,
-
-    /// ProtocolVersions that the authority supports.
-    pub supported_protocol_versions: SupportedProtocolVersions,
-
-    /// The ObjectRefs of all versions of system packages that the validator
-    /// possesses. Used to determine whether to do a framework/movestdlib
-    /// upgrade.
-    pub available_system_packages: Vec<ObjectRef>,
-}
-
-impl Debug for AuthorityCapabilitiesV1 {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("AuthorityCapabilities")
-            .field("authority", &self.authority.concise())
-            .field("generation", &self.generation)
-            .field(
-                "supported_protocol_versions",
-                &self.supported_protocol_versions,
-            )
-            .field("available_system_packages", &self.available_system_packages)
-            .finish()
-    }
-}
-
-impl AuthorityCapabilitiesV1 {
-    pub fn new(
-        authority: AuthorityName,
-        supported_protocol_versions: SupportedProtocolVersions,
-        available_system_packages: Vec<ObjectRef>,
-    ) -> Self {
-        let generation = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .expect("Iota did not exist prior to 1970")
-            .as_millis()
-            .try_into()
-            .expect("This build of iota is not supported in the year 500,000,000");
-        Self {
-            authority,
-            generation,
-            supported_protocol_versions,
-            available_system_packages,
-        }
-    }
-}
-
-/// Used to advertise capabilities of each authority via consensus. This allows
-/// validators to negotiate the creation of the ChangeEpoch transaction.
-#[derive(Serialize, Deserialize, Clone, Hash)]
-pub struct AuthorityCapabilitiesV2 {
     /// Originating authority - must match transaction source authority from
     /// consensus.
     pub authority: AuthorityName,
@@ -195,7 +137,8 @@ pub struct AuthorityCapabilitiesV2 {
     /// the epoch, but this should not be interpreted as a timestamp.)
     pub generation: u64,
 
-    /// ProtocolVersions that the authority supports.
+    /// ProtocolVersions that the authority supports, including the hash of the
+    /// serialized ProtocolConfig of that authority per version.
     pub supported_protocol_versions: SupportedProtocolVersionsWithHashes,
 
     /// The ObjectRefs of all versions of system packages that the validator
@@ -204,7 +147,7 @@ pub struct AuthorityCapabilitiesV2 {
     pub available_system_packages: Vec<ObjectRef>,
 }
 
-impl Debug for AuthorityCapabilitiesV2 {
+impl Debug for AuthorityCapabilitiesV1 {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("AuthorityCapabilities")
             .field("authority", &self.authority.concise())
@@ -218,7 +161,7 @@ impl Debug for AuthorityCapabilitiesV2 {
     }
 }
 
-impl AuthorityCapabilitiesV2 {
+impl AuthorityCapabilitiesV1 {
     pub fn new(
         authority: AuthorityName,
         chain: Chain,
@@ -250,7 +193,7 @@ pub enum ConsensusTransactionKind {
     CheckpointSignature(Box<CheckpointSignatureMessage>),
     EndOfPublish(AuthorityName),
 
-    CapabilityNotification(AuthorityCapabilitiesV1),
+    CapabilityNotificationV1(AuthorityCapabilitiesV1),
 
     NewJWKFetched(AuthorityName, JwkId, JWK),
     RandomnessStateUpdate(u64, Vec<u8>), // deprecated
@@ -262,8 +205,6 @@ pub enum ConsensusTransactionKind {
     // of `RandomnessDkgMessages` have been received locally, to complete the key generation
     // process. Contents are a serialized `fastcrypto_tbls::dkg::Confirmation`.
     RandomnessDkgConfirmation(AuthorityName, Vec<u8>),
-
-    CapabilityNotificationV2(AuthorityCapabilitiesV2),
 }
 
 impl ConsensusTransactionKind {
@@ -400,23 +341,13 @@ impl ConsensusTransaction {
         }
     }
 
-    pub fn new_capability_notification(capabilities: AuthorityCapabilitiesV1) -> Self {
-        let mut hasher = DefaultHasher::new();
-        capabilities.hash(&mut hasher);
-        let tracking_id = hasher.finish().to_le_bytes();
-        Self {
-            tracking_id,
-            kind: ConsensusTransactionKind::CapabilityNotification(capabilities),
-        }
-    }
-
-    pub fn new_capability_notification_v2(capabilities: AuthorityCapabilitiesV2) -> Self {
+    pub fn new_capability_notification_v1(capabilities: AuthorityCapabilitiesV1) -> Self {
         let mut hasher = DefaultHasher::new();
         capabilities.hash(&mut hasher);
         let tracking_id = hasher.finish().to_le_bytes();
         Self {
             tracking_id,
-            kind: ConsensusTransactionKind::CapabilityNotificationV2(capabilities),
+            kind: ConsensusTransactionKind::CapabilityNotificationV1(capabilities),
         }
     }
 
@@ -496,10 +427,7 @@ impl ConsensusTransaction {
             ConsensusTransactionKind::EndOfPublish(authority) => {
                 ConsensusTransactionKey::EndOfPublish(*authority)
             }
-            ConsensusTransactionKind::CapabilityNotification(cap) => {
-                ConsensusTransactionKey::CapabilityNotification(cap.authority, cap.generation)
-            }
-            ConsensusTransactionKind::CapabilityNotificationV2(cap) => {
+            ConsensusTransactionKind::CapabilityNotificationV1(cap) => {
                 ConsensusTransactionKey::CapabilityNotification(cap.authority, cap.generation)
             }
             ConsensusTransactionKind::NewJWKFetched(authority, id, key) => {
diff --git a/crates/iota-types/src/supported_protocol_versions.rs b/crates/iota-types/src/supported_protocol_versions.rs
index 23ecfd46aff..1708fd6e93e 100644
--- a/crates/iota-types/src/supported_protocol_versions.rs
+++ b/crates/iota-types/src/supported_protocol_versions.rs
@@ -25,14 +25,6 @@ impl SupportedProtocolVersions {
         max: ProtocolVersion::MAX,
     };
 
-    /// Use by VersionedProtocolMessage implementors to describe in which range
-    /// of versions a message variant is supported.
-    pub fn new_for_message(min: u64, max: u64) -> Self {
-        let min = ProtocolVersion::new(min);
-        let max = ProtocolVersion::new(max);
-        Self { min, max }
-    }
-
     pub fn new_for_testing(min: u64, max: u64) -> Self {
         let min = min.into();
         let max = max.into();
diff --git a/crates/iota-types/tests/serde_tests.rs b/crates/iota-types/tests/serde_tests.rs
index 1c5e94b8ef0..6445ca6bac2 100644
--- a/crates/iota-types/tests/serde_tests.rs
+++ b/crates/iota-types/tests/serde_tests.rs
@@ -12,7 +12,7 @@ use serde_with::serde_as;
 
 #[test]
 fn test_struct_tag_serde() {
-    let tag = parse_iota_struct_tag("0x7f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::iotafrens::IotaFren<0x7f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::capy::Capy>").unwrap();
+    let tag = parse_iota_struct_tag("0x7f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::mymodule::MyStruct<0x7f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::othermodule::OtherStruct>").unwrap();
     #[serde_as]
     #[derive(Serialize)]
     struct TestStructTag(#[serde_as(as = "IotaStructTag")] StructTag);
@@ -23,7 +23,7 @@ fn test_struct_tag_serde() {
     };
     assert_eq!(
         json,
-        "0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::iotafrens::IotaFren<0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::capy::Capy>"
+        "0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::mymodule::MyStruct<0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::othermodule::OtherStruct>"
     );
 
     let tag2 = parse_iota_struct_tag(&json).unwrap();
diff --git a/crates/iota-verifier-transactional-tests/tests/private_generics/private_event_emit.exp b/crates/iota-verifier-transactional-tests/tests/private_generics/private_event_emit.exp
index 6363239169a..70f5b05dd3e 100644
--- a/crates/iota-verifier-transactional-tests/tests/private_generics/private_event_emit.exp
+++ b/crates/iota-verifier-transactional-tests/tests/private_generics/private_event_emit.exp
@@ -1,42 +1,37 @@
-processed 10 tasks
+processed 9 tasks
 
-task 1, lines 9-19:
-//# publish
-Error: Transaction Effects Status: Iota Move Bytecode Verification Error. Please run the Iota Move Verifier for more information.
-Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: IotaMoveVerificationError, source: Some("_::m::t. Invalid call to 'iota::event::emit' with an event type 'iota::coin::CurrencyCreated<u64>'. The event's type must be defined in the current module"), command: Some(0) } }
-
-task 2, lines 21-30:
+task 1, lines 9-18:
 //# publish
 Error: Transaction Effects Status: Iota Move Bytecode Verification Error. Please run the Iota Move Verifier for more information.
 Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: IotaMoveVerificationError, source: Some("_::m::t. Invalid call to 'iota::event::emit' with an event type 'T0'. The event's type must be defined in the current module"), command: Some(0) } }
 
-task 3, lines 32-41:
+task 2, lines 20-29:
 //# publish
 Error: Transaction Effects Status: Iota Move Bytecode Verification Error. Please run the Iota Move Verifier for more information.
 Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: IotaMoveVerificationError, source: Some("_::m::t. Invalid call to 'iota::event::emit' with an event type 'u64'. The event's type must be defined in the current module"), command: Some(0) } }
 
-task 4, lines 43-56:
+task 3, lines 31-44:
 //# publish
 Error: Transaction Effects Status: Iota Move Bytecode Verification Error. Please run the Iota Move Verifier for more information.
 Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: IotaMoveVerificationError, source: Some("_::m::t. Invalid call to 'iota::event::emit' with an event type 'vector<_::m::X>'. The event's type must be defined in the current module"), command: Some(0) } }
 
-task 5, lines 58-71:
+task 4, lines 46-59:
 //# publish
 Error: Transaction Effects Status: Iota Move Bytecode Verification Error. Please run the Iota Move Verifier for more information.
 Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: IotaMoveVerificationError, source: Some("_::m::t. Invalid call to 'iota::event::emit' with an event type 'vector<_::m::X>'. The event's type must be defined in the current module"), command: Some(0) } }
 
-task 6, lines 73-82:
+task 5, lines 61-70:
 //# publish
-created: object(6,0)
+created: object(5,0)
 mutated: object(0,0)
 gas summary: computation_cost: 1000000, storage_cost: 3990000,  storage_rebate: 988000, non_refundable_storage_fee: 0
 
-task 8, lines 86-96:
+task 7, lines 74-84:
 //# publish --dependencies test
 Error: Transaction Effects Status: Iota Move Bytecode Verification Error. Please run the Iota Move Verifier for more information.
 Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: IotaMoveVerificationError, source: Some("_::t::t. Invalid call to 'iota::event::emit' with an event type 'test::m::X'. The event's type must be defined in the current module"), command: Some(0) } }
 
-task 9, lines 98-108:
+task 8, lines 86-96:
 //# publish --dependencies test
 Error: Transaction Effects Status: Iota Move Bytecode Verification Error. Please run the Iota Move Verifier for more information.
 Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: IotaMoveVerificationError, source: Some("_::t::t. Invalid call to 'iota::event::emit' with an event type 'test::m::Y'. The event's type must be defined in the current module"), command: Some(0) } }
diff --git a/crates/iota-verifier-transactional-tests/tests/private_generics/private_event_emit.mvir b/crates/iota-verifier-transactional-tests/tests/private_generics/private_event_emit.mvir
index 3d4dd0a44f0..09bb61413de 100644
--- a/crates/iota-verifier-transactional-tests/tests/private_generics/private_event_emit.mvir
+++ b/crates/iota-verifier-transactional-tests/tests/private_generics/private_event_emit.mvir
@@ -6,18 +6,6 @@
 
 //# init --addresses test=0x0 test2=0x0
 
-//# publish
-module 0x0.m {
-    import 0x2.event;
-    import 0x2.coin;
-
-    t(s: coin.CurrencyCreated<u64>) {
-        label l0:
-        event.emit<coin.CurrencyCreated<u64>>(move(s));
-        return;
-    }
-}
-
 //# publish
 module 0x0.m {
     import 0x2.event;
@@ -81,7 +69,7 @@ module test.m {
     }
 }
 
-//# set-address test object(6,0)
+//# set-address test object(5,0)
 
 //# publish --dependencies test
 module 0x0.t {
diff --git a/crates/iota/Cargo.toml b/crates/iota/Cargo.toml
index 0aa47c1d54f..9f0339a2604 100644
--- a/crates/iota/Cargo.toml
+++ b/crates/iota/Cargo.toml
@@ -108,6 +108,7 @@ shlex = "1.3.0"
 iota-macros.workspace = true
 iota-simulator.workspace = true
 iota-test-transaction-builder.workspace = true
+move-cli.workspace = true
 test-cluster.workspace = true
 
 [target.'cfg(msim)'.dependencies]
diff --git a/crates/iota/src/unit_tests/validator_tests.rs b/crates/iota/src/unit_tests/validator_tests.rs
index 8f70cceec68..c202b887d0f 100644
--- a/crates/iota/src/unit_tests/validator_tests.rs
+++ b/crates/iota/src/unit_tests/validator_tests.rs
@@ -2,18 +2,26 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
+use std::{str::FromStr, time::Duration};
+
 use anyhow::Ok;
 use fastcrypto::encoding::{Base64, Encoding};
+use iota_json::IotaJsonValue;
 use iota_types::{
     base_types::IotaAddress,
     crypto::{IotaKeyPair, Signature},
     transaction::{Transaction, TransactionData},
 };
 use shared_crypto::intent::{Intent, IntentMessage};
+use tempfile::TempDir;
 use test_cluster::TestClusterBuilder;
+use tokio::time::sleep;
 
-use crate::validator_commands::{
-    IotaValidatorCommand, IotaValidatorCommandResponse, get_validator_summary,
+use crate::{
+    client_commands::{IotaClientCommandResult, IotaClientCommands, OptsWithGas},
+    validator_commands::{
+        IotaValidatorCommand, IotaValidatorCommandResponse, get_validator_summary,
+    },
 };
 
 #[tokio::test]
@@ -69,3 +77,101 @@ async fn test_print_raw_rgp_txn() -> Result<(), anyhow::Error> {
     assert_eq!(summary.next_epoch_gas_price, 42);
     Ok(())
 }
+
+#[tokio::test]
+async fn test_become_validator() -> Result<(), anyhow::Error> {
+    cleanup_fs();
+    let config_dir = TempDir::new().unwrap();
+
+    let test_cluster = TestClusterBuilder::new()
+        .with_config_dir(config_dir.path().to_path_buf())
+        .build()
+        .await;
+
+    let mut context = test_cluster.wallet;
+    let address = context.active_address()?;
+    let client = context.get_client().await?;
+
+    let response = IotaValidatorCommand::MakeValidatorInfo {
+        name: "validator0".to_string(),
+        description: "description".to_string(),
+        image_url: "https://iota.org/logo.png".to_string(),
+        project_url: "https://www.iota.org".to_string(),
+        host_name: "127.0.0.1".to_string(),
+        gas_price: 1000,
+    }
+    .execute(&mut context)
+    .await?;
+    let IotaValidatorCommandResponse::MakeValidatorInfo = response else {
+        panic!("Expected MakeValidatorInfo");
+    };
+
+    let response = IotaValidatorCommand::BecomeCandidate {
+        file: "validator.info".into(),
+        gas_budget: None,
+    }
+    .execute(&mut context)
+    .await?;
+    let IotaValidatorCommandResponse::BecomeCandidate(_become_candidate_tx) = response else {
+        panic!("Expected BecomeCandidate");
+    };
+    // Wait some time to be sure that the tx is executed
+    sleep(Duration::from_secs(2)).await;
+
+    // Get coin and stake
+    let coins = client
+        .coin_read_api()
+        .get_coins(address, None, None, None)
+        .await?;
+    let stake_result = IotaClientCommands::Call {
+        package: "0x3".parse()?,
+        module: "iota_system".to_string(),
+        function: "request_add_stake".to_string(),
+        type_args: vec![],
+        gas_price: None,
+        args: vec![
+            IotaJsonValue::from_str("0x5").unwrap(),
+            IotaJsonValue::from_str(&coins.data.first().unwrap().coin_object_id.to_string())
+                .unwrap(),
+            IotaJsonValue::from_str(&address.to_string()).unwrap(),
+        ],
+        opts: OptsWithGas::for_testing(None, 1000000000),
+    }
+    .execute(&mut context)
+    .await?;
+    let IotaClientCommandResult::TransactionBlock(_) = stake_result else {
+        panic!("Expected TransactionBlock");
+    };
+    // Wait some time to be sure that the tx is executed
+    sleep(Duration::from_secs(2)).await;
+
+    let response = IotaValidatorCommand::JoinCommittee { gas_budget: None }
+        .execute(&mut context)
+        .await?;
+    let IotaValidatorCommandResponse::JoinCommittee(_tx) = response else {
+        panic!("Expected JoinCommittee");
+    };
+    sleep(Duration::from_secs(2)).await;
+
+    let response = IotaValidatorCommand::DisplayMetadata {
+        validator_address: None,
+        json: None,
+    }
+    .execute(&mut context)
+    .await?;
+    let IotaValidatorCommandResponse::DisplayMetadata = response else {
+        panic!("Expected DisplayMetadata");
+    };
+
+    cleanup_fs();
+    // These files get generated in IotaValidatorCommand::MakeValidatorInfo in the
+    // current directory, so we have to clean them up
+    fn cleanup_fs() {
+        std::fs::remove_file("validator.info").ok();
+        std::fs::remove_file("account.key").ok();
+        std::fs::remove_file("authority.key").ok();
+        std::fs::remove_file("protocol.key").ok();
+        std::fs::remove_file("network.key").ok();
+    }
+    Ok(())
+}
diff --git a/crates/iota/src/validator_commands.rs b/crates/iota/src/validator_commands.rs
index 5b14959c2d8..536892299f2 100644
--- a/crates/iota/src/validator_commands.rs
+++ b/crates/iota/src/validator_commands.rs
@@ -43,6 +43,7 @@ use iota_types::{
         IotaKeyPair, NetworkKeyPair, NetworkPublicKey, Signable, SignatureScheme,
         generate_proof_of_possession, get_authority_key_pair,
     },
+    dynamic_field::Field,
     iota_system_state::{
         iota_system_state_inner_v1::{UnverifiedValidatorOperationCap, ValidatorV1},
         iota_system_state_summary::{IotaSystemStateSummary, IotaValidatorSummary},
@@ -1108,16 +1109,13 @@ async fn display_metadata(
     json: bool,
 ) -> anyhow::Result<()> {
     match get_validator_summary(client, validator_address).await? {
-        None => println!(
-            "{} is not an active or pending Validator.",
-            validator_address
-        ),
+        None => println!("{validator_address} is not an active or pending Validator"),
         Some((status, info)) => {
-            println!("{}'s valdiator status: {:?}", validator_address, status);
+            println!("{validator_address}'s validator status: {status:?}");
             if json {
                 println!("{}", serde_json::to_string_pretty(&info)?);
             } else {
-                println!("{:#?}", info);
+                println!("{info:#?}");
             }
         }
     }
@@ -1149,20 +1147,15 @@ async fn get_pending_candidate_summary(
         // included.
         let object_id = resp.object_id()?;
         let bcs = resp.move_object_bcs().ok_or_else(|| {
-            anyhow::anyhow!(
-                "Object {} does not exist or does not return bcs bytes",
-                object_id
-            )
+            anyhow::anyhow!("Object {object_id} does not exist or does not return bcs bytes",)
         })?;
-        let val = bcs::from_bytes::<ValidatorV1>(bcs).map_err(|e| {
+        let field = bcs::from_bytes::<Field<u64, ValidatorV1>>(bcs).map_err(|e| {
             anyhow::anyhow!(
-                "Can't convert bcs bytes of object {} to ValidatorV1: {}",
-                object_id,
-                e,
+                "Can't convert bcs bytes of object {object_id} to Field<u64, ValidatorV1>: {e}",
             )
         })?;
-        if val.verified_metadata().iota_address == validator_address {
-            return Ok(Some(val));
+        if field.value.verified_metadata().iota_address == validator_address {
+            return Ok(Some(field.value));
         }
     }
     Ok(None)
diff --git a/crates/iota/tests/cli_tests.rs b/crates/iota/tests/cli_tests.rs
index 4e307d523ea..cc2ce6ec14f 100644
--- a/crates/iota/tests/cli_tests.rs
+++ b/crates/iota/tests/cli_tests.rs
@@ -135,7 +135,6 @@ async fn test_genesis() -> Result<(), anyhow::Error> {
     Ok(())
 }
 
-#[ignore = "https://github.com/iotaledger/iota/issues/2983"]
 #[sim_test]
 async fn test_start() -> Result<(), anyhow::Error> {
     let temp_dir = tempfile::tempdir()?;
@@ -167,7 +166,7 @@ async fn test_start() -> Result<(), anyhow::Error> {
     let files = read_dir(working_dir)?
         .flat_map(|r| r.map(|file| file.file_name().to_str().unwrap().to_owned()))
         .collect::<Vec<_>>();
-    assert_eq!(12, files.len());
+    assert_eq!(13, files.len());
     assert!(files.contains(&IOTA_CLIENT_CONFIG.to_string()));
     assert!(files.contains(&IOTA_NETWORK_CONFIG.to_string()));
     assert!(files.contains(&IOTA_FULLNODE_CONFIG.to_string()));
@@ -4170,3 +4169,81 @@ async fn test_faucet() -> Result<(), anyhow::Error> {
 
     Ok(())
 }
+
+#[tokio::test]
+async fn test_move_new() -> Result<(), anyhow::Error> {
+    let current_dir = std::env::current_dir()?;
+    let package_name = "test_move_new";
+    IotaCommand::Move {
+        package_path: None,
+        config: None,
+        build_config: move_package::BuildConfig::default(),
+        cmd: iota_move::Command::New(iota_move::new::New {
+            new: move_cli::base::new::New {
+                name: package_name.to_string(),
+            },
+        }),
+    }
+    .execute()
+    .await?;
+
+    // Get all the new file names
+    let files = read_dir(package_name)?
+        .flat_map(|r| r.map(|file| file.file_name().to_str().unwrap().to_owned()))
+        .collect::<Vec<_>>();
+
+    assert_eq!(3, files.len());
+    for name in ["sources", "tests", "Move.toml"] {
+        assert!(files.contains(&name.to_string()));
+    }
+    assert!(std::path::Path::new(&format!("{package_name}/sources/{package_name}.move")).exists());
+    assert!(
+        std::path::Path::new(&format!("{package_name}/tests/{package_name}_tests.move")).exists()
+    );
+
+    // Test if the generated files are valid to build a package
+    IotaCommand::Move {
+        package_path: Some(package_name.parse()?),
+        config: None,
+        build_config: move_package::BuildConfig::default(),
+        cmd: iota_move::Command::Build(iota_move::build::Build {
+            chain_id: None,
+            dump_bytecode_as_base64: false,
+            generate_struct_layouts: false,
+            with_unpublished_dependencies: false,
+        }),
+    }
+    .execute()
+    .await?;
+
+    // iota_move::Command::Build changes the current dir, so we have to switch back
+    // here
+    std::env::set_current_dir(&current_dir)?;
+
+    IotaCommand::Move {
+        package_path: Some(package_name.parse()?),
+        config: None,
+        build_config: move_package::BuildConfig::default(),
+        cmd: iota_move::Command::Test(iota_move::unit_test::Test {
+            test: move_cli::base::test::Test {
+                compute_coverage: false,
+                filter: None,
+                gas_limit: None,
+                list: false,
+                num_threads: 1,
+                report_statistics: None,
+                verbose_mode: false,
+                seed: None,
+                rand_num_iters: None,
+            },
+        }),
+    }
+    .execute()
+    .await?;
+
+    // iota_move::Command::Test changes the current dir, so we have to switch back
+    // here
+    std::env::set_current_dir(current_dir)?;
+    std::fs::remove_dir_all(package_name)?;
+    Ok(())
+}
diff --git a/docs/content/developer/getting-started/coffee-example.mdx b/docs/content/developer/getting-started/coffee-example.mdx
new file mode 100644
index 00000000000..f5c5980e71f
--- /dev/null
+++ b/docs/content/developer/getting-started/coffee-example.mdx
@@ -0,0 +1,282 @@
+---
+title: Getting Started with Move Coffee Token Tutorial
+tags:
+  - tutorial
+  - move
+  - getting-started
+---
+
+## Introduction
+
+Welcome to this beginner-friendly tutorial on [Move](../iota-101/move-overview/move-overview.mdx) programming! You will build a simple Coffee Shop example that allows customers to buy, claim, and transfer coffee tokens. The example demonstrates fundamental concepts like importing modules, defining [constants](https://move-language.github.io/move/constants.html), creating [structs](https://move-language.github.io/move/structs-and-resources.html), minting and burning tokens, and handling [control](https://move-language.github.io/move/loops.html) flow.
+
+### Key Concepts Covered
+
+1. [**Importing modules**](https://moved.network/docs/move-basics/importing-modules): You will import essential Move packages for transactions, tokens, and balances.
+2. [**Defining constants**](https://move-language.github.io/move/constants.html): Used to represent error codes and set a price for coffee.
+3. **Creating [structs](https://move-language.github.io/move/structs-and-resources.html) with [abilities](https://move-language.github.io/move/abilities.html)**: Defined the `COFFEE` and `CoffeeShop` structs to represent tokens and shop data.
+4. [**Initialization with OTW**](../iota-101/move-overview/one-time-witness.mdx): Set up the shop with its treasury cap for minting tokens.
+5. [**Control flow with assertions**](https://move-language.github.io/move/loops.html): Ensured correct amounts and balances in transactions.
+6. **[Transferring](../iota-101/objects/transfers/transfers.mdx) and burning tokens**: Demonstrated how tokens are moved between users and how they can be consumed (burned).
+
+## Prerequisites
+
+- Basic understanding of blockchain concepts like [tokens](../../references/framework/iota-framework/token.mdx) and [transactions](https://www.scalingparrots.com/en/what-is-a-blockchain-transaction/).
+- Basic understanding of the [Move](../iota-101/move-overview/move-overview.mdx)
+- [Install Iota CLI](install-iota.mdx)
+
+## 1. Create an IOTA Move Package
+
+Use the following command to create a standard IOTA Move [package](create-a-package.mdx) called `coffee_shop`:
+
+``` bash
+iota move new coffee_shop
+```
+
+The command will create and populate the `coffee_shop` directory with a skeleton for an IOTA Move project. To add a [module](create-a-module.mdx), create a `.move` file in the sources directory, and call it `coffee.move`. In `coffee.move`, paste the following codes to the `coffee` module:
+
+## 2. Importing Modules from the IOTA Package
+
+The first step in our program is importing necessary modules from the IOTA package. These modules provide functionalities for transaction handling, coins, balances, and tokens.
+
+```move file=<rootDir>/examples/move/token/sources/coffee.move#L8-L12
+```
+
+- [`iota::tx_context::sender`](../../references/framework/iota-framework/tx_context.mdx): Manages the transaction context.
+- [`iota::coin`](../../references/framework/iota-framework/coin.mdx): Handles the creation and management of coins.
+- [`iota::balance`](../../references/framework/iota-framework/balance.mdx): Manages the balance of the shop.
+- [`iota::token`](../../references/framework/iota-framework/token.mdx): Manages the minting, transfer, and burning of tokens.
+- [`iota::iota::IOTA`](../../references/framework/iota-framework/iota.mdx): The IOTA cryptocurrency module.
+
+## 3. Defining Constants
+
+In this step, you should define a few constants that represent different error codes and the price of a coffee. [Constants](https://move-language.github.io/move/constants.html) in Move are useful for defining fixed values used throughout the code.
+
+```move file=<rootDir>/examples/move/token/sources/coffee.move#L14-L21
+```
+
+- `EIncorrectAmount`: Error when the wrong amount is provided.
+- `ENotEnoughPoints`: Error when there aren’t enough points to complete a transaction.
+- `COFFEE_PRICE`: The price of a coffee (10 IOTA).
+
+## 4. Creating Structs with Abilities
+
+[Structs](https://move-language.github.io/move/structs-and-resources.html) in Move represent data storage objects, and you will define two structs in this program.
+
+[Abilities](https://docs.iota.org/developer/getting-started/create-a-module#abilities) in Move are a typing feature in Move that control what actions are permissible for values of a given type.
+
+1. `COFFEE`: A struct representing coffee points.
+2. `CoffeeShop`: A struct for the coffee shop that includes its treasury cap and IOTA balance.
+
+```move file=<rootDir>/examples/move/token/sources/coffee.move#L23-L34
+```
+
+- `COFFEE`: A token with the ability drop, allowing it to be destroyed when no longer needed.
+- `CoffeeShop`: Represents a shop that has an ID, a treasury for minting coffee points, and a balance in IOTA.
+
+## 5. Initialization with OneTimeWitness (OTW)
+
+In Move, the [init](../iota-101/move-overview/init.mdx) function plays a critical role during the module's lifecycle, executing only once at the moment of module publication.
+The init function initializes the CoffeeShop by creating the COFFEE token and defining the shop’s treasury cap and balance.
+
+A [One-Time Witness (OTW)](../iota-101/move-overview/one-time-witness.mdx) is a unique type in Move, specifically designed to ensure that certain actions within a module can only occur once, providing security for the system's setup.
+
+### Function Arguments
+
+- `otw: COFFEE`: A token witness that allows the creation of the COFFEE tokens. It ensures that the token setup can only happen once during initialization.
+- `ctx: &mut TxContext`: The transaction context, which provides necessary data about the current transaction, including the sender and other blockchain-related information
+
+```move file=<rootDir>/examples/move/token/sources/coffee.move#L40-L55
+```
+
+Here, you use the OneTimeWitness (OTW) pattern, where `COFFEE` is used as a witness to authorize the creation of a new currency called `COFFEE`. The shop’s balance starts at zero.
+
+## 6. Buying a Coffee (Token Transfer)
+
+The `buy_coffee` function enables customers to purchase coffee using IOTA tokens. In this process, you will also apply control flow using assertions to ensure the customer has sufficient funds. If the required conditions are met, the transaction proceeds; otherwise, an error is triggered, making this a crucial aspect of program logic.
+
+### Function Arguments
+
+- `app: &mut CoffeeShop`: A mutable reference to the `CoffeeShop` struct, which holds the shop's token treasury and balance.
+- `payment: Coin<IOTA>`: The amount of IOTA tokens that the customer pays for the coffee. This is a `Coin` type representing IOTA currency.
+- `ctx: &mut TxContext`: The transaction context that handles information about the sender and the blockchain transaction.
+
+```move file=<rootDir>/examples/move/token/sources/coffee.move#L57-L69
+```
+
+This function performs key tasks like checking the customer’s balance, minting 1 new `COFFEE` token, transferring it to the customer, and [confirming](../../developer/standards/closed-loop-token/action-request#request-confirmation) the transaction.
+
+## 7. Control Flow with Assertions
+
+Move uses assertions (`assert!`) to enforce logical conditions during execution. If an assertion fails, it aborts the function with the defined error code.
+
+```move file=<rootDir>/examples/move/token/sources/coffee.move#L60-L61
+```
+
+In this example, you will ensure the customer has enough IOTA to buy coffee. If not, it returns the `EIncorrectAmount` error.
+
+## 8. Claiming a Free Coffee (Burning Tokens)
+
+After purchasing 4 coffees, customers can claim a free coffee by burning their `COFFEE` points. In Move, burning tokens permanently removes them from circulation, ensuring they can’t be reused. This process is vital in controlling token supply and enforcing business logic in applications.
+
+### Function Arguments
+
+- `app: &mut CoffeeShop`: A mutable reference to the `CoffeeShop` struct, holding the shop’s treasury cap and token information.
+- `points: Token<COFFEE>`: The `COFFEE` tokens that the customer is using to claim a free coffee. The token value must equal 4 for the transaction to proceed.
+- `ctx: &mut TxContext`: The transaction context, which includes details about the sender and the blockchain transaction.
+
+```move file=<rootDir>/examples/move/token/sources/coffee.move#L71-L82
+```
+
+This function ensures the customer has exactly 4 points, spends them, and emits a purchase event, marking the reward for loyalty.
+
+## 9. Transferring Tokens
+
+The `transfer` function enables customers to [transfer](../../references/framework/iota-framework/transfer.mdx) their `COFFEE` tokens to others, but with a 1-point fee deducted as commission. This demonstrates how Move can enforce rules and fees during token transfers, ensuring a fair system of exchange.
+
+### Function Arguments
+
+- `app: &mut CoffeeShop`: A mutable reference to the `CoffeeShop` struct, which includes the shop's treasury and balance information.
+- `mut points: Token<COFFEE>`: The `COFFEE` tokens being transferred. The token value is mutable because 1 token will be deducted as a transfer fee.
+- `recipient: address`: The recipient's blockchain address to which the tokens will be transferred.
+- `ctx: &mut TxContext`: The transaction context that includes details about the sender and manages interaction with the blockchain.
+
+```move file=<rootDir>/examples/move/token/sources/coffee.move#L84-L98
+```
+
+The function first checks if the user has enough points, splits off 1 point as the transfer fee, sends the remaining points to the recipient, and burns the 1-point commission from the system's treasury, removing it from circulation.
+
+## Full Contract
+
+<details>
+<summary>Click to view code</summary>
+
+```move
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+/// This example illustrates how to use the `Token` without a `TokenPolicy`. And
+/// only rely on `TreasuryCap` for minting and burning tokens.
+module coffee_shop::coffee {
+    use iota::tx_context::sender;
+    use iota::coin::{Self, TreasuryCap, Coin};
+    use iota::balance::{Self, Balance};
+    use iota::token::{Self, Token};
+    use iota::iota::IOTA;
+
+    /// Error code for incorrect amount.
+    const EIncorrectAmount: u64 = 0;
+    /// Trying to claim a free coffee without enough points.
+    /// Or trying to transfer but not enough points to pay the commission.
+    const ENotEnoughPoints: u64 = 1;
+
+    /// 10 IOTA for a coffee.
+    const COFFEE_PRICE: u64 = 10_000_000_000;
+
+    /// OTW for the Token.
+    public struct COFFEE has drop {}
+
+    /// The shop that sells Coffee and allows to buy a Coffee if the customer
+    /// has 10 COFFEE points.
+    public struct CoffeeShop has key {
+        id: UID,
+        /// The treasury cap for the `COFFEE` points.
+        coffee_points: TreasuryCap<COFFEE>,
+        /// The IOTA balance of the shop; the shop can sell Coffee for IOTA.
+        balance: Balance<IOTA>,
+    }
+
+    /// Event marking that a Coffee was purchased; transaction sender serves as
+    /// the customer ID.
+    public struct CoffeePurchased has copy, store, drop {}
+
+    // Create and share the `CoffeeShop` object.
+    fun init(otw: COFFEE, ctx: &mut TxContext) {
+        let (coffee_points, metadata) = coin::create_currency(
+            otw, 0, b"COFFEE", b"Coffee Point",
+            b"Buy 4 coffees and get 1 free",
+            std::option::none(),
+            ctx
+        );
+
+        iota::transfer::public_freeze_object(metadata);
+        iota::transfer::share_object(CoffeeShop {
+            coffee_points,
+            id: object::new(ctx),
+            balance: balance::zero(),
+        });
+    }
+
+    /// Buy a coffee from the shop. Emitted event is tracked by the real coffee
+    /// shop and the customer gets a free coffee after 4 purchases.
+    public fun buy_coffee(app: &mut CoffeeShop, payment: Coin<IOTA>, ctx: &mut TxContext) {
+        // Check if the customer has enough IOTA to pay for the coffee.
+        assert!(coin::value(&payment) > COFFEE_PRICE, EIncorrectAmount);
+
+        let token = token::mint(&mut app.coffee_points, 1, ctx);
+        let request = token::transfer(token, sender(ctx), ctx);
+
+        token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx);
+        coin::put(&mut app.balance, payment);
+        iota::event::emit(CoffeePurchased {})
+    }
+
+    /// Claim a free coffee from the shop. Emitted event is tracked by the real
+    /// coffee shop and the customer gets a free coffee after 4 purchases. The
+    /// `COFFEE` tokens are spent.
+    public fun claim_free(app: &mut CoffeeShop, points: Token<COFFEE>, ctx: &mut TxContext) {
+        // Check if the customer has enough `COFFEE` points to claim a free one.
+        assert!(token::value(&points) == 4, EIncorrectAmount);
+
+        // While you could use `burn`, spend illustrates another way of doing this
+        let request = token::spend(points, ctx);
+        token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx);
+        iota::event::emit(CoffeePurchased {})
+    }
+
+    /// you will allow transfer of `COFFEE` points to other customers but you charge 1
+    /// `COFFEE` point for the transfer.
+    public fun transfer(
+        app: &mut CoffeeShop,
+        mut points: Token<COFFEE>,
+        recipient: address,
+        ctx: &mut TxContext
+    ) {
+        assert!(token::value(&points) > 1, ENotEnoughPoints);
+        let commission = token::split(&mut points, 1, ctx);
+        let request = token::transfer(points, recipient, ctx);
+
+        token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx);
+        token::burn(&mut app.coffee_points, commission);
+    }
+}
+```
+
+</details>
+
+## 10. Building your Package
+
+You can use the `iota move build` command to [build](build-test.mdx) Move packages in the working directory, `coffee_shop` in this case.
+
+```bash
+iota move build
+```
+
+## 11. Publish the `coffee_shop` package by running the following command:
+
+```bash
+iota client publish
+```
+
+The console will respond with the transaction effects. You should pay attention to the created objects to retrieve the object IDs.
+
+## Conclusion
+
+In this tutorial, you explored the basics of Move programming by building a simple Coffee Shop application. You learned how to import modules, define constants, create structs, mint and burn tokens, and manage control flow with assertions. With this foundational knowledge, you can now begin experimenting with more advanced Move features and expand your decentralized applications. Happy coding!
+
+
+
+
+
+
diff --git a/docs/content/developer/getting-started/create-a-package.mdx b/docs/content/developer/getting-started/create-a-package.mdx
index aec27db3d86..b2953a600fb 100644
--- a/docs/content/developer/getting-started/create-a-package.mdx
+++ b/docs/content/developer/getting-started/create-a-package.mdx
@@ -103,7 +103,7 @@ for the dependencies.
 
 ```move
 [dependencies]
-iota = { override = true, git = "", subdir = "crates/iota-framework/packages/iota-framework", rev = "framework/testnet" }
+iota = { override = true, git = "", subdir = "crates/iota-framework/packages/iota-framework", rev = "testnet" }
 MyPackage = { local = "../my-package" }
 ```
 
@@ -114,7 +114,7 @@ MyPackage = { local = "../my-package" }
 override = true
 git = "https://github.com/iotaledger/iota.git"
 subdir = "crates/iota-framework/packages/iota-framework"
-rev = "framework/testnet"
+rev = "testnet"
 
 [dependencies.MyPackage]
 local = "../my-package"
diff --git a/docs/content/references/cli/move.mdx b/docs/content/references/cli/move.mdx
index 9e7a1c1607b..271515ca45e 100644
--- a/docs/content/references/cli/move.mdx
+++ b/docs/content/references/cli/move.mdx
@@ -70,7 +70,7 @@ name = "smart_contract_test"
 edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move
 
 [dependencies]
-Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "framework/testnet" }
+Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "testnet" }
 
 [addresses]
 smart_contract_test = "0x0"
diff --git a/docs/content/sidebars/developer.js b/docs/content/sidebars/developer.js
index b96192b54a1..54656da5b35 100644
--- a/docs/content/sidebars/developer.js
+++ b/docs/content/sidebars/developer.js
@@ -26,6 +26,7 @@ const developer = [
             'developer/getting-started/publish',
             'developer/getting-started/debug',
             'developer/getting-started/client-tssdk',
+            'developer/getting-started/coffee-example',
         ],
     },
     {
diff --git a/docs/examples/move/coffee_shop/Move.toml b/docs/examples/move/coffee_shop/Move.toml
new file mode 100644
index 00000000000..1de98af0d74
--- /dev/null
+++ b/docs/examples/move/coffee_shop/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "coffee_shop"
+edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move
+
+[dependencies]
+Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "framework/testnet" }
+
+[addresses]
+coffee_shop = "0x0"
diff --git a/docs/examples/move/coffee_shop/sources/coffee.move b/docs/examples/move/coffee_shop/sources/coffee.move
new file mode 100644
index 00000000000..6893f8d9312
--- /dev/null
+++ b/docs/examples/move/coffee_shop/sources/coffee.move
@@ -0,0 +1,99 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+/// This example illustrates how to use the `Token` without a `TokenPolicy`. And
+/// only rely on `TreasuryCap` for minting and burning tokens.
+module coffee_shop::coffee {
+    use iota::tx_context::sender;
+    use iota::coin::{Self, TreasuryCap, Coin};
+    use iota::balance::{Self, Balance};
+    use iota::token::{Self, Token};
+    use iota::iota::IOTA;
+
+    /// Error code for incorrect amount.
+    const EIncorrectAmount: u64 = 0;
+    /// Trying to claim a free coffee without enough points.
+    /// Or trying to transfer but not enough points to pay the commission.
+    const ENotEnoughPoints: u64 = 1;
+
+    /// 10 IOTA for a coffee.
+    const COFFEE_PRICE: u64 = 10_000_000_000;
+
+    /// OTW for the Token.
+    public struct COFFEE has drop {}
+
+    /// The shop that sells Coffee and allows to buy a Coffee if the customer
+    /// has 10 COFFEE points.
+    public struct CoffeeShop has key {
+        id: UID,
+        /// The treasury cap for the `COFFEE` points.
+        coffee_points: TreasuryCap<COFFEE>,
+        /// The IOTA balance of the shop; the shop can sell Coffee for IOTA.
+        balance: Balance<IOTA>,
+    }
+
+    /// Event marking that a Coffee was purchased; transaction sender serves as
+    /// the customer ID.
+    public struct CoffeePurchased has copy, store, drop {}
+
+    // Create and share the `CoffeeShop` object.
+    fun init(otw: COFFEE, ctx: &mut TxContext) {
+        let (coffee_points, metadata) = coin::create_currency(
+            otw, 0, b"COFFEE", b"Coffee Point",
+            b"Buy 4 coffees and get 1 free",
+            std::option::none(),
+            ctx
+        );
+
+        iota::transfer::public_freeze_object(metadata);
+        iota::transfer::share_object(CoffeeShop {
+            coffee_points,
+            id: object::new(ctx),
+            balance: balance::zero(),
+        });
+    }
+
+    /// Buy a coffee from the shop. Emitted event is tracked by the real coffee
+    /// shop and the customer gets a free coffee after 4 purchases.
+    public fun buy_coffee(app: &mut CoffeeShop, payment: Coin<IOTA>, ctx: &mut TxContext) {
+        // Check if the customer has enough IOTA to pay for the coffee.
+        assert!(coin::value(&payment) > COFFEE_PRICE, EIncorrectAmount);
+
+        let token = token::mint(&mut app.coffee_points, 1, ctx);
+        let request = token::transfer(token, sender(ctx), ctx);
+
+        token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx);
+        coin::put(&mut app.balance, payment);
+        iota::event::emit(CoffeePurchased {})
+    }
+
+    /// Claim a free coffee from the shop. Emitted event is tracked by the real
+    /// coffee shop and the customer gets a free coffee after 4 purchases. The
+    /// `COFFEE` tokens are spent.
+    public fun claim_free(app: &mut CoffeeShop, points: Token<COFFEE>, ctx: &mut TxContext) {
+        // Check if the customer has enough `COFFEE` points to claim a free one.
+        assert!(token::value(&points) == 4, EIncorrectAmount);
+
+        // While you could use `burn`, spend illustrates another way of doing this
+        let request = token::spend(points, ctx);
+        token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx);
+        iota::event::emit(CoffeePurchased {})
+    }
+
+    /// you will allow transfer of `COFFEE` points to other customers but you charge 1
+    /// `COFFEE` point for the transfer.
+    public fun transfer(
+        app: &mut CoffeeShop,
+        mut points: Token<COFFEE>,
+        recipient: address,
+        ctx: &mut TxContext
+    ) {
+        assert!(token::value(&points) > 1, ENotEnoughPoints);
+        let commission = token::split(&mut points, 1, ctx);
+        let request = token::transfer(points, recipient, ctx);
+
+        token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx);
+        token::burn(&mut app.coffee_points, commission);
+    }
+}
\ No newline at end of file
diff --git a/external-crates/move/documentation/book/src/packages.md b/external-crates/move/documentation/book/src/packages.md
index e6bd8126005..f6c052dc314 100644
--- a/external-crates/move/documentation/book/src/packages.md
+++ b/external-crates/move/documentation/book/src/packages.md
@@ -146,7 +146,7 @@ specified_address = "0xB0B"
 # Local dependency
 LocalDep = { local = "projects/move-awesomeness", addr_subst = { "std" = "0x1" } }
 # Git dependency
-MoveStdlib = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/move-stdlib", rev = "framework/mainnet" }
+MoveStdlib = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/move-stdlib", rev = "mainnet" }
 
 [dev-addresses] # For use when developing this module
 address_to_be_filled_in = "0x101010101"
diff --git a/iota-execution/latest/iota-move-natives/src/validator.rs b/iota-execution/latest/iota-move-natives/src/validator.rs
index 25f5a5b38e7..00616f21375 100644
--- a/iota-execution/latest/iota-move-natives/src/validator.rs
+++ b/iota-execution/latest/iota-move-natives/src/validator.rs
@@ -59,7 +59,7 @@ pub fn validate_metadata_bcs(
     let validator_metadata =
         bcs::from_bytes::<ValidatorMetadataV1>(&metadata_bytes).map_err(|_| {
             PartialVMError::new(StatusCode::MALFORMED).with_message(
-                "ValidateMetadata Move struct does not much internal ValidateMetadata struct"
+                "ValidatorMetadata Move struct does not match internal ValidatorMetadataV1 struct"
                     .to_string(),
             )
         })?;
diff --git a/iota-execution/v0/iota-move-natives/src/validator.rs b/iota-execution/v0/iota-move-natives/src/validator.rs
index 25f5a5b38e7..00616f21375 100644
--- a/iota-execution/v0/iota-move-natives/src/validator.rs
+++ b/iota-execution/v0/iota-move-natives/src/validator.rs
@@ -59,7 +59,7 @@ pub fn validate_metadata_bcs(
     let validator_metadata =
         bcs::from_bytes::<ValidatorMetadataV1>(&metadata_bytes).map_err(|_| {
             PartialVMError::new(StatusCode::MALFORMED).with_message(
-                "ValidateMetadata Move struct does not much internal ValidateMetadata struct"
+                "ValidatorMetadata Move struct does not match internal ValidatorMetadataV1 struct"
                     .to_string(),
             )
         })?;
diff --git a/nre/validator_tool.md b/nre/validator_tool.md
index 6767f59076c..51b294e4e94 100644
--- a/nre/validator_tool.md
+++ b/nre/validator_tool.md
@@ -264,3 +264,29 @@ iota client call --package 0x3 --module iota_system --function request_add_stake
 ```bash
 iota validator join-committee
 ```
+
+#### Combined
+
+First terminal:
+
+```bash
+iota start --force-regenesis --with-faucet --faucet-amount 2600000000000000
+```
+
+Second terminal after the faucet is up:
+
+```bash
+iota client switch --env localnet
+iota client faucet --url http://127.0.0.1:9123/gas
+sleep 2 
+iota validator make-validator-info validator0 description https://iota.org/logo.png https://www.iota.org 127.0.0.1 1000
+iota validator become-candidate validator.info
+sleep 2
+coinObjectId=$(iota client gas --json | jq '.[0].gasCoinId')
+validatorAddress=$(iota client active-address)
+iota client call --package 0x3 --module iota_system --function request_add_stake --args 0x5 $coinObjectId $validatorAddress --gas-budget 10000000
+sleep 2
+iota validator join-committee
+sleep 2
+iota validator display-metadata
+```
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1c37e50b96f..558fef98139 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1012,6 +1012,9 @@ importers:
       '@tanstack/react-virtual':
         specifier: ^3.5.0
         version: 3.10.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      clsx:
+        specifier: ^2.1.1
+        version: 2.1.1
       next:
         specifier: 14.2.10
         version: 14.2.10(@babel/core@7.25.2)(@playwright/test@1.47.2)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.3)
diff --git a/scripts/generate_files/update_generated_files.sh b/scripts/generate_files/update_generated_files.sh
index 127ac45a414..15aadafc962 100755
--- a/scripts/generate_files/update_generated_files.sh
+++ b/scripts/generate_files/update_generated_files.sh
@@ -1,14 +1,23 @@
 #!/bin/bash
 TARGET_FOLDER="../.."
 SKIP_SPEC_GENERATION=false
+SKIP_TS_GENERATION=false
 CHECK_BUILDS=false
 
 # Parse command line arguments
 # Usage:
 # --target-folder <path>        - the target folder of the repository
 # --skip-spec-generation        - skip the generation of the open rpc and graphql schema
+# --skip-ts-generation          - skip the generation of the typescript files
 # --check-builds                - run a build check after the generation of the files
 while [ $# -gt 0 ]; do
+    # error on unknown arguments
+    if [[ $1 != *"--target-folder"* && $1 != *"--skip-spec-generation"* && $1 != *"--skip-ts-generation"* && $1 != *"--check-builds"* ]]; then
+        echo "Unknown argument: $1"
+        echo "Usage: $0 [--target-folder <path>] [--skip-spec-generation] [--skip-ts-generation] [--check-builds]"
+        exit 1
+    fi
+
     if [[ $1 == *"--target-folder"* ]]; then
         TARGET_FOLDER=$2
     fi
@@ -17,6 +26,10 @@ while [ $# -gt 0 ]; do
         SKIP_SPEC_GENERATION=true
     fi
 
+    if [[ $1 == *"--skip-ts-generation"* ]]; then
+        SKIP_TS_GENERATION=true
+    fi
+
     if [[ $1 == *"--check-builds"* ]]; then
         CHECK_BUILDS=true
     fi
@@ -78,6 +91,11 @@ if [ "$SKIP_SPEC_GENERATION" = false ]; then
     check_error "Failed to generate graphql schema"
 fi
 
+if [ "$SKIP_TS_GENERATION" = true ]; then
+    # skipping the generation of the typescript files
+    exit 0
+fi
+
 print_step "Installing typescript sdk dependencies..."
 docker_run "cd sdk/typescript && pnpm i"
 check_error "Failed to install typescript sdk dependencies"
diff --git a/sdk/create-dapp/templates/react-e2e-counter/move/counter/Move.toml b/sdk/create-dapp/templates/react-e2e-counter/move/counter/Move.toml
index 81edd07ca83..40d0f45b0cd 100644
--- a/sdk/create-dapp/templates/react-e2e-counter/move/counter/Move.toml
+++ b/sdk/create-dapp/templates/react-e2e-counter/move/counter/Move.toml
@@ -4,7 +4,7 @@ version = "0.0.1"
 edition = "2024.beta"
 
 [dependencies]
-Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "framework/devnet" }
+Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "devnet" }
 
 [addresses]
 counter = "0x0"
diff --git a/sdk/dapp-kit/src/components/AccountDropdownMenu.tsx b/sdk/dapp-kit/src/components/AccountDropdownMenu.tsx
index 6482478262c..cb602d9ebe1 100644
--- a/sdk/dapp-kit/src/components/AccountDropdownMenu.tsx
+++ b/sdk/dapp-kit/src/components/AccountDropdownMenu.tsx
@@ -19,9 +19,10 @@ import { Text } from './ui/Text.js';
 
 type AccountDropdownMenuProps = {
     currentAccount: WalletAccount;
+    size?: React.ComponentProps<typeof Button>['size'];
 };
 
-export function AccountDropdownMenu({ currentAccount }: AccountDropdownMenuProps) {
+export function AccountDropdownMenu({ currentAccount, size = 'lg' }: AccountDropdownMenuProps) {
     const { mutate: disconnectWallet } = useDisconnectWallet();
     const accounts = useAccounts();
 
@@ -29,7 +30,7 @@ export function AccountDropdownMenu({ currentAccount }: AccountDropdownMenuProps
         <DropdownMenu.Root modal={false}>
             <StyleMarker>
                 <DropdownMenu.Trigger asChild>
-                    <Button size="lg" className={styles.connectedAccount}>
+                    <Button size={size} className={styles.connectedAccount}>
                         <Text mono weight="bold">
                             {currentAccount.label ?? formatAddress(currentAccount.address)}
                         </Text>
diff --git a/sdk/dapp-kit/src/components/ConnectButton.tsx b/sdk/dapp-kit/src/components/ConnectButton.tsx
index 58016b4b43b..809de460b27 100644
--- a/sdk/dapp-kit/src/components/ConnectButton.tsx
+++ b/sdk/dapp-kit/src/components/ConnectButton.tsx
@@ -2,7 +2,7 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ButtonHTMLAttributes, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 import { useCurrentAccount } from '../hooks/wallet/useCurrentAccount.js';
 import { AccountDropdownMenu } from './AccountDropdownMenu.js';
@@ -12,20 +12,24 @@ import { Button } from './ui/Button.js';
 
 type ConnectButtonProps = {
     connectText?: ReactNode;
-} & ButtonHTMLAttributes<HTMLButtonElement>;
+    size?: React.ComponentProps<typeof Button>['size'];
+} & React.ComponentProps<typeof Button>;
 
 export function ConnectButton({
     connectText = 'Connect Wallet',
+    size,
     ...buttonProps
 }: ConnectButtonProps) {
     const currentAccount = useCurrentAccount();
     return currentAccount ? (
-        <AccountDropdownMenu currentAccount={currentAccount} />
+        <AccountDropdownMenu currentAccount={currentAccount} size={size} />
     ) : (
         <ConnectModal
             trigger={
                 <StyleMarker>
-                    <Button {...buttonProps}>{connectText}</Button>
+                    <Button {...buttonProps} size={size}>
+                        {connectText}
+                    </Button>
                 </StyleMarker>
             }
         />
diff --git a/sdk/dapp-kit/src/index.ts b/sdk/dapp-kit/src/index.ts
index 37eba378f44..ba0224e5a8c 100644
--- a/sdk/dapp-kit/src/index.ts
+++ b/sdk/dapp-kit/src/index.ts
@@ -25,6 +25,7 @@ export * from './hooks/wallet/useReportTransactionEffects.js';
 export * from './hooks/wallet/useSwitchAccount.js';
 export * from './hooks/wallet/useWallets.js';
 export * from './themes/lightTheme.js';
+export * from './themes/darkTheme.js';
 export * from './types.js';
 
 export type { Theme, ThemeVars, DynamicTheme } from './themes/themeContract.js';
diff --git a/sdk/graphql-transport/src/generated/queries.ts b/sdk/graphql-transport/src/generated/queries.ts
index ac36d66bdf4..af75693d249 100644
--- a/sdk/graphql-transport/src/generated/queries.ts
+++ b/sdk/graphql-transport/src/generated/queries.ts
@@ -342,7 +342,7 @@ export type AuthenticatorStateCreateTransaction = {
 
 export type AuthenticatorStateExpireTransaction = {
   __typename?: 'AuthenticatorStateExpireTransaction';
-  /** The initial version that the AuthenticatorStateUpdate was shared at. */
+  /** The initial version that the AuthenticatorStateUpdateV1 was shared at. */
   authenticatorObjInitialSharedVersion: Scalars['UInt53']['output'];
   /** Expire JWKs that have a lower epoch than this. */
   minEpoch?: Maybe<Epoch>;
@@ -5018,7 +5018,7 @@ export type Validator = {
   stakingPool?: Maybe<MoveObject>;
   /** The epoch at which this pool became active. */
   stakingPoolActivationEpoch?: Maybe<Scalars['UInt53']['output']>;
-  /** The ID of this validator's `0x3::staking_pool::StakingPool`. */
+  /** The ID of this validator's `0x3::staking_pool::StakingPoolV1`. */
   stakingPoolId: Scalars['IotaAddress']['output'];
   /** The total number of IOTA tokens in this pool. */
   stakingPoolIotaBalance?: Maybe<Scalars['BigInt']['output']>;
diff --git a/sdk/graphql-transport/src/methods.ts b/sdk/graphql-transport/src/methods.ts
index 67d420b43ce..46c91c9656c 100644
--- a/sdk/graphql-transport/src/methods.ts
+++ b/sdk/graphql-transport/src/methods.ts
@@ -799,6 +799,7 @@ export const RPC_METHODS: {
             iotaTotalSupply: String(systemState.iotaTotalSupply),
             iotaTreasuryCapId: String(systemState.iotaTreasuryCapId),
             maxValidatorCount: String(systemState.systemParameters?.maxValidatorCount),
+            minValidatorCount: String(systemState.systemParameters?.minValidatorCount),
             minValidatorJoiningStake: String(
                 systemState.systemParameters?.minValidatorJoiningStake,
             ),
diff --git a/sdk/typescript/src/client/types/generated.ts b/sdk/typescript/src/client/types/generated.ts
index a8a48b0e2a6..30bcba8d817 100644
--- a/sdk/typescript/src/client/types/generated.ts
+++ b/sdk/typescript/src/client/types/generated.ts
@@ -228,7 +228,7 @@ export interface EndOfEpochInfo {
     epochEndTimestamp: string;
     lastCheckpointId: string;
     mintedTokensAmount: string;
-    /** existing fields from `SystemEpochInfoEvent` (without epoch) */
+    /** existing fields from `SystemEpochInfoEventV1` (without epoch) */
     protocolVersion: string;
     referenceGasPrice: string;
     storageCharge: string;
@@ -690,6 +690,11 @@ export interface IotaSystemStateSummary {
      * epoch to go above this.
      */
     maxValidatorCount: string;
+    /**
+     * Minimum number of active validators at any moment. We do not allow the number of validators in any
+     * epoch to go under this.
+     */
+    minValidatorCount: string;
     /** Lower-bound on the amount of stake required to become a validator. */
     minValidatorJoiningStake: string;
     /** ID of the object that contains the list of new validators that will join at the end of the epoch. */
@@ -1479,7 +1484,7 @@ export type IotaTransactionBlockKind =
       } /** A transaction which updates global authenticator state */
     | {
           epoch: string;
-          kind: 'AuthenticatorStateUpdate';
+          kind: 'AuthenticatorStateUpdateV1';
           new_active_jwks: IotaActiveJwk[];
           round: string;
       } /** A transaction which updates global randomness state */
diff --git a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql
index fba63a69734..be787e02e22 100644
--- a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql
+++ b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql
@@ -191,7 +191,7 @@ type AuthenticatorStateExpireTransaction {
 	"""
 	minEpoch: Epoch
 	"""
-	The initial version that the AuthenticatorStateUpdate was shared at.
+	The initial version that the AuthenticatorStateUpdateV1 was shared at.
 	"""
 	authenticatorObjInitialSharedVersion: UInt53!
 }
@@ -4400,7 +4400,7 @@ type Validator {
 	"""
 	stakingPool: MoveObject @deprecated(reason: "The staking pool is a wrapped object. Access its fields directly on the `Validator` type.")
 	"""
-	The ID of this validator's `0x3::staking_pool::StakingPool`.
+	The ID of this validator's `0x3::staking_pool::StakingPoolV1`.
 	"""
 	stakingPoolId: IotaAddress!
 	"""