@centrifuge/sdk 0.55.1 → 1.0.0

package/dist/entities/ShareClass.js

@@ -1,18 +1,19 @@
-import { catchError, combineLatest, defer, EMPTY, expand, filter, firstValueFrom, map, of, switchMap } from 'rxjs';
+import { catchError, combineLatest, defer, EMPTY, expand, filter, firstValueFrom, map, of, switchMap, timer, } from 'rxjs';
 import { encodeFunctionData, encodePacked, getContract } from 'viem';
 import { ABI } from '../abi/index.js';
 import { AccountType } from '../types/holdings.js';
 import { MessageType } from '../types/transaction.js';
+import { AddressMap } from '../utils/AddressMap.js';
 import { Balance, Price } from '../utils/BigInt.js';
-import { addressToBytes32, randomUint } from '../utils/index.js';
+import { addressToBytes32, encode, randomUint } from '../utils/index.js';
 import { repeatOnEvents } from '../utils/rx.js';
 import { wrapTransaction } from '../utils/transaction.js';
 import { AssetId, ShareClassId } from '../utils/types.js';
 import { BalanceSheet } from './BalanceSheet.js';
 import { Entity } from './Entity.js';
-import { PoolNetwork } from './PoolNetwork.js';
+import { PoolNetwork, VaultManagerTrustedCall } from './PoolNetwork.js';
 import { Vault } from './Vault.js';
-import { AddressMap } from '../utils/AddressMap.js';
+const GAS_LIMIT = 30000000n;
 /**
  * Query and interact with a share class, which allows querying total issuance, NAV per share,
  * and allows interactions related to asynchronous deposits and redemptions.
@@ -64,11 +65,11 @@ export class ShareClass extends Entity {
             };
         })));
     }
-    balanceSheet(chainId) {
-        return this._query(['balanceSheet', chainId], () => this.pool.activeNetworks().pipe(map((networks) => {
-            const network = networks.find((n) => n.chainId === chainId);
+    balanceSheet(centrifugeId) {
+        return this._query(['balanceSheet', centrifugeId], () => this.pool.activeNetworks().pipe(map((networks) => {
+            const network = networks.find((n) => n.centrifugeId === centrifugeId);
             if (!network) {
-                throw new Error(`No active network found for chain ID ${chainId}`);
+                throw new Error(`No active network found for centrifuge ID ${centrifugeId}`);
             }
             return new BalanceSheet(this._root, network, this);
         })));
@@ -78,15 +79,15 @@ export class ShareClass extends Entity {
             if (networks.length === 0)
                 return of([]);
             return combineLatest(networks.map((network) => combineLatest([
-                this._share(network.chainId).pipe(catchError(() => of(null))),
-                this._restrictionManager(network.chainId).pipe(catchError(() => of(null))),
-                this.valuation(network.chainId).pipe(catchError(() => of(null))),
+                this._share(network.centrifugeId),
+                this._restrictionManager(network.centrifugeId).pipe(catchError(() => of(null))),
+                this.valuation(network.centrifugeId),
                 of(network),
             ])));
         }), map((data) => data
             .filter(([share, restrictionManager]) => share != null && restrictionManager != null)
             .map(([share, restrictionManager, valuation, network]) => ({
-            chainId: network.chainId,
+            centrifugeId: network.centrifugeId,
             shareTokenAddress: share,
             restrictionManagerAddress: restrictionManager,
             valuation,
@@ -100,12 +101,12 @@ export class ShareClass extends Entity {
                   tokenPrice
                   address
                   blockchain {
-                    id
+                    centrifugeId
                   }
                 }
               }
             }`, { scId: this.id.raw }, (data) => data.tokenInstances.items.map((item) => ({
-            chainId: Number(item.blockchain.id),
+            centrifugeId: Number(item.blockchain.centrifugeId),
             totalIssuance: new Balance(item.totalIssuance, poolCurrency.decimals),
             pricePerShare: new Price(item.tokenPrice),
             nav: new Balance(item.totalIssuance, poolCurrency.decimals).mul(new Price(item.tokenPrice)),
@@ -114,31 +115,30 @@ export class ShareClass extends Entity {
     }
     /**
      * Query the vaults of the share class.
-     * @param chainId The optional chain ID to query the vaults on.
+     * @param centrifugeId The optional centrifuge ID to query the vaults on.
      * @param includeUnlinked Whether to include unlinked vaults.
      * @returns Vaults of the share class.
      */
