@0xsequence/catapult 1.3.8 → 1.3.9

package/README.md

@@ -743,6 +743,7 @@ Catapult includes several standard templates:
 
 - **`sequence-universal-deployer-2`**: Deploy contracts using Sequence's Universal Deployer v2
 - **`nano-universal-deployer`**: Deploy contracts using the Nano Universal Deployer
+- **`arachnid-deterministic-deployment-proxy`**: Deploy contracts via Arachnid's CREATE2 proxy at `0x4e59…`, with automatic factory bootstrapping
 - **`erc-2470`** and raw variant: CREATE2 Deployer (singleton factory)
 - **`assured-deployment`**: Helper to ensure a contract is deployed at a specific address
 - **`min-balance`**: Ensure minimum balance for any given address

package/dist/lib/network-match.d.ts

@@ -0,0 +1,3 @@
+import { Network } from './types';
+export declare function resolveRequestedNetworks(requests: string[], networks: Network[]): number[];
+//# sourceMappingURL=network-match.d.ts.map

package/dist/lib/network-match.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"network-match.d.ts","sourceRoot":"","sources":["../../src/lib/network-match.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AA8BjC,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAyC1F"}

package/dist/lib/network-match.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRequestedNetworks = resolveRequestedNetworks;
+function normalize(input) {
+    return input
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim();
+}
+function scoreNameMatch(candidateName, query) {
+    const c = normalize(candidateName);
+    const q = normalize(query);
+    if (!q || !c)
+        return 0;
+    if (c === q)
+        return 100;
+    if (c.startsWith(q))
+        return 90;
+    if (c.includes(q))
+        return 75;
+    const qTokens = q.split(' ');
+    const allTokensPresent = qTokens.every(t => c.includes(t));
+    if (allTokensPresent)
+        return 70;
+    return 0;
+}
+function resolveRequestedNetworks(requests, networks) {
+    const chainIds = [];
+    for (const req of requests) {
+        const asNumber = Number(req);
+        if (!Number.isNaN(asNumber)) {
+            const found = networks.find(n => n.chainId === asNumber);
+            if (found) {
+                chainIds.push(found.chainId);
+                continue;
+            }
+        }
+        let bestScore = -1;
+        let bestMatches = [];
+        for (const n of networks) {
+            const s = scoreNameMatch(n.name, req);
+            if (s > bestScore) {
+                bestScore = s;
+                bestMatches = [n];
+            }
+            else if (s === bestScore && s > 0) {
+                bestMatches.push(n);
+            }
+        }
+        if (bestScore < 60 || bestMatches.length === 0) {
+            throw new Error(`No network matched "${req}". Available: ${networks.map(n => `${n.name} (${n.chainId})`).join(', ')}`);
+        }
+        if (bestMatches.length > 1) {
+            const candidates = bestMatches.map(n => `${n.name} (${n.chainId})`).join(', ');
+            throw new Error(`Ambiguous network "${req}". Possible matches: ${candidates}`);
+        }
+        chainIds.push(bestMatches[0].chainId);
+    }
+    return chainIds;
+}
+//# sourceMappingURL=network-match.js.map

package/dist/lib/network-match.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"network-match.js","sourceRoot":"","sources":["../../src/lib/network-match.ts"],"names":[],"mappings":"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"}

package/dist/lib/std/templates/arachnid-deterministic-deployment-proxy.yaml

@@ -0,0 +1,68 @@
+# Similar to "nano-universal-deployer" but targets Arachnid's Deterministic Deployment Proxy
+# (a CREATE2 deployer available at 0x4e59… on every chain). The proxy call reverts when the
+# inner CREATE2 fails, so no additional assurance wrapper is needed.
+name: "arachnid-deterministic-deployment-proxy"
+type: "template"
+description: "Deploy contracts through Arachnid's Deterministic Deployment Proxy"
+
+arguments:
+  creationCode:
+    type: "bytes"
+    description: "Creation code of the contract to deploy"
+  salt:
+    type: "bytes32"
+    description: "Salt supplied to the proxy for CREATE2"
+
+returns:
+  address:
+    type: "address"
+    description: "Address of the deployed contract"
+
+setup:
+  skip_condition:
+    - type: "contract-exists"
+      arguments:
+        address: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
+  actions:
+    - type: "test-nicks-method"
+    - type: "min-balance"
+      arguments:
+        address: "0x3fab184622dc19b6109349b94811493bf2a45362"
+        balance: "10000000000000000"
+    - type: "send-signed-transaction"
+      arguments:
+        transaction: |
+          0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222
+
+actions:
+  - type: "send-transaction"
+    arguments:
+      to: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
+      data:
+        type: "abi-pack"
+        arguments:
+          types:
+            - "bytes32"
+            - "bytes"
+          values:
+            - "{{salt}}"
+            - "{{creationCode}}"
+      gasMultiplier: 1.6
+
+skip_condition:
+  - type: "contract-exists"
+    arguments:
+      address:
+        type: "compute-create2"
+        arguments:
+          deployerAddress: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
+          salt: "{{salt}}"
+          initCode: "{{creationCode}}"
+
+outputs:
+  address:
+    type: "compute-create2"
+    arguments:
+      deployerAddress: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
+      salt: "{{salt}}"
+      initCode: "{{creationCode}}"

