@towns-protocol/generated 0.0.337 → 0.0.339

package/config/deployments.json

@@ -56,6 +56,7 @@
         "space": "0x99a177F81902fddc4785c6fc108C8F21BDB2aFe9",
         "spaceFactory": "0x968696BC59431Ef085441641f550C8e2Eaca8BEd",
         "spaceOwner": "0x9dEdb330A126C6dF2893a33018bb81aFE8573805",
+        "subscriptionModule": "0x65b6079647b6BbB9672198cD16FeeFfEB6fEE8EF",
         "swapRouter": "0x4997CC907512275b8D7E1c682a46f17d676F4913",
         "utils": {
           "towns": "0x00000000A22C618fd6b4D7E9A335C4B96B189a38"

package/deployments/alpha/.env.vite

@@ -0,0 +1,13 @@
+VITE_RIVER_ENV=alpha
+VITE_BASE_CHAIN_ID=84532
+VITE_BASE_ADDRESSES_APP_REGISTRY=0x23a9f5AbBcC82d1E2B5C0781b1F05F2B623E2c69
+VITE_BASE_ADDRESSES_BASE_REGISTRY=0x0230a9d28bc48a90d6f5e5112b24319ec1b14c52
+VITE_BASE_ADDRESSES_RIVER_AIRDROP=0x5cb1B2a6d413879a7A4A89f46e0621db04aa6430
+VITE_BASE_ADDRESSES_SPACE=0x8DdfAD0259803FA140e076C636E726573df77905
+VITE_BASE_ADDRESSES_SPACE_FACTORY=0xC09Ac0FFeecAaE5100158247512DC177AeacA3e3
+VITE_BASE_ADDRESSES_SPACE_OWNER=0x0443258849016da8Af08e2984Bce8C0ef6Cfc9A0
+VITE_BASE_ADDRESSES_SUBSCRIPTION_MODULE=0x709b0da64962b03559D5e7084a23B1a8c73C76a0
+VITE_BASE_ADDRESSES_SWAP_ROUTER=0xE2CE9e11BF480a5b88ad4008915D97d35C5087d5
+VITE_BASE_ADDRESSES_UTILS_TOWNS=0x00000000A22C618fd6b4D7E9A335C4B96B189a38
+VITE_RIVER_CHAIN_ID=6524490
+VITE_RIVER_ADDRESSES_RIVER_REGISTRY=0x44354786EacBEBf981453A05728E1653Bc3c5def

package/deployments/delta/.env.vite

@@ -0,0 +1,12 @@
+VITE_RIVER_ENV=delta
+VITE_BASE_CHAIN_ID=84532
+VITE_BASE_ADDRESSES_APP_REGISTRY=0x9fCd4F3F98b170C7A1AfB9d20E76C6f5ca9Cbe71
+VITE_BASE_ADDRESSES_BASE_REGISTRY=0xa7932228e6dAfb7A74dc8085F8bADAa993d4c592
+VITE_BASE_ADDRESSES_RIVER_AIRDROP=0xa9aAA53E49d20fd727AB5a6ED697332bb24f3A20
+VITE_BASE_ADDRESSES_SPACE=0xa489C4162a39CCE441Ee23c064E6dE6fF0822269
+VITE_BASE_ADDRESSES_SPACE_FACTORY=0x4e652CdB4715861dDCc4dF159af32223B40c8187
+VITE_BASE_ADDRESSES_SPACE_OWNER=0xf3a2E75d7da3c7a7F953b63342f0709972e5002b
+VITE_BASE_ADDRESSES_SWAP_ROUTER=0xE2CE9e11BF480a5b88ad4008915D97d35C5087d5
+VITE_BASE_ADDRESSES_UTILS_TOWNS=0x00000000A22C618fd6b4D7E9A335C4B96B189a38
+VITE_RIVER_CHAIN_ID=6524490
+VITE_RIVER_ADDRESSES_RIVER_REGISTRY=0x9Db19dB285cEd37099D40d27D51B75C4dFa05652

package/deployments/gamma/.env

@@ -6,6 +6,7 @@ BASE_ADDRESSES_RIVER_AIRDROP=0x4cBE6e47819cfE720d2ac83aE094B3a1307207A9
 BASE_ADDRESSES_SPACE=0x99a177F81902fddc4785c6fc108C8F21BDB2aFe9
 BASE_ADDRESSES_SPACE_FACTORY=0x968696BC59431Ef085441641f550C8e2Eaca8BEd
 BASE_ADDRESSES_SPACE_OWNER=0x9dEdb330A126C6dF2893a33018bb81aFE8573805
+BASE_ADDRESSES_SUBSCRIPTION_MODULE=0x65b6079647b6BbB9672198cD16FeeFfEB6fEE8EF
 BASE_ADDRESSES_SWAP_ROUTER=0x4997CC907512275b8D7E1c682a46f17d676F4913
 BASE_ADDRESSES_UTILS_TOWNS=0x00000000A22C618fd6b4D7E9A335C4B96B189a38
 BNB_CHAIN_ID=97

package/deployments/gamma/.env.vite

@@ -0,0 +1,19 @@
+VITE_RIVER_ENV=gamma
+VITE_BASE_CHAIN_ID=84532
+VITE_BASE_ADDRESSES_APP_REGISTRY=0xec3081A4b07678C12Fc6B56f69F894EE9e732c42
+VITE_BASE_ADDRESSES_BASE_REGISTRY=0x08cC41b782F27d62995056a4EF2fCBAe0d3c266F
+VITE_BASE_ADDRESSES_RIVER_AIRDROP=0x4cBE6e47819cfE720d2ac83aE094B3a1307207A9
+VITE_BASE_ADDRESSES_SPACE=0x99a177F81902fddc4785c6fc108C8F21BDB2aFe9
+VITE_BASE_ADDRESSES_SPACE_FACTORY=0x968696BC59431Ef085441641f550C8e2Eaca8BEd
+VITE_BASE_ADDRESSES_SPACE_OWNER=0x9dEdb330A126C6dF2893a33018bb81aFE8573805
+VITE_BASE_ADDRESSES_SUBSCRIPTION_MODULE=0x65b6079647b6BbB9672198cD16FeeFfEB6fEE8EF
+VITE_BASE_ADDRESSES_SWAP_ROUTER=0x4997CC907512275b8D7E1c682a46f17d676F4913
+VITE_BASE_ADDRESSES_UTILS_TOWNS=0x00000000A22C618fd6b4D7E9A335C4B96B189a38
+VITE_BNB_CHAIN_ID=97
+VITE_BNB_ADDRESSES_UTILS_TOWNS=0xA70F5aE0D1c993eDa24FfEB4B10416770a1BfA2B
+VITE_RIVER_CHAIN_ID=6524490
+VITE_RIVER_ADDRESSES_RIVER_REGISTRY=0xf18E98D36A6bd1aDb52F776aCc191E69B491c070
+VITE_SEPOLIA_CHAIN_ID=11155111
+VITE_SEPOLIA_ADDRESSES_TOWNS_MAINNET=0x000000Fa00b200406de700041CFc6b19BbFB4d13
+VITE_SEPOLIA_ADDRESSES_UTILS_PROXY_BATCH_DELEGATION=0x2898F12411782AfB413ce711660f06FCDAa92339
+VITE_SEPOLIA_ADDRESSES_UTILS_WRAPPED_TOWNS=0x7cA146A8f7329B4D44b253986D2DF27B98C3B36C

package/deployments/gamma/base/addresses/subscriptionModule.json

@@ -0,0 +1,3 @@
+{
+  "address": "0x65b6079647b6BbB9672198cD16FeeFfEB6fEE8EF"
+}

package/deployments/omega/.env.vite

@@ -0,0 +1,21 @@
+VITE_RIVER_ENV=omega
+VITE_BASE_CHAIN_ID=8453
+VITE_BASE_ADDRESSES_APP_REGISTRY=0xB3173F2a02855F07A0C4BfB26D3D87c323fe42BE
+VITE_BASE_ADDRESSES_BASE_REGISTRY=0x7c0422b31401C936172C897802CF0373B35B7698
+VITE_BASE_ADDRESSES_RIVER_AIRDROP=0xe55fEE191604cdBeb874F87A28Ca89aED401C303
+VITE_BASE_ADDRESSES_SPACE=0x34f35E1ECA9C00791bF8121A01c20977d8bEB11C
+VITE_BASE_ADDRESSES_SPACE_FACTORY=0x9978c826d93883701522d2CA645d5436e5654252
+VITE_BASE_ADDRESSES_SPACE_OWNER=0x2824D1235d1CbcA6d61C00C3ceeCB9155cd33a42
+VITE_BASE_ADDRESSES_SWAP_ROUTER=0x95A2a333D30c8686dE8D01AC464d6034b9aA7b24
+VITE_BASE_ADDRESSES_UTILS_TOWNS=0x00000000A22C618fd6b4D7E9A335C4B96B189a38
+VITE_BNB_CHAIN_ID=56
+VITE_BNB_ADDRESSES_TOWNS_BNB=0x00000000bcA93b25a6694ca3d2109d545988b13B
+VITE_GNOSIS_CHAIN_ID=100
+VITE_GNOSIS_ADDRESSES_POAP_ENTITLEMENT=0xEd142Ee3F6B445B70f063A30A3F61e5d7855F6Fd
+VITE_MAINNET_CHAIN_ID=1
+VITE_MAINNET_RIVER=0x53319181e003E7f86fB79f794649a2aB680Db244
+VITE_MAINNET_ADDRESSES_TOWNS_MAINNET=0x000000Fa00b200406de700041CFc6b19BbFB4d13
+VITE_MAINNET_ADDRESSES_W_TOWNS=0x00000000Bc5Ff0261B97004a79c6D361002Ba2db
+VITE_MAINNET_ADDRESSES_UTILS_PROXY_BATCH_DELEGATION=0x4ea3DA9d916473A285970B4318DE038A78fFd5f6
+VITE_RIVER_CHAIN_ID=550
+VITE_RIVER_ADDRESSES_RIVER_REGISTRY=0x1298c03Fde548dc433a452573E36A713b38A0404

package/dev/.contracts-hash

@@ -1 +1 @@
-84df1b2de8cad74ea4edf62df8ca64fec2e770d2
+e4abf8a40d8d359da841e67e415b2e7c56dcd7d2

package/dev/abis/IAppAccount.abi.json

@@ -25,6 +25,35 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "execute",
+    "inputs": [
+      {
+        "name": "target",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "value",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "data",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "stateMutability": "payable"
+  },
   {
     "type": "function",
     "name": "getAppExpiration",
@@ -105,6 +134,25 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "isAppExecuting",
+    "inputs": [
+      {
+        "name": "app",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool",
+        "internalType": "bool"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "isAppInstalled",

package/dev/abis/IAppAccount.abi.ts

@@ -25,6 +25,35 @@ export default [
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "execute",
+    "inputs": [
+      {
+        "name": "target",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "value",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "data",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "stateMutability": "payable"
+  },
   {
     "type": "function",
     "name": "getAppExpiration",
@@ -105,6 +134,25 @@ export default [
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "isAppExecuting",
+    "inputs": [
+      {
+        "name": "app",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool",
+        "internalType": "bool"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "isAppInstalled",

package/dev/abis/SubscriptionModuleFacet.abi.json

@@ -110,16 +110,21 @@
         "type": "tuple",
         "internalType": "struct Subscription",
         "components": [
+          {
+            "name": "tokenId",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
+          {
+            "name": "spent",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
           {
             "name": "space",
             "type": "address",
             "internalType": "address"
           },
-          {
-            "name": "active",
-            "type": "bool",
-            "internalType": "bool"
-          },
           {
             "name": "lastRenewalTime",
             "type": "uint40",
@@ -131,14 +136,9 @@
             "internalType": "uint40"
           },
           {
-            "name": "spent",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
-          {
-            "name": "tokenId",
-            "type": "uint256",
-            "internalType": "uint256"
+            "name": "active",
+            "type": "bool",
+            "internalType": "bool"
           }
         ]
       }
@@ -158,6 +158,25 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "isOperator",
+    "inputs": [
+      {
+        "name": "operator",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool",
+        "internalType": "bool"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "moduleId",
@@ -621,6 +640,32 @@
     ],
     "anonymous": false
   },
+  {
+    "type": "event",
+    "name": "OperatorGranted",
+    "inputs": [
+      {
+        "name": "operator",
+        "type": "address",
+        "indexed": true,
+        "internalType": "address"
+      }
+    ],
+    "anonymous": false
+  },
+  {
+    "type": "event",
+    "name": "OperatorRevoked",
+    "inputs": [
+      {
+        "name": "operator",
+        "type": "address",
+        "indexed": true,
+        "internalType": "address"
+      }
+    ],
+    "anonymous": false
+  },
   {
     "type": "event",
     "name": "OwnershipTransferred",
@@ -832,6 +877,11 @@
     "name": "SubscriptionModule__InactiveSubscription",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SubscriptionModule__InsufficientBalance",
+    "inputs": []
+  },
   {
     "type": "error",
     "name": "SubscriptionModule__InvalidAddress",

package/dev/abis/SubscriptionModuleFacet.abi.ts

@@ -110,16 +110,21 @@ export default [
         "type": "tuple",
         "internalType": "struct Subscription",
         "components": [
+          {
+            "name": "tokenId",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
+          {
+            "name": "spent",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
           {
             "name": "space",
             "type": "address",
             "internalType": "address"
           },
-          {
-            "name": "active",
-            "type": "bool",
-            "internalType": "bool"
-          },
           {
             "name": "lastRenewalTime",
             "type": "uint40",
@@ -131,14 +136,9 @@ export default [
             "internalType": "uint40"
           },
           {
-            "name": "spent",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
-          {
-            "name": "tokenId",
-            "type": "uint256",
-            "internalType": "uint256"
+            "name": "active",
+            "type": "bool",
+            "internalType": "bool"
           }
         ]
       }
@@ -158,6 +158,25 @@ export default [
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "isOperator",
+    "inputs": [
+      {
+        "name": "operator",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool",
+        "internalType": "bool"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "moduleId",
@@ -621,6 +640,32 @@ export default [
     ],
     "anonymous": false
   },
+  {
+    "type": "event",
+    "name": "OperatorGranted",
+    "inputs": [
+      {
+        "name": "operator",
+        "type": "address",
+        "indexed": true,
+        "internalType": "address"
+      }
+    ],
+    "anonymous": false
+  },
+  {
+    "type": "event",
+    "name": "OperatorRevoked",
+    "inputs": [
+      {
+        "name": "operator",
+        "type": "address",
+        "indexed": true,
+        "internalType": "address"
+      }
+    ],
+    "anonymous": false
+  },
   {
     "type": "event",
     "name": "OwnershipTransferred",
@@ -832,6 +877,11 @@ export default [
     "name": "SubscriptionModule__InactiveSubscription",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SubscriptionModule__InsufficientBalance",
+    "inputs": []
+  },
   {
     "type": "error",
     "name": "SubscriptionModule__InvalidAddress",

package/dev/typings/IAppAccount.ts

@@ -9,6 +9,7 @@ import type {
   CallOverrides,
   ContractTransaction,
   Overrides,
+  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -82,10 +83,12 @@ export interface IAppAccountInterface extends utils.Interface {
   functions: {
     "disableApp(address)": FunctionFragment;
     "enableApp(address)": FunctionFragment;
+    "execute(address,uint256,bytes)": FunctionFragment;
     "getAppExpiration(address)": FunctionFragment;
     "getAppId(address)": FunctionFragment;
     "getInstalledApps()": FunctionFragment;
     "isAppEntitled(address,address,bytes32)": FunctionFragment;
+    "isAppExecuting(address)": FunctionFragment;
     "isAppInstalled(address)": FunctionFragment;
     "onInstallApp(bytes32,bytes)": FunctionFragment;
     "onRenewApp(bytes32,bytes)": FunctionFragment;
@@ -96,10 +99,12 @@ export interface IAppAccountInterface extends utils.Interface {
     nameOrSignatureOrTopic:
       | "disableApp"
       | "enableApp"
+      | "execute"
       | "getAppExpiration"
       | "getAppId"
       | "getInstalledApps"
       | "isAppEntitled"
+      | "isAppExecuting"
       | "isAppInstalled"
       | "onInstallApp"
       | "onRenewApp"
@@ -114,6 +119,14 @@ export interface IAppAccountInterface extends utils.Interface {
     functionFragment: "enableApp",
     values: [PromiseOrValue<string>]
   ): string;
+  encodeFunctionData(
+    functionFragment: "execute",
+    values: [
+      PromiseOrValue<string>,
+      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<BytesLike>
+    ]
+  ): string;
   encodeFunctionData(
     functionFragment: "getAppExpiration",
     values: [PromiseOrValue<string>]
@@ -134,6 +147,10 @@ export interface IAppAccountInterface extends utils.Interface {
       PromiseOrValue<BytesLike>
     ]
   ): string;
+  encodeFunctionData(
+    functionFragment: "isAppExecuting",
+    values: [PromiseOrValue<string>]
+  ): string;
   encodeFunctionData(
     functionFragment: "isAppInstalled",
     values: [PromiseOrValue<string>]
@@ -153,6 +170,7 @@ export interface IAppAccountInterface extends utils.Interface {
 
   decodeFunctionResult(functionFragment: "disableApp", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "enableApp", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "execute", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "getAppExpiration",
     data: BytesLike
@@ -166,6 +184,10 @@ export interface IAppAccountInterface extends utils.Interface {
     functionFragment: "isAppEntitled",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "isAppExecuting",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "isAppInstalled",
     data: BytesLike
@@ -251,6 +273,13 @@ export interface IAppAccount extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
+    execute(
+      target: PromiseOrValue<string>,
+      value: PromiseOrValue<BigNumberish>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+
     getAppExpiration(
       app: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -270,6 +299,11 @@ export interface IAppAccount extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[boolean]>;
 
+    isAppExecuting(
+      app: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>;
+
     isAppInstalled(
       app: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -304,6 +338,13 @@ export interface IAppAccount extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
+  execute(
+    target: PromiseOrValue<string>,
+    value: PromiseOrValue<BigNumberish>,
+    data: PromiseOrValue<BytesLike>,
+    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
   getAppExpiration(
     app: PromiseOrValue<string>,
     overrides?: CallOverrides
@@ -323,6 +364,11 @@ export interface IAppAccount extends BaseContract {
     overrides?: CallOverrides
   ): Promise<boolean>;
 
+  isAppExecuting(
+    app: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<boolean>;
+
   isAppInstalled(
     app: PromiseOrValue<string>,
     overrides?: CallOverrides
@@ -357,6 +403,13 @@ export interface IAppAccount extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
+    execute(
+      target: PromiseOrValue<string>,
+      value: PromiseOrValue<BigNumberish>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<string>;
+
     getAppExpiration(
       app: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -376,6 +429,11 @@ export interface IAppAccount extends BaseContract {
       overrides?: CallOverrides
     ): Promise<boolean>;
 
+    isAppExecuting(
+      app: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<boolean>;
+
     isAppInstalled(
       app: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -433,6 +491,13 @@ export interface IAppAccount extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
+    execute(
+      target: PromiseOrValue<string>,
+      value: PromiseOrValue<BigNumberish>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
+
     getAppExpiration(
       app: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -452,6 +517,11 @@ export interface IAppAccount extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    isAppExecuting(
+      app: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     isAppInstalled(
       app: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -487,6 +557,13 @@ export interface IAppAccount extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
+    execute(
+      target: PromiseOrValue<string>,
+      value: PromiseOrValue<BigNumberish>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+
     getAppExpiration(
       app: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -506,6 +583,11 @@ export interface IAppAccount extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    isAppExecuting(
+      app: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     isAppInstalled(
       app: PromiseOrValue<string>,
       overrides?: CallOverrides

package/dev/typings/SubscriptionModuleFacet.ts

@@ -28,28 +28,28 @@ import type {
 } from "./common";
 
 export type SubscriptionStruct = {
+  tokenId: PromiseOrValue<BigNumberish>;
+  spent: PromiseOrValue<BigNumberish>;
   space: PromiseOrValue<string>;
-  active: PromiseOrValue<boolean>;
   lastRenewalTime: PromiseOrValue<BigNumberish>;
   nextRenewalTime: PromiseOrValue<BigNumberish>;
-  spent: PromiseOrValue<BigNumberish>;
-  tokenId: PromiseOrValue<BigNumberish>;
+  active: PromiseOrValue<boolean>;
 };
 
 export type SubscriptionStructOutput = [
+  BigNumber,
+  BigNumber,
   string,
-  boolean,
   number,
   number,
-  BigNumber,
-  BigNumber
+  boolean
 ] & {
+  tokenId: BigNumber;
+  spent: BigNumber;
   space: string;
-  active: boolean;
   lastRenewalTime: number;
   nextRenewalTime: number;
-  spent: BigNumber;
-  tokenId: BigNumber;
+  active: boolean;
 };
 
 export type PackedUserOperationStruct = {
@@ -108,6 +108,7 @@ export interface SubscriptionModuleFacetInterface extends utils.Interface {
     "getEntityIds(address)": FunctionFragment;
     "getSubscription(address,uint32)": FunctionFragment;
     "grantOperator(address)": FunctionFragment;
+    "isOperator(address)": FunctionFragment;
     "moduleId()": FunctionFragment;
     "onInstall(bytes)": FunctionFragment;
     "onUninstall(bytes)": FunctionFragment;
@@ -133,6 +134,7 @@ export interface SubscriptionModuleFacetInterface extends utils.Interface {
       | "getEntityIds"
       | "getSubscription"
       | "grantOperator"
+      | "isOperator"
       | "moduleId"
       | "onInstall"
       | "onUninstall"
@@ -180,6 +182,10 @@ export interface SubscriptionModuleFacetInterface extends utils.Interface {
     functionFragment: "grantOperator",
     values: [PromiseOrValue<string>]
   ): string;
+  encodeFunctionData(
+    functionFragment: "isOperator",
+    values: [PromiseOrValue<string>]
+  ): string;
   encodeFunctionData(functionFragment: "moduleId", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "onInstall",
@@ -294,6 +300,7 @@ export interface SubscriptionModuleFacetInterface extends utils.Interface {
     functionFragment: "grantOperator",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "isOperator", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "moduleId", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "onInstall", data: BytesLike): Result;
   decodeFunctionResult(
@@ -346,6 +353,8 @@ export interface SubscriptionModuleFacetInterface extends utils.Interface {
     "Initialized(uint32)": EventFragment;
     "InterfaceAdded(bytes4)": EventFragment;
     "InterfaceRemoved(bytes4)": EventFragment;
+    "OperatorGranted(address)": EventFragment;
+    "OperatorRevoked(address)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
     "SubscriptionConfigured(address,uint32,address,uint256,uint64)": EventFragment;
     "SubscriptionDeactivated(address,uint32)": EventFragment;
@@ -358,6 +367,8 @@ export interface SubscriptionModuleFacetInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "InterfaceAdded"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "InterfaceRemoved"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "OperatorGranted"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "OperatorRevoked"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SubscriptionConfigured"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "SubscriptionDeactivated"): EventFragment;
@@ -407,6 +418,26 @@ export type InterfaceRemovedEvent = TypedEvent<
 export type InterfaceRemovedEventFilter =
   TypedEventFilter<InterfaceRemovedEvent>;
 
+export interface OperatorGrantedEventObject {
+  operator: string;
+}
+export type OperatorGrantedEvent = TypedEvent<
+  [string],
+  OperatorGrantedEventObject
+>;
+
+export type OperatorGrantedEventFilter = TypedEventFilter<OperatorGrantedEvent>;
+
+export interface OperatorRevokedEventObject {
+  operator: string;
+}
+export type OperatorRevokedEvent = TypedEvent<
+  [string],
+  OperatorRevokedEventObject
+>;
+
+export type OperatorRevokedEventFilter = TypedEventFilter<OperatorRevokedEvent>;
+
 export interface OwnershipTransferredEventObject {
   previousOwner: string;
   newOwner: string;
@@ -543,6 +574,11 @@ export interface SubscriptionModuleFacet extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
+    isOperator(
+      operator: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>;
+
     moduleId(overrides?: CallOverrides): Promise<[string]>;
 
     onInstall(
@@ -657,6 +693,11 @@ export interface SubscriptionModuleFacet extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
+  isOperator(
+    operator: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<boolean>;
+
   moduleId(overrides?: CallOverrides): Promise<string>;
 
   onInstall(
@@ -769,6 +810,11 @@ export interface SubscriptionModuleFacet extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
+    isOperator(
+      operator: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<boolean>;
+
     moduleId(overrides?: CallOverrides): Promise<string>;
 
     onInstall(
@@ -881,6 +927,20 @@ export interface SubscriptionModuleFacet extends BaseContract {
       interfaceId?: PromiseOrValue<BytesLike> | null
     ): InterfaceRemovedEventFilter;
 
+    "OperatorGranted(address)"(
+      operator?: PromiseOrValue<string> | null
+    ): OperatorGrantedEventFilter;
+    OperatorGranted(
+      operator?: PromiseOrValue<string> | null
+    ): OperatorGrantedEventFilter;
+
+    "OperatorRevoked(address)"(
+      operator?: PromiseOrValue<string> | null
+    ): OperatorRevokedEventFilter;
+    OperatorRevoked(
+      operator?: PromiseOrValue<string> | null
+    ): OperatorRevokedEventFilter;
+
     "OwnershipTransferred(address,address)"(
       previousOwner?: PromiseOrValue<string> | null,
       newOwner?: PromiseOrValue<string> | null
@@ -980,6 +1040,11 @@ export interface SubscriptionModuleFacet extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
+    isOperator(
+      operator: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     moduleId(overrides?: CallOverrides): Promise<BigNumber>;
 
     onInstall(
@@ -1095,6 +1160,11 @@ export interface SubscriptionModuleFacet extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
+    isOperator(
+      operator: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     moduleId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     onInstall(

package/dev/typings/factories/IAppAccount__factory.ts

@@ -33,6 +33,35 @@ const _abi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
+  {
+    type: "function",
+    name: "execute",
+    inputs: [
+      {
+        name: "target",
+        type: "address",
+        internalType: "address",
+      },
+      {
+        name: "value",
+        type: "uint256",
+        internalType: "uint256",
+      },
+      {
+        name: "data",
+        type: "bytes",
+        internalType: "bytes",
+      },
+    ],
+    outputs: [
+      {
+        name: "",
+        type: "bytes",
+        internalType: "bytes",
+      },
+    ],
+    stateMutability: "payable",
+  },
   {
     type: "function",
     name: "getAppExpiration",
@@ -113,6 +142,25 @@ const _abi = [
     ],
     stateMutability: "view",
   },
+  {
+    type: "function",
+    name: "isAppExecuting",
+    inputs: [
+      {
+        name: "app",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+    outputs: [
+      {
+        name: "",
+        type: "bool",
+        internalType: "bool",
+      },
+    ],
+    stateMutability: "view",
+  },
   {
     type: "function",
     name: "isAppInstalled",

package/dev/typings/factories/SubscriptionModuleFacet__factory.ts

@@ -121,16 +121,21 @@ const _abi = [
         type: "tuple",
         internalType: "struct Subscription",
         components: [
+          {
+            name: "tokenId",
+            type: "uint256",
+            internalType: "uint256",
+          },
+          {
+            name: "spent",
+            type: "uint256",
+            internalType: "uint256",
+          },
           {
             name: "space",
             type: "address",
             internalType: "address",
           },
-          {
-            name: "active",
-            type: "bool",
-            internalType: "bool",
-          },
           {
             name: "lastRenewalTime",
             type: "uint40",
@@ -142,14 +147,9 @@ const _abi = [
             internalType: "uint40",
           },
           {
-            name: "spent",
-            type: "uint256",
-            internalType: "uint256",
-          },
-          {
-            name: "tokenId",
-            type: "uint256",
-            internalType: "uint256",
+            name: "active",
+            type: "bool",
+            internalType: "bool",
           },
         ],
       },
@@ -169,6 +169,25 @@ const _abi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
+  {
+    type: "function",
+    name: "isOperator",
+    inputs: [
+      {
+        name: "operator",
+        type: "address",
+        internalType: "address",
+      },
+    ],
+    outputs: [
+      {
+        name: "",
+        type: "bool",
+        internalType: "bool",
+      },
+    ],
+    stateMutability: "view",
+  },
   {
     type: "function",
     name: "moduleId",
@@ -632,6 +651,32 @@ const _abi = [
     ],
     anonymous: false,
   },
+  {
+    type: "event",
+    name: "OperatorGranted",
+    inputs: [
+      {
+        name: "operator",
+        type: "address",
+        indexed: true,
+        internalType: "address",
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: "event",
+    name: "OperatorRevoked",
+    inputs: [
+      {
+        name: "operator",
+        type: "address",
+        indexed: true,
+        internalType: "address",
+      },
+    ],
+    anonymous: false,
+  },
   {
     type: "event",
     name: "OwnershipTransferred",
@@ -843,6 +888,11 @@ const _abi = [
     name: "SubscriptionModule__InactiveSubscription",
     inputs: [],
   },
+  {
+    type: "error",
+    name: "SubscriptionModule__InsufficientBalance",
+    inputs: [],
+  },
   {
     type: "error",
     name: "SubscriptionModule__InvalidAddress",
@@ -896,7 +946,7 @@ const _abi = [
 ] as const;
 
 const _bytecode =
-  "0x6080604052348015600e575f5ffd5b5060156019565b60bd565b7f59b501c3653afc186af7d48dda36cf6732bd21629a6295693664240a6ef520008054640100000000900460ff16156064576040516366008a2d60e01b815260040160405180910390fd5b805463ffffffff908116101560ba57805463ffffffff191663ffffffff90811782556040519081527fe9c9b456cb2994b80aeef036cf59d26e9617df80f816a6ee5a5b4166e07e2f5c9060200160405180910390a15b50565b612ce3806100ca5f395ff3fe608060405234801561000f575f5ffd5b506004361061016e575f3560e01c8063885c1d09116100d2578063c1a287e211610088578063e7db7f7e11610063578063e7db7f7e1461048c578063eca8ad66146104f6578063fad8b32a14610500575f5ffd5b8063c1a287e214610467578063cfdbf25414610471578063e348da1314610479575f5ffd5b80639e94f3ab116100b85780639e94f3ab1461026e578063a07da64714610415578063a1308f2714610428575f5ffd5b8063885c1d09146102485780638a91b0e31461025b575f5ffd5b80633d6bda32116101275780633f41826e1161010d5780633f41826e1461020f578063465d33e0146102225780636d61fe7014610235575f5ffd5b80633d6bda32146101dc5780633e5f6091146101ef575f5ffd5b80630ab8785f116101575780630ab8785f146101af5780631313f410146101d45780632a3d428c146101af575f5ffd5b806301ffc9a714610172578063092640881461019a575b5f5ffd5b610185610180366004612629565b610513565b60405190151581526020015b60405180910390f35b6101ad6101a8366004612668565b6105ab565b005b6101c66101bd366004612699565b60019392505050565b604051908152602001610191565b6101ad6106f5565b6101ad6101ea366004612758565b6107d5565b6102026101fd3660046127f3565b610807565b604051610191919061280e565b6101ad61021d366004612850565b610856565b6101ad6102303660046128bc565b610886565b6101ad610243366004612969565b610975565b6101ad6102563660046129a8565b610d21565b6101ad610269366004612969565b611228565b6103a461027c366004612a19565b6040805160c0810182525f80825260208201819052918101829052606081018290526080810182905260a08101919091527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb860073ffffffffffffffffffffffffffffffffffffffff8085165f90815260019283016020908152604080832063ffffffff88168452825291829020825160c0810184528154948516815260ff7401000000000000000000000000000000000000000086041615159281019290925264ffffffffff750100000000000000000000000000000000000000000085048116938301939093527a01000000000000000000000000000000000000000000000000000090930490911660608201529181015460808301526002015460a0820152905092915050565b60405161019191905f60c08201905073ffffffffffffffffffffffffffffffffffffffff835116825260208301511515602083015264ffffffffff604084015116604083015264ffffffffff60608401511660608301526080830151608083015260a083015160a083015292915050565b6101ad610423366004612a4c565b611390565b604080518082018252601f81527f746f776e732e737562736372697074696f6e2d6d6f64756c652e312e302e3000602082015290516101919190612ab1565b6101c66203f48081565b6101c6603281565b6101ad6104873660046127f3565b611474565b6104c561049a366004612ac3565b7fffffffff000000000000000000000000000000000000000000000000000000009695505050505050565b6040517fffffffff000000000000000000000000000000000000000000000000000000009091168152602001610191565b6101c66201518081565b6101ad61050e3660046127f3565b61151e565b5f7fffffffff0000000000000000000000000000000000000000000000000000000082167f46c0c1b40000000000000000000000000000000000000000000000000000000014806105a557507f01ffc9a7000000000000000000000000000000000000000000000000000000007fffffffff000000000000000000000000000000000000000000000000000000008316145b92915050565b688000000000ab143c06466001036105d557805c156105cd57805f526004601cfd5b30815d6105ea565b308154036105e657805f526004601cfd5b3081555b507fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb86006106228161061d60208501856127f3565b6115c3565b61064f5761064f7f59530ce9000000000000000000000000000000000000000000000000000000006115fa565b6106d0600182015f61066460208601866127f3565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020015f205f8460200160208101906106b19190612a4c565b63ffffffff1663ffffffff1681526020019081526020015f2083611602565b50688000000000ab143c06466001036106ea575f815d5050565b8081555b5050565b50565b7f59b501c3653afc186af7d48dda36cf6732bd21629a6295693664240a6ef5200054640100000000900460ff16610758576040517f77a399b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6107817f985c01c500000000000000000000000000000000000000000000000000000000611c9d565b6107aa7fab3e34c100000000000000000000000000000000000000000000000000000000611c9d565b6107d37f28171ad000000000000000000000000000000000000000000000000000000000611c9d565b565b6107fe7fabbbbc73000000000000000000000000000000000000000000000000000000006115fa565b50505050505050565b73ffffffffffffffffffffffffffffffffffffffff81165f9081527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8602602052604090206060906105a590611df2565b61087f7fabbbbc73000000000000000000000000000000000000000000000000000000006115fa565b5050505050565b73ffffffffffffffffffffffffffffffffffffffff861630146108cc576108cc7f90467bf5000000000000000000000000000000000000000000000000000000006115fa565b73ffffffffffffffffffffffffffffffffffffffff88165f9081527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb86016020908152604080832063ffffffff8b16845290915290205474010000000000000000000000000000000000000000900460ff168061096a5761096a7fe01d3320000000000000000000000000000000000000000000000000000000006115fa565b505050505050505050565b688000000000ab143c064660010361099f57805c1561099757805f526004601cfd5b30815d6109b4565b308154036109b057805f526004601cfd5b3081555b505f80806109c484860186612b41565b9250925092506109d382611e03565b6040517f6352211e00000000000000000000000000000000000000000000000000000000815260048101829052339073ffffffffffffffffffffffffffffffffffffffff841690636352211e90602401602060405180830381865afa158015610a3e573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a629190612b6c565b73ffffffffffffffffffffffffffffffffffffffff1614610aa657610aa67ff107dccb000000000000000000000000000000000000000000000000000000006115fa565b6040517f17c957090000000000000000000000000000000000000000000000000000000081526004810182905282905f9073ffffffffffffffffffffffffffffffffffffffff8316906317c9570990602401602060405180830381865afa158015610b13573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b379190612b87565b90505f7fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8600335f908152600182016020908152604080832063ffffffff8b168452909152902080547fffffffffffffffffffffff0000000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff8816177401000000000000000000000000000000000000000017815560028101869055909150610be86201518084612bcb565b815464ffffffffff919091167a010000000000000000000000000000000000000000000000000000027fff0000000000ffffffffffffffffffffffffffffffffffffffffffffffffffff909116178155335f9081526002830160205260409020610c5b9063ffffffff808a1690611e4716565b508054604080518781527a01000000000000000000000000000000000000000000000000000090920464ffffffffff16602083015273ffffffffffffffffffffffffffffffffffffffff88169163ffffffff8a169133917f08720d091868d49076b0e5ce78e90cebcfc6eee115bcd31ebe88c341793075bf910160405180910390a450505050505050610cec600190565b15610d1157688000000000ab143c0646600103610d0b575f815d505050565b80555050565b5f688000000000ab143c065d5050565b688000000000ab143c0646600103610d4b57805c15610d4357805f526004601cfd5b30815d610d60565b30815403610d5c57805f526004601cfd5b3081555b50806032811115610d9457610d947f2efeb701000000000000000000000000000000000000000000000000000000006115fa565b805f03610dc457610dc47f8ac7f055000000000000000000000000000000000000000000000000000000006115fa565b7fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb86005f5b8281101561121d57610e1b82868684818110610e0557610e05612bde565b61061d92602060409092020190810191506127f3565b610e4857610e487f59530ce9000000000000000000000000000000000000000000000000000000006115fa565b5f826001015f878785818110610e6057610e60612bde565b610e7692602060409092020190810191506127f3565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020015f205f878785818110610ec257610ec2612bde565b9050604002016020016020810190610eda9190612a4c565b63ffffffff16815260208101919091526040015f20805490915074010000000000000000000000000000000000000000900460ff16610fee57858583818110610f2557610f25612bde565b9050604002016020016020810190610f3d9190612a4c565b63ffffffff16868684818110610f5557610f55612bde565b610f6b92602060409092020190810191506127f3565b73ffffffffffffffffffffffffffffffffffffffff167f5db17eb6b69c9f0cf51e3b1f2c90a067a24697d427ba54c65f211120d3da7c05604051610fe09060208082526008908201527f494e414354495645000000000000000000000000000000000000000000000000604082015260600190565b60405180910390a350611215565b80547a010000000000000000000000000000000000000000000000000000900464ffffffffff164210156110e95785858381811061102e5761102e612bde565b90506040020160200160208101906110469190612a4c565b63ffffffff1686868481811061105e5761105e612bde565b61107492602060409092020190810191506127f3565b73ffffffffffffffffffffffffffffffffffffffff167f5db17eb6b69c9f0cf51e3b1f2c90a067a24697d427ba54c65f211120d3da7c05604051610fe09060208082526007908201527f4e4f545f44554500000000000000000000000000000000000000000000000000604082015260600190565b805461111e906203f480907a010000000000000000000000000000000000000000000000000000900464ffffffffff16612c0b565b4211156111f25785858381811061113757611137612bde565b905060400201602001602081019061114f9190612a4c565b63ffffffff1686868481811061116757611167612bde565b61117d92602060409092020190810191506127f3565b73ffffffffffffffffffffffffffffffffffffffff167f5db17eb6b69c9f0cf51e3b1f2c90a067a24697d427ba54c65f211120d3da7c05604051610fe0906020808252600a908201527f504153545f475241434500000000000000000000000000000000000000000000604082015260600190565b6112138187878581811061120857611208612bde565b905060400201611602565b505b600101610de7565b505050610cec600190565b688000000000ab143c064660010361125257805c1561124a57805f526004601cfd5b30815d611267565b3081540361126357805f526004601cfd5b3081555b505f61127582840184612a4c565b335f9081527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8602602052604090209091507fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8600906112da9063ffffffff80851690611e5216565b611307576113077faacf701b000000000000000000000000000000000000000000000000000000006115fa565b335f81815260018084016020908152604080842063ffffffff8816808652925280842080547fff00000000000000000000000000000000000000000000000000000000000000168155928301849055600290920183905590519092917f48c4a5a219af3d077894cac7e6b26c5cdb83cf91d718428985a3f4a85e9ed45d91a35050610cec600190565b335f9081527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb86016020908152604080832063ffffffff851684529091529020805474010000000000000000000000000000000000000000900460ff16611418576114187fe01d3320000000000000000000000000000000000000000000000000000000006115fa565b80547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff16815560405163ffffffff83169033907fd01480b28a9baefd1cd771d8109d1abf2380614146253e17b61774b7b3fb77f1905f90a35050565b7f4675fa8241f86f37157864d3d49b85ad4b164352c516da28e1678a90470ae3005473ffffffffffffffffffffffffffffffffffffffff1633146114eb576040517f65f490650000000000000000000000000000000000000000000000000000000081523360048201526024015b60405180910390fd5b6114f481611e03565b6106ee7fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb860082611e5d565b7f4675fa8241f86f37157864d3d49b85ad4b164352c516da28e1678a90470ae3005473ffffffffffffffffffffffffffffffffffffffff163314611590576040517f65f490650000000000000000000000000000000000000000000000000000000081523360048201526024016114e2565b61159981611e03565b6106ee7fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb860082611fe1565b5f3373ffffffffffffffffffffffffffffffffffffffff8316036115e9575060016105a5565b6115f38333612155565b9392505050565b805f5260045ffd5b815474010000000000000000000000000000000000000000900460ff1661164c5761164c7fe01d3320000000000000000000000000000000000000000000000000000000006115fa565b81547a010000000000000000000000000000000000000000000000000000900464ffffffffff164210156116a3576116a37fd1cf008c000000000000000000000000000000000000000000000000000000006115fa565b81546116d8906203f480907a010000000000000000000000000000000000000000000000000000900464ffffffffff16612c0b565b42111561176e5781547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1682556117156040820160208301612a4c565b63ffffffff1661172860208301836127f3565b73ffffffffffffffffffffffffffffffffffffffff167fd01480b28a9baefd1cd771d8109d1abf2380614146253e17b61774b7b3fb77f160405160405180910390a35050565b815460028301546040517f5803909f00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff909216915f918391635803909f916117ce9160040190815260200190565b602060405180830381865afa1580156117e9573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061180d9190612b87565b905061181d426301e13380612c0b565b845464ffffffffff919091167a010000000000000000000000000000000000000000000000000000027fff0000000000ffffffffffffffffffffffffffffffffffffffffffffffffffff90911617845560028401546040515f916118879160240190815260200190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f7c9669ac00000000000000000000000000000000000000000000000000000000179052865490519192505f9161192d9173ffffffffffffffffffffffffffffffffffffffff169085908590602401612c1e565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152918152602080830180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb61d27f6000000000000000000000000000000000000000000000000000000001790529192505f916119fe916119bc91908901908901612a4c565b885460028a01546040805173ffffffffffffffffffffffffffffffffffffffff9093166020840152820152606001604051602081830303815290604052612227565b90505f8282604051602401611a14929190612c5b565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052602080820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167ff2680c0f00000000000000000000000000000000000000000000000000000000179052909150611aa590611a9e908901896127f3565b5f83612253565b5060028801546040517f17c957090000000000000000000000000000000000000000000000000000000081525f9173ffffffffffffffffffffffffffffffffffffffff8916916317c9570991611b019160040190815260200190565b602060405180830381865afa158015611b1c573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611b409190612b87565b9050611b4f6201518082612bcb565b89547fff00000000000000000000ffffffffffffffffffffffffffffffffffffffffff167a01000000000000000000000000000000000000000000000000000064ffffffffff928316027fffffffffffff0000000000ffffffffffffffffffffffffffffffffffffffffff161775010000000000000000000000000000000000000000004292909216919091021789556001890180548791905f90611bf5908490612c0b565b90915550611c0b90506040890160208a01612a4c565b63ffffffff16611c1e60208a018a6127f3565b8a546040517a01000000000000000000000000000000000000000000000000000090910464ffffffffff16815273ffffffffffffffffffffffffffffffffffffffff91909116907f9303e8c36264aec4db05a9f75307a7936b625c753189351a713ff8559cf0f4fd9060200160405180910390a3505050505050505050565b7fffffffff0000000000000000000000000000000000000000000000000000000081165f9081527f81088bbc801e045ea3e7620779ab349988f58afbdfba10dff983df3f33522b00602052604090205460ff16611d71577fffffffff0000000000000000000000000000000000000000000000000000000081165f9081527f81088bbc801e045ea3e7620779ab349988f58afbdfba10dff983df3f33522b006020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055611da3565b6040517ff2cfeefa00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040517fffffffff000000000000000000000000000000000000000000000000000000008216907f78f84e5b1c5c05be2b5ad3800781dd404d6d6c6302bc755c0fe20f58a33a7f22905f90a250565b60606105a5611e008361229f565b90565b73ffffffffffffffffffffffffffffffffffffffff81166106f2576106f27fe6c4247b000000000000000000000000000000000000000000000000000000006115fa565b5f6115f38383612358565b5f6115f3838361246a565b63978aab926004525f8281526024812073ffffffffffffffffffffffffffffffffffffffff92909216917fffffffffffffffffffffffffffffffffffffffffffffff04498025ad2b4047418301611ebb5763f5a267f15f526004601cfd5b82611ecd5768fbb67fda52d4bfb8bf92505b80546bffffffffffffffffffffffff81168260205280611f94578160601c80611f00578560601b84556001945050611fd8565b858103611f0d5750611fd8565b600184015460601c80611f2e578660601b6001860155600195505050611fd8565b868103611f3c575050611fd8565b600285015460601c80611f5e578760601b600287015560019650505050611fd8565b878103611f6d57505050611fd8565b5f928352604080842060019055918352818320600290558252902060039055506007908117905b845f5260405f208054611fd657600191821c808301825591945081611fc2578560601b600317845550611fd8565b8560601b8285015582600201845550611fd8565b505b50505092915050565b63978aab926004525f8281526024812073ffffffffffffffffffffffffffffffffffffffff92909216917fffffffffffffffffffffffffffffffffffffffffffffff04498025ad2b404741830161203f5763f5a267f15f526004601cfd5b826120515768fbb67fda52d4bfb8bf92505b80546bffffffffffffffffffffffff8116806120d05760019350848260601c0361208e5760018301805484556002840180549091555f9055611fd8565b84600184015460601c036120af5760028301805460018501555f9055611fd8565b84600284015460601c036120c8575f6002840155611fd8565b5f9350611fd8565b82602052845f5260405f208054806120e9575050611fd8565b60018360011c039250826001820314612119578285015460601c8060601b60018303870155805f52508060405f20555b5083547fffffffffffffffffffffffffffffffffffffffff00000000000000000000000016600192831b1782179093555f909255509392505050565b63978aab926004525f8281526024812073ffffffffffffffffffffffffffffffffffffffff92909216917fffffffffffffffffffffffffffffffffffffffffffffff04498025ad2b40474183016121b35763f5a267f15f526004601cfd5b826121c55768fbb67fda52d4bfb8bf92505b80546bffffffffffffffffffffffff811661220e5760019250838160601c031561221f57600182015460601c841461221f57600282015460601c841461221f575b5f925061221f565b81602052835f5260405f2054151592505b505092915050565b60606115f3835f8460405160200161223f9190612c96565b604051602081830303815290604052612568565b60405181515f9038906020850186885af1612270573d5f823e3d81fd5b3d61228857833b61228857635a836a5f5f526004601cfd5b3d8152602081013d5f823e3d016040529392505050565b6318fb58646004525f81815260249020801954604051919068fbb67fda52d4bfb8bf90602084018161231857835480156123125780841415028152600184810154909250801561231257808414150260208201526002848101549092508015612312576003925083811415810260408301525b50612343565b8160011c91505f5b8281101561234157848101548481141502600582901b830152600101612320565b505b8185528160051b810160405250505050919050565b6318fb58646004525f8281526024812068fbb67fda52d4bfb8bf83036123855763f5a267f15f526004601cfd5b826123975768fbb67fda52d4bfb8bf92505b801954816020528061243b578154806123b757848355600193505061221f565b8481036123c4575061221f565b6001830154806123df5785600185015560019450505061221f565b8581036123ed57505061221f565b600284015480612409578660028601556001955050505061221f565b8681036124185750505061221f565b5f9283526040808420600190559183528183206002905582529020600390555060075b835f5260405f208054611fd857600191821c8381018690558083019182905590821b821783195590925061221f565b6318fb58646004525f8281526024812068fbb67fda52d4bfb8bf83036124975763f5a267f15f526004601cfd5b826124a95768fbb67fda52d4bfb8bf92505b8019548061250a5760019250838254036124d65760018201805483556002830180549091555f905561221f565b836001830154036124f45760028201805460018401555f905561221f565b83600283015403612206575f600283015561221f565b81602052835f5260405f2080548061252357505061221f565b60018360011c03925082600182031461254d57828401548060018303860155805f52508060405f20555b5060018260011b178319555f81555060019250505092915050565b60605f8315612575576001175b6040517fff0000000000000000000000000000000000000000000000000000000000000060f883901b1660208201527fffffffff0000000000000000000000000000000000000000000000000000000060e087901b166021820152602501604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815290829052612610918590602001612cc7565b6040516020818303038152906040529150509392505050565b5f60208284031215612639575f5ffd5b81357fffffffff00000000000000000000000000000000000000000000000000000000811681146115f3575f5ffd5b5f6040828403128015612679575f5ffd5b509092915050565b803563ffffffff81168114612694575f5ffd5b919050565b5f5f5f606084860312156126ab575f5ffd5b6126b484612681565b9250602084013567ffffffffffffffff8111156126cf575f5ffd5b840161012081870312156126e1575f5ffd5b929592945050506040919091013590565b73ffffffffffffffffffffffffffffffffffffffff811681146106f2575f5ffd5b5f5f83601f840112612723575f5ffd5b50813567ffffffffffffffff81111561273a575f5ffd5b602083019150836020828501011115612751575f5ffd5b9250929050565b5f5f5f5f5f5f5f60a0888a03121561276e575f5ffd5b61277788612681565b96506020880135612787816126f2565b955060408801359450606088013567ffffffffffffffff8111156127a9575f5ffd5b6127b58a828b01612713565b909550935050608088013567ffffffffffffffff8111156127d4575f5ffd5b6127e08a828b01612713565b989b979a50959850939692959293505050565b5f60208284031215612803575f5ffd5b81356115f3816126f2565b602080825282518282018190525f918401906040840190835b81811015612845578351835260209384019390920191600101612827565b509095945050505050565b5f5f5f5f5f60808688031215612864575f5ffd5b61286d86612681565b9450602086013561287d816126f2565b935060408601359250606086013567ffffffffffffffff81111561289f575f5ffd5b6128ab88828901612713565b969995985093965092949392505050565b5f5f5f5f5f5f5f5f60c0898b0312156128d3575f5ffd5b88356128de816126f2565b97506128ec60208a01612681565b965060408901356128fc816126f2565b955060608901359450608089013567ffffffffffffffff81111561291e575f5ffd5b61292a8b828c01612713565b90955093505060a089013567ffffffffffffffff811115612949575f5ffd5b6129558b828c01612713565b999c989b5096995094979396929594505050565b5f5f6020838503121561297a575f5ffd5b823567ffffffffffffffff811115612990575f5ffd5b61299c85828601612713565b90969095509350505050565b5f5f602083850312156129b9575f5ffd5b823567ffffffffffffffff8111156129cf575f5ffd5b8301601f810185136129df575f5ffd5b803567ffffffffffffffff8111156129f5575f5ffd5b8560208260061b8401011115612a09575f5ffd5b6020919091019590945092505050565b5f5f60408385031215612a2a575f5ffd5b8235612a35816126f2565b9150612a4360208401612681565b90509250929050565b5f60208284031215612a5c575f5ffd5b6115f382612681565b5f81518084528060208401602086015e5f6020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081525f6115f36020830184612a65565b5f5f5f5f5f5f60a08789031215612ad8575f5ffd5b8635612ae3816126f2565b9550612af160208801612681565b94506040870135612b01816126f2565b935060608701359250608087013567ffffffffffffffff811115612b23575f5ffd5b612b2f89828a01612713565b979a9699509497509295939492505050565b5f5f5f60608486031215612b53575f5ffd5b612b5c84612681565b925060208401356126e1816126f2565b5f60208284031215612b7c575f5ffd5b81516115f3816126f2565b5f60208284031215612b97575f5ffd5b5051919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b818103818111156105a5576105a5612b9e565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b808201808211156105a5576105a5612b9e565b73ffffffffffffffffffffffffffffffffffffffff84168152826020820152606060408201525f612c526060830184612a65565b95945050505050565b604081525f612c6d6040830185612a65565b8281036020840152612c528185612a65565b5f81518060208401855e5f93019283525090919050565b7fff0000000000000000000000000000000000000000000000000000000000000081525f6115f36001830184612c7f565b5f612cdb612cd58386612c7f565b84612c7f565b94935050505056";
+  "0x6080604052348015600e575f5ffd5b5060156019565b60bd565b7f59b501c3653afc186af7d48dda36cf6732bd21629a6295693664240a6ef520008054640100000000900460ff16156064576040516366008a2d60e01b815260040160405180910390fd5b805463ffffffff908116101560ba57805463ffffffff191663ffffffff90811782556040519081527fe9c9b456cb2994b80aeef036cf59d26e9617df80f816a6ee5a5b4166e07e2f5c9060200160405180910390a15b50565b612e05806100ca5f395ff3fe608060405234801561000f575f5ffd5b5060043610610179575f3560e01c8063885c1d09116100d2578063c1a287e211610088578063e7db7f7e11610063578063e7db7f7e146104ad578063eca8ad6614610517578063fad8b32a14610521575f5ffd5b8063c1a287e214610488578063cfdbf25414610492578063e348da131461049a575f5ffd5b80639e94f3ab116100b85780639e94f3ab1461028c578063a07da64714610436578063a1308f2714610449575f5ffd5b8063885c1d09146102665780638a91b0e314610279575f5ffd5b80633d6bda3211610132578063465d33e01161010d578063465d33e01461022d5780636d61fe70146102405780636d70f7ae14610253575f5ffd5b80633d6bda32146101e75780633e5f6091146101fa5780633f41826e1461021a575f5ffd5b80630ab8785f116101625780630ab8785f146101ba5780631313f410146101df5780632a3d428c146101ba575f5ffd5b806301ffc9a71461017d57806309264088146101a5575b5f5ffd5b61019061018b36600461274b565b610534565b60405190151581526020015b60405180910390f35b6101b86101b336600461278a565b6105cc565b005b6101d16101c83660046127bb565b60019392505050565b60405190815260200161019c565b6101b8610713565b6101b86101f536600461287a565b6107f3565b61020d610208366004612915565b610825565b60405161019c9190612930565b6101b8610228366004612972565b610874565b6101b861023b3660046129de565b6108a4565b6101b861024e366004612a8b565b6109a0565b610190610261366004612915565b610d5f565b6101b8610274366004612aca565b610d8a565b6101b8610287366004612a8b565b6112a2565b6103c561029a366004612b3b565b6040805160c0810182525f80825260208201819052918101829052606081018290526080810182905260a08101919091527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb860073ffffffffffffffffffffffffffffffffffffffff8085165f90815260019283016020908152604080832063ffffffff88168452825291829020825160c081018452815481529481015491850191909152600201549182169083015264ffffffffff74010000000000000000000000000000000000000000820481166060840152790100000000000000000000000000000000000000000000000000820416608083015260ff7e0100000000000000000000000000000000000000000000000000000000000090910416151560a0820152905092915050565b60405161019c91905f60c082019050825182526020830151602083015273ffffffffffffffffffffffffffffffffffffffff604084015116604083015264ffffffffff606084015116606083015264ffffffffff608084015116608083015260a0830151151560a083015292915050565b6101b8610444366004612b6e565b61140a565b604080518082018252601f81527f746f776e732e737562736372697074696f6e2d6d6f64756c652e312e302e30006020820152905161019c9190612bd3565b6101d16203f48081565b6101d1603281565b6101b86104a8366004612915565b6114ff565b6104e66104bb366004612be5565b7fffffffff000000000000000000000000000000000000000000000000000000009695505050505050565b6040517fffffffff00000000000000000000000000000000000000000000000000000000909116815260200161019c565b6101d16201518081565b6101b861052f366004612915565b6115ed565b5f7fffffffff0000000000000000000000000000000000000000000000000000000082167f46c0c1b40000000000000000000000000000000000000000000000000000000014806105c657507f01ffc9a7000000000000000000000000000000000000000000000000000000007fffffffff000000000000000000000000000000000000000000000000000000008316145b92915050565b688000000000ab143c06466001036105f657805c156105ee57805f526004601cfd5b30815d61060b565b3081540361060757805f526004601cfd5b3081555b507fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb86006106438161063e6020850185612915565b6116d6565b610670576106707f59530ce90000000000000000000000000000000000000000000000000000000061170d565b6106f1600182015f6106856020860186612915565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020015f205f8460200160208101906106d29190612b6e565b63ffffffff1663ffffffff1681526020019081526020015f2083611715565b50688000000000ab143c064660010361070b575f815d5050565b805550565b50565b7f59b501c3653afc186af7d48dda36cf6732bd21629a6295693664240a6ef5200054640100000000900460ff16610776576040517f77a399b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61079f7ff52cf66b00000000000000000000000000000000000000000000000000000000611dbf565b6107c87fab3e34c100000000000000000000000000000000000000000000000000000000611dbf565b6107f17f28171ad000000000000000000000000000000000000000000000000000000000611dbf565b565b61081c7fabbbbc730000000000000000000000000000000000000000000000000000000061170d565b50505050505050565b73ffffffffffffffffffffffffffffffffffffffff81165f9081527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8602602052604090206060906105c690611f14565b61089d7fabbbbc730000000000000000000000000000000000000000000000000000000061170d565b5050505050565b73ffffffffffffffffffffffffffffffffffffffff861630146108ea576108ea7f90467bf50000000000000000000000000000000000000000000000000000000061170d565b73ffffffffffffffffffffffffffffffffffffffff88165f9081527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb86016020908152604080832063ffffffff8b1684529091529020600201547e01000000000000000000000000000000000000000000000000000000000000900460ff1680610995576109957fe01d33200000000000000000000000000000000000000000000000000000000061170d565b505050505050505050565b688000000000ab143c06466001036109ca57805c156109c257805f526004601cfd5b30815d6109df565b308154036109db57805f526004601cfd5b3081555b505f80806109ef84860186612c63565b9250925092506109fe82611f25565b6040517f6352211e00000000000000000000000000000000000000000000000000000000815260048101829052339073ffffffffffffffffffffffffffffffffffffffff841690636352211e90602401602060405180830381865afa158015610a69573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a8d9190612c8e565b73ffffffffffffffffffffffffffffffffffffffff1614610ad157610ad17ff107dccb0000000000000000000000000000000000000000000000000000000061170d565b6040517f17c957090000000000000000000000000000000000000000000000000000000081526004810182905282905f9073ffffffffffffffffffffffffffffffffffffffff8316906317c9570990602401602060405180830381865afa158015610b3e573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b629190612ca9565b90505f7fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8600335f908152600182016020908152604080832063ffffffff8b16845290915290206002810180547fff00ffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff8916177e01000000000000000000000000000000000000000000000000000000000000179055858155909150610c1d6201518084612ced565b6002808301805464ffffffffff93909316790100000000000000000000000000000000000000000000000000027fffff0000000000ffffffffffffffffffffffffffffffffffffffffffffffffff90931692909217909155335f90815290830160205260409020610c979063ffffffff808a1690611f6916565b5060028101546040805187815279010000000000000000000000000000000000000000000000000090920464ffffffffff16602083015273ffffffffffffffffffffffffffffffffffffffff88169163ffffffff8a169133917f08720d091868d49076b0e5ce78e90cebcfc6eee115bcd31ebe88c341793075bf910160405180910390a450505050505050610d2a600190565b15610d4f57688000000000ab143c0646600103610d49575f815d505050565b80555050565b5f688000000000ab143c065d5050565b5f6105c67fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb860083611f74565b688000000000ab143c0646600103610db457805c15610dac57805f526004601cfd5b30815d610dc9565b30815403610dc557805f526004601cfd5b3081555b50806032811115610dfd57610dfd7f2efeb7010000000000000000000000000000000000000000000000000000000061170d565b805f03610e2d57610e2d7f8ac7f0550000000000000000000000000000000000000000000000000000000061170d565b7fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb86005f5b8281101561129757610e8482868684818110610e6e57610e6e612d00565b61063e9260206040909202019081019150612915565b610eb157610eb17f59530ce90000000000000000000000000000000000000000000000000000000061170d565b5f826001015f878785818110610ec957610ec9612d00565b610edf9260206040909202019081019150612915565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020015f205f878785818110610f2b57610f2b612d00565b9050604002016020016020810190610f439190612b6e565b63ffffffff16815260208101919091526040015f2060028101549091507e01000000000000000000000000000000000000000000000000000000000000900460ff1661106457858583818110610f9b57610f9b612d00565b9050604002016020016020810190610fb39190612b6e565b63ffffffff16868684818110610fcb57610fcb612d00565b610fe19260206040909202019081019150612915565b73ffffffffffffffffffffffffffffffffffffffff167f5db17eb6b69c9f0cf51e3b1f2c90a067a24697d427ba54c65f211120d3da7c056040516110569060208082526008908201527f494e414354495645000000000000000000000000000000000000000000000000604082015260600190565b60405180910390a35061128f565b6002810154790100000000000000000000000000000000000000000000000000900464ffffffffff16421015611161578585838181106110a6576110a6612d00565b90506040020160200160208101906110be9190612b6e565b63ffffffff168686848181106110d6576110d6612d00565b6110ec9260206040909202019081019150612915565b73ffffffffffffffffffffffffffffffffffffffff167f5db17eb6b69c9f0cf51e3b1f2c90a067a24697d427ba54c65f211120d3da7c056040516110569060208082526007908201527f4e4f545f44554500000000000000000000000000000000000000000000000000604082015260600190565b6002810154611198906203f48090790100000000000000000000000000000000000000000000000000900464ffffffffff16612d2d565b42111561126c578585838181106111b1576111b1612d00565b90506040020160200160208101906111c99190612b6e565b63ffffffff168686848181106111e1576111e1612d00565b6111f79260206040909202019081019150612915565b73ffffffffffffffffffffffffffffffffffffffff167f5db17eb6b69c9f0cf51e3b1f2c90a067a24697d427ba54c65f211120d3da7c05604051611056906020808252600a908201527f504153545f475241434500000000000000000000000000000000000000000000604082015260600190565b61128d8187878581811061128257611282612d00565b905060400201611715565b505b600101610e50565b505050610d2a600190565b688000000000ab143c06466001036112cc57805c156112c457805f526004601cfd5b30815d6112e1565b308154036112dd57805f526004601cfd5b3081555b505f6112ef82840184612b6e565b335f9081527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8602602052604090209091507fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8600906113549063ffffffff8085169061204616565b611381576113817faacf701b0000000000000000000000000000000000000000000000000000000061170d565b335f81815260018084016020908152604080842063ffffffff88168086529252808420848155928301849055600290920180547fff0000000000000000000000000000000000000000000000000000000000000016905590519092917f48c4a5a219af3d077894cac7e6b26c5cdb83cf91d718428985a3f4a85e9ed45d91a35050610d2a600190565b335f9081527fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb86016020908152604080832063ffffffff85168452909152902060028101547e01000000000000000000000000000000000000000000000000000000000000900460ff1661149f5761149f7fe01d33200000000000000000000000000000000000000000000000000000000061170d565b6002810180547fff00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16905560405163ffffffff83169033907fd01480b28a9baefd1cd771d8109d1abf2380614146253e17b61774b7b3fb77f1905f90a35050565b7f4675fa8241f86f37157864d3d49b85ad4b164352c516da28e1678a90470ae3005473ffffffffffffffffffffffffffffffffffffffff163314611576576040517f65f490650000000000000000000000000000000000000000000000000000000081523360048201526024015b60405180910390fd5b61157f81611f25565b6115a97fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb860082612051565b5060405173ffffffffffffffffffffffffffffffffffffffff8216907f5b6a420b639feabfb011a07742a6ae14ef72f35d1a330ed65f42216c95bc6c2e905f90a250565b7f4675fa8241f86f37157864d3d49b85ad4b164352c516da28e1678a90470ae3005473ffffffffffffffffffffffffffffffffffffffff16331461165f576040517f65f4906500000000000000000000000000000000000000000000000000000000815233600482015260240161156d565b61166881611f25565b6116927fd241b3ceee256b40f80fe7a66fe789234ac389ed1408c472c4ee1cbb1deb8600826121d5565b5060405173ffffffffffffffffffffffffffffffffffffffff8216907fa5f3b7626fd86ff989f1d22cf3d41d74591ea6eb99241079400b0c332a9a8f11905f90a250565b5f3373ffffffffffffffffffffffffffffffffffffffff8316036116fc575060016105c6565b6117068333611f74565b9392505050565b805f5260045ffd5b60028201547e01000000000000000000000000000000000000000000000000000000000000900460ff1661176c5761176c7fe01d33200000000000000000000000000000000000000000000000000000000061170d565b6002820154790100000000000000000000000000000000000000000000000000900464ffffffffff164210156117c5576117c57fd1cf008c0000000000000000000000000000000000000000000000000000000061170d565b60028201546117fc906203f48090790100000000000000000000000000000000000000000000000000900464ffffffffff16612d2d565b421115611896576002820180547fff00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16905561183d6040820160208301612b6e565b63ffffffff166118506020830183612915565b73ffffffffffffffffffffffffffffffffffffffff167fd01480b28a9baefd1cd771d8109d1abf2380614146253e17b61774b7b3fb77f160405160405180910390a35050565b600282015482546040517f5803909f00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff909216915f918391635803909f916118f69160040190815260200190565b602060405180830381865afa158015611911573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906119359190612ca9565b9050806119456020850185612915565b73ffffffffffffffffffffffffffffffffffffffff1631101561198b5761198b7fc357cf730000000000000000000000000000000000000000000000000000000061170d565b83546040515f916119a29160240190815260200190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f7c9669ac00000000000000000000000000000000000000000000000000000000179052600287015490519192505f91611a4b9173ffffffffffffffffffffffffffffffffffffffff169085908590602401612d40565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152918152602080830180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb61d27f6000000000000000000000000000000000000000000000000000000001790529192505f91611b1c91611ada91908901908901612b6e565b600289015489546040805173ffffffffffffffffffffffffffffffffffffffff9093166020840152820152606001604051602081830303815290604052612349565b90505f8282604051602401611b32929190612d7d565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052602080820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167ff2680c0f00000000000000000000000000000000000000000000000000000000179052909150611bc390611bbc90890189612915565b5f83612375565b5087546040517f17c957090000000000000000000000000000000000000000000000000000000081525f9173ffffffffffffffffffffffffffffffffffffffff8916916317c9570991611c1c9160040190815260200190565b602060405180830381865afa158015611c37573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611c5b9190612ca9565b9050611c6a6201518082612ced565b60028a0180547fffff00000000000000000000ffffffffffffffffffffffffffffffffffffffff1679010000000000000000000000000000000000000000000000000064ffffffffff938416027fffffffffffffff0000000000ffffffffffffffffffffffffffffffffffffffff1617740100000000000000000000000000000000000000004293909316929092029190911790556001890180548791905f90611d15908490612d2d565b90915550611d2b90506040890160208a01612b6e565b63ffffffff16611d3e60208a018a612915565b60028b015460405179010000000000000000000000000000000000000000000000000090910464ffffffffff16815273ffffffffffffffffffffffffffffffffffffffff91909116907f9303e8c36264aec4db05a9f75307a7936b625c753189351a713ff8559cf0f4fd9060200160405180910390a3505050505050505050565b7fffffffff0000000000000000000000000000000000000000000000000000000081165f9081527f81088bbc801e045ea3e7620779ab349988f58afbdfba10dff983df3f33522b00602052604090205460ff16611e93577fffffffff0000000000000000000000000000000000000000000000000000000081165f9081527f81088bbc801e045ea3e7620779ab349988f58afbdfba10dff983df3f33522b006020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055611ec5565b6040517ff2cfeefa00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040517fffffffff000000000000000000000000000000000000000000000000000000008216907f78f84e5b1c5c05be2b5ad3800781dd404d6d6c6302bc755c0fe20f58a33a7f22905f90a250565b60606105c6611f22836123c1565b90565b73ffffffffffffffffffffffffffffffffffffffff8116610710576107107fe6c4247b0000000000000000000000000000000000000000000000000000000061170d565b5f611706838361247a565b63978aab926004525f8281526024812073ffffffffffffffffffffffffffffffffffffffff92909216917fffffffffffffffffffffffffffffffffffffffffffffff04498025ad2b4047418301611fd25763f5a267f15f526004601cfd5b82611fe45768fbb67fda52d4bfb8bf92505b80546bffffffffffffffffffffffff811661202d5760019250838160601c031561203e57600182015460601c841461203e57600282015460601c841461203e575b5f925061203e565b81602052835f5260405f2054151592505b505092915050565b5f611706838361258c565b63978aab926004525f8281526024812073ffffffffffffffffffffffffffffffffffffffff92909216917fffffffffffffffffffffffffffffffffffffffffffffff04498025ad2b40474183016120af5763f5a267f15f526004601cfd5b826120c15768fbb67fda52d4bfb8bf92505b80546bffffffffffffffffffffffff81168260205280612188578160601c806120f4578560601b845560019450506121cc565b85810361210157506121cc565b600184015460601c80612122578660601b60018601556001955050506121cc565b8681036121305750506121cc565b600285015460601c80612152578760601b6002870155600196505050506121cc565b878103612161575050506121cc565b5f928352604080842060019055918352818320600290558252902060039055506007908117905b845f5260405f2080546121ca57600191821c8083018255919450816121b6578560601b6003178455506121cc565b8560601b82850155826002018455506121cc565b505b50505092915050565b63978aab926004525f8281526024812073ffffffffffffffffffffffffffffffffffffffff92909216917fffffffffffffffffffffffffffffffffffffffffffffff04498025ad2b40474183016122335763f5a267f15f526004601cfd5b826122455768fbb67fda52d4bfb8bf92505b80546bffffffffffffffffffffffff8116806122c45760019350848260601c036122825760018301805484556002840180549091555f90556121cc565b84600184015460601c036122a35760028301805460018501555f90556121cc565b84600284015460601c036122bc575f60028401556121cc565b5f93506121cc565b82602052845f5260405f208054806122dd5750506121cc565b60018360011c03925082600182031461230d578285015460601c8060601b60018303870155805f52508060405f20555b5083547fffffffffffffffffffffffffffffffffffffffff00000000000000000000000016600192831b1782179093555f909255509392505050565b6060611706835f846040516020016123619190612db8565b60405160208183030381529060405261268a565b60405181515f9038906020850186885af1612392573d5f823e3d81fd5b3d6123aa57833b6123aa57635a836a5f5f526004601cfd5b3d8152602081013d5f823e3d016040529392505050565b6318fb58646004525f81815260249020801954604051919068fbb67fda52d4bfb8bf90602084018161243a57835480156124345780841415028152600184810154909250801561243457808414150260208201526002848101549092508015612434576003925083811415810260408301525b50612465565b8160011c91505f5b8281101561246357848101548481141502600582901b830152600101612442565b505b8185528160051b810160405250505050919050565b6318fb58646004525f8281526024812068fbb67fda52d4bfb8bf83036124a75763f5a267f15f526004601cfd5b826124b95768fbb67fda52d4bfb8bf92505b801954816020528061255d578154806124d957848355600193505061203e565b8481036124e6575061203e565b6001830154806125015785600185015560019450505061203e565b85810361250f57505061203e565b60028401548061252b578660028601556001955050505061203e565b86810361253a5750505061203e565b5f9283526040808420600190559183528183206002905582529020600390555060075b835f5260405f2080546121cc57600191821c8381018690558083019182905590821b821783195590925061203e565b6318fb58646004525f8281526024812068fbb67fda52d4bfb8bf83036125b95763f5a267f15f526004601cfd5b826125cb5768fbb67fda52d4bfb8bf92505b8019548061262c5760019250838254036125f85760018201805483556002830180549091555f905561203e565b836001830154036126165760028201805460018401555f905561203e565b83600283015403612025575f600283015561203e565b81602052835f5260405f2080548061264557505061203e565b60018360011c03925082600182031461266f57828401548060018303860155805f52508060405f20555b5060018260011b178319555f81555060019250505092915050565b60605f8315612697576001175b6040517fff0000000000000000000000000000000000000000000000000000000000000060f883901b1660208201527fffffffff0000000000000000000000000000000000000000000000000000000060e087901b166021820152602501604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815290829052612732918590602001612de9565b6040516020818303038152906040529150509392505050565b5f6020828403121561275b575f5ffd5b81357fffffffff0000000000000000000000000000000000000000000000000000000081168114611706575f5ffd5b5f604082840312801561279b575f5ffd5b509092915050565b803563ffffffff811681146127b6575f5ffd5b919050565b5f5f5f606084860312156127cd575f5ffd5b6127d6846127a3565b9250602084013567ffffffffffffffff8111156127f1575f5ffd5b84016101208187031215612803575f5ffd5b929592945050506040919091013590565b73ffffffffffffffffffffffffffffffffffffffff81168114610710575f5ffd5b5f5f83601f840112612845575f5ffd5b50813567ffffffffffffffff81111561285c575f5ffd5b602083019150836020828501011115612873575f5ffd5b9250929050565b5f5f5f5f5f5f5f60a0888a031215612890575f5ffd5b612899886127a3565b965060208801356128a981612814565b955060408801359450606088013567ffffffffffffffff8111156128cb575f5ffd5b6128d78a828b01612835565b909550935050608088013567ffffffffffffffff8111156128f6575f5ffd5b6129028a828b01612835565b989b979a50959850939692959293505050565b5f60208284031215612925575f5ffd5b813561170681612814565b602080825282518282018190525f918401906040840190835b81811015612967578351835260209384019390920191600101612949565b509095945050505050565b5f5f5f5f5f60808688031215612986575f5ffd5b61298f866127a3565b9450602086013561299f81612814565b935060408601359250606086013567ffffffffffffffff8111156129c1575f5ffd5b6129cd88828901612835565b969995985093965092949392505050565b5f5f5f5f5f5f5f5f60c0898b0312156129f5575f5ffd5b8835612a0081612814565b9750612a0e60208a016127a3565b96506040890135612a1e81612814565b955060608901359450608089013567ffffffffffffffff811115612a40575f5ffd5b612a4c8b828c01612835565b90955093505060a089013567ffffffffffffffff811115612a6b575f5ffd5b612a778b828c01612835565b999c989b5096995094979396929594505050565b5f5f60208385031215612a9c575f5ffd5b823567ffffffffffffffff811115612ab2575f5ffd5b612abe85828601612835565b90969095509350505050565b5f5f60208385031215612adb575f5ffd5b823567ffffffffffffffff811115612af1575f5ffd5b8301601f81018513612b01575f5ffd5b803567ffffffffffffffff811115612b17575f5ffd5b8560208260061b8401011115612b2b575f5ffd5b6020919091019590945092505050565b5f5f60408385031215612b4c575f5ffd5b8235612b5781612814565b9150612b65602084016127a3565b90509250929050565b5f60208284031215612b7e575f5ffd5b611706826127a3565b5f81518084528060208401602086015e5f6020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b602081525f6117066020830184612b87565b5f5f5f5f5f5f60a08789031215612bfa575f5ffd5b8635612c0581612814565b9550612c13602088016127a3565b94506040870135612c2381612814565b935060608701359250608087013567ffffffffffffffff811115612c45575f5ffd5b612c5189828a01612835565b979a9699509497509295939492505050565b5f5f5f60608486031215612c75575f5ffd5b612c7e846127a3565b9250602084013561280381612814565b5f60208284031215612c9e575f5ffd5b815161170681612814565b5f60208284031215612cb9575f5ffd5b5051919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b818103818111156105c6576105c6612cc0565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b808201808211156105c6576105c6612cc0565b73ffffffffffffffffffffffffffffffffffffffff84168152826020820152606060408201525f612d746060830184612b87565b95945050505050565b604081525f612d8f6040830185612b87565b8281036020840152612d748185612b87565b5f81518060208401855e5f93019283525090919050565b7fff0000000000000000000000000000000000000000000000000000000000000081525f6117066001830184612da1565b5f612dfd612df78386612da1565b84612da1565b94935050505056";
 
 type SubscriptionModuleFacetConstructorParams =
   | [signer?: Signer]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@towns-protocol/generated",
-    "version": "0.0.337",
+    "version": "0.0.339",
     "packageManager": "yarn@3.8.0",
     "type": "module",
     "scripts": {
@@ -9,6 +9,9 @@
         "preinstall": "node ./scripts/make-config.js",
         "prepare": "node ./scripts/prepare.js"
     },
+    "devDependencies": {
+        "@towns-protocol/contracts": "^0.0.339"
+    },
     "files": [
         "config/**/*",
         "deployments/**/*",
@@ -26,5 +29,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "a8dae6ecef2c3bc7713acf56e6738fd47d608482"
+    "gitHead": "0ad93e42f93eba4356839b148fa166a818cd0f9d"
 }

package/scripts/make-config.js

@@ -61,7 +61,12 @@ function convertToEnv(data, prefix = '') {
   return envContent;
 }
 
-
+function makeEnvFile(key, outputData, fileName, keyPrefix = '') {
+  const envFile = path.join(deploymentsSourceDir, key, fileName);
+  const data = outputData[key];
+  const envData = convertToEnv(data, keyPrefix);
+  fs.writeFileSync(envFile, `${keyPrefix}RIVER_ENV=${key}\n${envData}`);
+}
 
 const outputData = combineJson(deploymentsSourceDir);
 
@@ -69,10 +74,8 @@ const outputData = combineJson(deploymentsSourceDir);
 // for each top level key in outputData, write a .env file in the deployments/<key> folder
 // with all keys in the json converted to UPPER SNAKE CASE
 for (const key of Object.keys(outputData)) {
-  const envFile = path.join(deploymentsSourceDir, key, '.env');
-  const data = outputData[key];
-  const envData = convertToEnv(data);
-  fs.writeFileSync(envFile, `RIVER_ENV=${key}\n${envData}`);
+  makeEnvFile(key, outputData, '.env', '')
+  makeEnvFile(key, outputData, '.env.vite', 'VITE_')
 }
 
 // write a config.json file