feat: cache / expire uAgent almanac resolutions #198

bryanchriswhite · 2022-12-01T11:03:39Z

Changes

extract types-cosmos package from subquery-node image for modification
add yarn link instructions to README (existing installations MUST catch-up on these steps to continue building)
add yarn link steps to CI
add types-cosmos package to subquery-node image
mount types-cosmos and node-cosmos packages for local development (i.e. changes reflected on container restart)
extend types-cosmos Store to include selectRaw member for use in resolution expiration optimization
refactor / reorganize contract "structure" pieces

Code Review Checklist (to be filled out by reviewer)

Description accurately reflects what changes are being made.
Either the PR references an issue (via the "Development" combobox) or the description explains the need for the changes.
The PR appropriately sized. (:sweat_smile::see_no_evil:)
New code has enough tests.
New code has enough documentation to answer "how do I use it?" and "what does it do?".
Existing documentation is up-to-date, if impacted.

(cherry picked from commit 1885f718eaf5d66a4d91db01be74f4d8d00b9c0f)

bryanchriswhite · 2022-12-27T15:39:15Z

src/mappings/utils.ts

@@ -4,7 +4,7 @@ import {createHash} from "crypto";
 import {Attribute} from "@cosmjs/stargate/build/logs";
 import {LegacyBridgeSwapStructure} from "./wasm/contracts/bridge";
 import {CW20Structure} from "./wasm/contracts/cw20";
-import {Structure} from "./wasm/contracts/types";
+import {BaseStructure} from "./wasm/contracts/base";


This should've been in d7c166f, my bad.

bryanchriswhite · 2022-12-27T15:39:31Z

src/mappings/utils.ts

