@skalenetwork/upgrade-tools 1.0.0-develop.6 → 1.0.0-develop.9

package/dist/hardhat.config.js

@@ -18,7 +18,7 @@ const config = {
         ]
     },
     typechain: {
-        externalArtifacts: ['node_modules/@openzeppelin/upgrades-core/artifacts/*.json']
+        externalArtifacts: ['node_modules/@openzeppelin/upgrades-core/artifacts/[!b]*.json']
     }
 };
 exports.default = config;

package/dist/src/deploy.js

@@ -90,7 +90,9 @@ function getContractFactory(contract) {
             Object.assign(libraryArtifacts, manifest.libraries);
         }
         finally {
-            Object.assign(manifest, { libraries: libraryArtifacts });
+            if (manifest !== undefined) {
+                Object.assign(manifest, { libraries: libraryArtifacts });
+            }
             yield fs_1.promises.writeFile(yield getManifestFile(), JSON.stringify(manifest, null, 4));
         }
         return yield getLinkedContractFactory(contract, libraries);

package/dist/src/upgrade.d.ts

@@ -3,5 +3,6 @@ import { Contract } from "ethers";
 import { OwnableUpgradeable } from "../typechain-types";
 export declare function getContractFactoryAndUpdateManifest(contract: string): Promise<import("ethers").ContractFactory>;
 declare type DeploymentAction<ContractManagerType extends Contract> = (safeTransactions: string[], abi: SkaleABIFile, contractManager: ContractManagerType) => Promise<void>;
-export declare function upgrade<ContractManagerType extends OwnableUpgradeable>(projectName: string, targetVersion: string, getDeployedVersion: (abi: SkaleABIFile) => Promise<string | undefined>, setVersion: (safeTransaction: string[], abi: SkaleABIFile, newVersion: string) => Promise<void>, safeMockAccessRequirements: string[], contractNamesToUpgrade: string[], deployNewContracts: DeploymentAction<ContractManagerType>, initialize: DeploymentAction<ContractManagerType>): Promise<void>;
+declare type MultiTransactionAction<ContractManagerType extends Contract> = (abi: SkaleABIFile, contractManager: ContractManagerType) => Promise<string[][]>;
+export declare function upgrade<ContractManagerType extends OwnableUpgradeable>(projectName: string, targetVersion: string, getDeployedVersion: (abi: SkaleABIFile) => Promise<string | undefined>, setVersion: (safeTransaction: string[], abi: SkaleABIFile, newVersion: string) => Promise<void>, safeMockAccessRequirements: string[], contractNamesToUpgrade: string[], deployNewContracts: DeploymentAction<ContractManagerType>, initialize: DeploymentAction<ContractManagerType>, afterUpgrade?: MultiTransactionAction<ContractManagerType>): Promise<void>;
 export {};

package/dist/src/upgrade.js

@@ -62,7 +62,7 @@ function getContractFactoryAndUpdateManifest(contract) {
     });
 }
 exports.getContractFactoryAndUpdateManifest = getContractFactoryAndUpdateManifest;
-function upgrade(projectName, targetVersion, getDeployedVersion, setVersion, safeMockAccessRequirements, contractNamesToUpgrade, deployNewContracts, initialize) {
+function upgrade(projectName, targetVersion, getDeployedVersion, setVersion, safeMockAccessRequirements, contractNamesToUpgrade, deployNewContracts, initialize, afterUpgrade) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!process.env.ABI) {
             console.log(chalk_1.default.red("Set path to file with ABI and addresses to ABI environment variables"));
@@ -172,9 +172,22 @@ function upgrade(projectName, targetVersion, getDeployedVersion, setVersion, saf
             privateKey = hardhat_1.ethers.Wallet.createRandom().privateKey;
         }
         const safeTx = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, safeTransactions, safeMock !== undefined);
+        let transactionsBatches;
+        if (afterUpgrade !== undefined) {
+            transactionsBatches = yield afterUpgrade(abi, contractManager);
+            for (const { index, batch } of transactionsBatches.map((batch, index) => ({ index, batch }))) {
+                yield fs_1.promises.writeFile(`data/after-transactions-${index}-${version}-${hardhat_1.network.name}.json`, JSON.stringify(batch, null, 4));
+            }
+        }
         if (!safeMock) {
             const chainId = (yield hardhat_1.ethers.provider.getNetwork()).chainId;
             yield (0, gnosis_safe_1.sendSafeTransaction)(safe, chainId, safeTx);
+            if (transactionsBatches !== undefined) {
+                for (const batch of transactionsBatches) {
+                    const multiSendTransaction = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, batch, safeMock !== undefined);
+                    yield (0, gnosis_safe_1.sendSafeTransaction)(safe, chainId, multiSendTransaction);
+                }
+            }
         }
         else {
             console.log(chalk_1.default.blue("Send upgrade transactions to safe mock"));
@@ -184,6 +197,16 @@ function upgrade(projectName, targetVersion, getDeployedVersion, setVersion, saf
                     value: safeTx.value,
                     data: safeTx.data,
                 })).wait();
+                if (transactionsBatches !== undefined) {
+                    for (const batch of transactionsBatches) {
+                        const multiSendTransaction = yield (0, gnosis_safe_1.createMultiSendTransaction)(hardhat_1.ethers, safe, privateKey, batch, safeMock !== undefined);
+                        yield (yield deployer.sendTransaction({
+                            to: safeMock.address,
+                            value: multiSendTransaction.value,
+                            data: multiSendTransaction.data,
+                        })).wait();
+                    }
+                }
                 console.log(chalk_1.default.blue("Transactions have been sent"));
             }
             finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/upgrade-tools",
-  "version": "1.0.0-develop.6",
+  "version": "1.0.0-develop.9",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"