@ethersproject/contracts - npm Package Compare versions

Comparing version 5.0.0-beta.148 to 5.0.0-beta.149

lib.esm/_version.d.ts

@@ -1,1 +0,1 @@
-export declare const version = "contracts/5.0.0-beta.148";
+export declare const version = "contracts/5.0.0-beta.149";

lib.esm/_version.js

@@ -1,1 +0,1 @@
-export const version = "contracts/5.0.0-beta.148";
+export const version = "contracts/5.0.0-beta.149";

lib.esm/index.js

 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { Indexed, Interface } from "@ethersproject/abi";
@@ -62,3 +71,3 @@ import { Provider } from "@ethersproject/abstract-provider";
                 if (!allowedTransactionKeys[key]) {
-                    logger.throwError(("unknown transaxction override - " + key), "overrides", tx);
+                    logger.throwError(("unknown transaction override - " + key), "overrides", tx);
                 }
@@ -717,3 +726,3 @@ }
         // If we have 1 additional argument, we allow transaction overrides
-        if (args.length === this.interface.deploy.inputs.length + 1) {
+        if (args.length === this.interface.deploy.inputs.length + 1 && typeof (args[args.length - 1]) === "object") {
             tx = shallowCopy(args.pop());
@@ -743,12 +752,21 @@ for (const key in tx) {
     deploy(...args) {
-        return resolveAddresses(this.signer, args, this.interface.deploy.inputs).then((args) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            let overrides = {};
+            // If 1 extra parameter was passed in, it contains overrides
+            if (args.length === this.interface.deploy.inputs.length + 1) {
+                overrides = args.pop();
+            }
+            // Make sure the call matches the constructor signature
+            logger.checkArgumentCount(args.length, this.interface.deploy.inputs.length, " in Contract constructor");
+            // Resolve ENS names and promises in the arguments
+            const params = yield resolveAddresses(this.signer, args, this.interface.deploy.inputs);
+            params.push(overrides);
             // Get the deployment transaction (with optional overrides)
-            const tx = this.getDeployTransaction(...args);
+            const unsignedTx = this.getDeployTransaction(...params);
             // Send the deployment transaction
-            return this.signer.sendTransaction(tx).then((tx) => {
-                const address = (this.constructor).getContractAddress(tx);
-                const contract = (this.constructor).getContract(address, this.interface, this.signer);
-                defineReadOnly(contract, "deployTransaction", tx);
-                return contract;
-            });
+            const tx = yield this.signer.sendTransaction(unsignedTx);
+            const address = getStatic(this.constructor, "getContractAddress")(tx);
+            const contract = getStatic(this.constructor, "getContract")(address, this.interface, this.signer);
+            defineReadOnly(contract, "deployTransaction", tx);
+            return contract;
         });
@@ -755,0 +773,0 @@ }

lib/_version.d.ts

@@ -1,1 +0,1 @@
-export declare const version = "contracts/5.0.0-beta.148";
+export declare const version = "contracts/5.0.0-beta.149";

lib/_version.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = "contracts/5.0.0-beta.148";
+exports.version = "contracts/5.0.0-beta.149";

lib/index.js

@@ -15,2 +15,38 @@ "use strict";
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __spreadArrays = (this && this.__spreadArrays) || function () {
@@ -89,3 +125,3 @@ for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
                 if (!allowedTransactionKeys[key]) {
-                    logger.throwError(("unknown transaxction override - " + key), "overrides", tx);
+                    logger.throwError(("unknown transaction override - " + key), "overrides", tx);
                 }
@@ -779,3 +815,3 @@ }
         // If we have 1 additional argument, we allow transaction overrides
-        if (args.length === this.interface.deploy.inputs.length + 1) {
+        if (args.length === this.interface.deploy.inputs.length + 1 && typeof (args[args.length - 1]) === "object") {
             tx = properties_1.shallowCopy(args.pop());
@@ -805,3 +841,2 @@ for (var key in tx) {
     ContractFactory.prototype.deploy = function () {
-        var _this = this;
         var args = [];
@@ -811,11 +846,27 @@ for (var _i = 0; _i < arguments.length; _i++) {
         }
-        return resolveAddresses(this.signer, args, this.interface.deploy.inputs).then(function (args) {
-            // Get the deployment transaction (with optional overrides)
-            var tx = _this.getDeployTransaction.apply(_this, args);
-            // Send the deployment transaction
-            return _this.signer.sendTransaction(tx).then(function (tx) {
-                var address = (_this.constructor).getContractAddress(tx);
-                var contract = (_this.constructor).getContract(address, _this.interface, _this.signer);
-                properties_1.defineReadOnly(contract, "deployTransaction", tx);
-                return contract;
+        return __awaiter(this, void 0, void 0, function () {
+            var overrides, params, unsignedTx, tx, address, contract;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        overrides = {};
+                        // If 1 extra parameter was passed in, it contains overrides
+                        if (args.length === this.interface.deploy.inputs.length + 1) {
+                            overrides = args.pop();
+                        }
+                        // Make sure the call matches the constructor signature
+                        logger.checkArgumentCount(args.length, this.interface.deploy.inputs.length, " in Contract constructor");
+                        return [4 /*yield*/, resolveAddresses(this.signer, args, this.interface.deploy.inputs)];
+                    case 1:
+                        params = _a.sent();
+                        params.push(overrides);
+                        unsignedTx = this.getDeployTransaction.apply(this, params);
+                        return [4 /*yield*/, this.signer.sendTransaction(unsignedTx)];
+                    case 2:
+                        tx = _a.sent();
+                        address = properties_1.getStatic(this.constructor, "getContractAddress")(tx);
+                        contract = properties_1.getStatic(this.constructor, "getContract")(address, this.interface, this.signer);
+                        properties_1.defineReadOnly(contract, "deployTransaction", tx);
+                        return [2 /*return*/, contract];
+                }
             });
@@ -822,0 +873,0 @@ });

package.json

@@ -35,5 +35,5 @@ {
   },
-  "tarballHash": "0x4ff43d361fce2dcebd688d0f068197f8c95444c5a790620dd453119436c5db15",
+  "tarballHash": "0x0831bbcb34338804b94a0f9a4d177f00308651b2e40e6648e8d6678299c2f0eb",
   "types": "./lib/index.d.ts",
-  "version": "5.0.0-beta.148"
+  "version": "5.0.0-beta.149"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

90341

increased by5.57%

Lines of code

1953

increased by3.66%

No dependency changes