quais 0.2.0 → 0.2.2
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.
|
@@ -69,10 +69,10 @@ class AbstractSigner {
|
|
|
69
69
|
}
|
|
70
70
|
// Do not allow mixing pre-eip-1559 and eip-1559 properties
|
|
71
71
|
const hasEip1559 = (pop.maxFeePerGas != null || pop.maxPriorityFeePerGas != null);
|
|
72
|
-
if (pop.gasPrice != null && (pop.type ===
|
|
72
|
+
if (pop.gasPrice != null && (pop.type === 0 || hasEip1559)) {
|
|
73
73
|
(0, index_js_3.assertArgument)(false, "eip-1559 transaction do not support gasPrice", "tx", tx);
|
|
74
74
|
}
|
|
75
|
-
else if ((pop.type === 0
|
|
75
|
+
else if ((pop.type === 0) && !hasEip1559) {
|
|
76
76
|
(0, index_js_3.assertArgument)(false, "pre-eip-1559 transaction do not support maxFeePerGas/maxPriorityFeePerGas", "tx", tx);
|
|
77
77
|
}
|
|
78
78
|
if ((pop.type === 0 || pop.type == null) && (pop.maxFeePerGas != null && pop.maxPriorityFeePerGas != null)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-signer.js","sourceRoot":"","sources":["../../src.ts/providers/abstract-signer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"abstract-signer.js","sourceRoot":"","sources":["../../src.ts/providers/abstract-signer.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,10 +66,10 @@ export class AbstractSigner {
|
|
|
66
66
|
}
|
|
67
67
|
// Do not allow mixing pre-eip-1559 and eip-1559 properties
|
|
68
68
|
const hasEip1559 = (pop.maxFeePerGas != null || pop.maxPriorityFeePerGas != null);
|
|
69
|
-
if (pop.gasPrice != null && (pop.type ===
|
|
69
|
+
if (pop.gasPrice != null && (pop.type === 0 || hasEip1559)) {
|
|
70
70
|
assertArgument(false, "eip-1559 transaction do not support gasPrice", "tx", tx);
|
|
71
71
|
}
|
|
72
|
-
else if ((pop.type === 0
|
|
72
|
+
else if ((pop.type === 0) && !hasEip1559) {
|
|
73
73
|
assertArgument(false, "pre-eip-1559 transaction do not support maxFeePerGas/maxPriorityFeePerGas", "tx", tx);
|
|
74
74
|
}
|
|
75
75
|
if ((pop.type === 0 || pop.type == null) && (pop.maxFeePerGas != null && pop.maxPriorityFeePerGas != null)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-signer.js","sourceRoot":"","sources":["../../src.ts/providers/abstract-signer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"abstract-signer.js","sourceRoot":"","sources":["../../src.ts/providers/abstract-signer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -122,7 +122,7 @@
|
|
|
122
122
|
},
|
|
123
123
|
"repository": {
|
|
124
124
|
"type": "git",
|
|
125
|
-
"url": "git://github.com/
|
|
125
|
+
"url": "git://github.com/dominant-strategies/quais.js.git"
|
|
126
126
|
},
|
|
127
127
|
"scripts": {
|
|
128
128
|
"_build-dist": "rollup -c && uglifyjs ./dist/quais.js -o ./dist/quais.min.js && uglifyjs ./dist/quais.umd.js -o ./dist/quais.umd.min.js && uglifyjs ./dist/wordlists-extra.js -o ./dist/wordlists-extra.min.js && cp ./output/post-build/dist/* ./dist/",
|
|
@@ -146,5 +146,5 @@
|
|
|
146
146
|
"sideEffects": false,
|
|
147
147
|
"type": "module",
|
|
148
148
|
"types": "./types/index.d.ts",
|
|
149
|
-
"version": "0.2.
|
|
149
|
+
"version": "0.2.2"
|
|
150
150
|
}
|
|
@@ -93,9 +93,9 @@ export abstract class AbstractSigner<P extends null | Provider = null | Provider
|
|
|
93
93
|
|
|
94
94
|
// Do not allow mixing pre-eip-1559 and eip-1559 properties
|
|
95
95
|
const hasEip1559 = (pop.maxFeePerGas != null || pop.maxPriorityFeePerGas != null);
|
|
96
|
-
if (pop.gasPrice != null && (pop.type ===
|
|
96
|
+
if (pop.gasPrice != null && (pop.type === 0 || hasEip1559)) {
|
|
97
97
|
assertArgument(false, "eip-1559 transaction do not support gasPrice", "tx", tx);
|
|
98
|
-
} else if ((pop.type === 0
|
|
98
|
+
} else if ((pop.type === 0) && !hasEip1559) {
|
|
99
99
|
assertArgument(false, "pre-eip-1559 transaction do not support maxFeePerGas/maxPriorityFeePerGas", "tx", tx);
|
|
100
100
|
}
|
|
101
101
|
|