Skip to content
This repository was archived by the owner on Aug 21, 2023. It is now read-only.

Commit 933bff4

Browse files
zomglingszomglings
authored
Merge pull request #30 from bugout-dev/eip1559-support
Added EIP1559 parameters to arguments for all transaction commands
2 parents b119435 + 1c7f70f commit 933bff4

9 files changed

Lines changed: 135 additions & 9 deletions

‎dao/Diamond.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -108,6 +108,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
108108
transaction_config: Dict[str, Any] = {"from": signer}
109109
if args.gas_price is not None:
110110
transaction_config["gas_price"] = args.gas_price
111+
if args.max_fee_per_gas is not None:
112+
transaction_config["max_fee"] = args.max_fee_per_gas
113+
if args.max_priority_fee_per_gas is not None:
114+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
111115
if args.confirmations is not None:
112116
transaction_config["required_confs"] = args.confirmations
113117
if args.nonce is not None:
@@ -135,6 +139,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
135139
parser.add_argument(
136140
"--gas-price", default=None, help="Gas price at which to submit transaction"
137141
)
142+
parser.add_argument(
143+
"--max-fee-per-gas",
144+
default=None,
145+
help="Max fee per gas for EIP1559 transactions",
146+
)
147+
parser.add_argument(
148+
"--max-priority-fee-per-gas",
149+
default=None,
150+
help="Max priority fee per gas for EIP1559 transactions",
151+
)
138152
parser.add_argument(
139153
"--confirmations",
140154
type=int,

‎dao/DiamondCutFacet.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -113,6 +113,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
113113
transaction_config: Dict[str, Any] = {"from": signer}
114114
if args.gas_price is not None:
115115
transaction_config["gas_price"] = args.gas_price
116+
if args.max_fee_per_gas is not None:
117+
transaction_config["max_fee"] = args.max_fee_per_gas
118+
if args.max_priority_fee_per_gas is not None:
119+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
116120
if args.confirmations is not None:
117121
transaction_config["required_confs"] = args.confirmations
118122
if args.nonce is not None:
@@ -140,6 +144,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
140144
parser.add_argument(
141145
"--gas-price", default=None, help="Gas price at which to submit transaction"
142146
)
147+
parser.add_argument(
148+
"--max-fee-per-gas",
149+
default=None,
150+
help="Max fee per gas for EIP1559 transactions",
151+
)
152+
parser.add_argument(
153+
"--max-priority-fee-per-gas",
154+
default=None,
155+
help="Max priority fee per gas for EIP1559 transactions",
156+
)
143157
parser.add_argument(
144158
"--confirmations",
145159
type=int,

‎dao/DiamondLoupeFacet.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -121,6 +121,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
121121
transaction_config: Dict[str, Any] = {"from": signer}
122122
if args.gas_price is not None:
123123
transaction_config["gas_price"] = args.gas_price
124+
if args.max_fee_per_gas is not None:
125+
transaction_config["max_fee"] = args.max_fee_per_gas
126+
if args.max_priority_fee_per_gas is not None:
127+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
124128
if args.confirmations is not None:
125129
transaction_config["required_confs"] = args.confirmations
126130
if args.nonce is not None:
@@ -148,6 +152,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
148152
parser.add_argument(
149153
"--gas-price", default=None, help="Gas price at which to submit transaction"
150154
)
155+
parser.add_argument(
156+
"--max-fee-per-gas",
157+
default=None,
158+
help="Max fee per gas for EIP1559 transactions",
159+
)
160+
parser.add_argument(
161+
"--max-priority-fee-per-gas",
162+
default=None,
163+
help="Max priority fee per gas for EIP1559 transactions",
164+
)
151165
parser.add_argument(
152166
"--confirmations",
153167
type=int,

‎dao/ERC20Facet.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -171,6 +171,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
171171
transaction_config: Dict[str, Any] = {"from": signer}
172172
if args.gas_price is not None:
173173
transaction_config["gas_price"] = args.gas_price
174+
if args.max_fee_per_gas is not None:
175+
transaction_config["max_fee"] = args.max_fee_per_gas
176+
if args.max_priority_fee_per_gas is not None:
177+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
174178
if args.confirmations is not None:
175179
transaction_config["required_confs"] = args.confirmations
176180
if args.nonce is not None:
@@ -198,6 +202,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
198202
parser.add_argument(
199203
"--gas-price", default=None, help="Gas price at which to submit transaction"
200204
)
205+
parser.add_argument(
206+
"--max-fee-per-gas",
207+
default=None,
208+
help="Max fee per gas for EIP1559 transactions",
209+
)
210+
parser.add_argument(
211+
"--max-priority-fee-per-gas",
212+
default=None,
213+
help="Max priority fee per gas for EIP1559 transactions",
214+
)
201215
parser.add_argument(
202216
"--confirmations",
203217
type=int,

‎dao/ERC20Initializer.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -105,6 +105,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
105105
transaction_config: Dict[str, Any] = {"from": signer}
106106
if args.gas_price is not None:
107107
transaction_config["gas_price"] = args.gas_price
108+
if args.max_fee_per_gas is not None:
109+
transaction_config["max_fee"] = args.max_fee_per_gas
110+
if args.max_priority_fee_per_gas is not None:
111+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
108112
if args.confirmations is not None:
109113
transaction_config["required_confs"] = args.confirmations
110114
if args.nonce is not None:
@@ -132,6 +136,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
132136
parser.add_argument(
133137
"--gas-price", default=None, help="Gas price at which to submit transaction"
134138
)
139+
parser.add_argument(
140+
"--max-fee-per-gas",
141+
default=None,
142+
help="Max fee per gas for EIP1559 transactions",
143+
)
144+
parser.add_argument(
145+
"--max-priority-fee-per-gas",
146+
default=None,
147+
help="Max priority fee per gas for EIP1559 transactions",
148+
)
135149
parser.add_argument(
136150
"--confirmations",
137151
type=int,

‎dao/MoonstreamTokenFaucet.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -170,6 +170,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
170170
transaction_config: Dict[str, Any] = {"from": signer}
171171
if args.gas_price is not None:
172172
transaction_config["gas_price"] = args.gas_price
173+
if args.max_fee_per_gas is not None:
174+
transaction_config["max_fee"] = args.max_fee_per_gas
175+
if args.max_priority_fee_per_gas is not None:
176+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
173177
if args.confirmations is not None:
174178
transaction_config["required_confs"] = args.confirmations
175179
if args.nonce is not None:
@@ -197,6 +201,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
197201
parser.add_argument(
198202
"--gas-price", default=None, help="Gas price at which to submit transaction"
199203
)
204+
parser.add_argument(
205+
"--max-fee-per-gas",
206+
default=None,
207+
help="Max fee per gas for EIP1559 transactions",
208+
)
209+
parser.add_argument(
210+
"--max-priority-fee-per-gas",
211+
default=None,
212+
help="Max priority fee per gas for EIP1559 transactions",
213+
)
200214
parser.add_argument(
201215
"--confirmations",
202216
type=int,

‎dao/OwnershipFacet.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -111,6 +111,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
111111
transaction_config: Dict[str, Any] = {"from": signer}
112112
if args.gas_price is not None:
113113
transaction_config["gas_price"] = args.gas_price
114+
if args.max_fee_per_gas is not None:
115+
transaction_config["max_fee"] = args.max_fee_per_gas
116+
if args.max_priority_fee_per_gas is not None:
117+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
114118
if args.confirmations is not None:
115119
transaction_config["required_confs"] = args.confirmations
116120
if args.nonce is not None:
@@ -138,6 +142,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
138142
parser.add_argument(
139143
"--gas-price", default=None, help="Gas price at which to submit transaction"
140144
)
145+
parser.add_argument(
146+
"--max-fee-per-gas",
147+
default=None,
148+
help="Max fee per gas for EIP1559 transactions",
149+
)
150+
parser.add_argument(
151+
"--max-priority-fee-per-gas",
152+
default=None,
153+
help="Max priority fee per gas for EIP1559 transactions",
154+
)
141155
parser.add_argument(
142156
"--confirmations",
143157
type=int,

‎dao/TerminusFacet.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -279,6 +279,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
279279
transaction_config: Dict[str, Any] = {"from": signer}
280280
if args.gas_price is not None:
281281
transaction_config["gas_price"] = args.gas_price
282+
if args.max_fee_per_gas is not None:
283+
transaction_config["max_fee"] = args.max_fee_per_gas
284+
if args.max_priority_fee_per_gas is not None:
285+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
282286
if args.confirmations is not None:
283287
transaction_config["required_confs"] = args.confirmations
284288
if args.nonce is not None:
@@ -306,6 +310,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
306310
parser.add_argument(
307311
"--gas-price", default=None, help="Gas price at which to submit transaction"
308312
)
313+
parser.add_argument(
314+
"--max-fee-per-gas",
315+
default=None,
316+
help="Max fee per gas for EIP1559 transactions",
317+
)
318+
parser.add_argument(
319+
"--max-priority-fee-per-gas",
320+
default=None,
321+
help="Max priority fee per gas for EIP1559 transactions",
322+
)
309323
parser.add_argument(
310324
"--confirmations",
311325
type=int,

‎dao/TerminusInitializer.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Code generated by moonworm : https://github.com/bugout-dev/moonworm
2-
# Moonworm version : 0.1.13
2+
# Moonworm version : 0.1.14
33

44
import argparse
55
import json
@@ -105,6 +105,10 @@ def get_transaction_config(args: argparse.Namespace) -> Dict[str, Any]:
105105
transaction_config: Dict[str, Any] = {"from": signer}
106106
if args.gas_price is not None:
107107
transaction_config["gas_price"] = args.gas_price
108+
if args.max_fee_per_gas is not None:
109+
transaction_config["max_fee"] = args.max_fee_per_gas
110+
if args.max_priority_fee_per_gas is not None:
111+
transaction_config["priority_fee"] = args.max_priority_fee_per_gas
108112
if args.confirmations is not None:
109113
transaction_config["required_confs"] = args.confirmations
110114
if args.nonce is not None:
@@ -132,6 +136,16 @@ def add_default_arguments(parser: argparse.ArgumentParser, transact: bool) -> No
132136
parser.add_argument(
133137
"--gas-price", default=None, help="Gas price at which to submit transaction"
134138
)
139+
parser.add_argument(
140+
"--max-fee-per-gas",
141+
default=None,
142+
help="Max fee per gas for EIP1559 transactions",
143+
)
144+
parser.add_argument(
145+
"--max-priority-fee-per-gas",
146+
default=None,
147+
help="Max priority fee per gas for EIP1559 transactions",
148+
)
135149
parser.add_argument(
136150
"--confirmations",
137151
type=int,

0 commit comments

Comments
 (0)