fix(builder): router various issues (#1570)

Co-authored-by: Matías <mjlescano@protonmail.com>
usecannon · Dec 2, 2024 · 07a2526 · 07a2526
1 parent 7a8cb03
commit 07a2526
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 38 deletions.
diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -33,6 +33,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.12",
+    "@types/json-stable-stringify": "^1.1.0",
     "@types/lodash": "^4.17.7",
     "@types/pako": "^2.0.3",
     "jest": "^29.7.0",
@@ -43,7 +44,7 @@
     "typedoc-plugin-zod": "^1.2.0"
   },
   "dependencies": {
-    "@usecannon/router": "^4.1.0",
+    "@usecannon/router": "^4.1.2",
     "@usecannon/web-solc": "0.5.1",
     "axios": "^1.7.2",
     "axios-retry": "^4.4.2",
@@ -52,6 +53,7 @@
     "debug": "^4.3.6",
     "form-data": "^4.0.0",
     "fuse.js": "^7.0.0",
+    "json-stable-stringify": "^1.1.1",
     "lodash": "^4.17.21",
     "pako": "^2.1.0",
     "promise-events": "^0.2.4",

diff --git a/packages/builder/src/definition.ts b/packages/builder/src/definition.ts
@@ -7,6 +7,7 @@ import { ChainBuilderRuntime } from './runtime';
 import { chainDefinitionSchema } from './schemas';
 import { CannonHelperContext, ChainBuilderContext } from './types';
 import { template } from './utils/template';
+import stableStringify from 'json-stable-stringify';
 
 import { PackageReference } from './package-reference';
 
@@ -276,8 +277,16 @@ export class ChainDefinition {
     if (!objs) {
       return null;
     } else {
-      debugVerbose('creating hash of', objs.map(JSON.stringify as any));
-      return objs.map((o) => crypto.createHash('md5').update(JSON.stringify(o)).digest('hex'));
+      debugVerbose(
+        'creating hash of',
+        objs.map(JSON.stringify as any),
+        'and',
+        objs.map((o) => stableStringify(o))
+      );
+      return [
+        ...objs.map((o) => crypto.createHash('md5').update(JSON.stringify(o)).digest('hex')),
+        ...objs.map((o) => crypto.createHash('md5').update(stableStringify(o)).digest('hex')),
+      ];
     }
   }
 

diff --git a/packages/builder/src/steps/router.ts b/packages/builder/src/steps/router.ts
@@ -56,6 +56,16 @@ const routerStep = {
         contractAddresses,
         config: newConfig,
       },
+      {
+        contractAbis,
+        contractAddresses,
+        config: _.omit(newConfig, 'includeDiamondCompatibility'),
+      },
+      {
+        contractAbis,
+        contractAddresses,
+        config: _.omit(newConfig, 'includeReceive', 'includeDiamondCompatibility'),
+      },
     ];
   },