Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cactus-plugin-ledger-connector-ethereum): support London fork gas prices #2630

Merged
merged 1 commit into from
Oct 2, 2023
Merged

feat(cactus-plugin-ledger-connector-ethereum): support London fork gas prices #2630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions packages/cactus-plugin-ledger-connector-ethereum/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
"sanitize-html": "2.7.0",
"socket.io-client": "4.5.4",
"typescript-optional": "2.0.1",
"web3": "4.0.3",
"web3-eth-contract": "4.0.3",
"web3-utils": "4.0.3"
"web3": "4.1.2",
"web3-eth": "4.2.0",
"web3-eth-contract": "4.1.0"
},
"devDependencies": {
"@hyperledger/cactus-plugin-keychain-memory": "2.0.0-alpha.2",
Expand All @@ -86,9 +86,7 @@
"@types/minimist": "1.2.2",
"@types/sanitize-html": "2.6.2",
"chalk": "4.1.2",
"socket.io": "4.5.4",
"web3-eth": "4.0.3",
"web3-eth-accounts": "4.0.3"
"socket.io": "4.5.4"
},
"engines": {
"node": ">=10",
Expand Down
104 changes: 67 additions & 37 deletions packages/cactus-plugin-ledger-connector-ethereum/src/main/json/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,59 @@
}
}
},
"GasTransactionConfigLegacy": {
"type": "object",
"description": "Transaction gas settings in networks before EIP-1559 (London fork).",
"required": [],
"properties": {
"gas": {
"type": "string",
"description": "A maximum amount of gas a user is willing to provide for the execution of the transaction. (gasLimit)"
},
"gasPrice": {
"type": "string",
"description": "A price (in Wei) a user is willing to pay for each unit of gas used during the execution of the transaction. In EIP-1559 (London fork) networks, it will be set as both maxFeePerGas and maxPriorityFeePerGas."
}
}
},
"GasTransactionConfigEIP1559": {
"type": "object",
"description": "Transaction gas settings in networks after EIP-1559 (London fork).",
"required": [],
"properties": {
"gasLimit": {
"type": "string",
"description": "A maximum amount of gas a user is willing to provide for the execution of the transaction.",
"nullable": false
},
"maxFeePerGas": {
"type": "string",
"description": "A maximum fee (including the base fee and the tip) a user is willing to pay per unit of gas.",
"nullable": false
},
"maxPriorityFeePerGas": {
"type": "string",
"description": "A maximum tip amount a user is willing to pay per unit of gas.",
"nullable": false
}
}
},
"GasTransactionConfig": {
"type": "object",
"description": "Transaction gas settings.",
"required": [],
"oneOf": [
{
"$ref": "#/components/schemas/GasTransactionConfigLegacy"
},
{
"$ref": "#/components/schemas/GasTransactionConfigEIP1559"
}
]
},
"EthereumTransactionConfig": {
"type": "object",
"required": [],
"additionalProperties": true,
"properties": {
"rawTransaction": {
"type": "string",
Expand All @@ -225,17 +274,15 @@
"value": {
"type": "string"
},
"gas": {
"type": "string"
},
"gasPrice": {
"type": "string"
},
"nonce": {
"type": "string"
},
"data": {
"type": "string"
},
"gasConfig": {
"$ref": "#/components/schemas/GasTransactionConfig",
"nullable": false
}
}
},
Expand Down Expand Up @@ -450,12 +497,8 @@
"maxLength": 100,
"nullable": false
},
"gas": {
"type": "number",
"nullable": false
},
"gasPrice": {
"type": "number",
"gasConfig": {
"$ref": "#/components/schemas/GasTransactionConfig",
"nullable": false
},
"nonce": {
Expand Down Expand Up @@ -504,12 +547,8 @@
"$ref": "#/components/schemas/Web3SigningCredential",
"nullable": false
},
"gas": {
"type": "number",
"nullable": false
},
"gasPrice": {
"type": "string",
"gasConfig": {
"$ref": "#/components/schemas/GasTransactionConfig",
"nullable": false
},
"timeoutMs": {
Expand Down Expand Up @@ -574,11 +613,9 @@
"value": {
"type": "string"
},
"gas": {
"type": "string"
},
"gasPrice": {
"type": "string"
"gasConfig": {
"$ref": "#/components/schemas/GasTransactionConfig",
"nullable": false
},
"nonce": {
"type": "string"
Expand Down Expand Up @@ -640,11 +677,9 @@
"value": {
"type": "string"
},
"gas": {
"type": "string"
},
"gasPrice": {
"type": "string"
"gasConfig": {
"$ref": "#/components/schemas/GasTransactionConfig",
"nullable": false
},
"nonce": {
"type": "string"
Expand Down Expand Up @@ -799,12 +834,7 @@
},
"Web3BlockHeader": {
"type": "object",
"required": [
"sha3Uncles",
"transactionRoot",
"gasLimit",
"gasUsed"
],
"required": ["sha3Uncles", "transactionRoot", "gasLimit", "gasUsed"],
"properties": {
"number": {
"type": "string"
Expand Down Expand Up @@ -1145,7 +1175,7 @@
}
},
"operationId": "invokeContractV1",
"summary": "Invokes a contract on a besu ledger",
"summary": "Invokes a contract on an ethereum ledger",
"parameters": [],
"requestBody": {
"content": {
Expand Down Expand Up @@ -1179,7 +1209,7 @@
}
},
"operationId": "invokeContractV1NoKeychain",
"summary": "Invokes a contract on a besu ledger",
"summary": "Invokes a contract on an ethereum ledger",
"parameters": [],
"requestBody": {
"content": {
Expand Down
Loading