@0xsequence/catapult 1.3.2 → 1.3.4

package/src/lib/std/templates/era-evm-predeploy.yaml

@@ -0,0 +1,35 @@
+# Calls the EVM predeploy manager to deploy preapproved contracts to ZK Era chains.
+# The ZKSync Era predeploy manager is 0x0000000000000000000000000000000000008014.
+# https://github.com/matter-labs/era-contracts/blob/540762151e3b030cac8ea274284b249f549e2c2a/system-contracts/contracts/EvmPredeploysManager.sol
+name: "era-evm-predeploy"
+type: "template"
+description: "Deploy an approved predeployed contract to the EVM"
+
+arguments:
+  evmPredeployManager:
+    type: "address"
+    description: "The address of the EVM predeploy manager"
+  address:
+    type: "address"
+    description: "The address of the predeployed contract to deploy"
+  bytecode:
+    type: "bytes"
+    description: "The deployment bytecode of the predeployed contract to deploy"
+
+skip_condition:
+  - type: "contract-exists"
+    arguments:
+      address: "{{address}}"
+
+actions:
+  - name: "deploy"
+    type: "send-transaction"
+    arguments:
+      to: "{{evmPredeployManager}}"
+      data:
+        type: "abi-encode"
+        arguments:
+          signature: "deployPredeployedContract(address,bytes)"
+          values:
+            - "{{address}}"
+            - "{{bytecode}}"

package/src/lib/std/templates/erc-2470.yaml

@@ -7,12 +7,15 @@ type: "template"
 arguments:
   creationCode:
     type: "bytes"
+    description: "The creation code of the contract to deploy"
   salt:
     type: "bytes32"
+    description: "The salt for deployment"
 
 returns:
   address:
     type: "address"
+    description: "The address of the deployed contract"
 
 setup:
   skip_condition:

package/src/lib/std/templates/min-balance.yaml

@@ -1,11 +1,14 @@
 name: "min-balance"
 type: "template"
+description: "Ensures a minimum balance for any given address"
 
 arguments:
   address:
     type: "address"
+    description: "The address to check the balance of"
   balance:
     type: "uint256"
+    description: "The minimum balance required"
 
 actions:
   - type: "send-transaction"

package/src/lib/std/templates/nano-universal-deployer.yaml

@@ -7,10 +7,12 @@ type: "template"
 arguments:
   creationCode:
     type: "bytes"
+    description: "The creation code of the contract to deploy"
 
 returns:
   address:
     type: "address"
+    description: "The address of the deployed contract"
 
 setup:
   skip_condition:

package/src/lib/std/templates/raw-erc-2470.yaml

@@ -4,12 +4,15 @@ type: "template"
 arguments:
   creationCode:
     type: "bytes"
+    description: "The creation code of the contract to deploy"
   salt:
     type: "bytes32"
+    description: "The salt for deployment"
 
 returns:
   address:
     type: "address"
+    description: "The address of the deployed contract"
 
 setup:
   skip_condition:

package/src/lib/std/templates/raw-nano-universal-deployer.yaml

@@ -1,13 +1,16 @@
 name: "raw-nano-universal-deployer"
 type: "template"
+description: "Deploy a contract using the Nano Universal Deployer"
 
 arguments:
   creationCode:
     type: "bytes"
+    description: "The creation code of the contract to deploy"
 
 returns:
   address:
     type: "address"
+    description: "The address of the deployed contract"
 
 setup:
   skip_condition:

package/src/lib/std/templates/raw-sequence-universal-deployer-2.yaml

@@ -1,15 +1,19 @@
 name: "raw-sequence-universal-deployer-2"
 type: "template"
+description: "Deploy a contract using the Sequence Universal Deployer v2"
 
 arguments:
   creationCode:
     type: "bytes"
+    description: "The creation code of the contract to deploy"
   salt:
     type: "bytes32"
+    description: "The salt for deployment"
 
 returns:
   address:
     type: "address"
+    description: "The address of the deployed contract"
 
 setup:
   - type: "nano-universal-deployer"

package/src/lib/std/templates/sequence-universal-deployer-2.yaml

@@ -3,16 +3,20 @@
 # fails to deploy. This ensures that the gas estimation is accurate and the transaction won't silently fail with out of gas.
 name: "sequence-universal-deployer-2"
 type: "template"
+description: "Deploy a contract using the Sequence Universal Deployer v2"
 
 arguments:
   creationCode:
     type: "bytes"
+    description: "The creation code of the contract to deploy"
   salt:
     type: "bytes32"
+    description: "The salt for deployment"
 
 returns:
   address:
     type: "address"
+    description: "The address of the deployed contract"
 
 setup:
   - type: "nano-universal-deployer"

package/src/lib/types/values.ts

@@ -32,6 +32,14 @@ export interface ConstructorEncodeValue {
   };
 }
 
+export interface ComputeCreateValue {
+  type: 'compute-create';
+  arguments: {
+    deployerAddress: AddressValue;
+    nonce: Uint256Value;
+  };
+}
+
 export interface ComputeCreate2Value {
   type: 'compute-create2';
   arguments: {
@@ -94,6 +102,7 @@ export type ValueResolver =
   | AbiEncodeValue
   | AbiPackValue
   | ConstructorEncodeValue
+  | ComputeCreateValue
   | ComputeCreate2Value
   | ReadBalanceValue
   | BasicArithmeticValue
@@ -113,4 +122,4 @@ export type Value<T = string | number | boolean> = T | Reference | ValueResolver
 export type BytesValue = Value<string>;
 export type AddressValue = Value<string>;
 export type Uint256Value = Value<string | number>;
-export type BooleanValue = Value<boolean>;
+export type BooleanValue = Value<boolean>;

package/src/lib/utils/assertion.ts

@@ -0,0 +1,24 @@
+import { ethers } from "ethers";
+
+export function isAddress(value: unknown): value is string {
+  return ethers.isAddress(value)
+}
+
+export function isBytesLike(value: unknown): value is string {
+  return ethers.isBytesLike(value)
+}
+
+export function isBigNumberish(value: unknown): value is string | number | bigint {
+  try {
+    switch (typeof(value)) {
+      case "bigint":
+      case "number":
+      case "string":
+        ethers.toBigInt(value)
+        return true
+    }
+  } catch (error) {
+    // Fail out
+  }
+  return false
+}