package/package.json

@@ -1,23 +1,11 @@
 {
   "name": "@0xsequence/catapult",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "Ethereum contract deployment CLI tool",
   "main": "dist/index.js",
   "bin": {
     "catapult": "dist/index.js"
   },
-  "scripts": {
-    "build": "tsc && cp -r src/lib/std dist/lib/",
-    "dev": "ts-node src/index.ts",
-    "start": "node dist/index.js",
-    "start:dev": "npm run build && npm run start",
-    "watch": "tsc --watch",
-    "clean": "rm -rf dist",
-    "prepare": "npm run build",
-    "test": "jest --runInBand --detectOpenHandles",
-    "lint": "eslint src/**/*.ts",
-    "lint:fix": "eslint src/**/*.ts --fix"
-  },
   "keywords": [
     "ethereum",
     "deployment",
@@ -64,5 +52,16 @@
   },
   "engines": {
     "node": ">=16.0.0"
+  },
+  "scripts": {
+    "build": "tsc && cp -r src/lib/std dist/lib/",
+    "dev": "ts-node src/index.ts",
+    "start": "node dist/index.js",
+    "start:dev": "npm run build && npm run start",
+    "watch": "tsc --watch",
+    "clean": "rm -rf dist",
+    "test": "jest --runInBand --detectOpenHandles",
+    "lint": "eslint src/**/*.ts",
+    "lint:fix": "eslint src/**/*.ts --fix"
   }
 }

package/src/lib/std/templates/arachnid-deterministic-deployment-proxy.yaml

@@ -0,0 +1,68 @@
+# Similar to "nano-universal-deployer" but targets Arachnid's Deterministic Deployment Proxy
+# (a CREATE2 deployer available at 0x4e59… on every chain). The proxy call reverts when the
+# inner CREATE2 fails, so no additional assurance wrapper is needed.
+name: "arachnid-deterministic-deployment-proxy"
+type: "template"
+description: "Deploy contracts through Arachnid's Deterministic Deployment Proxy"
+
+arguments:
+  creationCode:
+    type: "bytes"
+    description: "Creation code of the contract to deploy"
+  salt:
+    type: "bytes32"
+    description: "Salt supplied to the proxy for CREATE2"
+
+returns:
+  address:
+    type: "address"
+    description: "Address of the deployed contract"
+
+setup:
+  skip_condition:
+    - type: "contract-exists"
+      arguments:
+        address: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
+  actions:
+    - type: "test-nicks-method"
+    - type: "min-balance"
+      arguments:
+        address: "0x3fab184622dc19b6109349b94811493bf2a45362"
+        balance: "10000000000000000"
+    - type: "send-signed-transaction"
+      arguments:
+        transaction: |
+          0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222
+
+actions:
+  - type: "send-transaction"
+    arguments:
+      to: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
+      data:
+        type: "abi-pack"
+        arguments:
+          types:
+            - "bytes32"
+            - "bytes"
+          values:
+            - "{{salt}}"
+            - "{{creationCode}}"
+      gasMultiplier: 1.6
+
+skip_condition:
+  - type: "contract-exists"
+    arguments:
+      address:
+        type: "compute-create2"
+        arguments:
+          deployerAddress: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
+          salt: "{{salt}}"
+          initCode: "{{creationCode}}"
+
+outputs:
+  address:
+    type: "compute-create2"
+    arguments:
+      deployerAddress: "0x4e59b44847b379578588920ca78fbf26c0b4956c"
+      salt: "{{salt}}"
+      initCode: "{{creationCode}}"