dequanto 0.1.81 → 0.1.85

package/lib/cjs/blocks/BlockDateResolver.js

@@ -1,11 +1,19 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockDateResolver = void 0;
-const _block_1 = require("../utils/$block.js");
 const alot_1 = __importDefault(require("alot"));
+const memd_1 = __importDefault(require("memd"));
+const _block_1 = require("../utils/$block.js");
+const _date_1 = require("../utils/$date.js");
 class BlockDateResolver {
     constructor(client) {
         this.client = client;
@@ -14,14 +22,31 @@ class BlockDateResolver {
             bsc: 3000,
             polygon: 3000,
         };
-        this.known = [];
+        this._known = [];
     }
     async getDate(blockNumber) {
-        let block = await this.client.getBlock(blockNumber);
+        let block = await this.getBlock(blockNumber);
         return new Date(block.timestamp * 1000);
     }
     async getBlockNumberFor(date) {
-        this.q = date;
+        this._requestedDate = date;
+        let avg = this.AVG_INITIAL[this.client.platform] ?? this.client.blockTimeAvg ?? this.AVG_INITIAL['eth'];
+        let now = new Date();
+        let topBlock = {
+            blockNumber: await this.client.getBlockNumberCached(),
+            date: now,
+            avg,
+        };
+        this._known.push(topBlock);
+        const result = await this.moveNext(date, {
+            closestTime: null,
+            blockNumber: null,
+            date: null
+        });
+        return result.blockNumber;
+    }
+    async getBlockInfoFor(date) {
+        this._requestedDate = date;
         let avg = this.AVG_INITIAL[this.client.platform] ?? this.client.blockTimeAvg ?? this.AVG_INITIAL['eth'];
         let now = new Date();
         let topBlock = {
@@ -29,30 +54,35 @@ class BlockDateResolver {
             date: now,
             avg,
         };
-        this.maxBlock = topBlock.blockNumber;
-        this.known.push(topBlock);
-        return await this.moveNext(date, {
+        this._known.push(topBlock);
+        const result = await this.moveNext(date, {
             closestTime: null,
             blockNumber: null,
+            date: null,
         });
+        return {
+            block: result.blockNumber,
+            timestamp: result.date ? _date_1.$date.toUnixTimestamp(result.date) : null,
+        };
     }
     async moveNext(date, ctx) {
         let closestIndex = this.getClosest(date);
-        let block = this.known[closestIndex];
+        let block = this._known[closestIndex];
         let timeDiff = this.diffTime(block.date, date);
         let timeDistance = Math.abs(timeDiff);
         const BLOCKS_TOLERANCE = 2;
         if (timeDistance <= block.avg * BLOCKS_TOLERANCE) {
-            return block.blockNumber;
+            return block;
         }
         if (ctx.closestTime != null && timeDistance >= ctx.closestTime) {
-            return ctx.blockNumber;
+            return ctx;
         }
         ctx.closestTime = timeDistance;
         ctx.blockNumber = block.blockNumber;
+        ctx.date = block.date;
         let nextInfo = await this.checkPoint(block, timeDiff);
         if (nextInfo == null) {
-            return block.blockNumber;
+            return block;
         }
         return this.moveNext(date, ctx);
     }
@@ -60,11 +90,11 @@ class BlockDateResolver {
      * Returns index of the first known block, which is most near to specified block (it can be before or after the specified date).
      */
     getClosest(date) {
-        let entry = (0, alot_1.default)(this.known).map(x => [
+        let entry = (0, alot_1.default)(this._known).map(x => [
             this.diffTimeAbs(x.date, date),
             x
         ]).minItem(x => x[0])[1];
-        let i = this.known.indexOf(entry);
+        let i = this._known.indexOf(entry);
         return i;
     }
     async checkPoint(anchor, diffTime) {
@@ -74,7 +104,7 @@ class BlockDateResolver {
         }
         let blockNumber = anchor.blockNumber + diffCount;
         if (blockNumber < 0) {
-            throw new Error(`Date Out of range: ${this.q.toISOString()}. Based on the AVG block time, the blockchain was not active on that date`);
+            throw new Error(`Date Out of range: ${this._requestedDate.toISOString()}. Based on the AVG block time, the blockchain was not active on that date`);
         }
         let date = await this.getBlockDate(blockNumber);
         let info = {
@@ -87,18 +117,18 @@ class BlockDateResolver {
     }
     /** Add a know block to set */
     push(info) {
-        for (let i = 0; i < this.known.length; i++) {
-            let x = this.known[i];
+        for (let i = 0; i < this._known.length; i++) {
+            let x = this._known[i];
             if (info.date < x.date) {
-                this.known.splice(i, 0, info);
+                this._known.splice(i, 0, info);
                 return;
             }
         }
-        this.known.push(info);
+        this._known.push(info);
     }
     /** Loads the block and gets the Date of the block */
     async getBlockDate(blockNumber) {
-        let block = await this.client.getBlock(blockNumber);
+        let block = await this.getBlock(blockNumber);
         if (block == null) {
             throw new Error(`Block not loaded: ${blockNumber}`);
         }
@@ -120,16 +150,22 @@ class BlockDateResolver {
     }
     /** With N>1 blocks we can better find out the AVG block time */
     refineAvg() {
-        for (let i = 1; i < this.known.length; i++) {
-            let info = this.known[i];
-            let prev = this.known[i - 1];
+        for (let i = 1; i < this._known.length; i++) {
+            let info = this._known[i];
+            let prev = this._known[i - 1];
             info.avg = this.getAvgBlockCountBetween(prev, info);
             if (i === 1) {
-                this.known[0].avg = info.avg;
+                this._known[0].avg = info.avg;
             }
         }
     }
+    getBlock(blockNumber) {
+        return this.client.getBlock(blockNumber);
+    }
 }
+__decorate([
+    memd_1.default.deco.memoize()
+], BlockDateResolver.prototype, "getBlock", null);
 exports.BlockDateResolver = BlockDateResolver;
 //# sourceMappingURL=BlockDateResolver.js.map
 //# sourceMappingURL=BlockDateResolver.ts.map

package/lib/cjs/blocks/BlockDateResolver.js.map

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

package/lib/cjs/contracts/deploy/proxy/$proxyDeploy.js

@@ -28,6 +28,7 @@ var $proxyDeploy;
     $proxyDeploy.compareStorageLayout = compareStorageLayout;
     async function compareStorageLayoutInner(oldVars, newVars, ctx) {
         ctx ??= {};
+        let rgxGap = /^_+gap$/;
         let oldMemory = oldVars.map(getMemoryPosition);
         let oldLastSlot = (0, alot_1.default)(oldVars).max(x => x.slot);
         for (let i = 0; i < newVars.length; i++) {
@@ -44,6 +45,9 @@ var $proxyDeploy;
                 }
                 continue;
             }
+            if (rgxGap.test(newVar.name)) {
+                continue;
+            }
             let isLastVariable = newVar.slot === oldLastSlot;
             let oldVar = oldVars.find(x => x.slot === newVar.slot && x.position === newVar.position);
             if (oldVar != null) {
@@ -76,7 +80,7 @@ var $proxyDeploy;
                 return true;
             });
             collisions = collisions.filter(x => {
-                return /gap/.test(x.variable.name) === false;
+                return rgxGap.test(x.variable.name) === false;
             });
             if (collisions.length > 0) {
                 if (collisions.length === 1) {

package/lib/cjs/contracts/deploy/proxy/$proxyDeploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":"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"}

package/lib/cjs/erc4337/Erc4337Factory.js

@@ -16,7 +16,6 @@ class Erc4337Factory {
         let providers = _config_1.$config.get('erc4337');
         let provider = providers.find(x => (x.name === name || (name === 'default' && !x.name)) && x.platforms.includes(platform));
         _require_1.$require.notNull(provider, `No 4337 provider information found for ${name} and platform "${platform}"`);
-        console.log(`CreateService`, provider.contracts.entryPoint);
         return new Erc4337Service_1.Erc4337Service(client, explorer, {
             addresses: {
                 entryPoint: provider.contracts.entryPoint,

package/lib/cjs/erc4337/Erc4337Factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"Erc4337Factory.js","sourceRoot":"","sources":["../../../src/erc4337/Erc4337Factory.ts"],"names":[],"mappings":";;;AAAA,4FAAyF;AAGzF,2EAAwE;AAExE,qDAAkD;AAClD,uDAAoD;AACpD,qDAAkD;AAClD,uDAAoD;AAGpD,MAAa,cAAc;IACvB,MAAM,CAAC,aAAa,CAAE,IAMrB;QACG,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7B,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC;QAClC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,qCAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,qDAAyB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExE,IAAI,SAAS,GAAG,iBAAO,CAAC,GAAG,CAAC,SAAS,CAA2B,CAAC;QACjE,IAAI,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE3H,mBAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,0CAA0C,IAAI,kBAAkB,QAAQ,GAAG,CAAC,CAAC;QAExG,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE5D,OAAO,IAAI,+BAAc,CAAC,MAAM,EAAE,QAAQ,EAAE;YACxC,SAAS,EAAE;gBACP,UAAU,EAAE,QAAQ,CAAC,SAAS,CAAC,UAAU;gBACzC,cAAc,EAAE,QAAQ,CAAC,SAAS,CAAC,cAAc;aACpD;SACJ,CAAC,CAAC;IACP,CAAC;IACD,MAAM,CAAC,YAAY,CAAE,IAMpB;QACG,IAAI,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,MAAM,GAAG,IAAI,iCAAe,CAC5B,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,IAAI,CACf,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA1CD,wCA0CC"}
+{"version":3,"file":"Erc4337Factory.js","sourceRoot":"","sources":["../../../src/erc4337/Erc4337Factory.ts"],"names":[],"mappings":";;;AAAA,4FAAyF;AAGzF,2EAAwE;AAExE,qDAAkD;AAClD,uDAAoD;AACpD,qDAAkD;AAClD,uDAAoD;AAGpD,MAAa,cAAc;IACvB,MAAM,CAAC,aAAa,CAAE,IAMrB;QACG,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7B,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC;QAClC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,qCAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,qDAAyB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExE,IAAI,SAAS,GAAG,iBAAO,CAAC,GAAG,CAAC,SAAS,CAA2B,CAAC;QACjE,IAAI,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE3H,mBAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,0CAA0C,IAAI,kBAAkB,QAAQ,GAAG,CAAC,CAAC;QAExG,OAAO,IAAI,+BAAc,CAAC,MAAM,EAAE,QAAQ,EAAE;YACxC,SAAS,EAAE;gBACP,UAAU,EAAE,QAAQ,CAAC,SAAS,CAAC,UAAU;gBACzC,cAAc,EAAE,QAAQ,CAAC,SAAS,CAAC,cAAc;aACpD;SACJ,CAAC,CAAC;IACP,CAAC;IACD,MAAM,CAAC,YAAY,CAAE,IAMpB;QACG,IAAI,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,MAAM,GAAG,IAAI,iCAAe,CAC5B,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,IAAI,CACf,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAxCD,wCAwCC"}

package/lib/cjs/prebuilt-factories/TimelockControllerFactory.js

@@ -0,0 +1,251 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimelockControllerFactory = void 0;
+/**
+ *  AUTO-Generated Class: 2024-05-17 00:25
+ *  Implementation: https://etherscan.io/address/undefined#code
+ */
+const a_di_1 = __importDefault(require("a-di"));
+const ContractBase_1 = require("../contracts/ContractBase.js");
+const Etherscan_1 = require("../explorer/Etherscan.js");
+const EthWeb3Client_1 = require("../clients/EthWeb3Client.js");
+function TimelockControllerFactory() {
+    class TimelockController extends ContractBase_1.ContractBase {
+        constructor(address = null, client = a_di_1.default.resolve(EthWeb3Client_1.EthWeb3Client), explorer = a_di_1.default.resolve(Etherscan_1.Etherscan)) {
+            super(address, client, explorer);
+            this.address = address;
+            this.client = client;
+            this.explorer = explorer;
+            this.$meta = {
+                "class": "./src/prebuilt/openzeppelin/TimelockController.ts"
+            };
+            this.abi = [{ "inputs": [{ "internalType": "uint256", "name": "minDelay", "type": "uint256" }, { "internalType": "address[]", "name": "proposers", "type": "address[]" }, { "internalType": "address[]", "name": "executors", "type": "address[]" }, { "internalType": "address", "name": "admin", "type": "address" }], "stateMutability": "nonpayable", "type": "constructor" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "id", "type": "bytes32" }, { "indexed": true, "internalType": "uint256", "name": "index", "type": "uint256" }, { "indexed": false, "internalType": "address", "name": "target", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "value", "type": "uint256" }, { "indexed": false, "internalType": "bytes", "name": "data", "type": "bytes" }], "name": "CallExecuted", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "id", "type": "bytes32" }, { "indexed": false, "internalType": "bytes32", "name": "salt", "type": "bytes32" }], "name": "CallSalt", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "id", "type": "bytes32" }, { "indexed": true, "internalType": "uint256", "name": "index", "type": "uint256" }, { "indexed": false, "internalType": "address", "name": "target", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "value", "type": "uint256" }, { "indexed": false, "internalType": "bytes", "name": "data", "type": "bytes" }, { "indexed": false, "internalType": "bytes32", "name": "predecessor", "type": "bytes32" }, { "indexed": false, "internalType": "uint256", "name": "delay", "type": "uint256" }], "name": "CallScheduled", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "id", "type": "bytes32" }], "name": "Cancelled", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": false, "internalType": "uint256", "name": "oldDuration", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "newDuration", "type": "uint256" }], "name": "MinDelayChange", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "indexed": true, "internalType": "bytes32", "name": "previousAdminRole", "type": "bytes32" }, { "indexed": true, "internalType": "bytes32", "name": "newAdminRole", "type": "bytes32" }], "name": "RoleAdminChanged", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "indexed": true, "internalType": "address", "name": "account", "type": "address" }, { "indexed": true, "internalType": "address", "name": "sender", "type": "address" }], "name": "RoleGranted", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "indexed": true, "internalType": "address", "name": "account", "type": "address" }, { "indexed": true, "internalType": "address", "name": "sender", "type": "address" }], "name": "RoleRevoked", "type": "event" }, { "inputs": [], "name": "CANCELLER_ROLE", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "DEFAULT_ADMIN_ROLE", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "EXECUTOR_ROLE", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "PROPOSER_ROLE", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "TIMELOCK_ADMIN_ROLE", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], "name": "cancel", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "target", "type": "address" }, { "internalType": "uint256", "name": "value", "type": "uint256" }, { "internalType": "bytes", "name": "payload", "type": "bytes" }, { "internalType": "bytes32", "name": "predecessor", "type": "bytes32" }, { "internalType": "bytes32", "name": "salt", "type": "bytes32" }], "name": "execute", "outputs": [], "stateMutability": "payable", "type": "function" }, { "inputs": [{ "internalType": "address[]", "name": "targets", "type": "address[]" }, { "internalType": "uint256[]", "name": "values", "type": "uint256[]" }, { "internalType": "bytes[]", "name": "payloads", "type": "bytes[]" }, { "internalType": "bytes32", "name": "predecessor", "type": "bytes32" }, { "internalType": "bytes32", "name": "salt", "type": "bytes32" }], "name": "executeBatch", "outputs": [], "stateMutability": "payable", "type": "function" }, { "inputs": [], "name": "getMinDelay", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }], "name": "getRoleAdmin", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], "name": "getTimestamp", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "internalType": "address", "name": "account", "type": "address" }], "name": "grantRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "internalType": "address", "name": "account", "type": "address" }], "name": "hasRole", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "target", "type": "address" }, { "internalType": "uint256", "name": "value", "type": "uint256" }, { "internalType": "bytes", "name": "data", "type": "bytes" }, { "internalType": "bytes32", "name": "predecessor", "type": "bytes32" }, { "internalType": "bytes32", "name": "salt", "type": "bytes32" }], "name": "hashOperation", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "pure", "type": "function" }, { "inputs": [{ "internalType": "address[]", "name": "targets", "type": "address[]" }, { "internalType": "uint256[]", "name": "values", "type": "uint256[]" }, { "internalType": "bytes[]", "name": "payloads", "type": "bytes[]" }, { "internalType": "bytes32", "name": "predecessor", "type": "bytes32" }, { "internalType": "bytes32", "name": "salt", "type": "bytes32" }], "name": "hashOperationBatch", "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], "stateMutability": "pure", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], "name": "isOperation", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], "name": "isOperationDone", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], "name": "isOperationPending", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "id", "type": "bytes32" }], "name": "isOperationReady", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }, { "internalType": "uint256[]", "name": "", "type": "uint256[]" }, { "internalType": "uint256[]", "name": "", "type": "uint256[]" }, { "internalType": "bytes", "name": "", "type": "bytes" }], "name": "onERC1155BatchReceived", "outputs": [{ "internalType": "bytes4", "name": "", "type": "bytes4" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }, { "internalType": "uint256", "name": "", "type": "uint256" }, { "internalType": "uint256", "name": "", "type": "uint256" }, { "internalType": "bytes", "name": "", "type": "bytes" }], "name": "onERC1155Received", "outputs": [{ "internalType": "bytes4", "name": "", "type": "bytes4" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }, { "internalType": "uint256", "name": "", "type": "uint256" }, { "internalType": "bytes", "name": "", "type": "bytes" }], "name": "onERC721Received", "outputs": [{ "internalType": "bytes4", "name": "", "type": "bytes4" }], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "internalType": "address", "name": "account", "type": "address" }], "name": "renounceRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "bytes32", "name": "role", "type": "bytes32" }, { "internalType": "address", "name": "account", "type": "address" }], "name": "revokeRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "target", "type": "address" }, { "internalType": "uint256", "name": "value", "type": "uint256" }, { "internalType": "bytes", "name": "data", "type": "bytes" }, { "internalType": "bytes32", "name": "predecessor", "type": "bytes32" }, { "internalType": "bytes32", "name": "salt", "type": "bytes32" }, { "internalType": "uint256", "name": "delay", "type": "uint256" }], "name": "schedule", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address[]", "name": "targets", "type": "address[]" }, { "internalType": "uint256[]", "name": "values", "type": "uint256[]" }, { "internalType": "bytes[]", "name": "payloads", "type": "bytes[]" }, { "internalType": "bytes32", "name": "predecessor", "type": "bytes32" }, { "internalType": "bytes32", "name": "salt", "type": "bytes32" }, { "internalType": "uint256", "name": "delay", "type": "uint256" }], "name": "scheduleBatch", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "bytes4", "name": "interfaceId", "type": "bytes4" }], "name": "supportsInterface", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "newDelay", "type": "uint256" }], "name": "updateDelay", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "stateMutability": "payable", "type": "receive" }];
+        }
+        async $constructor(deployer, minDelay, proposers, executors, admin) {
+            throw new Error('Not implemented. Typing purpose. Use the ContractDeployer class to deploy the contract');
+        }
+        // 0xb08e51c0
+        async CANCELLER_ROLE() {
+            return this.$read(this.$getAbiItem('function', 'CANCELLER_ROLE'));
+        }
+        // 0xa217fddf
+        async DEFAULT_ADMIN_ROLE() {
+            return this.$read(this.$getAbiItem('function', 'DEFAULT_ADMIN_ROLE'));
+        }
+        // 0x07bd0265
+        async EXECUTOR_ROLE() {
+            return this.$read(this.$getAbiItem('function', 'EXECUTOR_ROLE'));
+        }
+        // 0x8f61f4f5
+        async PROPOSER_ROLE() {
+            return this.$read(this.$getAbiItem('function', 'PROPOSER_ROLE'));
+        }
+        // 0x0d3cf6fc
+        async TIMELOCK_ADMIN_ROLE() {
+            return this.$read(this.$getAbiItem('function', 'TIMELOCK_ADMIN_ROLE'));
+        }
+        // 0xc4d252f5
+        async cancel(sender, id) {
+            return this.$write(this.$getAbiItem('function', 'cancel'), sender, id);
+        }
+        // 0x134008d3
+        async execute(sender, target, value, payload, predecessor, salt) {
+            return this.$write(this.$getAbiItem('function', 'execute'), sender, target, value, payload, predecessor, salt);
+        }
+        // 0xe38335e5
+        async executeBatch(sender, targets, values, payloads, predecessor, salt) {
+            return this.$write(this.$getAbiItem('function', 'executeBatch'), sender, targets, values, payloads, predecessor, salt);
+        }
+        // 0xf27a0c92
+        async getMinDelay() {
+            return this.$read(this.$getAbiItem('function', 'getMinDelay'));
+        }
+        // 0x248a9ca3
+        async getRoleAdmin(role) {
+            return this.$read(this.$getAbiItem('function', 'getRoleAdmin'), role);
+        }
+        // 0xd45c4435
+        async getTimestamp(id) {
+            return this.$read(this.$getAbiItem('function', 'getTimestamp'), id);
+        }
+        // 0x2f2ff15d
+        async grantRole(sender, role, account) {
+            return this.$write(this.$getAbiItem('function', 'grantRole'), sender, role, account);
+        }
+        // 0x91d14854
+        async hasRole(role, account) {
+            return this.$read(this.$getAbiItem('function', 'hasRole'), role, account);
+        }
+        // 0x8065657f
+        async hashOperation(target, value, data, predecessor, salt) {
+            return this.$read(this.$getAbiItem('function', 'hashOperation'), target, value, data, predecessor, salt);
+        }
+        // 0xb1c5f427
+        async hashOperationBatch(targets, values, payloads, predecessor, salt) {
+            return this.$read(this.$getAbiItem('function', 'hashOperationBatch'), targets, values, payloads, predecessor, salt);
+        }
+        // 0x31d50750
+        async isOperation(id) {
+            return this.$read(this.$getAbiItem('function', 'isOperation'), id);
+        }
+        // 0x2ab0f529
+        async isOperationDone(id) {
+            return this.$read(this.$getAbiItem('function', 'isOperationDone'), id);
+        }
+        // 0x584b153e
+        async isOperationPending(id) {
+            return this.$read(this.$getAbiItem('function', 'isOperationPending'), id);
+        }
+        // 0x13bc9f20
+        async isOperationReady(id) {
+            return this.$read(this.$getAbiItem('function', 'isOperationReady'), id);
+        }
+        // 0xbc197c81
+        async onERC1155BatchReceived(sender, input0, input1, input2, input3, input4) {
+            return this.$write(this.$getAbiItem('function', 'onERC1155BatchReceived'), sender, input0, input1, input2, input3, input4);
+        }
+        // 0xf23a6e61
+        async onERC1155Received(sender, input0, input1, input2, input3, input4) {
+            return this.$write(this.$getAbiItem('function', 'onERC1155Received'), sender, input0, input1, input2, input3, input4);
+        }
+        // 0x150b7a02
+        async onERC721Received(sender, input0, input1, input2, input3) {
+            return this.$write(this.$getAbiItem('function', 'onERC721Received'), sender, input0, input1, input2, input3);
+        }
+        // 0x36568abe
+        async renounceRole(sender, role, account) {
+            return this.$write(this.$getAbiItem('function', 'renounceRole'), sender, role, account);
+        }
+        // 0xd547741f
+        async revokeRole(sender, role, account) {
+            return this.$write(this.$getAbiItem('function', 'revokeRole'), sender, role, account);
+        }
+        // 0x01d5062a
+        async schedule(sender, target, value, data, predecessor, salt, delay) {
+            return this.$write(this.$getAbiItem('function', 'schedule'), sender, target, value, data, predecessor, salt, delay);
+        }
+        // 0x8f2a0bb0
+        async scheduleBatch(sender, targets, values, payloads, predecessor, salt, delay) {
+            return this.$write(this.$getAbiItem('function', 'scheduleBatch'), sender, targets, values, payloads, predecessor, salt, delay);
+        }
+        // 0x01ffc9a7
+        async supportsInterface(interfaceId) {
+            return this.$read(this.$getAbiItem('function', 'supportsInterface'), interfaceId);
+        }
+        // 0x64d62353
+        async updateDelay(sender, newDelay) {
+            return this.$write(this.$getAbiItem('function', 'updateDelay'), sender, newDelay);
+        }
+        $call() {
+            return super.$call();
+        }
+        $signed() {
+            return super.$signed();
+        }
+        $data() {
+            return super.$data();
+        }
+        $gas() {
+            return super.$gas();
+        }
+        onTransaction(method, options) {
+            options ??= {};
+            options.filter ??= {};
+            options.filter.method = method;
+            return this.$onTransaction(options);
+        }
+        onLog(event, cb) {
+            return this.$onLog(event, cb);
+        }
+        async getPastLogs(mix, options) {
+            return await super.getPastLogs(mix, options);
+        }
+        onCallExecuted(fn) {
+            return this.$onLog('CallExecuted', fn);
+        }
+        onCallSalt(fn) {
+            return this.$onLog('CallSalt', fn);
+        }
+        onCallScheduled(fn) {
+            return this.$onLog('CallScheduled', fn);
+        }
+        onCancelled(fn) {
+            return this.$onLog('Cancelled', fn);
+        }
+        onMinDelayChange(fn) {
+            return this.$onLog('MinDelayChange', fn);
+        }
+        onRoleAdminChanged(fn) {
+            return this.$onLog('RoleAdminChanged', fn);
+        }
+        onRoleGranted(fn) {
+            return this.$onLog('RoleGranted', fn);
+        }
+        onRoleRevoked(fn) {
+            return this.$onLog('RoleRevoked', fn);
+        }
+        extractLogsCallExecuted(tx) {
+            let abi = this.$getAbiItem('event', 'CallExecuted');
+            return this.$extractLogs(tx, abi);
+        }
+        extractLogsCallSalt(tx) {
+            let abi = this.$getAbiItem('event', 'CallSalt');
+            return this.$extractLogs(tx, abi);
+        }
+        extractLogsCallScheduled(tx) {
+            let abi = this.$getAbiItem('event', 'CallScheduled');
+            return this.$extractLogs(tx, abi);
+        }
+        extractLogsCancelled(tx) {
+            let abi = this.$getAbiItem('event', 'Cancelled');
+            return this.$extractLogs(tx, abi);
+        }
+        extractLogsMinDelayChange(tx) {
+            let abi = this.$getAbiItem('event', 'MinDelayChange');
+            return this.$extractLogs(tx, abi);
+        }
+        extractLogsRoleAdminChanged(tx) {
+            let abi = this.$getAbiItem('event', 'RoleAdminChanged');
+            return this.$extractLogs(tx, abi);
+        }
+        extractLogsRoleGranted(tx) {
+            let abi = this.$getAbiItem('event', 'RoleGranted');
+            return this.$extractLogs(tx, abi);
+        }
+        extractLogsRoleRevoked(tx) {
+            let abi = this.$getAbiItem('event', 'RoleRevoked');
+            return this.$extractLogs(tx, abi);
+        }
+        async getPastLogsCallExecuted(options) {
+            return await this.$getPastLogsParsed('CallExecuted', options);
+        }
+        async getPastLogsCallSalt(options) {
+            return await this.$getPastLogsParsed('CallSalt', options);
+        }
+        async getPastLogsCallScheduled(options) {
+            return await this.$getPastLogsParsed('CallScheduled', options);
+        }
+        async getPastLogsCancelled(options) {
+            return await this.$getPastLogsParsed('Cancelled', options);
+        }
+        async getPastLogsMinDelayChange(options) {
+            return await this.$getPastLogsParsed('MinDelayChange', options);
+        }
+        async getPastLogsRoleAdminChanged(options) {
+            return await this.$getPastLogsParsed('RoleAdminChanged', options);
+        }
+        async getPastLogsRoleGranted(options) {
+            return await this.$getPastLogsParsed('RoleGranted', options);
+        }
+        async getPastLogsRoleRevoked(options) {
+            return await this.$getPastLogsParsed('RoleRevoked', options);
+        }
+    }
+    return TimelockController;
+}
+exports.TimelockControllerFactory = TimelockControllerFactory;
+//# sourceMappingURL=TimelockControllerFactory.js.map
+//# sourceMappingURL=TimelockControllerFactory.ts.map

package/lib/cjs/prebuilt-factories/TimelockControllerFactory.js.map

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