@skalenetwork/upgrade-tools 4.0.0-develop.0 → 4.0.0-develop.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -1
- package/dist/src/contractFactory.js +1 -1
- package/dist/src/contractFactory.js.map +1 -1
- package/dist/src/contractVerifier.d.ts +24 -12
- package/dist/src/contractVerifier.js +47 -43
- package/dist/src/contractVerifier.js.map +1 -1
- package/dist/src/deploy.d.ts +1 -0
- package/dist/src/deploy.js +16 -9
- package/dist/src/deploy.js.map +1 -1
- package/dist/src/gnosis-safe.js +6 -37
- package/dist/src/gnosis-safe.js.map +1 -1
- package/dist/src/index.d.ts +4 -0
- package/dist/src/index.js +4 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/ownership-transfer/constants.d.ts +8 -0
- package/dist/src/ownership-transfer/constants.js +33 -0
- package/dist/src/ownership-transfer/constants.js.map +1 -0
- package/dist/src/ownership-transfer/contractAdmin.d.ts +55 -0
- package/dist/src/ownership-transfer/contractAdmin.js +211 -0
- package/dist/src/ownership-transfer/contractAdmin.js.map +1 -0
- package/dist/src/ownership-transfer/instanceAdmin.d.ts +51 -0
- package/dist/src/ownership-transfer/instanceAdmin.js +221 -0
- package/dist/src/ownership-transfer/instanceAdmin.js.map +1 -0
- package/dist/src/ownership-transfer/permission-utils.d.ts +37 -0
- package/dist/src/ownership-transfer/permission-utils.js +191 -0
- package/dist/src/ownership-transfer/permission-utils.js.map +1 -0
- package/dist/src/ownership-transfer/utils.d.ts +19 -0
- package/dist/src/ownership-transfer/utils.js +201 -0
- package/dist/src/ownership-transfer/utils.js.map +1 -0
- package/dist/src/proxyUpgrader.d.ts +19 -0
- package/dist/src/proxyUpgrader.js +89 -0
- package/dist/src/proxyUpgrader.js.map +1 -0
- package/dist/src/submitters/auto-submitter.d.ts +3 -0
- package/dist/src/submitters/auto-submitter.js +11 -2
- package/dist/src/submitters/auto-submitter.js.map +1 -1
- package/dist/src/submitters/eoa-submitter.js +0 -1
- package/dist/src/submitters/eoa-submitter.js.map +1 -1
- package/dist/src/submitters/safe-ima-legacy-marionette-submitter.js +0 -4
- package/dist/src/submitters/safe-ima-legacy-marionette-submitter.js.map +1 -1
- package/dist/src/submitters/safe-ima-marionette-submitter.d.ts +1 -0
- package/dist/src/submitters/safe-ima-marionette-submitter.js +1 -0
- package/dist/src/submitters/safe-ima-marionette-submitter.js.map +1 -1
- package/dist/src/submitters/safe-submitter.d.ts +2 -0
- package/dist/src/submitters/safe-submitter.js +3 -0
- package/dist/src/submitters/safe-submitter.js.map +1 -1
- package/dist/src/submitters/safe-to-ima-submitter.d.ts +1 -0
- package/dist/src/submitters/safe-to-ima-submitter.js +4 -4
- package/dist/src/submitters/safe-to-ima-submitter.js.map +1 -1
- package/dist/src/submitters/submitter.d.ts +3 -1
- package/dist/src/submitters/submitter.js +5 -17
- package/dist/src/submitters/submitter.js.map +1 -1
- package/dist/src/upgrader.d.ts +12 -6
- package/dist/src/upgrader.js +80 -61
- package/dist/src/upgrader.js.map +1 -1
- package/dist/src/upgraders/abstractTransparentProxyUpgrader.d.ts +19 -0
- package/dist/src/upgraders/abstractTransparentProxyUpgrader.js +57 -0
- package/dist/src/upgraders/abstractTransparentProxyUpgrader.js.map +1 -0
- package/dist/src/upgraders/beaconUpgrader.d.ts +8 -0
- package/dist/src/upgraders/beaconUpgrader.js +37 -0
- package/dist/src/upgraders/beaconUpgrader.js.map +1 -0
- package/dist/src/upgraders/transparentProxyUpgrader.d.ts +5 -0
- package/dist/src/upgraders/transparentProxyUpgrader.js +20 -0
- package/dist/src/upgraders/transparentProxyUpgrader.js.map +1 -0
- package/dist/src/upgraders/v4TransparentProxyUpgrader.d.ts +5 -0
- package/dist/src/upgraders/v4TransparentProxyUpgrader.js +19 -0
- package/dist/src/upgraders/v4TransparentProxyUpgrader.js.map +1 -0
- package/dist/src/verification.d.ts +2 -17
- package/dist/src/verification.js +64 -203
- package/dist/src/verification.js.map +1 -1
- package/dist/src/verifiers/blockscoutVerifier.d.ts +11 -0
- package/dist/src/verifiers/blockscoutVerifier.js +85 -0
- package/dist/src/verifiers/blockscoutVerifier.js.map +1 -0
- package/dist/src/verifiers/etherscanVerifier.d.ts +19 -0
- package/dist/src/verifiers/etherscanVerifier.js +105 -0
- package/dist/src/verifiers/etherscanVerifier.js.map +1 -0
- package/dist/src/verifiers/skaleBlockscoutVerifier.d.ts +7 -0
- package/dist/src/verifiers/skaleBlockscoutVerifier.js +60 -0
- package/dist/src/verifiers/skaleBlockscoutVerifier.js.map +1 -0
- package/package.json +6 -6
- package/dist/src/proxyAdmin.d.ts +0 -4
- package/dist/src/proxyAdmin.js +0 -56
- package/dist/src/proxyAdmin.js.map +0 -1
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.renounceAccessManagerRole = exports.grantAccessManagerRole = exports.getPermissionModels = exports.renounceRole = exports.grantRole = exports.transferOwnership = exports.isAccessManaged = exports.isAccessManager = exports.isAccessControl = exports.isOwnable = exports.PermissionModel = void 0;
|
|
4
|
+
const constants_1 = require("./constants");
|
|
5
|
+
const ethers_1 = require("ethers");
|
|
6
|
+
const utils_1 = require("./utils");
|
|
7
|
+
const hardhat_1 = require("hardhat");
|
|
8
|
+
var PermissionModel;
|
|
9
|
+
(function (PermissionModel) {
|
|
10
|
+
// Does not fully complete the process of Ownable2Step
|
|
11
|
+
PermissionModel["OWNABLE"] = "OWNABLE";
|
|
12
|
+
PermissionModel["ROLE_BASED"] = "ROLE_BASED";
|
|
13
|
+
PermissionModel["ACCESS_MANAGED"] = "ACCESS_MANAGED";
|
|
14
|
+
PermissionModel["ACCESS_MANAGER"] = "ACCESS_MANAGER";
|
|
15
|
+
})(PermissionModel || (exports.PermissionModel = PermissionModel = {}));
|
|
16
|
+
const ZERO = 0;
|
|
17
|
+
const verifyOwnableInterface = async (contract, contractAddress) => {
|
|
18
|
+
const owner = await contract.owner();
|
|
19
|
+
return owner !== hardhat_1.ethers.ZeroAddress &&
|
|
20
|
+
await (0, utils_1.hasFunctionSelector)(contractAddress, "transferOwnership(address)");
|
|
21
|
+
};
|
|
22
|
+
const isOwnable = async (contractAddress) => {
|
|
23
|
+
try {
|
|
24
|
+
const resolvedAddress = await hardhat_1.ethers.resolveAddress(contractAddress);
|
|
25
|
+
if (!await (0, utils_1.isContractAddress)(resolvedAddress)) {
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
const contract = new ethers_1.Contract(resolvedAddress, constants_1.OWNABLE_ABI, hardhat_1.ethers.provider);
|
|
29
|
+
return await verifyOwnableInterface(contract, resolvedAddress);
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
exports.isOwnable = isOwnable;
|
|
36
|
+
const verifyAccessControlInterface = async (contract, contractAddress) => {
|
|
37
|
+
await contract.hasRole(hardhat_1.ethers.ZeroHash, hardhat_1.ethers.ZeroAddress);
|
|
38
|
+
return await (0, utils_1.hasFunctionSelector)(contractAddress, "grantRole(bytes32,address)") &&
|
|
39
|
+
await (0, utils_1.hasFunctionSelector)(contractAddress, "renounceRole(bytes32,address)");
|
|
40
|
+
};
|
|
41
|
+
const isAccessControl = async (contractAddress) => {
|
|
42
|
+
try {
|
|
43
|
+
const resolvedAddress = await hardhat_1.ethers.resolveAddress(contractAddress);
|
|
44
|
+
if (!await (0, utils_1.isContractAddress)(resolvedAddress)) {
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
const contract = new ethers_1.Contract(resolvedAddress, constants_1.ACCESS_CONTROL_ABI, hardhat_1.ethers.provider);
|
|
48
|
+
return await verifyAccessControlInterface(contract, resolvedAddress);
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
exports.isAccessControl = isAccessControl;
|
|
55
|
+
const verifyAccessManagerInterface = async (contract, contractAddress) => {
|
|
56
|
+
const zeroRole = 0n;
|
|
57
|
+
await contract.hasRole(zeroRole, hardhat_1.ethers.ZeroAddress);
|
|
58
|
+
return await (0, utils_1.hasFunctionSelector)(contractAddress, "grantRole(uint64,address,uint32)") &&
|
|
59
|
+
await (0, utils_1.hasFunctionSelector)(contractAddress, "renounceRole(uint64,address)");
|
|
60
|
+
};
|
|
61
|
+
const isAccessManager = async (contractAddress) => {
|
|
62
|
+
try {
|
|
63
|
+
const resolvedAddress = await hardhat_1.ethers.resolveAddress(contractAddress);
|
|
64
|
+
if (!await (0, utils_1.isContractAddress)(resolvedAddress)) {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
const contract = new ethers_1.Contract(resolvedAddress, constants_1.ACCESS_MANAGER_ABI, hardhat_1.ethers.provider);
|
|
68
|
+
return await verifyAccessManagerInterface(contract, resolvedAddress);
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
exports.isAccessManager = isAccessManager;
|
|
75
|
+
const isAccessManaged = async (contractAddress) => {
|
|
76
|
+
try {
|
|
77
|
+
const resolvedAddress = await hardhat_1.ethers.resolveAddress(contractAddress);
|
|
78
|
+
if (!await (0, utils_1.isContractAddress)(resolvedAddress)) {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
const contract = new ethers_1.Contract(resolvedAddress, constants_1.ACCESS_MANAGED_ABI, hardhat_1.ethers.provider);
|
|
82
|
+
const authorityAddress = await contract.authority();
|
|
83
|
+
return await (0, exports.isAccessManager)(authorityAddress);
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
return false;
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
exports.isAccessManaged = isAccessManaged;
|
|
90
|
+
const transferOwnership = async (contractAddress, newOwner, oldOwner) => {
|
|
91
|
+
const contract = new ethers_1.Contract(contractAddress, constants_1.OWNABLE_ABI, hardhat_1.ethers.provider);
|
|
92
|
+
if (await contract.owner() === newOwner) {
|
|
93
|
+
return false;
|
|
94
|
+
}
|
|
95
|
+
if (await contract.owner() !== oldOwner) {
|
|
96
|
+
throw new Error(`Current owner of contract ${contractAddress} does not match the provided old owner address.`);
|
|
97
|
+
}
|
|
98
|
+
const data = contract.interface.encodeFunctionData("transferOwnership", [newOwner]);
|
|
99
|
+
const transaction = new ethers_1.Transaction();
|
|
100
|
+
transaction.to = contractAddress;
|
|
101
|
+
transaction.data = data;
|
|
102
|
+
return transaction;
|
|
103
|
+
};
|
|
104
|
+
exports.transferOwnership = transferOwnership;
|
|
105
|
+
const grantRole = async (input) => {
|
|
106
|
+
const contract = new ethers_1.Contract(input.contractAddress, constants_1.ACCESS_CONTROL_ABI, hardhat_1.ethers.provider);
|
|
107
|
+
// If new account already has role or old account never had it in the first place - no action
|
|
108
|
+
if (await contract.hasRole(input.role, input.newAccount) || !await contract.hasRole(input.role, input.oldAccount)) {
|
|
109
|
+
return false;
|
|
110
|
+
}
|
|
111
|
+
if (!await contract.hasRole(hardhat_1.ethers.ZeroHash, input.oldAccount)) {
|
|
112
|
+
// Currently we do not support roleAdmins - must be ran by owner
|
|
113
|
+
throw new Error(`Account ${input.oldAccount} does not have permission to grant roles on contract ${input.contractAddress}.`);
|
|
114
|
+
}
|
|
115
|
+
const data = contract.interface.encodeFunctionData("grantRole", [input.role, input.newAccount]);
|
|
116
|
+
const transaction = new ethers_1.Transaction();
|
|
117
|
+
transaction.to = input.contractAddress;
|
|
118
|
+
transaction.data = data;
|
|
119
|
+
return transaction;
|
|
120
|
+
};
|
|
121
|
+
exports.grantRole = grantRole;
|
|
122
|
+
const renounceRole = async (input) => {
|
|
123
|
+
const contract = new ethers_1.Contract(input.contractAddress, constants_1.ACCESS_CONTROL_ABI, hardhat_1.ethers.provider);
|
|
124
|
+
if (!await contract.hasRole(input.role, input.oldAccount)) {
|
|
125
|
+
return true;
|
|
126
|
+
}
|
|
127
|
+
// Prevent revoking last role holder of default admin role
|
|
128
|
+
if (input.role === hardhat_1.ethers.ZeroHash && !(await contract.hasRole(input.role, input.newAccount))) {
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
const data = contract.interface.encodeFunctionData("renounceRole", [input.role, input.oldAccount]);
|
|
132
|
+
const transaction = new ethers_1.Transaction();
|
|
133
|
+
transaction.to = input.contractAddress;
|
|
134
|
+
transaction.data = data;
|
|
135
|
+
return transaction;
|
|
136
|
+
};
|
|
137
|
+
exports.renounceRole = renounceRole;
|
|
138
|
+
const getPermissionModels = async (address) => {
|
|
139
|
+
const checks = [
|
|
140
|
+
{ check: exports.isOwnable, model: PermissionModel.OWNABLE },
|
|
141
|
+
{ check: exports.isAccessControl, model: PermissionModel.ROLE_BASED },
|
|
142
|
+
{ check: exports.isAccessManager, model: PermissionModel.ACCESS_MANAGER },
|
|
143
|
+
{ check: exports.isAccessManaged, model: PermissionModel.ACCESS_MANAGED }
|
|
144
|
+
];
|
|
145
|
+
const models = [];
|
|
146
|
+
// Change to await in loop if rate-limiting becomes an issue
|
|
147
|
+
await Promise.all(checks.map(async ({ check, model }) => {
|
|
148
|
+
if (await check(address)) {
|
|
149
|
+
models.push(model);
|
|
150
|
+
}
|
|
151
|
+
}));
|
|
152
|
+
if (models.includes(PermissionModel.ACCESS_MANAGER) && models.includes(PermissionModel.ROLE_BASED)) {
|
|
153
|
+
throw new Error(`Address ${address} cannot be both ACCESS_MANAGER and ROLE_BASED permission models.`);
|
|
154
|
+
}
|
|
155
|
+
return models;
|
|
156
|
+
};
|
|
157
|
+
exports.getPermissionModels = getPermissionModels;
|
|
158
|
+
const grantAccessManagerRole = async (input) => {
|
|
159
|
+
const contract = new ethers_1.Contract(input.contractAddress, constants_1.ACCESS_MANAGER_ABI, hardhat_1.ethers.provider);
|
|
160
|
+
// If new account already has role or old account never had it in the first place - no action
|
|
161
|
+
if (await contract.hasRole(input.role, input.newAccount) || !await contract.hasRole(input.role, input.oldAccount)) {
|
|
162
|
+
return false;
|
|
163
|
+
}
|
|
164
|
+
if (!await contract.hasRole(ZERO, input.oldAccount)) {
|
|
165
|
+
// Currently we do not support roleAdmins - must be ran by owner
|
|
166
|
+
throw new Error(`Account ${input.oldAccount} does not have permission to grant roles on contract ${input.contractAddress}.`);
|
|
167
|
+
}
|
|
168
|
+
const data = contract.interface.encodeFunctionData("grantRole", [input.role, input.newAccount, ZERO]);
|
|
169
|
+
const transaction = new ethers_1.Transaction();
|
|
170
|
+
transaction.to = input.contractAddress;
|
|
171
|
+
transaction.data = data;
|
|
172
|
+
return transaction;
|
|
173
|
+
};
|
|
174
|
+
exports.grantAccessManagerRole = grantAccessManagerRole;
|
|
175
|
+
const renounceAccessManagerRole = async (input) => {
|
|
176
|
+
const contract = new ethers_1.Contract(input.contractAddress, constants_1.ACCESS_MANAGER_ABI, hardhat_1.ethers.provider);
|
|
177
|
+
if (!await contract.hasRole(input.role, input.oldAccount)) {
|
|
178
|
+
return true;
|
|
179
|
+
}
|
|
180
|
+
// Ensure role was granted to newAccount before renouncing
|
|
181
|
+
if (input.role === BigInt(ZERO) && !(await contract.hasRole(input.role, input.newAccount))) {
|
|
182
|
+
return false;
|
|
183
|
+
}
|
|
184
|
+
const data = contract.interface.encodeFunctionData("renounceRole", [input.role, input.oldAccount]);
|
|
185
|
+
const transaction = new ethers_1.Transaction();
|
|
186
|
+
transaction.to = input.contractAddress;
|
|
187
|
+
transaction.data = data;
|
|
188
|
+
return transaction;
|
|
189
|
+
};
|
|
190
|
+
exports.renounceAccessManagerRole = renounceAccessManagerRole;
|
|
191
|
+
//# sourceMappingURL=permission-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permission-utils.js","sourceRoot":"","sources":["../../../src/ownership-transfer/permission-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { AddressLike } from "ethers";
|
|
2
|
+
import { TransactionData } from "./contractAdmin";
|
|
3
|
+
export declare enum Pattern {
|
|
4
|
+
TUPP = "TUPP",
|
|
5
|
+
BEACON = "BEACON",
|
|
6
|
+
REGULAR = "REGULAR"
|
|
7
|
+
}
|
|
8
|
+
export declare const isContractAddress: (address: string) => Promise<boolean>;
|
|
9
|
+
export declare const extractAddressFromSlot: (slotValue: string) => string;
|
|
10
|
+
export declare const getAdminAddress: (address: string) => Promise<string>;
|
|
11
|
+
export declare const getTUPPImplementationAddress: (address: string) => Promise<string>;
|
|
12
|
+
export declare const isTUPPPattern: (address: string) => Promise<boolean>;
|
|
13
|
+
export declare const hasFunctionSelector: (address: string, signature: string) => Promise<boolean>;
|
|
14
|
+
export declare const isMultisig: (contractAddress: AddressLike) => Promise<boolean>;
|
|
15
|
+
export declare const isBeaconPattern: (address: string) => Promise<boolean>;
|
|
16
|
+
export declare const identifyProxyPattern: (address: string) => Promise<Pattern>;
|
|
17
|
+
export declare const promptUserConfirmation: (message?: string) => Promise<boolean>;
|
|
18
|
+
export declare const detectPattern: (address: AddressLike) => Promise<Pattern>;
|
|
19
|
+
export declare const removeDuplicateTransactions: (items: TransactionData[]) => TransactionData[];
|
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.removeDuplicateTransactions = exports.detectPattern = exports.promptUserConfirmation = exports.identifyProxyPattern = exports.isBeaconPattern = exports.isMultisig = exports.hasFunctionSelector = exports.isTUPPPattern = exports.getTUPPImplementationAddress = exports.getAdminAddress = exports.extractAddressFromSlot = exports.isContractAddress = exports.Pattern = void 0;
|
|
7
|
+
// Cspell:words TUPP
|
|
8
|
+
const constants_1 = require("./constants");
|
|
9
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
10
|
+
const hardhat_1 = require("hardhat");
|
|
11
|
+
const readline_1 = __importDefault(require("readline"));
|
|
12
|
+
/*
|
|
13
|
+
* Ethereum addresses are 20 bytes = 40 hex characters
|
|
14
|
+
* Used for extracting addresses from 32-byte storage slots
|
|
15
|
+
*/
|
|
16
|
+
const ADDRESS_HEX_LENGTH = 40;
|
|
17
|
+
var Pattern;
|
|
18
|
+
(function (Pattern) {
|
|
19
|
+
Pattern["TUPP"] = "TUPP";
|
|
20
|
+
Pattern["BEACON"] = "BEACON";
|
|
21
|
+
Pattern["REGULAR"] = "REGULAR";
|
|
22
|
+
})(Pattern || (exports.Pattern = Pattern = {}));
|
|
23
|
+
const isContractAddress = async (address) => {
|
|
24
|
+
const code = await hardhat_1.ethers.provider.getCode(address);
|
|
25
|
+
return code !== "0x" && code !== "0x0";
|
|
26
|
+
};
|
|
27
|
+
exports.isContractAddress = isContractAddress;
|
|
28
|
+
const extractAddressFromSlot = (slotValue) => {
|
|
29
|
+
const addressHex = `0x${slotValue.slice(-ADDRESS_HEX_LENGTH)}`;
|
|
30
|
+
return hardhat_1.ethers.getAddress(addressHex);
|
|
31
|
+
};
|
|
32
|
+
exports.extractAddressFromSlot = extractAddressFromSlot;
|
|
33
|
+
const getAdminAddress = async (address) => {
|
|
34
|
+
const adminSlotValue = await hardhat_1.ethers.provider.getStorage(address, constants_1.ERC1967_ADMIN_SLOT);
|
|
35
|
+
return (0, exports.extractAddressFromSlot)(adminSlotValue);
|
|
36
|
+
};
|
|
37
|
+
exports.getAdminAddress = getAdminAddress;
|
|
38
|
+
const getTUPPImplementationAddress = async (address) => {
|
|
39
|
+
const implementationSlotValue = await hardhat_1.ethers.provider.getStorage(address, constants_1.ERC1967_IMPLEMENTATION_SLOT);
|
|
40
|
+
return (0, exports.extractAddressFromSlot)(implementationSlotValue);
|
|
41
|
+
};
|
|
42
|
+
exports.getTUPPImplementationAddress = getTUPPImplementationAddress;
|
|
43
|
+
const validateTUPPProxy = async (proxyAddress, adminAddress) => {
|
|
44
|
+
const isAdminContract = await (0, exports.isContractAddress)(adminAddress);
|
|
45
|
+
if (!isAdminContract) {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
const implementationAddress = await (0, exports.getTUPPImplementationAddress)(proxyAddress);
|
|
49
|
+
return implementationAddress !== hardhat_1.ethers.ZeroAddress && await (0, exports.isContractAddress)(implementationAddress);
|
|
50
|
+
};
|
|
51
|
+
/*
|
|
52
|
+
* Checks if the contract follows the Transparent Upgradeable Proxy Pattern.
|
|
53
|
+
* A TUPP proxy has an admin address in the ERC1967 admin slot.
|
|
54
|
+
*/
|
|
55
|
+
const isTUPPPattern = async (address) => {
|
|
56
|
+
try {
|
|
57
|
+
const adminAddress = await (0, exports.getAdminAddress)(address);
|
|
58
|
+
if (adminAddress === hardhat_1.ethers.ZeroAddress) {
|
|
59
|
+
return false;
|
|
60
|
+
}
|
|
61
|
+
return await validateTUPPProxy(address, adminAddress);
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
};
|
|
67
|
+
exports.isTUPPPattern = isTUPPPattern;
|
|
68
|
+
const resolveImplementationAddress = async (address) => {
|
|
69
|
+
if (await (0, exports.isTUPPPattern)(address)) {
|
|
70
|
+
return (0, exports.getTUPPImplementationAddress)(address);
|
|
71
|
+
}
|
|
72
|
+
// Beacon not required because we only change upgradeability ownership - on UpgradeableBeacon
|
|
73
|
+
return address;
|
|
74
|
+
};
|
|
75
|
+
const hasFunctionSelector = async (address, signature) => {
|
|
76
|
+
const iface = new hardhat_1.ethers.Interface([`function ${signature}`]);
|
|
77
|
+
const toSlice = "0x".length;
|
|
78
|
+
const selector = iface.getFunction(signature)?.selector.slice(toSlice).toLowerCase();
|
|
79
|
+
if (!selector) {
|
|
80
|
+
throw new Error(`Invalid function signature: ${signature}`);
|
|
81
|
+
}
|
|
82
|
+
const implementationAddress = await resolveImplementationAddress(address);
|
|
83
|
+
const bytecode = (await hardhat_1.ethers.provider.getCode(implementationAddress)).toLowerCase();
|
|
84
|
+
// May very rarely cause false positives - But user verifies findings
|
|
85
|
+
return bytecode.includes(selector);
|
|
86
|
+
};
|
|
87
|
+
exports.hasFunctionSelector = hasFunctionSelector;
|
|
88
|
+
const isMultisig = async (contractAddress) => {
|
|
89
|
+
try {
|
|
90
|
+
const resolvedAddress = await hardhat_1.ethers.resolveAddress(contractAddress);
|
|
91
|
+
if (!await (0, exports.isContractAddress)(resolvedAddress)) {
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
94
|
+
const contract = new hardhat_1.ethers.Contract(resolvedAddress, constants_1.MULTISIG_ABI, hardhat_1.ethers.provider);
|
|
95
|
+
const owners = await contract.getOwners();
|
|
96
|
+
const threshold = Number(await contract.getThreshold());
|
|
97
|
+
const minOwnersRequired = 1;
|
|
98
|
+
return owners.length >= minOwnersRequired &&
|
|
99
|
+
threshold >= minOwnersRequired &&
|
|
100
|
+
threshold <= owners.length;
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
// We prefer false negatives here than false positives - user should check Network/RPC issues
|
|
104
|
+
return false;
|
|
105
|
+
}
|
|
106
|
+
};
|
|
107
|
+
exports.isMultisig = isMultisig;
|
|
108
|
+
/*
|
|
109
|
+
* Checks if the contract follows the Beacon Proxy Pattern.
|
|
110
|
+
* A Beacon proxy has a beacon address in the ERC1967 beacon slot,
|
|
111
|
+
* or it might be a beacon contract itself with an owner() function.
|
|
112
|
+
*/
|
|
113
|
+
const isBeaconPattern = async (address) => {
|
|
114
|
+
try {
|
|
115
|
+
const contract = new hardhat_1.ethers.Contract(address, constants_1.UPGRADEABLE_BEACON_ABI, hardhat_1.ethers.provider);
|
|
116
|
+
const implementation = await contract.implementation();
|
|
117
|
+
const owner = await contract.owner();
|
|
118
|
+
const interfaceHasUpgradeTo = await (0, exports.hasFunctionSelector)(address, "upgradeTo(address)");
|
|
119
|
+
return owner !== hardhat_1.ethers.ZeroAddress &&
|
|
120
|
+
implementation !== hardhat_1.ethers.ZeroAddress &&
|
|
121
|
+
await (0, exports.isContractAddress)(implementation) &&
|
|
122
|
+
interfaceHasUpgradeTo;
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
return false;
|
|
126
|
+
}
|
|
127
|
+
};
|
|
128
|
+
exports.isBeaconPattern = isBeaconPattern;
|
|
129
|
+
/*
|
|
130
|
+
* Identifies the proxy pattern for a given address by checking:
|
|
131
|
+
* 1. TUPP (Transparent Upgradeable Proxy Pattern)
|
|
132
|
+
* 2. BEACON pattern
|
|
133
|
+
* 3. REGULAR (non-proxy contract)
|
|
134
|
+
*/
|
|
135
|
+
const identifyProxyPattern = async (address) => {
|
|
136
|
+
const isTUPP = await (0, exports.isTUPPPattern)(address);
|
|
137
|
+
if (isTUPP) {
|
|
138
|
+
return Pattern.TUPP;
|
|
139
|
+
}
|
|
140
|
+
const isBeacon = await (0, exports.isBeaconPattern)(address);
|
|
141
|
+
if (isBeacon) {
|
|
142
|
+
return Pattern.BEACON;
|
|
143
|
+
}
|
|
144
|
+
return Pattern.REGULAR;
|
|
145
|
+
};
|
|
146
|
+
exports.identifyProxyPattern = identifyProxyPattern;
|
|
147
|
+
/*
|
|
148
|
+
* Prompts the user for confirmation via command line input.
|
|
149
|
+
* Accepts "yes" or "y" (case-insensitive) as confirmation.
|
|
150
|
+
* Returns a Promise that resolves to true if confirmed, false otherwise.
|
|
151
|
+
*/
|
|
152
|
+
const promptUserConfirmation = (message) => {
|
|
153
|
+
const rl = readline_1.default.createInterface({
|
|
154
|
+
"input": process.stdin,
|
|
155
|
+
"output": process.stdout
|
|
156
|
+
});
|
|
157
|
+
const msg = message || "Do you confirm these findings?";
|
|
158
|
+
return new Promise((resolve) => {
|
|
159
|
+
rl.question(chalk_1.default.yellow(`${msg} (yes/y to confirm): `), (answer) => {
|
|
160
|
+
rl.close();
|
|
161
|
+
const normalizedAnswer = answer.trim().toLowerCase();
|
|
162
|
+
resolve(normalizedAnswer === "yes" || normalizedAnswer === "y");
|
|
163
|
+
});
|
|
164
|
+
});
|
|
165
|
+
};
|
|
166
|
+
exports.promptUserConfirmation = promptUserConfirmation;
|
|
167
|
+
/*
|
|
168
|
+
* Detects the proxy pattern used by a contract at the given address.
|
|
169
|
+
*/
|
|
170
|
+
const detectPattern = async (address) => {
|
|
171
|
+
try {
|
|
172
|
+
const resolvedAddress = await hardhat_1.ethers.resolveAddress(address);
|
|
173
|
+
const isContract = await (0, exports.isContractAddress)(resolvedAddress);
|
|
174
|
+
if (!isContract) {
|
|
175
|
+
throw new Error(`Address ${address} is not a contract. Stopping...`);
|
|
176
|
+
}
|
|
177
|
+
return await (0, exports.identifyProxyPattern)(resolvedAddress);
|
|
178
|
+
}
|
|
179
|
+
catch (error) {
|
|
180
|
+
console.error(`Error detecting pattern for address ${address}:`, error);
|
|
181
|
+
return Pattern.REGULAR;
|
|
182
|
+
}
|
|
183
|
+
};
|
|
184
|
+
exports.detectPattern = detectPattern;
|
|
185
|
+
const removeDuplicateTransactions = (items) => {
|
|
186
|
+
const seen = new Set();
|
|
187
|
+
return items.filter((item) => {
|
|
188
|
+
/*
|
|
189
|
+
* Create a unique composite key for the 'to' and 'data' pair.
|
|
190
|
+
* We use a separator ('|') to ensure 'a' + 'bc' doesn't clash with 'ab' + 'c'
|
|
191
|
+
*/
|
|
192
|
+
const uniqueKey = `${item.transaction.to}|${item.transaction.data}`;
|
|
193
|
+
if (seen.has(uniqueKey)) {
|
|
194
|
+
return false;
|
|
195
|
+
}
|
|
196
|
+
seen.add(uniqueKey);
|
|
197
|
+
return true;
|
|
198
|
+
});
|
|
199
|
+
};
|
|
200
|
+
exports.removeDuplicateTransactions = removeDuplicateTransactions;
|
|
201
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/ownership-transfer/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { AddressLike, Transaction } from "ethers";
|
|
2
|
+
import { NonceProvider } from "./nonceProvider";
|
|
3
|
+
export declare abstract class ProxyUpgrader {
|
|
4
|
+
protected proxyAddress: AddressLike;
|
|
5
|
+
protected newImplementationAddress: AddressLike | null;
|
|
6
|
+
private contractName;
|
|
7
|
+
private nonceProvider?;
|
|
8
|
+
constructor(contractName: string, proxyAddress: AddressLike, nonceProvider?: NonceProvider);
|
|
9
|
+
deployNewImplementation(): Promise<void>;
|
|
10
|
+
needsUpgrade(): boolean;
|
|
11
|
+
getUpgradeTransaction(): Promise<Transaction>;
|
|
12
|
+
getContractName(): string;
|
|
13
|
+
getNewImplementationAddress(): AddressLike;
|
|
14
|
+
abstract getOwner(): Promise<string>;
|
|
15
|
+
protected abstract makeUpgradeTransaction(): Promise<Transaction>;
|
|
16
|
+
protected abstract getCurrentImplementationAddress(): Promise<AddressLike>;
|
|
17
|
+
private prepareUpgrade;
|
|
18
|
+
private resolveDeployment;
|
|
19
|
+
}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ProxyUpgrader = void 0;
|
|
7
|
+
const ethers_1 = require("ethers");
|
|
8
|
+
const hardhat_1 = require("hardhat");
|
|
9
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
10
|
+
const contractFactory_1 = require("./contractFactory");
|
|
11
|
+
// 10 minutes
|
|
12
|
+
const deployTimeout = 60e4;
|
|
13
|
+
class ProxyUpgrader {
|
|
14
|
+
constructor(contractName, proxyAddress, nonceProvider) {
|
|
15
|
+
this.newImplementationAddress = null;
|
|
16
|
+
this.contractName = contractName;
|
|
17
|
+
this.proxyAddress = proxyAddress;
|
|
18
|
+
this.nonceProvider = nonceProvider;
|
|
19
|
+
}
|
|
20
|
+
// Public
|
|
21
|
+
async deployNewImplementation() {
|
|
22
|
+
const contractFactory = await (0, contractFactory_1.getContractFactoryAndUpdateManifest)(this.contractName, this.nonceProvider);
|
|
23
|
+
console.log(`Prepare upgrade of ${this.contractName}`);
|
|
24
|
+
return this.prepareUpgrade(contractFactory);
|
|
25
|
+
}
|
|
26
|
+
needsUpgrade() {
|
|
27
|
+
return this.newImplementationAddress !== null;
|
|
28
|
+
}
|
|
29
|
+
async getUpgradeTransaction() {
|
|
30
|
+
if (this.newImplementationAddress === null) {
|
|
31
|
+
throw new Error(`Upgrade of ${this.contractName} is not prepared or not needed`);
|
|
32
|
+
}
|
|
33
|
+
const infoMessage = `Prepare transaction to upgrade ${this.contractName}` +
|
|
34
|
+
` at ${this.proxyAddress}` +
|
|
35
|
+
` to ${this.newImplementationAddress}`;
|
|
36
|
+
console.log(chalk_1.default.yellowBright(infoMessage));
|
|
37
|
+
return await this.makeUpgradeTransaction();
|
|
38
|
+
}
|
|
39
|
+
getContractName() {
|
|
40
|
+
return this.contractName;
|
|
41
|
+
}
|
|
42
|
+
getNewImplementationAddress() {
|
|
43
|
+
if (this.newImplementationAddress === null) {
|
|
44
|
+
throw new Error(`There is no new implementation address for ${this.contractName}`);
|
|
45
|
+
}
|
|
46
|
+
return this.newImplementationAddress;
|
|
47
|
+
}
|
|
48
|
+
// Private
|
|
49
|
+
async prepareUpgrade(contractFactory) {
|
|
50
|
+
const currentImplementationAddress = await this.getCurrentImplementationAddress();
|
|
51
|
+
const nonce = this.nonceProvider?.reserveNonce();
|
|
52
|
+
const response = await hardhat_1.upgrades.prepareUpgrade(await hardhat_1.ethers.resolveAddress(this.proxyAddress), contractFactory, {
|
|
53
|
+
"getTxResponse": true,
|
|
54
|
+
"timeout": deployTimeout,
|
|
55
|
+
"txOverrides": {
|
|
56
|
+
nonce
|
|
57
|
+
},
|
|
58
|
+
"unsafeAllowLinkedLibraries": true,
|
|
59
|
+
"unsafeAllowRenames": true
|
|
60
|
+
});
|
|
61
|
+
// Resolves the deployment, getting the address and releasing nonce if needed
|
|
62
|
+
const newImplementationAddress = await this.resolveDeployment(response, nonce);
|
|
63
|
+
if (newImplementationAddress === currentImplementationAddress) {
|
|
64
|
+
console.log(chalk_1.default.gray(`Contract ${this.contractName} is up to date`));
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
this.newImplementationAddress = newImplementationAddress;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
async resolveDeployment(response, nonce) {
|
|
71
|
+
// If return is valid address, means no deployment transaction was required
|
|
72
|
+
if ((0, ethers_1.isAddress)(response)) {
|
|
73
|
+
if (nonce) {
|
|
74
|
+
this.nonceProvider?.releaseNonce(nonce);
|
|
75
|
+
}
|
|
76
|
+
return response;
|
|
77
|
+
}
|
|
78
|
+
const receipt = await response.wait();
|
|
79
|
+
if (!receipt) {
|
|
80
|
+
throw new Error(`Failed to get receipt for deployment transaction`);
|
|
81
|
+
}
|
|
82
|
+
if (!receipt.contractAddress) {
|
|
83
|
+
throw new Error(`Failed to get contract address from deployment receipt`);
|
|
84
|
+
}
|
|
85
|
+
return receipt.contractAddress;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
exports.ProxyUpgrader = ProxyUpgrader;
|
|
89
|
+
//# sourceMappingURL=proxyUpgrader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxyUpgrader.js","sourceRoot":"","sources":["../../src/proxyUpgrader.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA4E;AAC5E,qCAAyC;AAGzC,kDAA0B;AAC1B,uDAAsE;AAGtE,gCAAgC;AAChC,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B,MAAsB,aAAa;IAM/B,YACI,YAAoB,EACpB,YAAyB,EACzB,aAA6B;QAPvB,6BAAwB,GAAuB,IAAI,CAAC;QAS1D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED,SAAS;IAEF,KAAK,CAAC,uBAAuB;QAChC,MAAM,eAAe,GAAG,MAAM,IAAA,qDAAmC,EAC7D,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,aAAa,CACrB,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,wBAAwB,KAAK,IAAI,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAC9B,IAAI,IAAI,CAAC,wBAAwB,KAAK,IAAI,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACX,cAAc,IAAI,CAAC,YAAY,gCAAgC,CAClE,CAAC;QACN,CAAC;QACD,MAAM,WAAW,GACb,kCAAkC,IAAI,CAAC,YAAY,EAAE;YACrD,OAAO,IAAI,CAAC,YAAY,EAAE;YAC1B,OAAO,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC;QAC7C,OAAO,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAC/C,CAAC;IAEM,eAAe;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEM,2BAA2B;QAC9B,IAAI,IAAI,CAAC,wBAAwB,KAAK,IAAI,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACX,8CAA8C,IAAI,CAAC,YAAY,EAAE,CACpE,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACzC,CAAC;IASD,UAAU;IAEF,KAAK,CAAC,cAAc,CAAC,eAAgC;QACzD,MAAM,4BAA4B,GAAG,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAElF,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC;QAEjD,MAAM,QAAQ,GAAG,MAAM,kBAAQ,CAAC,cAAc,CAC1C,MAAM,gBAAM,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,EAC9C,eAAe,EACf;YACI,eAAe,EAAE,IAAI;YACrB,SAAS,EAAE,aAAa;YACxB,aAAa,EAAE;gBACX,KAAK;aACR;YACD,4BAA4B,EAAE,IAAI;YAClC,oBAAoB,EAAE,IAAI;SAC7B,CACJ,CAAC;QACF,6EAA6E;QAC7E,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAE/E,IAAI,wBAAwB,KAAK,4BAA4B,EAAE,CAAC;YAC5D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,gBAAgB,CAAC,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QAC7D,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,QAAsC,EAAE,KAAc;QAClF,2EAA2E;QAC3E,IAAI,IAAA,kBAAS,EAAC,QAAQ,CAAC,EAAE,CAAC;YACtB,IAAI,KAAK,EAAE,CAAC;gBACR,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtC,IAAG,CAAC,OAAO,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,OAAO,CAAC,eAAe,CAAC;IACnC,CAAC;CACJ;AAhHD,sCAgHC"}
|
|
@@ -4,6 +4,7 @@ import { Upgrader } from "../upgrader";
|
|
|
4
4
|
export declare class AutoSubmitter extends Submitter {
|
|
5
5
|
name: string;
|
|
6
6
|
upgrader: Upgrader;
|
|
7
|
+
submitter: Submitter | undefined;
|
|
7
8
|
constructor(upgrader: Upgrader);
|
|
8
9
|
static marionetteInterface: {
|
|
9
10
|
inputs: never[];
|
|
@@ -17,6 +18,8 @@ export declare class AutoSubmitter extends Submitter {
|
|
|
17
18
|
type: string;
|
|
18
19
|
}[];
|
|
19
20
|
submit(transactions: Transaction[]): Promise<void>;
|
|
21
|
+
isAtomicSubmitter(): Promise<boolean>;
|
|
22
|
+
private loadSubmitter;
|
|
20
23
|
private getSubmitter;
|
|
21
24
|
private static getSubmitterForContractOwner;
|
|
22
25
|
private static getImaInstance;
|
|
@@ -22,10 +22,19 @@ class AutoSubmitter extends submitter_1.Submitter {
|
|
|
22
22
|
}
|
|
23
23
|
async submit(transactions) {
|
|
24
24
|
console.log(`Submit via ${this.name}`);
|
|
25
|
-
|
|
26
|
-
await submitter.submit(transactions);
|
|
25
|
+
await this.loadSubmitter();
|
|
26
|
+
await this.submitter.submit(transactions);
|
|
27
|
+
}
|
|
28
|
+
async isAtomicSubmitter() {
|
|
29
|
+
await this.loadSubmitter();
|
|
30
|
+
return this.submitter.isAtomicSubmitter();
|
|
27
31
|
}
|
|
28
32
|
// Private
|
|
33
|
+
async loadSubmitter() {
|
|
34
|
+
if (!this.submitter) {
|
|
35
|
+
this.submitter = await this.getSubmitter();
|
|
36
|
+
}
|
|
37
|
+
}
|
|
29
38
|
async getSubmitter() {
|
|
30
39
|
const owner = await this.upgrader.getOwner();
|
|
31
40
|
if (await hardhat_1.ethers.provider.getCode(owner) === "0x") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-submitter.js","sourceRoot":"","sources":["../../../src/submitters/auto-submitter.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAoD;AACpD,4CAAwC;AACxC,mDAA6C;AAC7C,mDAAsD;AACtD,iGAEgD;AAChD,qDAA+C;AAC/C,2CAAsC;AAEtC,kDAA0B;AAC1B,qCAA+B;AAC/B,uFAAuE;AAGvE,MAAa,aAAc,SAAQ,qBAAS;
|
|
1
|
+
{"version":3,"file":"auto-submitter.js","sourceRoot":"","sources":["../../../src/submitters/auto-submitter.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAoD;AACpD,4CAAwC;AACxC,mDAA6C;AAC7C,mDAAsD;AACtD,iGAEgD;AAChD,qDAA+C;AAC/C,2CAAsC;AAEtC,kDAA0B;AAC1B,qCAA+B;AAC/B,uFAAuE;AAGvE,MAAa,aAAc,SAAQ,qBAAS;IAKxC,YACI,QAAkB;QAElB,KAAK,EAAE,CAAC;QAPZ,SAAI,GAAG,gBAAgB,CAAC;QAQpB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAkBD,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3B,MAAM,IAAI,CAAC,SAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC,SAAU,CAAC,iBAAiB,EAAE,CAAC;IAC/C,CAAC;IAED,UAAU;IAEF,KAAK,CAAC,aAAa;QACvB,IAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/C,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,YAAY;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC7C,IAAI,MAAM,gBAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,OAAO,IAAI,4BAAY,EAAE,CAAC;QAC9B,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACnC,OAAO,aAAa,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAE,KAAa;QAC5D,MAAM,cAAc,GAAG,aAAa,CAAC,iBAAiB,EAAE,CAAC;QACzD,IAAI,gBAAM,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,gBAAM,CAAC,UAAU,CAAC,+BAAkB,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;YAE5C,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,cAAc,EAAE,CAAC;YACzD,MAAM,WAAW,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC;YACnD,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,CAAC;YAEjD;;;;;;;;;;;;;;;;;;;;;;;;eAwBG;YACH,OAAO,IAAI,uEAAgC,CACvC,WAAW,EACX,WAAW,EACX;gBACI,cAAc;gBACd,kBAAkB,EAAE,UAAU;aACjC,CACJ,CAAC;QACN,CAAC;QAED,kCAAkC;QAClC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACjC,OAAO,IAAI,8BAAa,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACpD,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,cAAc;QAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB;gBACxC,8BAA8B,CAAC,CAAC,CAAC;YACrC,OAAO,CAAC,IAAI,CAAC,sBAAU,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sBAAsB;gBACxC,2CAA2C,CAAC,CAAC,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,sBAAU,CAAC,wBAAwB,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,eAAe,GAAG,IAAI,wBAAe,CACvC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAC/B,CAAC;QACF,MAAM,gBAAgB,GAClB,MAAM,0CAAc,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,gBAAgB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACvD,OAAO,MAAM,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IAEO,MAAM,CAAC,cAAc;QACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,+BAA+B;gBACjD,uCAAuC,CAAC,CAAC,CAAC;YAC9C,OAAO,CAAC,IAAI,CAAC,sBAAU,CAAC,oBAAoB,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;IACpC,CAAC;IAEO,MAAM,CAAC,aAAa;QACxB,mCAAmC;QACnC,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QACnC,CAAC;QACD,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAC1B,OAAO,gBAAM,CAAC,uBAAuB,CACjC,CAAC,QAAQ,CAAC,EACV,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAC5B,CAAC;QACN,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,iBAAiB;YACnC,sCAAsC,CAAC,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,gBAAgB;YAClC,sCAAsC,CAAC,CAAC,CAAC;QAC7C,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACrC,CAAC;IAEO,MAAM,CAAC,iBAAiB;QAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,wBAAwB;YAC1C,2CAA2C,CAAC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,4BAA4B;YAC9C,kBAAkB,CAAC,CAAC,CAAC;QACzB,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC9C,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,sBAAsB;QACvC,MAAM,QAAQ,GAAG,MAAM,gBAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,+BAAkB,CAAC,CAAC;QACnE,MAAM,eAAe,GAAG,CAAC,CAAC;QAC1B,MAAM,cAAc,GAAG,EAAE,CAAC;QAE1B;;;WAGG;QACH,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAM,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,KAAK,CAC/C,eAAe,EACf,cAAc,CACjB,CAAC,EAAE,CAAC;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,gBAAM,CAAC,QAAQ,CAClC,+BAAkB,EAClB,aAAa,CAAC,mBAAmB,EACjC,gBAAM,CAAC,QAAQ,CAClB,CAAC;QAEF;;;WAGG;QACH,IAAI,CAAC;YACD,MAAM,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YACL;;;;eAIG;YACH,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;;AA3ML,sCA4MC;AAhMU,iCAAmB,GAAG;IACzB;QACI,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE;YACP;gBACI,cAAc,EAAE,QAAQ;gBACxB,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,QAAQ;aACnB;SACJ;QACD,iBAAiB,EAAE,MAAM;QACzB,MAAM,EAAE,UAAU;KACrB;CACJ,AAdyB,CAcxB"}
|
|
@@ -9,7 +9,6 @@ class EoaSubmitter extends submitter_1.Submitter {
|
|
|
9
9
|
this.name = "EOA Submitter";
|
|
10
10
|
}
|
|
11
11
|
async submit(transactions) {
|
|
12
|
-
EoaSubmitter.atomicityWarning();
|
|
13
12
|
const [deployer] = await hardhat_1.ethers.getSigners();
|
|
14
13
|
console.log(`Send transaction via ${this.name}`);
|
|
15
14
|
/*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eoa-submitter.js","sourceRoot":"","sources":["../../../src/submitters/eoa-submitter.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qCAA+B;AAG/B,MAAa,YAAa,SAAQ,qBAAS;IAA3C;;QACI,SAAI,GAAG,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"eoa-submitter.js","sourceRoot":"","sources":["../../../src/submitters/eoa-submitter.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qCAA+B;AAG/B,MAAa,YAAa,SAAQ,qBAAS;IAA3C;;QACI,SAAI,GAAG,eAAe,CAAC;IAwB3B,CAAC;IAtBG,KAAK,CAAC,MAAM,CAAE,YAA2B;QACrC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD;;;;;WAKG;QACH,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;YAC5B,qCAAqC;YACrC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,eAAe,CAAC;gBAClD,IAAI,EAAE,EAAE,CAAC,IAAI;gBACb,EAAE,EAAE,EAAE,CAAC,EAAE;gBACT,KAAK,EAAE,EAAE,CAAC,KAAK;aAClB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,+BAA+B,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IACvD,CAAC;CACJ;AAzBD,oCAyBC"}
|
|
@@ -41,10 +41,6 @@ class SafeImaLegacyMarionetteSubmitter extends safe_to_ima_submitter_1.SafeToIma
|
|
|
41
41
|
]), hardhat_1.ethers.provider);
|
|
42
42
|
}
|
|
43
43
|
async submit(transactions) {
|
|
44
|
-
const singleTransaction = 1;
|
|
45
|
-
if (transactions.length > singleTransaction) {
|
|
46
|
-
SafeImaLegacyMarionetteSubmitter.atomicityWarning();
|
|
47
|
-
}
|
|
48
44
|
const marionetteAddress = await this.marionette.getAddress();
|
|
49
45
|
const transactionsToMarionette = (await Promise.all(transactions.
|
|
50
46
|
map((transaction) => this.marionette.encodeFunctionCall(transaction.to ?? hardhat_1.ethers.ZeroAddress, transaction.value, transaction.data)))).map((data) => ethers_1.Transaction.from({
|