Onbarding cancel signing (#23)

* onboarding using sigPk * Updated cancel and onboarding signing * removed unwanted package * Update package.json * signature fixed for no ui flow * latest sui
fireflyprotocol · Aug 17, 2023 · 457ce1d · 457ce1d
1 parent 15f23ff
commit 457ce1d
Show file tree

Hide file tree

Showing 5 changed files with 158 additions and 198 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firefly-exchange/bluefin-client-sui",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "The Bluefin client Library allows traders to sign, create, retrieve and listen to orders on Bluefin Exchange.",
   "main": "dist/index.js",
   "scripts": {
@@ -55,7 +55,7 @@
     "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
-    "@firefly-exchange/library-sui": "0.1.40",
+    "@firefly-exchange/library-sui": "^0.1.41",
     "@mysten/sui.js": "^0.35.0",
     "@noble/hashes": "^1.2.0",
     "@noble/secp256k1": "^1.7.1",

diff --git a/src/bluefinClient.ts b/src/bluefinClient.ts
@@ -300,7 +300,7 @@ export class BluefinClient {
   userOnBoarding = async (token?: string) => {
     let userAuthToken = token;
     if (!userAuthToken) {
-      let signature: string;
+      let signature: SigPK;
 
       if (this.kmsSigner !== undefined) {
         // const hashedMessageSHA = sha256(
@@ -317,15 +317,24 @@ export class BluefinClient {
         // (signature = await this.kmsSigner._signDigest(hashedMessageETH));
       } else {
         // sign onboarding message
-
-        signature = await OnboardingSigner.createOnboardSignature(
-          this.network.onboardingUrl,
-          this.signer
-        );
+        // eslint-disable-next-line no-lonely-if
+        const onboardingSignature = {
+          onboardingUrl: this.network.onboardingUrl,
+        };
+        if (this.uiWallet) {
+          signature = await OrderSigner.signPayloadUsingWallet(
+            onboardingSignature,
+            this.uiWallet
+          );
+        } else {
+          signature = this.orderSigner.signPayload(onboardingSignature);
+        }
       }
 
       // authorize signature created by dAPI
-      const authTokenResponse = await this.authorizeSignedHash(signature);
+      const authTokenResponse = await this.authorizeSignedHash(
+        `${signature?.signature}${signature?.publicKey}`
+      );
 
       if (!authTokenResponse.ok || !authTokenResponse.data) {
         throw Error(
@@ -509,10 +518,26 @@ export class BluefinClient {
    */
   createOrderCancellationSignature = async (
     params: OrderCancelSignatureRequest
-  ): Promise<string> => {
+  ): Promise<SigPK> => {
     // TODO: serialize correctly, this is the default method from suiet wallet docs
-    const serialized = new TextEncoder().encode(JSON.stringify(params));
-    return this.signer.signData(serialized);
+    // const serialized = new TextEncoder().encode(JSON.stringify(params));
+    // return this.signer.signData(serialized);
+    try {
+      let signature: SigPK;
+      if (this.uiWallet) {
+        signature = await OrderSigner.signPayloadUsingWallet(
+          { orderHashes: params.hashes },
+          this.uiWallet
+        );
+      } else {
+        signature = this.orderSigner.signPayload({
+          orderHashes: params.hashes,
+        });
+      }
+      return signature;
+    } catch {
+      throw Error("Siging cancelled by user");
+    }
   };
 
   /**
@@ -548,7 +573,7 @@ export class BluefinClient {
     const signature = await this.createOrderCancellationSignature(params);
     const response = await this.placeCancelOrder({
       ...params,
-      signature,
+      signature: `${signature?.signature}${signature?.publicKey}`,
     });
     return response;
   };

diff --git a/src/constants.ts b/src/constants.ts
@@ -8,7 +8,7 @@ export const Networks = {
     dmsURL: "https://api.arbitrum-staging.firefly.exchange/dead-man-switch",
     socketURL: "wss://dapi.api.arbitrum-staging.firefly.exchange",
     webSocketURL: "wss://notifications.api.arbitrum-staging.firefly.exchange/",
-    onboardingUrl: "https://testnet.firefly.exchange",
+    onboardingUrl: "https://testnet.bluefin.io",
     faucet: "https://faucet.devnet.sui.io",
   },
   PRODUCTION_SUI: {
@@ -18,7 +18,7 @@ export const Networks = {
     socketURL: "wss://dapi.api.arbitrum-prod.firefly.exchange",
     dmsURL: "https://api.arbitrum-prod.firefly.exchange/dead-man-switch",
     webSocketURL: "wss://notifications.api.arbitrum-prod.firefly.exchange/",
-    onboardingUrl: "https://trade-arb.firefly.exchange",
+    onboardingUrl: "https://testnet.bluefin.io",
     faucet: "does not exist",
   },
   LOCAL_SUI: {
@@ -28,7 +28,7 @@ export const Networks = {
     dmsURL: "https://api.arbitrum-staging.firefly.exchange/dead-man-switch",
     socketURL: "wss://dapi.api.arbitrum-staging.firefly.exchange",
     webSocketURL: "wss://notifications.api.arbitrum-staging.firefly.exchange/",
-    onboardingUrl: "https://testnet.firefly.exchange",
+    onboardingUrl: "https://testnet.bluefin.io",
     faucet: "http://127.0.0.1:5003/gas",
   },
 };