@1inch/solidity-utils 2.2.28 → 2.3.0
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 +1 -0
- package/dist/src/prelude.d.ts +1 -0
- package/dist/src/prelude.js +1 -0
- package/dist/src/prelude.js.map +1 -1
- package/dist/src/utils.d.ts +20 -1
- package/dist/src/utils.js +35 -2
- package/dist/src/utils.js.map +1 -1
- package/package.json +3 -1
package/README.md
CHANGED
|
@@ -40,6 +40,7 @@ This repository contains frequently used smart contracts, libraries and interfac
|
|
|
40
40
|
|utils|`fixSignature(signature)`|patchs ganache's signature to geth's version|
|
|
41
41
|
|utils|`signMessage(signer, messageHex) `|signs `messageHex` with `signer` and patchs ganache's signature to geth's version|
|
|
42
42
|
|utils|`countInstructions(txHash, instruction)`|counts amount of `instruction` in transaction with `txHash` hash|
|
|
43
|
+
|utils|`deployAndGetContract(contractName, constructorArgs, deployments, deployer, deploymentName, skipVerify, skipIfAlreadyDeployed, gasPrice, maxPriorityFeePerGas, maxFeePerGas, log, waitConfirmations)`|deploys contract `contractName` as `deploymentName` if not `skipIfAlreadyDeployed` with `constructorArgs` from `deployer` using `hardhat-deploy` `deployments` with additional gas options `gasPrice`, `maxPriorityFeePerGas` and `maxFeePerGas` and outputs results to the console if `log`. Tries to verify it after `waitConfirmations` on Etherscan if not `skipVerify`.|
|
|
43
44
|
|profileEVM|`profileEVM(txHash, instruction, optionalTraceFile)`|the same as the `countInstructions()` with option of writing all trace to `optionalTraceFile`|
|
|
44
45
|
|profileEVM|`gasspectEVM(txHash, options, optionalTraceFile)`|returns all used operations in `txHash` transaction with `options` and their costs with option of writing all trace to `optionalTraceFile`|
|
|
45
46
|
|
package/dist/src/prelude.d.ts
CHANGED
package/dist/src/prelude.js
CHANGED
package/dist/src/prelude.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prelude.js","sourceRoot":"","sources":["../../src/prelude.ts"],"names":[],"mappings":";;;AAAA,+BAAiF;
|
|
1
|
+
{"version":3,"file":"prelude.js","sourceRoot":"","sources":["../../src/prelude.ts"],"names":[],"mappings":";;;AAAA,+BAAiF;AAyBxE,0FAzBA,gBAAS,OAyBA;AAAE,+FAzBA,qBAAc,OAyBA;AAAE,uFAzBA,aAAM,OAyBA;AAAE,uFAzBA,aAAM,OAyBA;AAAE,uFAzBA,aAAM,OAyBA;AAAE,uFAzBA,aAAM,OAyBA;AAxBlE,4CAA8C;AAC9C,sFAAgE;AAgBvD,qFAhBA,8BAAI,OAgBA;AAdA,QAAA,SAAS,GAAG;IACrB,YAAY,EAAE,4CAA4C;IAC1D,WAAW,EAAE,4CAA4C;IACzD,YAAY,EAAE,oEAAoE;IAClF,WAAW,EAAE,EAAE,IAAI,IAAI,GAAG,EAAE;IAC5B,UAAU,EAAE,EAAE,IAAI,IAAI,GAAG,EAAE;IAC3B,UAAU,EAAE,EAAE,IAAI,GAAG,GAAG,EAAE;IAC1B,UAAU,EAAE,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC;IACzB,WAAW,EAAE,EAAE,IAAI,IAAI,GAAG,EAAE;IAC5B,UAAU,EAAE,EAAE,IAAI,GAAG,GAAG,EAAE;IAC1B,UAAU,EAAE,CAAC,SAAS,EAAE,WAAW,CAAa;CAC1C,CAAC;AAKX,SAAgB,KAAK,CAAC,CAAS;IAC3B,OAAO,IAAA,kBAAU,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC;AAFD,sBAEC"}
|
package/dist/src/utils.d.ts
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
import { constants } from './prelude';
|
|
2
|
-
import { providers, Wallet, Contract, Bytes, ContractTransaction, BigNumberish } from 'ethers';
|
|
2
|
+
import { providers, Wallet, Contract, Bytes, ContractTransaction, BigNumberish, BigNumber } from 'ethers';
|
|
3
|
+
import { DeployOptions, DeployResult } from 'hardhat-deploy/types';
|
|
4
|
+
interface DeployContractOptions {
|
|
5
|
+
contractName: string;
|
|
6
|
+
constructorArgs?: any[];
|
|
7
|
+
deployments: {
|
|
8
|
+
deploy: (name: string, options: DeployOptions) => Promise<DeployResult>;
|
|
9
|
+
};
|
|
10
|
+
deployer: string;
|
|
11
|
+
deploymentName?: string;
|
|
12
|
+
skipVerify?: boolean;
|
|
13
|
+
skipIfAlreadyDeployed?: boolean;
|
|
14
|
+
gasPrice?: BigNumber;
|
|
15
|
+
maxPriorityFeePerGas?: BigNumber;
|
|
16
|
+
maxFeePerGas?: BigNumber;
|
|
17
|
+
log?: boolean;
|
|
18
|
+
waitConfirmations?: number;
|
|
19
|
+
}
|
|
20
|
+
export declare function deployAndGetContract({ contractName, constructorArgs, deployments, deployer, deploymentName, skipVerify, skipIfAlreadyDeployed, gasPrice, maxPriorityFeePerGas, maxFeePerGas, log, waitConfirmations, }: DeployContractOptions): Promise<Contract>;
|
|
3
21
|
export declare function timeIncreaseTo(seconds: number | string): Promise<void>;
|
|
4
22
|
export declare function deployContract(name: string, parameters?: Array<BigNumberish>): Promise<Contract>;
|
|
5
23
|
export declare function trackReceivedTokenAndTx<T extends unknown[]>(provider: providers.JsonRpcProvider, token: Contract | {
|
|
@@ -10,3 +28,4 @@ export declare function trackReceivedTokenAndTx<T extends unknown[]>(provider: p
|
|
|
10
28
|
export declare function fixSignature(signature: string): string;
|
|
11
29
|
export declare function signMessage(signer: Wallet, messageHex?: string | Bytes): Promise<string>;
|
|
12
30
|
export declare function countInstructions(provider: providers.JsonRpcProvider, txHash: string, instructions: string[]): Promise<number[]>;
|
|
31
|
+
export {};
|
package/dist/src/utils.js
CHANGED
|
@@ -1,9 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.countInstructions = exports.signMessage = exports.fixSignature = exports.trackReceivedTokenAndTx = exports.deployContract = exports.timeIncreaseTo = void 0;
|
|
3
|
+
exports.countInstructions = exports.signMessage = exports.fixSignature = exports.trackReceivedTokenAndTx = exports.deployContract = exports.timeIncreaseTo = exports.deployAndGetContract = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const prelude_1 = require("./prelude");
|
|
5
|
-
const hardhat_1 = require("hardhat");
|
|
6
|
+
const hardhat_1 = tslib_1.__importStar(require("hardhat"));
|
|
6
7
|
const hardhat_network_helpers_1 = require("@nomicfoundation/hardhat-network-helpers");
|
|
8
|
+
async function deployAndGetContract({ contractName, constructorArgs, deployments, deployer, deploymentName = contractName, skipVerify = false, skipIfAlreadyDeployed = true, gasPrice, maxPriorityFeePerGas, maxFeePerGas, log = true, waitConfirmations = prelude_1.constants.DEV_CHAINS.includes(hardhat_1.default.network.name) ? 1 : 6, }) {
|
|
9
|
+
/**
|
|
10
|
+
* Deploys contract and tries to verify it on Etherscan if requested.
|
|
11
|
+
* @remarks
|
|
12
|
+
* If the contract is deployed on a dev chain, verification is skipped.
|
|
13
|
+
* @returns Deployed contract instance
|
|
14
|
+
*/
|
|
15
|
+
const { deploy } = deployments;
|
|
16
|
+
const deployOptions = {
|
|
17
|
+
args: constructorArgs,
|
|
18
|
+
from: deployer,
|
|
19
|
+
contract: contractName,
|
|
20
|
+
skipIfAlreadyDeployed,
|
|
21
|
+
gasPrice,
|
|
22
|
+
maxPriorityFeePerGas,
|
|
23
|
+
maxFeePerGas,
|
|
24
|
+
log,
|
|
25
|
+
waitConfirmations,
|
|
26
|
+
};
|
|
27
|
+
const deployResult = await deploy(deploymentName, deployOptions);
|
|
28
|
+
if (!(skipVerify || prelude_1.constants.DEV_CHAINS.includes(hardhat_1.default.network.name))) {
|
|
29
|
+
await hardhat_1.default.run('verify:verify', {
|
|
30
|
+
address: deployResult.address,
|
|
31
|
+
constructorArguments: constructorArgs,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
console.log('Skipping verification');
|
|
36
|
+
}
|
|
37
|
+
return await hardhat_1.ethers.getContractAt(contractName, deployResult.address);
|
|
38
|
+
}
|
|
39
|
+
exports.deployAndGetContract = deployAndGetContract;
|
|
7
40
|
async function timeIncreaseTo(seconds) {
|
|
8
41
|
const delay = 1000 - new Date().getMilliseconds();
|
|
9
42
|
await new Promise((resolve) => setTimeout(resolve, delay));
|
package/dist/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAAsC;AACtC,2DAAsC;AACtC,sFAAgE;AAoBzD,KAAK,UAAU,oBAAoB,CAAC,EACvC,YAAY,EACZ,eAAe,EACf,WAAW,EACX,QAAQ,EACR,cAAc,GAAG,YAAY,EAC7B,UAAU,GAAG,KAAK,EAClB,qBAAqB,GAAG,IAAI,EAC5B,QAAQ,EACR,oBAAoB,EACpB,YAAY,EACZ,GAAG,GAAG,IAAI,EACV,iBAAiB,GAAG,mBAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,GACtD;IACpB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAE/B,MAAM,aAAa,GAAkB;QACjC,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,YAAY;QACtB,qBAAqB;QACrB,QAAQ;QACR,oBAAoB;QACpB,YAAY;QACZ,GAAG;QACH,iBAAiB;KACpB,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAEjE,IAAI,CAAC,CAAC,UAAU,IAAI,mBAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;QAClE,MAAM,iBAAG,CAAC,GAAG,CAAC,eAAe,EAAE;YAC3B,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,oBAAoB,EAAE,eAAe;SACxC,CAAC,CAAC;KACN;SAAM;QACH,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;KACxC;IACD,OAAO,MAAM,gBAAM,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;AAC1E,CAAC;AA5CD,oDA4CC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAwB;IACzD,MAAM,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,eAAe,EAAE,CAAC;IAClD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3D,MAAM,8BAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAJD,wCAIC;AAEM,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,aAAkC,EAAE;IACnF,MAAM,eAAe,GAAG,MAAM,gBAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC;IAC7D,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC1B,OAAO,QAAQ,CAAC;AACpB,CAAC;AALD,wCAKC;AAEM,KAAK,UAAU,uBAAuB,CACzC,QAAmC,EACnC,KAAwG,EACxG,MAAc,EACd,SAAuD,EACvD,GAAG,IAAO;IAEV,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,KAAK,mBAAS,CAAC,YAAY,IAAI,KAAK,CAAC,OAAO,KAAK,mBAAS,CAAC,WAAW,CAAC;IAClG,MAAM,UAAU,GAAG,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;IAEhF,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IAE7C,IAAI,MAAM,IAAI,QAAQ,EAAE;QACpB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,MAAM,GACR,MAAM,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,KAAK;YACzD,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE;YACvE,CAAC,CAAC,EAAE,CAAC;QACb,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;KAC/D;SAAM;QACH,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;KAClD;AACL,CAAC;AAxBD,0DAwBC;AAED,SAAgB,YAAY,CAAC,SAAiB;IAC1C,2EAA2E;IAC3E,2CAA2C;IAC3C,uFAAuF;IACvF,IAAI,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,GAAG,EAAE,EAAE;QACR,CAAC,IAAI,EAAE,CAAC;KACX;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;AAC1C,CAAC;AAVD,oCAUC;AAEM,KAAK,UAAU,WAAW,CAAC,MAAc,EAAE,aAA6B,IAAI;IAC/E,OAAO,YAAY,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;AAC9D,CAAC;AAFD,kCAEC;AAEM,KAAK,UAAU,iBAAiB,CACnC,QAAmC,EACnC,MAAc,EACd,YAAsB;IAEtB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAElC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9B,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACP,CAAC;AAZD,8CAYC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@1inch/solidity-utils",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"main": "dist/src/index.js",
|
|
5
5
|
"types": "dist/src/index.d.ts",
|
|
6
6
|
"repository": {
|
|
@@ -38,6 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@nomicfoundation/hardhat-chai-matchers": "1.0.6",
|
|
41
|
+
"@nomicfoundation/hardhat-verify": "1.0.1",
|
|
41
42
|
"@typechain/ethers-v5": "10.2.0",
|
|
42
43
|
"@typechain/hardhat": "6.1.5",
|
|
43
44
|
"@types/chai": "4.3.4",
|
|
@@ -61,6 +62,7 @@
|
|
|
61
62
|
"eslint-plugin-standard": "5.0.0",
|
|
62
63
|
"ethereumjs-wallet": "1.0.2",
|
|
63
64
|
"hardhat": "2.13.0",
|
|
65
|
+
"hardhat-deploy": "0.11.30",
|
|
64
66
|
"hardhat-gas-reporter": "1.0.9",
|
|
65
67
|
"hardhat-tracer": "2.1.2",
|
|
66
68
|
"prettier": "2.8.7",
|