Transaction Router refactor (#50)

* Transaction Router refactor * lint * fixes * for now remove interface * linter happy * fix * fixes * all tests passing :)) * lint fix * remove types & artifacts * update readme * update CI * fix * fix test * fix * remove empty file * add types --------- Co-authored-by: cute0laf <[email protected]>
TheDotflow · Jul 27, 2023 · 012df3c · 012df3c
1 parent 0a181f7
commit 012df3c
Show file tree

Hide file tree

Showing 38 changed files with 2,165 additions and 3,813 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,7 @@ package-lock.json
 
 # zombienet
 bin/
+
+# toolchain
+
+artifacts/
diff --git a/README.md b/README.md
@@ -22,7 +22,8 @@ For details regarding the contract deployment go to this [page](https://github.c
 1.  Install [NodeJs](https://nodejs.org/en/download)
 2.  `yarn install`
 3.  `yarn dev`
-4.  Go to `http://localhost:3000` to interact with the webapp
+4. `yarn compile` NOTE: This requires the [dotflow-ink](https://github.com/TheDotflow/dotflow-ink) repository to be cloned next to the `dotflow-ui` repo.
+5.  Go to `http://localhost:3000` to interact with the webapp
 
 ### Running tests
 

diff --git a/__tests__/assetRegistry.test.ts b/__tests__/assetRegistry.test.ts
@@ -427,8 +427,8 @@ describe('AssetRegistry', () => {
         asset: {
           Token: 'AUSD',
         },
-        name: 'Acala Dollar',
-        symbol: 'aUSD',
+        name: 'aUSD SEED',
+        symbol: 'aSEED',
         decimals: 12,
         xcmInteriorKey: [
           { network: 'polkadot' },

diff --git a/__tests__/transactionRouter.test.ts b/__tests__/transactionRouter.test.ts
@@ -1,6 +1,8 @@
 import { ApiPromise, Keyring, WsProvider } from "@polkadot/api";
 import { KeyringPair } from "@polkadot/keyring/types";
 
+import { Fungible, Receiver, Sender } from "@/utils/transactionRouter/types";
+
 import TransactionRouter from "../src/utils/transactionRouter";
 import IdentityContractFactory from "../types/constructors/identity";
 import IdentityContract from "../types/contracts/identity";
@@ -32,42 +34,57 @@ describe("TransactionRouter", () => {
   });
 
   it("Can't send tokens to yourself", async () => {
-    const sender = alice;
-    const receiver = alice;
-
     // First lets add a network and create an identity.
 
     await addNetwork(identityContract, alice, {
       rpcUrl: "ws://127.0.0.1:4242",
       accountType: AccountType.accountId32,
     });
 
+    const sender: Sender = {
+      keypair: alice,
+      network: 0
+    };
+
+    const receiver: Receiver = {
+      addressRaw: alice.addressRaw,
+      type: AccountType.accountId32,
+      network: 0,
+    };
+
+    const asset: Fungible = {
+      multiAsset: {},
+      amount: 1000
+    };
+
     await expect(
       TransactionRouter.sendTokens(
         identityContract,
         sender,
-        0, // origin network
-        receiver.addressRaw,
-        AccountType.accountId32,
-        0, // destination network
-        {}, // multi asset
-        1000
+        receiver,
+        asset
       )
     ).rejects.toThrow("Cannot send tokens to yourself");
   });
 
   it("Sending native asset on the same network works", async () => {
-    const sender = alice;
-    const receiver = bob;
+    const sender: Sender = {
+      keypair: alice,
+      network: 0
+    };
+
+    const receiver: Receiver = {
+      addressRaw: bob.addressRaw,
+      type: AccountType.accountId32,
+      network: 0,
+    };
 
     const westendProvider = new WsProvider("ws://127.0.0.1:4242");
     const westendApi = await ApiPromise.create({ provider: westendProvider });
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const { data: balance } = await westendApi.query.system.account(
-      receiver.address
-    );
+    const { data: balance } = (await westendApi.query.system.account(
+      receiver.addressRaw
+    )) as any;
     const receiverBalance = parseInt(balance.free.toHuman().replace(/,/g, ""));
 
     // First lets add a network.
@@ -78,36 +95,42 @@ describe("TransactionRouter", () => {
 
     const amount = Math.pow(10, 12);
 
-    await TransactionRouter.sendTokens(
-      identityContract,
-      sender,
-      0, // origin network
-      receiver.addressRaw,
-      AccountType.accountId32,
-      0, // destination network
-      // MultiAsset:
-      {
+    const asset: Fungible = {
+      multiAsset: {
         interior: "Here",
         parents: 0,
       },
       amount
-    );
+    };
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const { data: balance } = await westendApi.query.system.account(
-      receiver.address
+    await TransactionRouter.sendTokens(
+      identityContract,
+      sender,
+      receiver,
+      asset
     );
+
+    const { data: newBalance } = (await westendApi.query.system.account(
+      receiver.addressRaw
+    )) as any;
     const newReceiverBalance = parseInt(
-      balance.free.toHuman().replace(/,/g, "")
+      newBalance.free.toHuman().replace(/,/g, "")
     );
 
     expect(newReceiverBalance).toBe(receiverBalance + amount);
   }, 30000);
 
   it("Sending non-native asset on the same network works", async () => {
-    const sender = alice;
-    const receiver = bob;
+    const sender: Sender = {
+      keypair: alice,
+      network: 0
+    };
+
+    const receiver: Receiver = {
+      addressRaw: bob.addressRaw,
+      type: AccountType.accountId32,
+      network: 0,
+    };
 
     const assetHubProvider = new WsProvider("ws://127.0.0.1:4243");
     const assetHubApi = await ApiPromise.create({
@@ -116,24 +139,24 @@ describe("TransactionRouter", () => {
 
     // First create an asset.
     if (!(await getAsset(assetHubApi, 0))) {
-      await createAsset(assetHubApi, sender, 0);
+      await createAsset(assetHubApi, sender.keypair, 0);
     }
 
     // Mint some assets to the creator.
-    await mintAsset(assetHubApi, sender, 0, 500);
+    await mintAsset(assetHubApi, sender.keypair, 0, 500);
 
     const amount = 200;
 
     const senderAccountBefore: any = (await assetHubApi.query.assets.account(
       0,
-      sender.address
+      sender.keypair.address
     )).toHuman();
 
     const senderBalanceBefore = parseInt(senderAccountBefore.balance.replace(/,/g, ""));
 
     const receiverAccountBefore: any = (await assetHubApi.query.assets.account(
       0,
-      receiver.address
+      bob.address
     )).toHuman();
 
     const receiverBalanceBefore = receiverAccountBefore ? parseInt(receiverAccountBefore.balance.replace(/,/g, "")) : 0;
@@ -144,15 +167,8 @@ describe("TransactionRouter", () => {
       accountType: AccountType.accountId32,
     });
 
-    await TransactionRouter.sendTokens(
-      identityContract,
-      sender,
-      0, // origin network
-      receiver.addressRaw,
-      AccountType.accountId32,
-      0, // destination network
-      // MultiAsset:
-      {
+    const asset: Fungible = {
+      multiAsset: {
         interior: {
           X2: [
             { PalletInstance: 50 }, // assets pallet
@@ -162,18 +178,25 @@ describe("TransactionRouter", () => {
         parents: 0,
       },
       amount
+    };
+
+    await TransactionRouter.sendTokens(
+      identityContract,
+      sender,
+      receiver,
+      asset
     );
 
     const senderAccountAfter: any = (await assetHubApi.query.assets.account(
       0,
-      sender.address
+      sender.keypair.address
     )).toHuman();
 
     const senderBalanceAfter = parseInt(senderAccountAfter.balance.replace(/,/g, ""));
 
     const receiverAccountAfter: any = (await assetHubApi.query.assets.account(
       0,
-      receiver.address
+      bob.address
     )).toHuman();
 
     const receiverBalanceAfter = parseInt(receiverAccountAfter.balance.replace(/,/g, ""));

diff --git a/artifacts/address_book.contract b/artifacts/address_book.contract