@@ -31,7 +31,7 @@ export async function checkBalancesAccount(address: string, chainId: string) {
 }

 export function getJaccardResult(payload: object): Interface {
-  let prediction = Structure, prediction_coefficient = 0.5;   // prediction coefficient can be set as a minimum threshold for the certainty of an output
+  let prediction = BaseStructure, prediction_coefficient = 0.5;   // prediction coefficient can be set as a minimum threshold for the certainty of an output


bryanchriswhite · 2022-12-27T16:00:46Z

src/mappings/utils.ts

@@ -29,7 +33,8 @@ export async function checkBalancesAccount(address: string, chainId: string) {
 export function getJaccardResult(payload: object): Interface {
  let prediction = Structure, prediction_coefficient = 0.5;   // prediction coefficient can be set as a minimum threshold for the certainty of an output
  let diff = 0, match = 0, coefficient = 0;                   // where coefficient of 1 is a perfect property key match, 2 is a perfect match of property and type
-  const structs = [CW20Structure, LegacyBridgeSwapStructure];
+  // TODO: refactor


I think it would be more maintainable if we redesigned this a little bit. Perhaps we can add a contract structure registry which this function iterates over (as opposed to a hard-coded list of known structures). Each structure would import the registry and register itself. I suspect that the index (i.e. src/mappings/wasm/contracts) would have to be required (import value ignored) just so that they are included in the build tree (and their registration calls get run, subsequently). Effort may need to be taken to avoid circular dependencies when building and bootstrapping the registry. I think so long as the contract structure index isn't in the same module as the registry we should be good. I would imagine a good place for this import would be in the src/mappings/mappingHandler.ts file instead.

bryanchriswhite · 2022-12-27T16:04:08Z

src/mappings/utils.ts

@@ -116,60 +121,6 @@ export async function trackUnprocessed(error: Error, primitives: Primitives): Pr
  }
 }

-class Structure {


This was supposed to be in d7c166f

bryanchriswhite · 2022-12-27T16:04:47Z

src/mappings/utils.ts

@@ -2,6 +2,10 @@ import {CosmosBlock, CosmosEvent, CosmosMessage, CosmosTransaction} from "@subql
 import {Account, Interface, UnprocessedEntity} from "../types";
 import {createHash} from "crypto";
 import {Attribute} from "@cosmjs/stargate/build/logs";
+import {LegacyBridgeSwapStructure} from "./wasm/contracts/bridge";
+import {CW20Structure} from "./wasm/contracts/cw20";
+import {Structure} from "./wasm/contracts/types";


Not sure if we actually need this import.

bryanchriswhite · 2022-12-27T16:05:18Z

src/mappings/utils.ts

+import {LegacyBridgeSwapStructure} from "./wasm/contracts/bridge";
+import {CW20Structure} from "./wasm/contracts/cw20";


This was supposed to be in d7c166f

bryanchriswhite · 2022-12-27T16:05:28Z

src/mappings/utils.ts

+import {LegacyBridgeSwapStructure} from "./wasm/contracts/bridge";
+import {CW20Structure} from "./wasm/contracts/cw20";
+import {Structure} from "./wasm/contracts/types";
+import {MicroAgentAlmanacStructure} from "./wasm/contracts/almanac";


This was supposed to be in d7c166f

bryanchriswhite linked an issue Dec 1, 2022 that may be closed by this pull request

uAgent almanac tracking #176

Open

bryanchriswhite changed the title ~~chore: cache / expire uAgent almanac resolutions~~ feat: cache / expire uAgent almanac resolutions Dec 1, 2022

bryanchriswhite self-assigned this Dec 5, 2022

bryanchriswhite force-pushed the chore/u-agent-almanac branch from 8e55180 to cbf7aa7 Compare December 7, 2022 07:28

bryanchriswhite force-pushed the chore/almanac-resolutions branch from eb6f2b9 to e3302c5 Compare December 7, 2022 14:00

bryanchriswhite force-pushed the chore/u-agent-almanac branch 6 times, most recently from 25b5859 to c1d3ff4 Compare December 13, 2022 14:16

bryanchriswhite force-pushed the chore/almanac-resolutions branch from a9f50b3 to db9d439 Compare December 19, 2022 14:47

Base automatically changed from chore/u-agent-almanac to main December 19, 2022 16:34

bryanchriswhite force-pushed the chore/almanac-resolutions branch from db9d439 to 7f90135 Compare December 20, 2022 08:29

feat: almanac resolutions schema

6881e43

bryanchriswhite force-pushed the chore/almanac-resolutions branch from f0a6a10 to 9f1d4b5 Compare December 22, 2022 11:01

bryanchriswhite added 14 commits December 22, 2022 14:06

tests: almanac resolutions

0ca271e

feat: uAgent almanac resolution caching/expiration

4947ffe

refactor: wasm contract structures

d7c166f

chore: add wasm/contracts module index

6acea51

(cherry picked from commit 1885f718eaf5d66a4d91db01be74f4d8d00b9c0f)

wip: add almanac contract interface

3a7725f

chore: extract types-cosmos for modification

2cb3e63

feat: add selectRaw to Store interface

b5d3dfa

chore: integrate custom types-cosmos

1f59d61

fix: mount entire node-cosmos package

5872e80

docs: add link local deps section and other README improvements

fcbc6bb

fix: yarn link for CI host building TS

e8347c4

fix: pylint

8cf590f

fix: yarn build node-cosmos types-cosmos

feef99a

chore: add root-level node_modules to dockerignore

422e89a

chore: add resolutions migration

6dbb344

bryanchriswhite force-pushed the chore/almanac-resolutions branch from 9f1d4b5 to 6dbb344 Compare December 22, 2022 13:07

fix: pylint

b357a9e

bryanchriswhite mentioned this pull request Dec 22, 2022

Bug report: flickering tests #228

Open

3 tasks

bryanchriswhite marked this pull request as ready for review December 22, 2022 16:54

bryanchriswhite requested a review from Jonathansumner December 22, 2022 16:55

bryanchriswhite commented Dec 27, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: cache / expire uAgent almanac resolutions #198

feat: cache / expire uAgent almanac resolutions #198

bryanchriswhite commented Dec 1, 2022 •

edited

Loading

bryanchriswhite Dec 27, 2022

bryanchriswhite Dec 27, 2022

bryanchriswhite Dec 27, 2022

bryanchriswhite Dec 27, 2022

bryanchriswhite Dec 27, 2022

bryanchriswhite Dec 27, 2022

bryanchriswhite Dec 27, 2022

		import {LegacyBridgeSwapStructure} from "./wasm/contracts/bridge";
		import {CW20Structure} from "./wasm/contracts/cw20";

feat: cache / expire uAgent almanac resolutions #198

Are you sure you want to change the base?

feat: cache / expire uAgent almanac resolutions #198

Conversation

bryanchriswhite commented Dec 1, 2022 • edited Loading

Changes

Code Review Checklist (to be filled out by reviewer)

bryanchriswhite Dec 27, 2022

Choose a reason for hiding this comment

bryanchriswhite Dec 27, 2022

Choose a reason for hiding this comment

bryanchriswhite Dec 27, 2022

Choose a reason for hiding this comment

bryanchriswhite Dec 27, 2022

Choose a reason for hiding this comment

bryanchriswhite Dec 27, 2022

Choose a reason for hiding this comment

bryanchriswhite Dec 27, 2022

Choose a reason for hiding this comment

bryanchriswhite Dec 27, 2022

Choose a reason for hiding this comment

bryanchriswhite commented Dec 1, 2022 •

edited

Loading