Signed fixed actions order logic.

Author: MoMannn

index.ts

@@ -3,9 +3,10 @@ import {
   approveAssetTransfer,
   checkApprovedAssetCreation,
   approveAssetCreation,
-  signOrder,
   performOrder,
-  provider
+  provider,
+  signOrderAccount1,
+  signOrderAccount2
 } from "./src/example";
 import { config } from "./src/config";
 
@@ -37,37 +38,47 @@ btnSignOrder.addEventListener("click", async () => {
     return;
   }
 
-  if (provider.accountId !== config.account1Id) {
-    printWarning("Select account1 in metamask to sign this order.");
-    return;
-  }
+  if (provider.accountId === config.account1Id) {
+    let error = null;
+    await signOrderAccount1().catch(e => {
+      error = e;
+      printError(e);
+    });
 
-  let error = null;
-  await signOrder().catch(e => {
-    error = e;
-    printError(e);
-  });
+    if (!error) {
+      printMessage(
+        "Order signing with account1 sucessfull: " + config.signatureAccount1
+      );
+    }
+  } else if (provider.accountId === config.account2Id) {
+    let error = null;
+    await signOrderAccount2().catch(e => {
+      error = e;
+      printError(e);
+    });
 
-  if (!error) {
-    printMessage("Order signing sucessfull: " + config.signature);
+    if (!error) {
+      printMessage(
+        "Order signing with account2 sucessfull: " + config.signatureAccount2
+      );
+    }
+  } else {
+    printWarning("Select account1 or account2 in metamask to sign this order.");
   }
 });
 
 btnPerformOrder.addEventListener("click", async () => {
-  if (config.assetLedgerId === "") {
+  if (config.signatureAccount1 === "") {
     printWarning(
-      "No assetLedgerSource defined. Either deploy a new asset ledger or set asset ledger source in src/config.ts file."
+      "No signature from account 1 provided. Please sign order with account 1."
     );
     return;
   }
 
-  if (config.account2Id === "") {
-    printWarning("No account2Id defined. Please set it in src/config.ts file.");
-    return;
-  }
-
-  if (provider.accountId !== config.account2Id) {
-    printWarning("Select account2 in metamask to perform this order.");
+  if (config.signatureAccount2 === "") {
+    printWarning(
+      "No signature from account 2 provided. Please sign order with account 2."
+    );
     return;
   }
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "example-atomic-orders",
+  "name": "example-signed-fixed-actions-order",
   "version": "0.0.1",
   "description": "",
   "main": "index.html",
@@ -17,4 +17,4 @@
     "parcel-bundler": "^1.6.1"
   },
   "keywords": []
-}
+}

src/config.ts

@@ -1,7 +1,7 @@
 import {
   OrderKind,
   ActionsOrderActionKind,
-  FixedActionsOrder
+  SignedFixedActionsOrder
 } from "@0xcert/ethereum-gateway";
 
 export const config = {
@@ -14,14 +14,15 @@ export const config = {
       valueLedgerDeployOrderId: "0x327577e70e21AcEe01447AD06939Fb4057232b2A"
     }
   },
-  assetLedgerId: "", // Input you own asset ledger id
-  account1Id: "", // Input your primary metamask account Id.
-  account2Id: "", // Input your secondary metamask account Id
-  signature: ""
+  assetLedgerId: "0x8ABa05cA8c8F2c614486AD0EbaFf794C297bc6e5", // Input you own asset ledger id
+  account1Id: "0xF9196F9f176fd2eF9243E8960817d5FbE63D79aa", // Input your primary metamask account Id.
+  account2Id: "0x44e44897FC076Bc46AaE6b06b917D0dfD8B2dae9", // Input your secondary metamask account Id
+  signatureAccount1: "",
+  signatureAccount2: ""
 };
 
 export const order = {
-  kind: OrderKind.FIXED_ACTIONS_ORDER,
+  kind: OrderKind.SIGNED_FIXED_ACTIONS_ORDER,
   signers: [config.account1Id, config.account2Id],
   seed: Date.now(),
   expiration: Date.now() + 86400000,
@@ -43,4 +44,4 @@ export const order = {
         "c6c14772f269bed1161d4350403f4c867c749b3cce7abe84c6d0605068cd8a87"
     }
   ]
-} as FixedActionsOrder;
+} as SignedFixedActionsOrder;

src/example.ts

@@ -59,18 +59,28 @@ export async function approveAssetCreation() {
   ]);
 }
 
-export async function signOrder() {
+export async function signOrderAccount1() {
   await enableMetamask();
   const gateway = new Gateway(provider);
-  console.log(order);
   const signature = await gateway.sign(order).catch(e => {
-    console.log(e);
     throw e;
   });
-  config.signature = signature;
+  config.signatureAccount1 = signature;
+}
+
+export async function signOrderAccount2() {
+  await enableMetamask();
+  const gateway = new Gateway(provider);
+  const signature = await gateway.sign(order).catch(e => {
+    throw e;
+  });
+  config.signatureAccount2 = signature;
 }
 
 export async function performOrder() {
   const gateway = new Gateway(provider);
-  return gateway.perform(order, [config.signature]);
+  return gateway.perform(order, [
+    config.signatureAccount1,
+    config.signatureAccount2
+  ]);
 }