Fuel Mint support Part 1 - Implement HyperFuel query selection for Mint receipts #214

DZakh · 2024-09-18T15:41:14Z

No description provided.

…n receipts

DZakh · 2024-09-18T15:41:39Z

codegenerator/cli/templates/dynamic/codegen/src/RegisterHandlers.res.hbs

@@ -136,12 +136,33 @@ let registerContractHandlers = (
            {{#with chain_config.network_config.hyperfuel_config as | hyperfuel_config |}}
            module(HyperFuelWorker.Make({
              let chain = chain
-              let contracts = contracts


Ideally to get rid of the old contract config

DZakh · 2024-09-18T15:42:08Z

codegenerator/cli/templates/dynamic/codegen/src/RegisterHandlers.res.hbs

+                      name: "{{event.name.capitalized}}",
+                      logId: Types.{{contract.name.capitalized}}.{{event.name.capitalized}}.sighash,
+                      {{!-- mint: {{#if event.mint}}true{{else}}false{{/if}}, --}}
+                      eventMod: module(Types.{{contract.name.capitalized}}.{{event.name.capitalized}}),


Ideally to pass everything via the event options and get rid of the generated eventMod (use it only for types)

DZakh · 2024-09-18T15:43:23Z

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

+  events: array<event>,
+}
+
+let makeGetRecieptsSelectionOrThrow = (~contracts: array<contract>) => {


Extracted it to a factory, I'm going to write a few tests tomorrow. Ideally to do the same for HyperSync. Also, what's good about it that it'll allow to get rid of Evm specific fields from EventMod

DZakh · 2024-09-18T15:43:56Z

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

-    })
-
-    let contractsReceiptQuery = shouldApplyWildcards
-      ? contractsReceiptQuery->Array.concat(wildcardLogSelection)


Bye bye concat

DZakh · 2024-09-18T15:44:28Z

codegenerator/cli/templates/static/codegen/src/eventFetching/hyperfuel/HyperFuel.res

-    let receipts = contractsReceiptQuery->Js.Array2.map((
-      q
-    ): HyperFuelClient.QueryTypes.receiptSelection => {
-      rootContractId: ?q.addresses,
-      receiptType: receiptTypeSelection,
-      rb: q.rb,
-      txStatus: txStatusSelection,
-    })


Like how everything became much lighter after moving it to hyperFuelWorker

JonoPrest · 2024-09-19T10:58:33Z

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

+      | addresses => {
+          if mint.contents == #NonWildcard {
+            selection
+            ->Js.Array2.push({
+              rootContractId: addresses,
+              receiptType: mintReceiptTypeSelection,


Any chance you can leave some comments on the conditional logic here? It's a little difficult to understand from just the code.

JonoPrest · 2024-09-19T10:59:47Z

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

+  let txStatusSelection = [1]
+
+  let mint: ref<[#None | #Wildcard | #NonWildcard]> = ref(#None)
+  let nonWildcardRbsByContract = Js.Dict.empty()


What is rbs short for?

Oh I understand it's plural of "rb" 👍🏼

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

JonoPrest · 2024-09-19T11:03:57Z

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

+  let maybeWildcardLogSelection = switch wildcardRbs {
+  | [] => None
+  | wildcardRbs =>
+    Some(
+      (
+        {
+          receiptType: logDataReceiptTypeSelection,
+          txStatus: txStatusSelection,
+          rb: wildcardRbs,
+        }: HyperFuelClient.QueryTypes.receiptSelection
+      ),
+    )
+  }


Isn't this always the None case? I don't see where wildcardRbs gets any values added before this.

True, caught this as well, while I writing tests

JonoPrest · 2024-09-19T11:08:04Z

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

+      let module(Event) = event.eventMod
+      let {isWildcard} = Event.handlerRegister->Types.HandlerTypes.Register.getEventOptions
+      switch event {
+      | {mint: true} => mint := (isWildcard ? #Wildcard : #NonWildcard)


Looks like "mint" can be over written with "#Wildcard or #NonWildcard", what should happen if both appear?

JonoPrest · 2024-09-19T11:18:42Z

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

+    }
+
+    selection
+  }
+}
+


Whew 😅 this function was quite difficult to read. Maybe we can break it up a bit. I worry about logic errors creeping in when it's difficult to read end to end.

JonoPrest

The only blocking thing where I think there is a bug is where maybeWildcardLogSelection gets defined in the worker function. The rest of my comments are just about readability. Let me know if I'm wrong about the bug

…hainWorkers/HyperFuelWorker.res Co-authored-by: Jono Prest <[email protected]>

DZakh · 2024-09-19T11:59:41Z

@JonoPrest I finished writing tests and found 2 bugs and then one more. I hope the code became a little bit more readable. At least it should have 100% coverage now.

JonoPrest · 2024-09-19T12:42:17Z

codegenerator/cli/templates/dynamic/codegen/src/RegisterHandlers.res.hbs

-                  addresses: [
-                    {{#each contract.addresses as | address |}}
-                    "{{address}}"->Address.unsafeFromString,
-                    {{/each}}
-                  ],


Are these static addresses never used?

Yes. They are taken from contractConfig outside of the HyperFuelWorker

JonoPrest · 2024-09-19T12:44:57Z

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res

      | {logId} => {
          let rb = logId->BigInt.fromStringUnsafe
-          if isWildcard {
+          if event.isWildcard === Some(true) {


Maybe this should go in the pattern match like the above cases?

I didn't want to duplicate the let rb = logId->BigInt.fromStringUnsafe line

JonoPrest · 2024-09-19T12:52:23Z

codegenerator/cli/templates/static/codegen/src/Utils.res

+
+module Set = {
+  type t<'value>
+
+  /*
+   * Constructor
+   */
+  @ocaml.doc("Creates a new `Set` object.") @new
+  external make: unit => t<'value> = "Set"
+
+  @ocaml.doc("Creates a new `Set` object.") @new
+  external fromEntries: array<'value> => t<'value> = "Set"


Out of interest why rebind this whole module? Just to be explicit about what the bindings are?

To prevent the case when you expect it to use the bindings, but then it unexpectedly used Belt version instead

JonoPrest

Ok great, think it's a lot more understandable what the various cases are now 👍🏼

Nice one Dmitry 👊🏼

DZakh added 5 commits September 18, 2024 15:43

Modify interaction script to populate test contract with Mint and Bur…

5397095

…n receipts

Improve config descriptions

04d74ef

Experiment with getting mint and burn receipts

0f5e7f9

Update interaction-tools logging

e328ffe

Implement receipts selection, which takes mint into considiration

bc5d0c9

DZakh commented Sep 18, 2024

View reviewed changes

DZakh changed the title ~~Fuel Mint support Part 1~~ Fuel Mint support Part 1 - Implement HyperFuel query selection for Mint receipts Sep 18, 2024

DZakh requested a review from JonoPrest September 19, 2024 09:41

Add tests in ReScript to fuel_test

6ec4a4b

JonoPrest reviewed Sep 19, 2024

View reviewed changes

codegenerator/cli/templates/static/codegen/src/eventFetching/chainWorkers/HyperFuelWorker.res Outdated Show resolved Hide resolved

JonoPrest reviewed Sep 19, 2024

View reviewed changes

JonoPrest requested changes Sep 19, 2024

View reviewed changes

DZakh and others added 3 commits September 19, 2024 15:28

Write tests and fix log selection for fuel

9b94dec

Update codegenerator/cli/templates/static/codegen/src/eventFetching/c…

22b74e6

…hainWorkers/HyperFuelWorker.res Co-authored-by: Jono Prest <[email protected]>

Fix Mint selection with multiple contracts

042bcfd

DZakh requested a review from JonoPrest September 19, 2024 11:59

DZakh added 2 commits September 19, 2024 16:36

Final fixes

ea9446a

Merge branch 'main' into dz/fuel-mint-event

e68e56d

JonoPrest reviewed Sep 19, 2024

View reviewed changes

JonoPrest approved these changes Sep 19, 2024

View reviewed changes

DZakh merged commit 8246af4 into main Sep 19, 2024
1 check passed

DZakh deleted the dz/fuel-mint-event branch September 19, 2024 13:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fuel Mint support Part 1 - Implement HyperFuel query selection for Mint receipts #214

Fuel Mint support Part 1 - Implement HyperFuel query selection for Mint receipts #214

DZakh commented Sep 18, 2024

DZakh Sep 18, 2024

DZakh Sep 18, 2024

DZakh Sep 18, 2024

DZakh Sep 18, 2024

DZakh Sep 18, 2024

JonoPrest Sep 19, 2024

JonoPrest Sep 19, 2024

JonoPrest Sep 19, 2024

JonoPrest Sep 19, 2024

DZakh Sep 19, 2024

JonoPrest Sep 19, 2024

JonoPrest Sep 19, 2024

JonoPrest left a comment

DZakh commented Sep 19, 2024

JonoPrest Sep 19, 2024

DZakh Sep 19, 2024

JonoPrest Sep 19, 2024

DZakh Sep 19, 2024

JonoPrest Sep 19, 2024

DZakh Sep 19, 2024

JonoPrest left a comment

Fuel Mint support Part 1 - Implement HyperFuel query selection for Mint receipts #214

Fuel Mint support Part 1 - Implement HyperFuel query selection for Mint receipts #214

Conversation

DZakh commented Sep 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JonoPrest left a comment

Choose a reason for hiding this comment

DZakh commented Sep 19, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JonoPrest left a comment

Choose a reason for hiding this comment