-    vaults(chainId, includeUnlinked = false) {
-        return this._query(['vaults', chainId, includeUnlinked.toString()], () => this._allVaults().pipe(map((allVaults) => {
-            const vaults = allVaults.filter((vault) => {
-                if (chainId && vault.chainId !== chainId)
+    vaults(centrifugeId, includeUnlinked = false) {
+        return this._query(['vaults', centrifugeId, includeUnlinked.toString()], () => this._allVaults().pipe(map((allVaults) => {
+            return allVaults.filter((vault) => {
+                if (centrifugeId !== undefined && vault.centrifugeId !== centrifugeId)
                     return false;
                 if (!includeUnlinked && vault.status === 'Unlinked')
                     return false;
                 return true;
             });
-            return vaults.map((vault) => new Vault(this._root, new PoolNetwork(this._root, this.pool, vault.chainId), this, vault.assetAddress, vault.address, vault.assetId));
-        })));
+        }), map((vaults) => vaults.map((vault) => new Vault(this._root, new PoolNetwork(this._root, this.pool, vault.centrifugeId), this, vault.assetAddress, vault.address, vault.assetId)))));
     }
     /**
      * Query all the balances of the share class (from BalanceSheet and Holdings).
      */
-    balances(chainId) {
-        return this._query(['balances', chainId], () => combineLatest([this._balances(), this.pool.currency()]).pipe(switchMap(([res, poolCurrency]) => {
+    balances(centrifugeId) {
+        return this._query(['balances', centrifugeId], () => combineLatest([this._balances(), this.pool.currency()]).pipe(switchMap(([res, poolCurrency]) => {
             if (res.length === 0) {
                 return of([]);
             }
-            const items = res.filter((item) => Number(item.asset.blockchain.id) === chainId || !chainId);
+            const items = res.filter((item) => Number(item.centrifugeId) === centrifugeId || !centrifugeId);
             if (items.length === 0)
                 return of([]);
             return combineLatest([
@@ -146,11 +146,11 @@ export class ShareClass extends Entity {
                     if (!holding.holding)
                         return of(null);
                     const assetId = new AssetId(holding.assetId);
-                    return this._holding(assetId);
+                    return this._holding(assetId).pipe(catchError(() => of(null)));
                 })),
                 combineLatest(items.map((holding) => {
                     const assetId = new AssetId(holding.assetId);
-                    return this._balance(Number(holding.asset.blockchain.id), {
+                    return this._balance(Number(holding.centrifugeId), {
                         address: holding.asset.address,
                         assetTokenId: BigInt(holding.asset.assetTokenId),
                         id: assetId,
@@ -174,7 +174,7 @@ export class ShareClass extends Entity {
                         tokenId: BigInt(data.asset.assetTokenId),
                         name: data.asset.name,
                         symbol: data.asset.symbol,
-                        chainId: Number(data.asset.blockchain.id),
+                        centrifugeId: Number(data.centrifugeId),
                     },
                     holding: holding && {
                         valuation: holding.valuation,
@@ -201,20 +201,20 @@ export class ShareClass extends Entity {
                 this.balances(),
             ]).pipe(map(([epochs, outInv, outRed, balancesData]) => {
                 const invByKey = new Map();
-                outInv.forEach((o) => invByKey.set(`${o.assetId.toString()}-${o.chainId}`, o.amount));
+                outInv.forEach((o) => invByKey.set(`${o.assetId.toString()}-${o.centrifugeId}`, o.amount));
                 const redByKey = new Map();
-                outRed.forEach((o) => redByKey.set(`${o.assetId.toString()}-${o.chainId}`, o.amount));
+                outRed.forEach((o) => redByKey.set(`${o.assetId.toString()}-${o.centrifugeId}`, o.amount));
                 const priceByAsset = new Map();
                 balancesData.forEach((b) => priceByAsset.set(b.assetId.toString(), b.price));
                 return epochs.map((epoch, i) => {
                     const vault = vaults[i];
-                    const key = `${vault.assetId.toString()}-${vault.chainId}`;
+                    const key = `${vault.assetId.toString()}-${vault.centrifugeId}`;
                     const queuedInvest = invByKey.get(key) ?? new Balance(0n, 18);
                     const queuedRedeem = redByKey.get(key) ?? new Balance(0n, 18);
                     const assetPrice = priceByAsset.get(vault.assetId.toString()) ?? Price.fromFloat(1);
                     return {
                         assetId: vault.assetId,
-                        chainId: vault.chainId,
+                        centrifugeId: vault.centrifugeId,
                         queuedInvest,
                         queuedRedeem,
                         assetPrice,
@@ -227,12 +227,16 @@ export class ShareClass extends Entity {
     /**
      * Check if an address is a member of the share class.
      * @param address Address to check
-     * @param chainId Chain ID of the network on which to check the member
+     * @param centrifugeId Centrifuge ID of the network on which to check the member
      */
-    member(address, chainId) {
+    member(address, centrifugeId) {
         const addr = address.toLowerCase();
-        return this._query(['member', addr, chainId], () => combineLatest([this._share(chainId), this._restrictionManager(chainId)]).pipe(switchMap(([share, restrictionManager]) => defer(async () => {
-            const res = await this._root.getClient(chainId).readContract({
+        return this._query(['member', addr, centrifugeId], () => combineLatest([
+            this._share(centrifugeId),
+            this._restrictionManager(centrifugeId),
+            this._root.getClient(centrifugeId),
+        ]).pipe(switchMap(([share, restrictionManager, client]) => defer(async () => {
+            const res = await client.readContract({
                 address: restrictionManager,
                 abi: ABI.RestrictionManager,
                 functionName: 'isMember',
@@ -246,7 +250,7 @@ export class ShareClass extends Entity {
             address: restrictionManager,
             eventName: 'UpdateMember',
             filter: (events) => events.some((event) => event.args.user?.toLowerCase() === addr && event.args.token?.toLowerCase() === share),
-        }, chainId), catchError((e) => {
+        }, centrifugeId), catchError((e) => {
             console.warn('Error checking member status', e);
             // Freeze-only hook doesn't have isMember function
             return of({
@@ -267,7 +271,7 @@ export class ShareClass extends Entity {
         const self = this;
         return this._transact(async function* (ctx) {
             const [{ hub }, metadata] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
+                self._root._protocolAddresses(self.pool.centrifugeId),
                 self.pool.metadata(),
             ]);
             let data;
@@ -351,13 +355,13 @@ export class ShareClass extends Entity {
                 contract: hub,
                 data,
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
-    updateSharePrice(pricePerShare) {
+    updateSharePrice(pricePerShare, updatedAt = new Date()) {
         const self = this;
         return this._transact(async function* (ctx) {
             const [{ hub }, activeNetworks] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
+                self._root._protocolAddresses(self.pool.centrifugeId),
                 self.pool.activeNetworks(),
             ]);
             const batch = [];
@@ -370,17 +374,22 @@ export class ShareClass extends Entity {
             batch.push(encodeFunctionData({
                 abi: ABI.Hub,
                 functionName: 'updateSharePrice',
-                args: [self.pool.id.raw, self.id.raw, pricePerShare.toBigInt()],
+                args: [
+                    self.pool.id.raw,
+                    self.id.raw,
+                    pricePerShare.toBigInt(),
+                    BigInt(Math.floor(updatedAt.getTime() / 1000)),
+                ],
             }));
             await Promise.all(activeNetworks.map(async (activeNetwork) => {
                 const networkDetails = await activeNetwork.details();
-                const id = await self._root.id(activeNetwork.chainId);
+                const id = activeNetwork.centrifugeId;
                 const isShareClassInNetwork = networkDetails.activeShareClasses.find((shareClass) => shareClass.id.equals(self.id));
                 if (isShareClassInNetwork) {
                     batch.push(encodeFunctionData({
                         abi: ABI.Hub,
                         functionName: 'notifySharePrice',
-                        args: [self.pool.id.raw, self.id.raw, id],
+                        args: [self.pool.id.raw, self.id.raw, id, ctx.signingAddress],
                     }));
                     addMessage(id, MessageType.NotifyPricePoolPerShare);
                 }
@@ -390,81 +399,75 @@ export class ShareClass extends Entity {
                 data: batch,
                 messages,
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     setMaxAssetPriceAge(assetId, maxPriceAge) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const { hub } = await self._root._protocolAddresses(self.pool.chainId);
+            const { hub } = await self._root._protocolAddresses(self.pool.centrifugeId);
             yield* wrapTransaction('Set max asset price age', ctx, {
                 contract: hub,
                 data: encodeFunctionData({
                     abi: ABI.Hub,
                     functionName: 'setMaxAssetPriceAge',
-                    args: [self.pool.id.raw, self.id.raw, assetId.raw, BigInt(maxPriceAge)],
+                    args: [self.pool.id.raw, self.id.raw, assetId.raw, BigInt(maxPriceAge), ctx.signingAddress],
                 }),
                 messages: {
-                    [assetId.centrifugeId]: [MessageType.MaxAssetPriceAge],
+                    [assetId.centrifugeId]: [MessageType.SetMaxAssetPriceAge],
                 },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
-    setMaxSharePriceAge(chainId, maxPriceAge) {
+    setMaxSharePriceAge(centrifugeId, maxPriceAge) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [{ hub }, id] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
-                self._root.id(chainId),
-            ]);
+            const { hub } = await self._root._protocolAddresses(self.pool.centrifugeId);
             yield* wrapTransaction('Set max share price age', ctx, {
                 contract: hub,
                 data: encodeFunctionData({
                     abi: ABI.Hub,
                     functionName: 'setMaxSharePriceAge',
-                    args: [id, self.pool.id.raw, self.id.raw, BigInt(maxPriceAge)],
+                    args: [self.pool.id.raw, self.id.raw, centrifugeId, BigInt(maxPriceAge), ctx.signingAddress],
                 }),
                 messages: {
-                    [id]: [MessageType.MaxSharePriceAge],
+                    [centrifugeId]: [MessageType.SetMaxSharePriceAge],
                 },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     notifyAssetPrice(assetId) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const { hub } = await self._root._protocolAddresses(self.pool.chainId);
+            const { hub } = await self._root._protocolAddresses(self.pool.centrifugeId);
             yield* wrapTransaction('Notify asset price', ctx, {
                 contract: hub,
                 data: encodeFunctionData({
                     abi: ABI.Hub,
                     functionName: 'notifyAssetPrice',
-                    args: [self.pool.id.raw, self.id.raw, assetId.raw],
+                    args: [self.pool.id.raw, self.id.raw, assetId.raw, ctx.signingAddress],
                 }),
                 messages: {
                     [assetId.centrifugeId]: [MessageType.NotifyPricePoolPerAsset],
                 },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
-    notifySharePrice(chainId) {
+    notifySharePrice(centrifugeId) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [{ hub }, id] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
-                self._root.id(chainId),
-            ]);
+            const { hub } = await self._root._protocolAddresses(self.pool.centrifugeId);
             yield* wrapTransaction('Notify share price', ctx, {
                 contract: hub,
                 data: encodeFunctionData({
                     abi: ABI.Hub,
                     functionName: 'notifySharePrice',
-                    args: [self.pool.id.raw, self.id.raw, id],
+                    args: [self.pool.id.raw, self.id.raw, centrifugeId, ctx.signingAddress],
                 }),
                 messages: {
-                    [id]: [MessageType.NotifyPricePoolPerShare],
+                    [centrifugeId]: [MessageType.NotifyPricePoolPerShare],
                 },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /**
      * Approve deposits and issue shares for the given assets.
@@ -474,20 +477,18 @@ export class ShareClass extends Entity {
     approveDepositsAndIssueShares(assets) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [{ hub }, id, pendingAmounts, orders, maxBatchGasLimit] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
-                self._root.id(self.pool.chainId),
+            const [{ batchRequestManager }, pendingAmounts, orders] = await Promise.all([
+                self._root._protocolAddresses(self.pool.centrifugeId),
                 self.pendingAmounts(),
                 firstValueFrom(self._investorOrders().pipe(switchMap((orders) => {
                     if (orders.outstandingInvests.length === 0)
                         return of([]);
                     return combineLatest(orders.outstandingInvests.map((order) => self._investorOrder(order.assetId, order.investor)));
                 }))),
-                self._root._maxBatchGasLimit(self.pool.chainId),
             ]);
-            const assetsWithApprove = assets.filter((a) => a.approveAssetAmount).length;
-            const assetsWithIssue = assets.filter((a) => a.issuePricePerShare).length;
-            const gasLimitPerAsset = assetsWithIssue ? maxBatchGasLimit / BigInt(assetsWithIssue) : 0n;
+            const assetsWithApprove = assets.filter((a) => 'approveAssetAmount' in a).length;
+            const assetsWithIssue = assets.filter((a) => 'issuePricePerShare' in a).length;
+            const gasLimitPerAsset = assetsWithIssue ? GAS_LIMIT / BigInt(assetsWithIssue) : 0n;
             const estimatePerMessage = 700000n;
             const estimatePerMessageIfLocal = 360000n;
             const ordersByAssetId = {};
@@ -511,14 +512,14 @@ export class ShareClass extends Entity {
                 messages[centId].push(message);
             }
             for (const asset of assets) {
-                const gasPerMessage = asset.assetId.centrifugeId === id ? estimatePerMessageIfLocal : estimatePerMessage;
+                const gasPerMessage = asset.assetId.centrifugeId === self.pool.centrifugeId ? estimatePerMessageIfLocal : estimatePerMessage;
                 let gasLeft = gasLimitPerAsset;
                 const pending = pendingAmounts.find((e) => e.assetId.equals(asset.assetId));
                 if (!pending) {
                     throw new Error(`No pending amount found for asset "${asset.assetId.toString()}"`);
                 }
                 let nowDepositEpoch = pending?.depositEpoch;
-                if (asset.approveAssetAmount) {
+                if ('approveAssetAmount' in asset) {
                     if (asset.approveAssetAmount.gt(pending.pendingDeposit)) {
                         throw new Error(`Approve amount exceeds pending amount for asset "${asset.assetId.toString()}"`);
                     }
@@ -526,7 +527,7 @@ export class ShareClass extends Entity {
                         throw new Error(`Approve amount must be greater than 0 for asset "${asset.assetId.toString()}"`);
                     }
                     batch.push(encodeFunctionData({
-                        abi: ABI.Hub,
+                        abi: ABI.BatchRequestManager,
                         functionName: 'approveDeposits',
                         args: [
                             self.pool.id.raw,
@@ -534,6 +535,8 @@ export class ShareClass extends Entity {
                             asset.assetId.raw,
                             nowDepositEpoch,
                             asset.approveAssetAmount.toBigInt(),
+                            asset.approvePricePerAsset.toBigInt(),
+                            ctx.signingAddress,
                         ],
                     }));
                     addMessage(asset.assetId.centrifugeId, MessageType.RequestCallback);
@@ -541,7 +544,7 @@ export class ShareClass extends Entity {
                     nowDepositEpoch++;
                 }
                 const nowIssueEpoch = pending.issueEpoch;
-                if (asset.issuePricePerShare) {
+                if ('issuePricePerShare' in asset) {
                     if (nowIssueEpoch >= nowDepositEpoch)
                         throw new Error('Nothing to issue');
                     let i;
@@ -555,9 +558,17 @@ export class ShareClass extends Entity {
                             throw new Error(`Issue price per share must be greater than 0 for asset "${asset.assetId.toString()}"`);
                         }
                         batch.push(encodeFunctionData({
-                            abi: ABI.Hub,
+                            abi: ABI.BatchRequestManager,
                             functionName: 'issueShares',
-                            args: [self.pool.id.raw, self.id.raw, asset.assetId.raw, nowIssueEpoch + i, price.toBigInt(), 0n],
+                            args: [
+                                self.pool.id.raw,
+                                self.id.raw,
+                                asset.assetId.raw,
+                                nowIssueEpoch + i,
+                                price.toBigInt(),
+                                0n,
+                                ctx.signingAddress,
+                            ],
                         }));
                         addMessage(asset.assetId.centrifugeId, MessageType.RequestCallback);
                         gasLeft -= gasPerMessage;
@@ -569,7 +580,7 @@ export class ShareClass extends Entity {
                         assetOrders?.slice(0, claims).forEach((order) => {
                             if (order.pendingDeposit > 0n) {
                                 batch.push(encodeFunctionData({
-                                    abi: ABI.Hub,
+                                    abi: ABI.BatchRequestManager,
                                     functionName: 'notifyDeposit',
                                     args: [
                                         self.pool.id.raw,
@@ -577,6 +588,7 @@ export class ShareClass extends Entity {
                                         asset.assetId.raw,
                                         addressToBytes32(order.investor),
                                         order.maxDepositClaims + i, // +i to ensure the additional epochs that are being issued are included
+                                        ctx.signingAddress,
                                     ],
                                 }));
                                 addMessage(asset.assetId.centrifugeId, MessageType.RequestCallback);
@@ -596,11 +608,11 @@ export class ShareClass extends Entity {
                 title = 'Approve';
             }
             yield* wrapTransaction(title, ctx, {
-                contract: hub,
+                contract: batchRequestManager,
                 data: batch,
                 messages,
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /**
      * Approve redeems and revoke shares for the given assets.
@@ -610,20 +622,18 @@ export class ShareClass extends Entity {
     approveRedeemsAndRevokeShares(assets) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [{ hub }, id, pendingAmounts, orders, maxBatchGasLimit] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
-                self._root.id(self.pool.chainId),
+            const [{ batchRequestManager }, pendingAmounts, orders] = await Promise.all([
+                self._root._protocolAddresses(self.pool.centrifugeId),
                 self.pendingAmounts(),
                 firstValueFrom(self._investorOrders().pipe(switchMap((orders) => {
                     if (orders.outstandingRedeems.length === 0)
                         return of([]);
                     return combineLatest(orders.outstandingRedeems.map((order) => self._investorOrder(order.assetId, order.investor)));
                 }))),
-                self._root._maxBatchGasLimit(self.pool.chainId),
             ]);
-            const assetsWithApprove = assets.filter((a) => a.approveShareAmount).length;
-            const assetsWithRevoke = assets.filter((a) => a.revokePricePerShare).length;
-            const gasLimitPerAsset = assetsWithRevoke ? maxBatchGasLimit / BigInt(assetsWithRevoke) : 0n;
+            const assetsWithApprove = assets.filter((a) => 'approveShareAmount' in a).length;
+            const assetsWithRevoke = assets.filter((a) => 'revokePricePerShare' in a).length;
+            const gasLimitPerAsset = assetsWithRevoke ? GAS_LIMIT / BigInt(assetsWithRevoke) : 0n;
             const estimatePerMessage = 700000n;
             const estimatePerMessageIfLocal = 360000n;
             const ordersByAssetId = {};
@@ -647,14 +657,14 @@ export class ShareClass extends Entity {
                 messages[centId].push(message);
             }
             for (const asset of assets) {
-                const gasPerMessage = asset.assetId.centrifugeId === id ? estimatePerMessageIfLocal : estimatePerMessage;
+                const gasPerMessage = asset.assetId.centrifugeId === self.pool.centrifugeId ? estimatePerMessageIfLocal : estimatePerMessage;
                 let gasLeft = gasLimitPerAsset;
                 const pending = pendingAmounts.find((e) => e.assetId.equals(asset.assetId));
                 if (!pending) {
                     throw new Error(`No pending amount found for asset "${asset.assetId.toString()}"`);
                 }
                 let nowRedeemEpoch = pending.redeemEpoch;
-                if (asset.approveShareAmount) {
+                if ('approveShareAmount' in asset) {
                     if (asset.approveShareAmount.gt(pending.pendingRedeem)) {
                         throw new Error(`Share amount exceeds pending redeem for asset "${asset.assetId.toString()}"`);
                     }
@@ -662,7 +672,7 @@ export class ShareClass extends Entity {
                         throw new Error(`Share amount must be greater than 0 for asset "${asset.assetId.toString()}"`);
                     }
                     batch.push(encodeFunctionData({
-                        abi: ABI.Hub,
+                        abi: ABI.BatchRequestManager,
                         functionName: 'approveRedeems',
                         args: [
                             self.pool.id.raw,
@@ -670,12 +680,13 @@ export class ShareClass extends Entity {
                             asset.assetId.raw,
                             nowRedeemEpoch,
                             asset.approveShareAmount.toBigInt(),
+                            asset.approvePricePerAsset.toBigInt(),
                         ],
                     }));
                     nowRedeemEpoch++;
                 }
                 const nowRevokeEpoch = pending.revokeEpoch;
-                if (asset.revokePricePerShare) {
+                if ('revokePricePerShare' in asset) {
                     if (nowRevokeEpoch >= nowRedeemEpoch)
                         throw new Error('Nothing to revoke');
                     let i;
@@ -689,9 +700,17 @@ export class ShareClass extends Entity {
                             throw new Error(`Revoke price per share must be greater than 0 for asset "${asset.assetId.toString()}"`);
                         }
                         batch.push(encodeFunctionData({
-                            abi: ABI.Hub,
+                            abi: ABI.BatchRequestManager,
                             functionName: 'revokeShares',
-                            args: [self.pool.id.raw, self.id.raw, asset.assetId.raw, nowRevokeEpoch + i, price.toBigInt(), 0n],
+                            args: [
+                                self.pool.id.raw,
+                                self.id.raw,
+                                asset.assetId.raw,
+                                nowRevokeEpoch + i,
+                                price.toBigInt(),
+                                0n,
+                                ctx.signingAddress,
+                            ],
                         }));
                         addMessage(asset.assetId.centrifugeId, MessageType.RequestCallback);
                         gasLeft -= gasPerMessage;
@@ -703,7 +722,7 @@ export class ShareClass extends Entity {
                         assetOrders?.slice(0, claims).forEach((order) => {
                             if (order.pendingRedeem > 0n) {
                                 batch.push(encodeFunctionData({
-                                    abi: ABI.Hub,
+                                    abi: ABI.BatchRequestManager,
                                     functionName: 'notifyRedeem',
                                     args: [
                                         self.pool.id.raw,
@@ -711,6 +730,7 @@ export class ShareClass extends Entity {
                                         asset.assetId.raw,
                                         addressToBytes32(order.investor),
                                         order.maxRedeemClaims + 1, // +1 to ensure the order that's being issued is included
+                                        ctx.signingAddress,
                                     ],
                                 }));
                                 addMessage(asset.assetId.centrifugeId, MessageType.RequestCallback);
@@ -730,11 +750,11 @@ export class ShareClass extends Entity {
                 title = 'Approve';
             }
             yield* wrapTransaction(title, ctx, {
-                contract: hub,
+                contract: batchRequestManager,
                 data: batch,
                 messages,
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /**
      * Claim a deposit on the Hub side for the given asset and investor after the shares have been issued.
@@ -743,14 +763,14 @@ export class ShareClass extends Entity {
     claimDeposit(assetId, investor) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [{ hub }, investorOrder] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
+            const [{ batchRequestManager }, investorOrder] = await Promise.all([
+                self._root._protocolAddresses(self.pool.centrifugeId),
                 self._investorOrder(assetId, investor),
             ]);
             yield* wrapTransaction('Claim deposit', ctx, {
-                contract: hub,
+                contract: batchRequestManager,
                 data: encodeFunctionData({
-                    abi: ABI.Hub,
+                    abi: ABI.BatchRequestManager,
                     functionName: 'notifyDeposit',
                     args: [
                         self.pool.id.raw,
@@ -758,11 +778,12 @@ export class ShareClass extends Entity {
                         assetId.raw,
                         addressToBytes32(investor),
                         investorOrder.maxDepositClaims,
+                        ctx.signingAddress,
                     ],
                 }),
                 messages: { [assetId.centrifugeId]: [MessageType.RequestCallback] },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /**
      * Claim a redemption on the Hub side for the given asset and investor after the shares have been revoked.
@@ -771,44 +792,48 @@ export class ShareClass extends Entity {
     claimRedeem(assetId, investor) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [{ hub }, investorOrder] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
+            const [{ batchRequestManager }, investorOrder] = await Promise.all([
+                self._root._protocolAddresses(self.pool.centrifugeId),
                 self._investorOrder(assetId, investor),
             ]);
             yield* wrapTransaction('Claim redeem', ctx, {
-                contract: hub,
+                contract: batchRequestManager,
                 data: encodeFunctionData({
-                    abi: ABI.Hub,
+                    abi: ABI.BatchRequestManager,
                     functionName: 'notifyRedeem',
-                    args: [self.pool.id.raw, self.id.raw, assetId.raw, addressToBytes32(investor), investorOrder.maxRedeemClaims],
+                    args: [
+                        self.pool.id.raw,
+                        self.id.raw,
+                        assetId.raw,
+                        addressToBytes32(investor),
+                        investorOrder.maxRedeemClaims,
+                        ctx.signingAddress,
+                    ],
                 }),
                 messages: { [assetId.centrifugeId]: [MessageType.RequestCallback] },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /**
      * Update a member of the share class.
      * @param address Address of the investor
      * @param validUntil Time in seconds from Unix epoch until the investor is valid
-     * @param chainId Chain ID of the network on which to update the member
+     * @param centrifugeId Centrifuge ID of the network on which to update the member
      */
-    updateMember(address, validUntil, chainId) {
-        return this.updateMembers([{ address, validUntil, chainId }]);
+    updateMember(address, validUntil, centrifugeId) {
+        return this.updateMembers([{ address, validUntil, centrifugeId }]);
     }
     /**
      * Batch update a list of members of the share class.
-     * @param members Array of members to update, each with address, validUntil and chainId
+     * @param members Array of members to update, each with address, validUntil and centrifugeId
      * @param members.address Address of the investor
      * @param members.validUntil Time in seconds from Unix epoch until the investor is valid
-     * @param members.chainId Chain ID of the network on which to update the member
+     * @param members.centrifugeId Centrifuge ID of the network on which to update the member
      */
     updateMembers(members) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [{ hub }, ...ids] = await Promise.all([
-                self._root._protocolAddresses(self.pool.chainId),
-                ...members.map((m) => self._root.id(m.chainId)),
-            ]);
+            const { hub } = await self._root._protocolAddresses(self.pool.centrifugeId);
             const batch = [];
             const messages = {};
             function addMessage(centId, message) {
@@ -816,23 +841,20 @@ export class ShareClass extends Entity {
                     messages[centId] = [];
                 messages[centId].push(message);
             }
-            members.forEach((member, index) => {
-                const id = ids[index];
-                if (!id) {
-                    return;
-                }
+            members.forEach((member) => {
                 batch.push(encodeFunctionData({
                     abi: ABI.Hub,
                     functionName: 'updateRestriction',
                     args: [
                         self.pool.id.raw,
                         self.id.raw,
-                        id,
+                        member.centrifugeId,
                         encodePacked(['uint8', 'bytes32', 'uint64'], [/* UpdateRestrictionType.Member */ 1, addressToBytes32(member.address), BigInt(member.validUntil)]),
                         0n,
+                        ctx.signingAddress,
                     ],
                 }));
-                addMessage(id, MessageType.UpdateRestriction);
+                addMessage(member.centrifugeId, MessageType.UpdateRestriction);
             });
             if (batch.length === 0) {
                 throw new Error('No data to update members');
@@ -842,7 +864,7 @@ export class ShareClass extends Entity {
                 data: batch,
                 messages,
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /**
      * Retrieve all holders of the share class.
@@ -873,11 +895,10 @@ export class ShareClass extends Entity {
             orderBy,
             orderDirection,
         ], () => combineLatest([
-            this._root._deployments(),
             this.pool.currency(),
             this._investorOrders(),
             this._tokenInstancePositions({ limit, offset, orderBy, orderDirection, filter }),
-        ]).pipe(switchMap(([deployments, poolCurrency, { outstandingInvests, outstandingRedeems }, { items: tokenInstancePositions, assets, pageInfo, totalCount },]) => {
+        ]).pipe(switchMap(([poolCurrency, { outstandingInvests, outstandingRedeems }, { items: tokenInstancePositions, assets, pageInfo, totalCount },]) => {
             // Handle empty positions case or else combineLatest([]) can hang indefinitely
             if (tokenInstancePositions.length === 0) {
                 return of({
@@ -891,11 +912,10 @@ export class ShareClass extends Entity {
                 centrifugeId: position.centrifugeId,
                 tokenId: this.id.raw,
             }).pipe(catchError(() => of(null))));
-            const chainsById = new Map(deployments.blockchains.items.map((chain) => [chain.centrifugeId, chain.id]));
             return combineLatest(whitelistedQueries).pipe(map((whitelistResults) => {
                 const investors = tokenInstancePositions.map((position, i) => {
                     const whitelistData = whitelistResults[i];
-                    const chainId = Number(chainsById.get(position.centrifugeId));
+                    const centrifugeId = Number(position.centrifugeId);
                     const outstandingInvest = outstandingInvests.find((order) => order.investor === position.accountAddress);
                     const outstandingRedeem = outstandingRedeems.find((order) => order.investor === position.accountAddress);
                     const assetId = outstandingInvest?.assetId.toString();
@@ -906,7 +926,7 @@ export class ShareClass extends Entity {
                     return {
                         address: position.accountAddress,
                         amount: new Balance(outstandingInvest?.pendingAmount ?? 0n, assetDecimals),
-                        chainId,
+                        centrifugeId,
                         createdAt: whitelistData?.createdAt ?? '',
                         holdings: new Balance(position.balance, poolCurrency.decimals),
                         isFrozen: whitelistData?.isFrozen ?? position.isFrozen,
@@ -947,12 +967,7 @@ export class ShareClass extends Entity {
     whitelistedHolders(options) {
         const limit = options?.limit ?? 20;
         const offset = options?.offset ?? 0;
-        return this._query(['whitelistedHolders', this.id.raw, limit, offset], () => combineLatest([
-            this._root._deployments(),
-            this.pool.currency(),
-            this._investorOrders(),
-            this._whitelistedInvestors({ limit, offset }),
-        ]).pipe(switchMap(([deployments, poolCurrency, { outstandingInvests, outstandingRedeems }, { items: whitelistedInvestors, assets, pageInfo, totalCount },]) => {
+        return this._query(['whitelistedHolders', this.id.raw, limit, offset], () => combineLatest([this.pool.currency(), this._investorOrders(), this._whitelistedInvestors({ limit, offset })]).pipe(switchMap(([poolCurrency, { outstandingInvests, outstandingRedeems }, { items: whitelistedInvestors, assets, pageInfo, totalCount },]) => {
             if (whitelistedInvestors.length === 0) {
                 return of({
                     investors: [],
@@ -965,11 +980,9 @@ export class ShareClass extends Entity {
                 centrifugeId: investor.centrifugeId,
                 tokenId: this.id.raw,
             }).pipe(catchError(() => of(null))));
-            const chainsById = new Map(deployments.blockchains.items.map((chain) => [chain.centrifugeId, chain.id]));
             return combineLatest(positionQueries).pipe(map((positionResults) => {
                 const investors = whitelistedInvestors.map((investor, i) => {
                     const positionData = positionResults[i];
-                    const chainId = Number(chainsById.get(investor.centrifugeId));
                     const outstandingInvest = outstandingInvests.find((order) => order.investor === investor.address);
                     const outstandingRedeem = outstandingRedeems.find((order) => order.investor === investor.address);
                     const assetId = outstandingInvest?.assetId.toString();
@@ -979,7 +992,7 @@ export class ShareClass extends Entity {
                     return {
                         address: investor.address,
                         amount: new Balance(outstandingInvest?.pendingAmount ?? 0n, assetDecimals),
-                        chainId,
+                        centrifugeId: Number(investor.centrifugeId),
                         createdAt: investor.createdAt,
                         holdings: new Balance(positionBalance, poolCurrency.decimals),
                         isFrozen: investor.isFrozen ?? positionData?.isFrozen,
@@ -1040,13 +1053,15 @@ export class ShareClass extends Entity {
     }
     /**
      * Freeze a member of the share class.
+     * @param address Address to freeze
+     * @param centrifugeId Centrifuge ID of the network on which to freeze the member
      */
-    freezeMember(address, chainId) {
+    freezeMember(address, centrifugeId) {
         const self = this;
         return this._transact(async function* (ctx) {
             const [share, restrictionManager] = await Promise.all([
-                firstValueFrom(self._share(chainId)),
-                firstValueFrom(self._restrictionManager(chainId)),
+                firstValueFrom(self._share(centrifugeId)),
+                firstValueFrom(self._restrictionManager(centrifugeId)),
             ]);
             yield* wrapTransaction('Freeze member', ctx, {
                 contract: restrictionManager,
@@ -1056,17 +1071,19 @@ export class ShareClass extends Entity {
                     args: [share, address],
                 }),
             });
-        }, chainId);
+        }, centrifugeId);
     }
     /**
      * Unfreeze a member of the share class
+     * @param address Address to unfreeze
+     * @param centrifugeId Centrifuge ID of the network on which to unfreeze the member
      */
-    unfreezeMember(address, chainId) {
+    unfreezeMember(address, centrifugeId) {
         const self = this;
         return this._transact(async function* (ctx) {
             const [share, restrictionManager] = await Promise.all([
-                firstValueFrom(self._share(chainId)),
-                firstValueFrom(self._restrictionManager(chainId)),
+                firstValueFrom(self._share(centrifugeId)),
+                firstValueFrom(self._restrictionManager(centrifugeId)),
             ]);
             yield* wrapTransaction('Unfreeze member', ctx, {
                 contract: restrictionManager,
@@ -1076,14 +1093,14 @@ export class ShareClass extends Entity {
                     args: [share, address],
                 }),
             });
-        }, chainId);
+        }, centrifugeId);
     }
     /**
      * Get the pending and claimable investment/redeem amounts for all investors
      * in a given share class (per vault/chain)
      */
-    investmentsByVault(chainId) {
-        return this._query(['investmentsByVault', chainId], () => combineLatest([this._investorOrders(), this.vaults(chainId), this.pendingAmounts()]).pipe(switchMap(([orders, vaults, pendingAmounts]) => {
+    investmentsByVault(centrifugeId) {
+        return this._query(['investmentsByVault', centrifugeId], () => combineLatest([this._investorOrders(), this.vaults(centrifugeId), this.pendingAmounts()]).pipe(switchMap(([orders, vaults, pendingAmounts]) => {
             if (!vaults.length)
                 return of([]);
             const allInvestors = new Set();
@@ -1101,25 +1118,25 @@ export class ShareClass extends Entity {
                     .forEach((o) => vaultInvestors.add(o.investor));
                 if (vaultInvestors.size === 0)
                     return of([]);
-                const pendingMatch = pendingAmounts.find((p) => p.assetId.equals(vault.assetId) && p.chainId === vault.chainId);
+                const pendingMatch = pendingAmounts.find((p) => p.assetId.equals(vault.assetId) && p.centrifugeId === vault.centrifugeId);
                 const allPendingIssuances = pendingMatch?.pendingIssuances ?? [];
                 const allPendingRevocations = pendingMatch?.pendingRevocations ?? [];
                 return combineLatest(Array.from(vaultInvestors).map((investor) => vault.investment(investor).pipe(map((investment) => {
                     const pendingIssuances = allPendingIssuances.map((epoch) => ({
                         ...epoch,
                         assetId: vault.assetId,
-                        chainId: vault.chainId,
+                        centrifugeId: vault.centrifugeId,
                     }));
                     const pendingRevocations = allPendingRevocations.map((epoch) => ({
                         ...epoch,
                         assetId: vault.assetId,
-                        chainId: vault.chainId,
+                        centrifugeId: vault.centrifugeId,
                     }));
                     return {
                         investor,
                         investment,
                         assetId: vault.assetId,
-                        chainId: vault.chainId,
+                        centrifugeId: vault.centrifugeId,
                         pendingIssuances,
                         pendingRevocations,
                         pendingMatch,
@@ -1128,7 +1145,7 @@ export class ShareClass extends Entity {
                     investor,
                     investment: null,
                     assetId: vault.assetId,
-                    chainId: vault.chainId,
+                    centrifugeId: vault.centrifugeId,
                     pendingIssuances: [],
                     pendingRevocations: [],
                     pendingMatch: null,
@@ -1169,7 +1186,7 @@ export class ShareClass extends Entity {
                                 expandedRecords.push({
                                     investor: inv.investor,
                                     assetId: inv.assetId,
-                                    chainId: inv.chainId,
+                                    centrifugeId: inv.centrifugeId,
                                     epoch: inv.pendingMatch.depositEpoch,
                                     epochType: 'deposit',
                                     investorAmount,
@@ -1188,7 +1205,7 @@ export class ShareClass extends Entity {
                                     expandedRecords.push({
                                         investor: inv.investor,
                                         assetId: inv.assetId,
-                                        chainId: inv.chainId,
+                                        centrifugeId: inv.centrifugeId,
                                         epoch: issuance.epoch,
                                         epochType: 'issue',
                                         investorAmount,
@@ -1207,7 +1224,7 @@ export class ShareClass extends Entity {
                                 expandedRecords.push({
                                     investor: inv.investor,
                                     assetId: inv.assetId,
-                                    chainId: inv.chainId,
+                                    centrifugeId: inv.centrifugeId,
                                     epoch: inv.pendingMatch.redeemEpoch,
                                     epochType: 'redeem',
                                     investorAmount,
@@ -1226,7 +1243,7 @@ export class ShareClass extends Entity {
                                     expandedRecords.push({
                                         investor: inv.investor,
                                         assetId: inv.assetId,
-                                        chainId: inv.chainId,
+                                        centrifugeId: inv.centrifugeId,
                                         epoch: revocation.epoch,
                                         epochType: 'revoke',
                                         investorAmount,
@@ -1265,15 +1282,10 @@ export class ShareClass extends Entity {
                   decimals
                   symbol
                   name
-                  blockchain {
-                    chainId
-                  }
+                  centrifugeId
                 }
                 token {
                   decimals
-                  blockchain {
-                    chainId
-                  }
                 }
               }
             }
@@ -1305,14 +1317,10 @@ export class ShareClass extends Entity {
                           decimals
                           symbol
                           name
-                          blockchain {
-                            chainId
-                          }
+                          centrifugeId
                         }
                         token {
                           decimals
-                          blockchain {
-                            chainId
                           }
                         }
                       }
@@ -1398,15 +1406,10 @@ export class ShareClass extends Entity {
                   decimals
                   symbol
                   name
-                  blockchain {
-                    chainId
-                  }
+                  centrifugeId
                 }
                 token {
                   decimals
-                  blockchain {
-                    chainId
-                  }
                 }
               }
             }
@@ -1438,15 +1441,10 @@ export class ShareClass extends Entity {
                           decimals
                           symbol
                           name
-                          blockchain {
-                            chainId
-                          }
+                          centrifugeId
                         }
                         token {
                           decimals
-                          blockchain {
-                            chainId
-                          }
                         }
                       }
                     }
@@ -1511,13 +1509,13 @@ export class ShareClass extends Entity {
     }
     /**
      * Get the valuation contract address for this share class on a specific chain.
-     * @param chainId
+     * @param centrifugeId
      */
-    valuation(chainId) {
-        return this._query(['valuation', chainId], () => this._root._protocolAddresses(chainId).pipe(switchMap(({ syncManager }) => defer(async () => {
-            const valuation = await this._root.getClient(chainId).readContract({
+    valuation(centrifugeId) {
+        return this._query(['valuation', centrifugeId], () => combineLatest([this._root._protocolAddresses(centrifugeId), this._root.getClient(centrifugeId)]).pipe(switchMap(([{ syncManager }, client]) => defer(async () => {
+            const valuation = await client.readContract({
                 address: syncManager,
-                abi: ABI.SyncRequests,
+                abi: ABI.SyncManager,
                 functionName: 'valuation',
                 args: [this.pool.id.raw, this.id.raw],
             });
@@ -1526,20 +1524,19 @@ export class ShareClass extends Entity {
             address: syncManager,
             eventName: ['SetValuation'],
             filter: (events) => events.some((event) => event.args.poolId === this.pool.id.raw && event.args.scId === this.id.raw),
-        }, chainId)))));
+        }, centrifugeId)))));
     }
     /**
      * Set the default valuation contract for this share class on a specific chain.
-     * @param chainId - The chain ID where the valuation should be updated
+     * @param centrifugeId - The centrifuge ID where the valuation should be updated
      * @param valuation - The address of the valuation contract
      */
-    updateValuation(chainId, valuation) {
+    updateValuation(centrifugeId, valuation) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [id, { hub }, spokeAddresses] = await Promise.all([
-                self._root.id(chainId),
-                self._root._protocolAddresses(self.pool.chainId),
-                self._root._protocolAddresses(chainId),
+            const [{ hub }, spokeAddresses] = await Promise.all([
+                self._root._protocolAddresses(self.pool.centrifugeId),
+                self._root._protocolAddresses(centrifugeId),
             ]);
             yield* wrapTransaction('Update valuation', ctx, {
                 contract: hub,
@@ -1549,55 +1546,52 @@ export class ShareClass extends Entity {
                     args: [
                         self.pool.id.raw,
                         self.id.raw,
-                        id,
+                        centrifugeId,
                         addressToBytes32(spokeAddresses.syncManager),
-                        encodePacked(['uint8', 'bytes32'], [/* UpdateContractType.Valuation */ 1, addressToBytes32(valuation)]),
+                        encode([VaultManagerTrustedCall.Valuation, addressToBytes32(valuation)]),
                         0n,
+                        ctx.signingAddress,
                     ],
                 }),
-                messages: { [id]: [MessageType.UpdateContract] },
+                messages: { [centrifugeId]: [MessageType.TrustedContractUpdate] },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /**
      * Update the hook for this share class on a specific chain.
-     * @param chainId - The chain ID where the hook should be updated
+     * @param centrifugeId - The centrifuge ID where the hook should be updated
      * @param hook - The address of the new hook contract
      */
-    updateHook(chainId, hook) {
+    updateHook(centrifugeId, hook) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [id, { hub }] = await Promise.all([
-                self._root.id(chainId),
-                self._root._protocolAddresses(self.pool.chainId),
-            ]);
+            const { hub } = await self._root._protocolAddresses(self.pool.centrifugeId);
             yield* wrapTransaction('Update hook', ctx, {
                 contract: hub,
                 data: encodeFunctionData({
                     abi: ABI.Hub,
                     functionName: 'updateShareHook',
-                    args: [self.pool.id.raw, self.id.raw, id, addressToBytes32(hook)],
+                    args: [self.pool.id.raw, self.id.raw, centrifugeId, addressToBytes32(hook), ctx.signingAddress],
                 }),
-                messages: { [id]: [MessageType.UpdateShareHook] },
+                messages: { [centrifugeId]: [MessageType.UpdateShareHook] },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /**
      * Update both (or one of) the hook and valuation for this share class on a specific chain in a single transaction.
-     * @param chainId - The chain ID where the updates should be applied
+     * @param centrifugeId - The centrifuge ID where the updates should be applied
      * @param hook - The address of the new hook contract (optional)
      * @param valuation - The address of the new valuation contract (optional)
      */
-    updateHookAndValuation(chainId, hook, valuation) {
+    updateHookAndValuation(centrifugeId, hook, valuation) {
         if (!hook && !valuation) {
             throw new Error('At least one of hook or valuation must be provided');
         }
         const self = this;
         return this._transact(async function* (ctx) {
-            const [id, { hub }, spokeAddresses] = await Promise.all([
-                self._root.id(chainId),
-                self._root._protocolAddresses(self.pool.chainId),
-                self._root._protocolAddresses(chainId),
+            const [{ hub }, spokeAddresses] = await Promise.all([
+                self._root._protocolAddresses(self.pool.centrifugeId),
+                self._root._protocolAddresses(centrifugeId),
             ]);
             const calls = [];
             const messages = [];
@@ -1605,7 +1599,7 @@ export class ShareClass extends Entity {
                 calls.push(encodeFunctionData({
                     abi: ABI.Hub,
                     functionName: 'updateShareHook',
-                    args: [self.pool.id.raw, self.id.raw, id, addressToBytes32(hook)],
+                    args: [self.pool.id.raw, self.id.raw, centrifugeId, addressToBytes32(hook), ctx.signingAddress],
                 }));
                 messages.push(MessageType.UpdateShareHook);
             }
@@ -1616,21 +1610,22 @@ export class ShareClass extends Entity {
                     args: [
                         self.pool.id.raw,
                         self.id.raw,
-                        id,
+                        centrifugeId,
                         addressToBytes32(spokeAddresses.syncManager),
                         encodePacked(['uint8', 'bytes32'], [/* UpdateContractType.Valuation */ 1, addressToBytes32(valuation)]),
                         0n,
+                        ctx.signingAddress,
                     ],
                 }));
-                messages.push(MessageType.UpdateContract);
+                messages.push(MessageType.TrustedContractUpdate);
             }
             const title = hook && valuation ? 'Update hook and valuation' : hook ? 'Update hook' : 'Update valuation';
             yield* wrapTransaction(title, ctx, {
                 contract: hub,
                 data: calls,
-                messages: { [id]: messages },
+                messages: { [centrifugeId]: messages },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /** @internal */
     _balances() {
@@ -1643,6 +1638,7 @@ export class ShareClass extends Entity {
             assetAmount
             assetPrice
             assetId
+            centrifugeId
             asset {
               decimals
               assetTokenId
@@ -1651,6 +1647,7 @@ export class ShareClass extends Entity {
               symbol
               blockchain {
                 id
+                centrifugeId
               }
             }
           }
@@ -1662,14 +1659,15 @@ export class ShareClass extends Entity {
     /** @internal */
     _holding(assetId) {
         return this._query(['holding', assetId.toString()], () => combineLatest([
-            this._root._protocolAddresses(this.pool.chainId),
+            this._root._protocolAddresses(this.pool.centrifugeId),
             this.pool.currency(),
-            this._root._assetDecimals(assetId, this.pool.chainId),
+            this._root._assetDecimals(assetId, this.pool.centrifugeId),
         ]).pipe(switchMap(([{ holdings: holdingsAddr }, poolCurrency, assetDecimals]) => defer(async () => {
+            const client = await firstValueFrom(this._root.getClient(this.pool.centrifugeId));
             const holdings = getContract({
                 address: holdingsAddr,
                 abi: ABI.Holdings,
-                client: this._root.getClient(this.pool.chainId),
+                client,
             });
             const [valuation, amount, value, isLiability, ...accounts] = await Promise.all([
                 holdings.read.valuation([this.pool.id.raw, this.id.raw, assetId.raw]),
@@ -1709,12 +1707,15 @@ export class ShareClass extends Entity {
                     return event.args.scId === this.id && event.args.assetId === assetId.raw;
                 });
             },
-        }, this.pool.chainId)))));
+        }, this.pool.centrifugeId)))));
     }
     /** @internal */
-    _balance(chainId, asset) {
-        return this._query(['balance', asset.id.toString()], () => combineLatest([this._root._protocolAddresses(chainId), this.pool.currency()]).pipe(switchMap(([addresses, poolCurrency]) => defer(async () => {
-            const client = this._root.getClient(chainId);
+    _balance(centrifugeId, asset) {
+        return this._query(['balance', asset.id.toString()], () => combineLatest([
+            this._root._protocolAddresses(centrifugeId),
+            this.pool.currency(),
+            this._root.getClient(centrifugeId),
+        ]).pipe(switchMap(([addresses, poolCurrency, client]) => defer(async () => {
             const [amountBn, priceBn] = await Promise.all([
                 client.readContract({
                     address: addresses.balanceSheet,
@@ -1747,53 +1748,106 @@ export class ShareClass extends Entity {
                         // NoteDeposit, Deposit, Withdraw events
                         event.args.asset?.toLowerCase() === asset.address?.toLowerCase()));
             },
-        }, chainId)))));
+        }, centrifugeId)))));
     }
     /** @internal */
     _investorOrders() {
         return this._root._queryIndexer(`query ($scId: String!) {
-        outstandingInvests(where: {tokenId: $scId}) {
+        investOrders(where: {tokenId: $scId}) {
           items {
-            investor: account
+            account
             assetId
-            queuedAmount
-            depositAmount
-            pendingAmount
+            tokenId
+            approvedAssetsAmount
+            approvedAt
+            claimedSharesAmount
+            claimedAt
+            issuedSharesAmount
+            issuedAt
+            pendingAssetsAmount
+            postedAt
+            queuedAssetsAmount
           }
         }
-        outstandingRedeems(where: {tokenId: $scId}) {
+        redeemOrders(where: {tokenId: $scId}) {
           items {
+            account
             assetId
-            investor: account
-            queuedAmount
-            depositAmount
-            pendingAmount
+            tokenId
+            approvedSharesAmount
+            approvedAt
+            claimedAssetsAmount
+            claimedAt
+            pendingSharesAmount
+            postedAt
+            revokedSharesAmount
+            revokedAssetsAmount
+            revokedPoolAmount
+            revokedAt
+            queuedSharesAmount
           }
         }
         }`, { scId: this.id.raw }, (data) => ({
-            outstandingInvests: data.outstandingInvests.items.map((item) => ({
+            investOrders: data.investOrders.items.map((item) => ({
                 ...item,
                 assetId: new AssetId(item.assetId),
+                account: item.account.toLowerCase(),
+                investor: item.account.toLowerCase(),
+                tokenId: item.tokenId.toLowerCase(),
+            })),
+            outstandingInvests: data.investOrders.items.map((item) => ({
+                assetId: new AssetId(item.assetId),
+                account: item.account.toLowerCase(),
+                investor: item.account.toLowerCase(),
+                tokenId: item.tokenId.toLowerCase(),
+                pendingAmount: item.pendingAssetsAmount,
+                queuedAmount: item.queuedAssetsAmount,
             })),
-            outstandingRedeems: data.outstandingRedeems.items.map((item) => ({
+            redeemOrders: data.redeemOrders.items.map((item) => ({
                 ...item,
                 assetId: new AssetId(item.assetId),
+                account: item.account.toLowerCase(),
+                investor: item.account.toLowerCase(),
+                tokenId: item.tokenId.toLowerCase(),
+            })),
+            outstandingRedeems: data.redeemOrders.items.map((item) => ({
+                assetId: new AssetId(item.assetId),
+                account: item.account.toLowerCase(),
+                investor: item.account.toLowerCase(),
+                tokenId: item.tokenId.toLowerCase(),
+                pendingAmount: item.pendingSharesAmount,
+                queuedAmount: item.queuedSharesAmount,
             })),
         }));
     }
     /** @internal */
     _investorOrder(assetId, investor) {
-        return this._query(['investorOrder', assetId.toString(), investor.toLowerCase()], () => this._root._protocolAddresses(this.pool.chainId).pipe(switchMap(({ shareClassManager }) => defer(async () => {
+        return this._query(['investorOrder', assetId.toString(), investor.toLowerCase()], () => combineLatest([
+            this._root._protocolAddresses(this.pool.centrifugeId),
+            this._root.getClient(this.pool.centrifugeId),
+        ]).pipe(switchMap(([{ batchRequestManager }, client]) => defer(async () => {
             const contract = getContract({
-                address: shareClassManager,
-                abi: ABI.ShareClassManager,
-                client: this._root.getClient(this.pool.chainId),
+                address: batchRequestManager,
+                abi: ABI.BatchRequestManager,
+                client,
             });
-            const [maxDepositClaims, maxRedeemClaims, [pendingDeposit], [pendingRedeem]] = await Promise.all([
-                contract.read.maxDepositClaims([this.id.raw, addressToBytes32(investor), assetId.raw]),
-                contract.read.maxRedeemClaims([this.id.raw, addressToBytes32(investor), assetId.raw]),
-                contract.read.depositRequest([this.id.raw, assetId.raw, addressToBytes32(investor)]),
-                contract.read.redeemRequest([this.id.raw, assetId.raw, addressToBytes32(investor)]),
+            const [maxDepositClaims, maxRedeemClaims, [pendingDeposit], [pendingRedeem], [, queuedInvest], [, queuedRedeem],] = await Promise.all([
+                contract.read.maxDepositClaims([this.pool.id.raw, this.id.raw, addressToBytes32(investor), assetId.raw]),
+                contract.read.maxRedeemClaims([this.pool.id.raw, this.id.raw, addressToBytes32(investor), assetId.raw]),
+                contract.read.depositRequest([this.pool.id.raw, this.id.raw, assetId.raw, addressToBytes32(investor)]),
+                contract.read.redeemRequest([this.pool.id.raw, this.id.raw, assetId.raw, addressToBytes32(investor)]),
+                contract.read.queuedDepositRequest([
+                    this.pool.id.raw,
+                    this.id.raw,
+                    assetId.raw,
+                    addressToBytes32(investor),
+                ]),
+                contract.read.queuedRedeemRequest([
+                    this.pool.id.raw,
+                    this.id.raw,
+                    assetId.raw,
+                    addressToBytes32(investor),
+                ]),
             ]);
             return {
                 assetId,
@@ -1802,9 +1856,11 @@ export class ShareClass extends Entity {
                 maxRedeemClaims,
                 pendingDeposit,
                 pendingRedeem,
+                queuedInvest,
+                queuedRedeem,
             };
         }).pipe(repeatOnEvents(this._root, {
-            address: shareClassManager,
+            address: batchRequestManager,
             eventName: [
                 'UpdateDepositRequest',
                 'UpdateRedeemRequest',
@@ -1817,7 +1873,7 @@ export class ShareClass extends Entity {
                 return events.some((event) => event.args.scId === this.id.raw &&
                     (event.args.depositAssetId === assetId.raw || event.args.payoutAssetId === assetId.raw));
             },
-        }, this.pool.chainId)))));
+        }, this.pool.centrifugeId)))));
     }
     /** @internal */
     _allVaults() {
@@ -1832,24 +1888,25 @@ export class ShareClass extends Entity {
               assetAddress
               status
               blockchain {
-                id
+                centrifugeId
               }
             }
           }
         }`, { scId: this.id.raw }, (data) => data.vaults.items.map(({ blockchain, asset, ...rest }) => ({
             ...rest,
-            chainId: Number(blockchain.id),
+            centrifugeId: Number(blockchain.centrifugeId),
             assetId: new AssetId(asset.id),
         })));
     }
     /** @internal */
     _metadata() {
-        return this._query(['metadata'], () => this._root._protocolAddresses(this.pool.chainId).pipe(switchMap(({ shareClassManager }) => defer(async () => {
-            const [name, symbol] = await this._root.getClient(this.pool.chainId).readContract({
+        return this._query(['metadata'], () => this._root._protocolAddresses(this.pool.centrifugeId).pipe(switchMap(({ shareClassManager }) => defer(async () => {
+            const client = await firstValueFrom(this._root.getClient(this.pool.centrifugeId));
+            const [name, symbol] = await client.readContract({
                 address: shareClassManager,
                 abi: ABI.ShareClassManager,
                 functionName: 'metadata',
-                args: [this.id.raw],
+                args: [this.pool.id.raw, this.id.raw],
             });
             return {
                 name,
@@ -1863,17 +1920,23 @@ export class ShareClass extends Entity {
                     return event.args.scId === this.id;
                 });
             },
-        }, this.pool.chainId)))));
+        }, this.pool.centrifugeId)))));
     }
     /** @internal */
     _metrics() {
-        return this._query(['metrics'], () => this._root._protocolAddresses(this.pool.chainId).pipe(switchMap(({ shareClassManager }) => defer(async () => {
-            const [totalIssuance, pricePerShare] = await this._root.getClient(this.pool.chainId).readContract({
+        return this._query(['metrics'], () => combineLatest([
+            this._root._protocolAddresses(this.pool.centrifugeId),
+            this._root.getClient(this.pool.centrifugeId),
+        ]).pipe(switchMap(([{ shareClassManager }, client]) => defer(async () => {
+            const contract = getContract({
                 address: shareClassManager,
                 abi: ABI.ShareClassManager,
-                functionName: 'metrics',
-                args: [this.id.raw],
+                client,
             });
+            const [totalIssuance, [pricePerShare]] = await Promise.all([
+                contract.read.totalIssuance([this.pool.id.raw, this.id.raw]),
+                contract.read.pricePoolPerShare([this.pool.id.raw, this.id.raw]),
+            ]);
             return {
                 totalIssuance: new Balance(totalIssuance, 18),
                 pricePerShare: new Price(pricePerShare),
@@ -1892,7 +1955,7 @@ export class ShareClass extends Entity {
                     return event.args.scId === this.id.raw;
                 });
             },
-        }, this.pool.chainId)))));
+        }, this.pool.centrifugeId)))));
     }
     /** @internal */
     _epochInvestOrders() {
@@ -1949,29 +2012,30 @@ export class ShareClass extends Entity {
     /** @internal */
     _epoch(assetId) {
         return this._query(['epoch', assetId.toString()], () => combineLatest([
-            this._root._protocolAddresses(this.pool.chainId),
+            this._root._protocolAddresses(this.pool.centrifugeId),
             this.pool.currency(),
-            this._root._assetDecimals(assetId, this.pool.chainId),
+            this._root._assetDecimals(assetId, this.pool.centrifugeId),
             this._epochInvestOrders(),
             this._epochRedeemOrders(),
-        ]).pipe(switchMap(([{ shareClassManager }, poolCurrency, assetDecimals, epochInvestOrders, epochRedeemOrders]) => defer(async () => {
+            this._root.getClient(this.pool.centrifugeId),
+        ]).pipe(switchMap(([{ batchRequestManager }, poolCurrency, assetDecimals, epochInvestOrders, epochRedeemOrders, client]) => defer(async () => {
             const scm = getContract({
-                address: shareClassManager,
-                abi: ABI.ShareClassManager,
-                client: this._root.getClient(this.pool.chainId),
+                address: batchRequestManager,
+                abi: ABI.BatchRequestManager,
+                client,
             });
             const [epoch, pendingDeposit, pendingRedeem] = await Promise.all([
-                scm.read.epochId([this.id.raw, assetId.raw]),
-                scm.read.pendingDeposit([this.id.raw, assetId.raw]),
-                scm.read.pendingRedeem([this.id.raw, assetId.raw]),
+                scm.read.epochId([this.pool.id.raw, this.id.raw, assetId.raw]),
+                scm.read.pendingDeposit([this.pool.id.raw, this.id.raw, assetId.raw]),
+                scm.read.pendingRedeem([this.pool.id.raw, this.id.raw, assetId.raw]),
             ]);
             const depositEpoch = epoch[0] + 1;
             const redeemEpoch = epoch[1] + 1;
             const issueEpoch = epoch[2] + 1;
             const revokeEpoch = epoch[3] + 1;
             const [depositEpochAmounts, redeemEpochAmount] = await Promise.all([
-                Promise.all(Array.from({ length: depositEpoch - issueEpoch }).map((_, i) => scm.read.epochInvestAmounts([this.id.raw, assetId.raw, issueEpoch + i]))),
-                Promise.all(Array.from({ length: redeemEpoch - revokeEpoch }).map((_, i) => scm.read.epochRedeemAmounts([this.id.raw, assetId.raw, revokeEpoch + i]))),
+                Promise.all(Array.from({ length: depositEpoch - issueEpoch }).map((_, i) => scm.read.epochInvestAmounts([this.pool.id.raw, this.id.raw, assetId.raw, issueEpoch + i]))),
+                Promise.all(Array.from({ length: redeemEpoch - revokeEpoch }).map((_, i) => scm.read.epochRedeemAmounts([this.pool.id.raw, this.id.raw, assetId.raw, revokeEpoch + i]))),
             ]);
             const approvedDeposit = depositEpochAmounts.reduce((acc, amount) => acc + amount[1], 0n);
             const approvedRedeem = redeemEpochAmount.reduce((acc, amount) => acc + amount[1], 0n);
@@ -1996,7 +2060,7 @@ export class ShareClass extends Entity {
                 })),
             };
         }).pipe(repeatOnEvents(this._root, {
-            address: shareClassManager,
+            address: batchRequestManager,
             eventName: [
                 'ApproveDeposits',
                 'ApproveRedeems',
@@ -2012,30 +2076,35 @@ export class ShareClass extends Entity {
                     return event.args.scId === this.id.raw;
                 });
             },
-        }, this.pool.chainId)))));
+        }, this.pool.centrifugeId)))));
     }
     /** @internal */
-    _updateContract(chainId, target, payload) {
+    _updateContract(centrifugeId, target, payload) {
         const self = this;
         return this._transact(async function* (ctx) {
-            const [id, { hub }] = await Promise.all([
-                self._root.id(chainId),
-                self._root._protocolAddresses(self.pool.chainId),
-            ]);
+            const { hub } = await self._root._protocolAddresses(self.pool.centrifugeId);
             yield* wrapTransaction('Update contract', ctx, {
                 contract: hub,
                 data: encodeFunctionData({
                     abi: ABI.Hub,
                     functionName: 'updateContract',
-                    args: [self.pool.id.raw, self.id.raw, id, addressToBytes32(target), payload, 0n],
+                    args: [
+                        self.pool.id.raw,
+                        self.id.raw,
+                        centrifugeId,
+                        addressToBytes32(target),
+                        payload,
+                        0n,
+                        ctx.signingAddress,
+                    ],
                 }),
-                messages: { [id]: [MessageType.UpdateContract] },
+                messages: { [centrifugeId]: [MessageType.TrustedContractUpdate] },
             });
-        }, this.pool.chainId);
+        }, this.pool.centrifugeId);
     }
     /** @internal */
     _epochOutstandingInvests() {
-        return this._query(['epochOutstandingInvests'], () => combineLatest([this._root._deployments()]).pipe(switchMap(([deployments]) => this._root._queryIndexer(`query ($scId: String!) {
+        return this._query(['epochOutstandingInvests'], () => this._root._queryIndexer(`query ($scId: String!) {
             epochOutstandingInvests(where: { tokenId: $scId }, limit: 1000) {
               items {
                 assetId
@@ -2044,17 +2113,16 @@ export class ShareClass extends Entity {
               }
             }
           }`, { scId: this.id.raw }, (data) => {
-            const chainsById = new Map(deployments.blockchains.items.map((c) => [c.centrifugeId, c.id]));
             return data.epochOutstandingInvests.items.map((item) => ({
                 assetId: new AssetId(item.assetId),
-                chainId: Number(chainsById.get(item.asset.centrifugeId)),
+                centrifugeId: item.asset.centrifugeId,
                 amount: new Balance(item.pendingAssetsAmount || 0, item.asset.decimals),
             }));
-        }))));
+        }));
     }
     /** @internal */
     _epochOutstandingRedeems() {
-        return this._query(['epochOutstandingRedeems'], () => combineLatest([this._root._deployments()]).pipe(switchMap(([deployments]) => this._root._queryIndexer(`query ($scId: String!) {
+        return this._query(['epochOutstandingRedeems'], () => this._root._queryIndexer(`query ($scId: String!) {
             epochOutstandingRedeems(where: { tokenId: $scId }, limit: 1000) {
               items {
                 assetId
@@ -2063,22 +2131,21 @@ export class ShareClass extends Entity {
               }
             }
           }`, { scId: this.id.raw }, (data) => {
-            const chainsById = new Map(deployments.blockchains.items.map((c) => [c.centrifugeId, c.id]));
             return data.epochOutstandingRedeems.items.map((item) => ({
                 assetId: new AssetId(item.assetId),
-                chainId: Number(chainsById.get(item.asset.centrifugeId)),
+                centrifugeId: item.asset.centrifugeId,
                 amount: new Balance(item.pendingSharesAmount || 0, 18),
             }));
-        }))));
+        }));
     }
     /** @internal */
-    _share(chainId) {
-        return this._query(['share', chainId], () => this.pool.network(chainId).pipe(switchMap((network) => network._share(this.id))));
+    _share(centrifugeId) {
+        return this._query(['share', centrifugeId], () => this.pool.network(centrifugeId).pipe(switchMap((network) => network._share(this.id))));
     }
     /** @internal */
-    _restrictionManager(chainId) {
-        return this._query(['restrictionManager', chainId], () => this._share(chainId).pipe(switchMap((share) => defer(async () => {
-            const address = await this._root.getClient(chainId).readContract({
+    _restrictionManager(centrifugeId) {
+        return this._query(['restrictionManager', centrifugeId], () => combineLatest([this._share(centrifugeId), this._root.getClient(centrifugeId)]).pipe(switchMap(([share, client]) => defer(async () => {
+            const address = await client.readContract({
                 address: share,
                 abi: ABI.Currency,
                 functionName: 'hook',
@@ -2088,12 +2155,13 @@ export class ShareClass extends Entity {
     }
     /** @internal */
     _getFreeAccountId() {
-        return this._query(['getFreeAccountId'], () => this._root._protocolAddresses(this.pool.chainId).pipe(map(({ accounting }) => ({ accounting, id: null, triesLeft: 10 })), expand(({ accounting, triesLeft }) => {
-            const id = Number(randomUint(32));
+        return this._query(['getFreeAccountId'], () => this._root._protocolAddresses(this.pool.centrifugeId).pipe(map(({ accounting }) => ({ accounting, id: null, triesLeft: 10 })), expand(({ accounting, triesLeft }) => {
+            const id = randomUint(256);
             if (triesLeft <= 0)
                 return EMPTY;
             return defer(async () => {
-                const exists = await this._root.getClient(this.pool.chainId).readContract({
+                const client = await firstValueFrom(this._root.getClient(this.pool.centrifugeId));
+                const exists = await client.readContract({
                     address: accounting,
                     abi: ABI.Accounting,
                     functionName: 'exists',
@@ -2122,7 +2190,7 @@ export class ShareClass extends Entity {
             centrifugeIds?.join(','),
             orderBy,
             orderDirection,
-        ], () => this._root._protocolAddresses(this.pool.chainId).pipe(switchMap((protocolAddresses) => {
+        ], () => this._root._protocolAddresses(this.pool.centrifugeId).pipe(switchMap((protocolAddresses) => {
             // Build where clause dynamically based on which filters are provided
             const whereConditions = ['tokenId: $scId', 'accountAddress_not_in: $excludedAddresses'];
             if (balance_gt !== undefined)
@@ -2311,5 +2379,21 @@ export class ShareClass extends Entity {
             };
         })));
     }
+    /** @internal */
+    _getQuote(valuationAddress, assetId, baseAmount) {
+        return this._query(['getQuote', valuationAddress, baseAmount.toString(), assetId.toString()], () => timer(0, 120_000).pipe(switchMap(() => this._root.getClient(this.pool.centrifugeId)), switchMap((client) => combineLatest([
+            this.pool.currency(),
+            defer(() => {
+                return client.readContract({
+                    address: valuationAddress,
+                    abi: ABI.Valuation,
+                    functionName: 'getQuote',
+                    args: [this.pool.id.raw, this.id.raw, assetId.raw, baseAmount.toBigInt()],
+                });
+            }),
+        ])), map(([poolCurrency, quote]) => {
+            return new Balance(quote, poolCurrency.decimals);
+        })));
+    }
 }
 //# sourceMappingURL=ShareClass.js.map