remove hardcoded delegate contract

OrderlyNetwork · Feb 8, 2024 · ff8c5e2 · ff8c5e2
1 parent 1f647c4
commit ff8c5e2
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 23 deletions.
diff --git a/src/Account.tsx b/src/Account.tsx
@@ -9,18 +9,27 @@ import {
   DelegateSignerResponse,
   announceDelegateSigner,
   delegateAddOrderlyKey,
-  registerDelegateSigner,
+  registerExampleDelegateSigner,
   isTestnet
 } from './helpers';
 
 export const Account: FC<{
   brokerId: string;
   accountId: string;
+  contractAddress: string;
   delegateSigner?: DelegateSignerResponse;
   setDelegateSigner: React.Dispatch<React.SetStateAction<DelegateSignerResponse | undefined>>;
   orderlyKey?: Uint8Array;
   setOrderlyKey: React.Dispatch<React.SetStateAction<Uint8Array | undefined>>;
-}> = ({ brokerId, accountId, delegateSigner, setDelegateSigner, orderlyKey, setOrderlyKey }) => {
+}> = ({
+  brokerId,
+  accountId,
+  contractAddress,
+  delegateSigner,
+  setDelegateSigner,
+  orderlyKey,
+  setOrderlyKey
+}) => {
   const [txHash, setTxHash] = useState<string>('');
   const [publicKey, setPublicKey] = useState<string>();
 
@@ -101,7 +110,12 @@ export const Account: FC<{
           onClick={async () => {
             const address = wallet?.accounts[0]?.address;
             if (!wallet || !connectedChain || !address) return;
-            const hash = await registerDelegateSigner(wallet, brokerId, connectedChain.id, address);
+            const hash = await registerExampleDelegateSigner(
+              wallet,
+              brokerId,
+              connectedChain.id,
+              address
+            );
             setTxHash(hash);
           }}
         >
@@ -127,7 +141,13 @@ export const Account: FC<{
           disabled={!wallet || !connectedChain || !brokerId || !txHash}
           onClick={async () => {
             if (!wallet || !connectedChain || !brokerId || !txHash) return;
-            const res = await announceDelegateSigner(wallet, connectedChain.id, brokerId, txHash);
+            const res = await announceDelegateSigner(
+              wallet,
+              connectedChain.id,
+              brokerId,
+              contractAddress,
+              txHash
+            );
             setDelegateSigner(res);
           }}
         >
@@ -139,7 +159,13 @@ export const Account: FC<{
         disabled={!wallet || !connectedChain || !brokerId}
         onClick={async () => {
           if (!wallet || !connectedChain || !brokerId) return;
-          const key = await delegateAddOrderlyKey(wallet, connectedChain.id, brokerId, accountId);
+          const key = await delegateAddOrderlyKey(
+            wallet,
+            connectedChain.id,
+            brokerId,
+            contractAddress,
+            accountId
+          );
           setOrderlyKey(key);
         }}
       >

diff --git a/src/App.tsx b/src/App.tsx
@@ -260,6 +260,7 @@ function App() {
             <Account
               brokerId={brokerId}
               accountId={accountId}
+              contractAddress={contractAddress}
               delegateSigner={delegateSigner}
               setDelegateSigner={setDelegateSigner}
               orderlyKey={orderlyKey}

diff --git a/src/Assets.tsx b/src/Assets.tsx
@@ -120,18 +120,20 @@ export const Assets: FC<{
           <Table.Row>
             <Table.RowHeaderCell>Wallet Balance (USDC):</Table.RowHeaderCell>
             <Table.Cell>
-              {balance ? formatter.format(Number(formatUnits(balance, 6))) : '-'}
+              {balance != null ? formatter.format(Number(formatUnits(balance, 6))) : '-'}
             </Table.Cell>
           </Table.Row>
           <Table.Row>
             <Table.RowHeaderCell>Contract Balance (USDC):</Table.RowHeaderCell>
             <Table.Cell>
-              {contractBalance ? formatter.format(Number(formatUnits(contractBalance, 6))) : '-'}
+              {contractBalance != null
+                ? formatter.format(Number(formatUnits(contractBalance, 6)))
+                : '-'}
             </Table.Cell>
           </Table.Row>
           <Table.Row>
             <Table.RowHeaderCell>Account Balance (USDC):</Table.RowHeaderCell>
-            <Table.Cell>{vaultBalance ? String(vaultBalance) : '-'}</Table.Cell>
+            <Table.Cell>{vaultBalance != null ? String(vaultBalance) : '-'}</Table.Cell>
           </Table.Row>
         </Table.Body>
       </Table.Root>
@@ -185,6 +187,7 @@ export const Assets: FC<{
                 wallet,
                 connectedChain.id,
                 brokerId,
+                contractAddress,
                 amountBN.toString(),
                 contractAddress,
                 accountId
@@ -213,6 +216,7 @@ export const Assets: FC<{
               wallet,
               connectedChain.id,
               brokerId,
+              contractAddress,
               accountId,
               orderlyKey,
               amountBN.toString(),

diff --git a/src/SafeInstructions.tsx b/src/SafeInstructions.tsx
@@ -174,15 +174,6 @@ export const SafeInstructions: FC<{ brokerId: string; chainId: string }> = ({
                     style={{ maxWidth: '100%' }}
                   />
                 </Flex>
-
-                <Flex direction="column">
-                  <Strong>Execute transaction</Strong>
-                  <img
-                    src="./confirm-tx.webp"
-                    alt="Confirm Gnosis Safe batch transaction"
-                    style={{ maxWidth: '100%' }}
-                  />
-                </Flex>
               </Flex>
             </Tabs.Content>
           </Container>

diff --git a/src/helpers/index.ts b/src/helpers/index.ts
@@ -79,7 +79,7 @@ export type DelegateSignerResponse = {
   valid_signer: string;
 };
 
-export async function registerDelegateSigner(
+export async function registerExampleDelegateSigner(
   wallet: WalletState,
   brokerId: string,
   chainId: string,
@@ -99,14 +99,15 @@ export async function announceDelegateSigner(
   wallet: WalletState,
   chainId: string,
   brokerId: string,
+  delegateContract: string,
   txHash: ethers.BytesLike
 ): Promise<DelegateSignerResponse> {
   const nonceRes = await fetch(`${getBaseUrl(chainId)}/v1/registration_nonce`);
   const nonceJson = await nonceRes.json();
   const registrationNonce = nonceJson.data.registration_nonce as string;
 
   const delegateSignerMessage = {
-    delegateContract: exampleDelegateContract,
+    delegateContract,
     brokerId,
     chainId: Number(chainId),
     timestamp: Date.now(),
@@ -144,13 +145,14 @@ export async function delegateAddOrderlyKey(
   wallet: WalletState,
   chainId: string,
   brokerId: string,
+  delegateContract: string,
   accountId: string
 ): Promise<Uint8Array> {
   const privateKey = utils.randomPrivateKey();
   const orderlyKey = `ed25519:${encodeBase58(await getPublicKeyAsync(privateKey))}`;
   const timestamp = Date.now();
   const addKeyMessage = {
-    delegateContract: exampleDelegateContract,
+    delegateContract,
     brokerId,
     chainId: Number(chainId),
     orderlyKey,
@@ -193,6 +195,7 @@ export async function delegateDeposit(
   wallet: WalletState,
   chainId: string,
   brokerId: string,
+  delegateContract: string,
   amount: string,
   contractAddress: string,
   accountId: string
@@ -209,13 +212,14 @@ export async function delegateDeposit(
   } satisfies VaultTypes.VaultDepositFEStruct;
   const depositFee = await contract.getDepositFee(contractAddress, depositInput);
 
-  await contract.depositTo(exampleDelegateContract, depositInput, { value: depositFee });
+  await contract.depositTo(delegateContract, depositInput, { value: depositFee });
 }
 
 export async function delegateWithdraw(
   wallet: WalletState,
   chainId: string,
   brokerId: string,
+  delegateContract: string,
   accountId: string,
   orderlyKey: Uint8Array,
   amount: string,
@@ -230,7 +234,7 @@ export async function delegateWithdraw(
   const withdrawNonce = nonceJson.data.withdraw_nonce as string;
 
   const delegateWithdrawMessage = {
-    delegateContract: exampleDelegateContract,
+    delegateContract,
     brokerId,
     chainId: Number(chainId),
     receiver,
@@ -272,6 +276,7 @@ export async function delegateSettlePnL(
   wallet: WalletState,
   chainId: string,
   brokerId: string,
+  delegateContract: string,
   accountId: string,
   orderlyKey: Uint8Array
 ): Promise<void> {
@@ -284,7 +289,7 @@ export async function delegateSettlePnL(
   const settleNonce = nonceJson.data.settle_nonce as string;
 
   const delegateSettlePnLMessage = {
-    delegateContract: exampleDelegateContract,
+    delegateContract,
     brokerId,
     chainId: Number(chainId),
     timestamp: Date.now(),