dequanto 0.1.80 → 0.1.84

package/src/contracts/deploy/proxy/ProxyDeployment.ts

@@ -37,6 +37,7 @@ export interface IBeacon extends ContractBase {
 interface IDeploymentCtx {
     ImplementationContract: Constructor<ContractBase>
     deployer: IAccount
+    owner?: IAccount
     deployments: Deployments
     implementation: {
         address: TAddress
@@ -207,7 +208,7 @@ export class ProxyDeployment {
                     await this.requireCompatibleStorageLayout(proxyId, ctx);
                     $logger.log(`Upgrading ProxyAdmin(${contractProxyAdmin.address}) to ${implAddress} (${v}) from ${address}`);
                     let receipt = await Interfaces.call(
-                        deployer,
+                        ctx.owner ?? deployer,
                         contractProxyAdmin,
                         Interfaces.TransparentProxy[v].contractProxyAdmin.upgradeAndCall,
                         contractProxy.address,

package/src/erc4337/Erc4337Factory.ts

@@ -27,8 +27,6 @@ export class Erc4337Factory {
 
         $require.notNull(provider, `No 4337 provider information found for ${name} and platform "${platform}"`);
 
-        console.log(`CreateService`, provider.contracts.entryPoint);
-
         return new Erc4337Service(client, explorer, {
             addresses: {
                 entryPoint: provider.contracts.entryPoint,

package/src/indexer/EventsIndexer.ts

@@ -106,7 +106,9 @@ export class EventsIndexer <TContract extends ContractBase> {
     > (
         event: TLogName | TLogName[] | '*',
         options?: {
+            // includes block
             fromBlock?: number
+            // includes block
             toBlock?: number
             blockRangeLimits?: WClient['blockRangeLimits']
             params?: Partial<TContract['Types']['Events'][TLogName]['outputParams']>
@@ -183,6 +185,10 @@ export class EventsIndexer <TContract extends ContractBase> {
         fromBlock?: number
         filterKey?: string
     }): Promise<TRange[]> {
+        let fromBlock = opts?.fromBlock ?? initialBlockNumber;
+        if (fromBlock != null) {
+            $require.lte(fromBlock, toBlock, `Invalid block range order`);
+        }
         let logsMetaArr = await this.storeMeta.fetch();
         let eventsBlock = alot(logsMetaArr)
             .filter(x => x.filterKey == opts?.filterKey)
@@ -198,15 +204,24 @@ export class EventsIndexer <TContract extends ContractBase> {
         if (hasInitialBlock === false) {
             let blockNr = opts?.fromBlock ?? await this.getInitialBlockNumber();
             logsMeta.filter(x => x.lastBlock == null).forEach(x => x.lastBlock = blockNr);
-        };
+        }
 
         let ranges = [] as TRange[];
-        let blockNumbers = [ ...logsMeta.map(x => x.lastBlock), toBlock ];
-        let blockNumberSteps = alot(blockNumbers).distinct().sortBy(x => x).toArray();
+        let blockNumbers = [ ...logsMeta.map(x => x.lastBlock), toBlock ].filter(x => x <= toBlock);
 
+        let blockNumberSteps = alot(blockNumbers).distinct().sortBy(x => x).toArray();
+        if (blockNumberSteps.length === 1) {
+            let [ block ] = blockNumberSteps;
+            ranges.push({
+                fromBlock: block,
+                toBlock: block,
+                events: events
+            });
+        }
         for (let i = 0; i < blockNumberSteps.length - 1; i++) {
             let from = blockNumberSteps[i];
             if (i > 0) {
+                // The range includes both blocks: [x, y], but we want (x, y], so we make [x + 1, y]
                 from += 1;
             }
             let to = blockNumberSteps[i + 1];

package/src/models/TAccount.ts

@@ -4,7 +4,7 @@ import { TEth } from './TEth';
 import { TPlatform } from './TPlatform';
 
 export interface IAccount {
-    type?: 'eoa' | 'safe' | 'erc4337'
+    type?: 'eoa' | 'safe' | 'erc4337' | 'timelock'
     name?: string
     platform?: TPlatform
 
@@ -58,4 +58,14 @@ export interface Erc4337Account extends IAccount {
     operator: EoAccount
 }
 
+export interface TimelockAccount extends IAccount {
+    type: 'timelock'
+    provider?: 'default' | string
+
+    // Erc4337 account must include platform information
+    platform: TPlatform
+
+    operator: EoAccount
+}
+
 export type TAccount = string | IAccount | EoAccount | SafeAccount | Erc4337Account;