Merge pull request #2122 from Emurgo/ruslan/ergo-flow-fixes

Ergo Flow and Lint fixes
Emurgo · Jun 1, 2021 · ead01b8 · ead01b8
2 parents 9d8780e + 9720b3d
commit ead01b8
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 12 deletions.
diff --git a/packages/yoroi-extension/.eslintrc.js b/packages/yoroi-extension/.eslintrc.js
@@ -77,7 +77,7 @@ module.exports = {
     'no-undef-init': 0, // need this to improve Flow type inference
     'no-unneeded-ternary': ['error', { defaultAssignment: true }],
     'prefer-template': 0,
-    'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
+    'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
     'no-trailing-spaces': 1,
     'padded-blocks': 0,
     'no-undef': 1,

diff --git a/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/catalyst.test.js b/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/catalyst.test.js
@@ -8,9 +8,9 @@ beforeAll(async () => {
 });
 
 test('Generate Catalyst registration tx', async () => {
-  const paymentKey = RustModule.WalletV4.PublicKey.from_bytes(
-    Buffer.from('3273a5316e4de228863bd7cf8dac90d57149e1a595f3dd131073b84e35546676', 'hex')
-  );
+  // const paymentKey = RustModule.WalletV4.PublicKey.from_bytes(
+  //   Buffer.from('3273a5316e4de228863bd7cf8dac90d57149e1a595f3dd131073b84e35546676', 'hex')
+  // );
   const stakePrivateKey = RustModule.WalletV4.PrivateKey.from_normal_bytes(
     Buffer.from('f5beaeff7932a4164d270afde7716067582412e8977e67986cd9b456fc082e3a', 'hex')
   );

diff --git a/packages/yoroi-extension/app/ergo-connector/stores/ConnectorStore.js b/packages/yoroi-extension/app/ergo-connector/stores/ConnectorStore.js
@@ -166,6 +166,7 @@ export default class ConnectorStore extends Store<StoresMap, ActionsMap> {
           this.connectingMessage = response;
         });
       })
+      // eslint-disable-next-line no-console
       .catch(err => console.error(err));
   };
 
@@ -177,6 +178,7 @@ export default class ConnectorStore extends Store<StoresMap, ActionsMap> {
           this.signingMessage = response;
         });
       })
+      // eslint-disable-next-line no-console
       .catch(err => console.error(err));
   };
 

diff --git a/packages/yoroi-extension/chrome/extension/background.js b/packages/yoroi-extension/chrome/extension/background.js
@@ -339,7 +339,8 @@ chrome.runtime.onMessage.addListener(async (
           }
           const utxos = await canGetAllUtxos.getAllUtxos();
           const stateFetcher = await getStateFetcher(localStorageApi);
-          const bestBlock = await stateFetcher.getBestBlock({ network: wallet.getParent().getNetworkInfo() });
+          const bestBlock = await stateFetcher
+            .getBestBlock({ network: wallet.getParent().getNetworkInfo() });
           return await connectorSignTx(wallet, password, utxos, bestBlock, tx, indices);
         },
         db,

diff --git a/packages/yoroi-extension/chrome/extension/ergo-connector/api.js b/packages/yoroi-extension/chrome/extension/ergo-connector/api.js
@@ -290,7 +290,7 @@ export async function connectorSignTx(
     timestamp: Date.now(),
     nBits: 682315684511744, // TODO: where to get difficulty? (does this impact signing?)
     height: bestBlock.height + 1,
-    votes: "040000", // TODO: where to get votes? (does this impact signing?)
+    votes: '040000', // TODO: where to get votes? (does this impact signing?)
   });
   const blockHeader = RustModule.SigmaRust.BlockHeader.from_json(headerJson);
   const preHeader = RustModule.SigmaRust.PreHeader.from_block_header(blockHeader);

diff --git a/packages/yoroi-extension/chrome/extension/ergo-connector/types.js b/packages/yoroi-extension/chrome/extension/ergo-connector/types.js
@@ -1,9 +1,9 @@
 // @flow
 
 import type { WalletChecksum } from '@emurgo/cip4-js';
-import {PublicDeriver} from '../../../app/api/ada/lib/storage/models/PublicDeriver/index';
-import {MultiToken} from '../../../app/api/common/lib/MultiToken';
-import {RustModule} from '../../../app/api/ada/lib/cardanoCrypto/rustLoader';
+import { PublicDeriver } from '../../../app/api/ada/lib/storage/models/PublicDeriver/index';
+import { MultiToken } from '../../../app/api/common/lib/MultiToken';
+import { RustModule } from '../../../app/api/ada/lib/cardanoCrypto/rustLoader';
 
 // ----- Types used in the dApp <-> Yoroi connection bridge ----- //
 
@@ -22,7 +22,7 @@ export function asAddress(input: any): Address {
 
 export function asBoxCandidate(
   input: any,
-  wasmInstance: typeof RustModule.SigmaRust
+  // wasmInstance: typeof RustModule.SigmaRust
 ): ErgoBoxCandidateJson {
   try {
     if (typeof input === 'object' &&
@@ -302,7 +302,7 @@ export function asTx(
       return {
         inputs: tx.inputs.map(input => asUnsignedInput(input, wasmInstance)),
         dataInputs: tx.dataInputs.map(asDataInput),
-        outputs: tx.outputs.map(output => asBoxCandidate(output, wasmInstance)),
+        outputs: tx.outputs.map(output => asBoxCandidate(output /* , wasmInstance */)),
       };
     }
   } catch (err) {

diff --git a/packages/yoroi-extension/flow-typed/npm/ergo-lib-wasm-browser_vx.x.x.js b/packages/yoroi-extension/flow-typed/npm/ergo-lib-wasm-browser_vx.x.x.js
@@ -784,6 +784,12 @@ declare module 'ergo-lib-wasm-browser' { // need to wrap flowgen output into mod
     */
     get(index: number): ErgoBox;
   }
+  declare export class BlockHeader {
+    static from_json(json: string): BlockHeader;
+  }
+  declare export class PreHeader {
+    static from_block_header(block_header: BlockHeader): PreHeader;
+  }
   /**
   * TBD
   */
@@ -795,6 +801,8 @@ declare module 'ergo-lib-wasm-browser' { // need to wrap flowgen output into mod
     * @returns {ErgoStateContext}
     */
     static dummy(): ErgoStateContext;
+
+    constructor(pre_header: PreHeader): this;
   }
   /**
   * The root of ErgoScript IR. Serialized instances of this class are self sufficient and can be passed around.

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json