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

Jump to bottom

Revert reason handling #19

Closed
wants to merge 5 commits into from
Closed

Revert reason handling #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
350b545
Initial commit
ryjones Jan 19, 2024
b118023
Merge branch 'main' into indy-besu-mvp
akarabashov Jan 24, 2024
bcccbc6
added handling for revert reason
DenisRybas Feb 2, 2024
e285ca0
web3 lib version bump
DenisRybas Feb 6, 2024
1e2755b
Merge branch 'main' of https://github.com/hyperledger/indy-besu into …
DenisRybas Feb 6, 2024
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
24 changes: 1 addition & 23 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,10 @@ x-besu-def:
/opt/besu/bin/besu \
--config-file=/config/config.toml \
--p2p-host=$$(hostname -i) \
--revert-reason-enabled=true \
--rpc-http-api=EEA,WEB3,ETH,NET,TRACE,DEBUG,ADMIN,TXPOOL,PERM,${BESU_CONS_ALGO:-QBFT} \
--rpc-ws-api=EEA,WEB3,ETH,NET,TRACE,DEBUG,ADMIN,TXPOOL,PERM,${BESU_CONS_ALGO:-QBFT} ;









x-ethsignerProxy-def:
&ethsignerProxy-def
image: consensys/ethsigner:${ETHSIGNER_VERSION:-latest}
Expand Down Expand Up @@ -176,16 +169,6 @@ services:
quorum-dev-quickstart:
ipv4_address: 172.16.239.40











prometheus:
image: "prom/prometheus"
volumes:
Expand Down Expand Up @@ -234,11 +217,6 @@ services:
quorum-dev-quickstart:
ipv4_address: 172.16.239.35






volumes:
public-keys:
prometheus:
Expand Down
2 changes: 1 addition & 1 deletion network/config/besu/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

LOG4J_CONFIGURATION_FILE=/config/log-config.xml

BESU_REVERT_REASON_ENABLED=true

1 change: 1 addition & 0 deletions network/config/besu/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ logging="INFO"
data-path="/opt/besu/data"
host-allowlist=["*"]
min-gas-price=0
revert-reason-enabled=true

# rpc
rpc-http-enabled=true
Expand Down
4 changes: 2 additions & 2 deletions vdr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ serde = "1.0.188"
serde_derive = "1.0.188"
serde_json = "1.0.107"
thiserror = "1.0.49"
web3 = { version = "0.19.0", optional = true }
web3 = { version = "0.20.0", optional = true }
web-sys = { version = "0.3.64", optional = true, features = ["Window"] }
web3-wasm = { package = "web3", version = "0.19.0", default-features = false, features = ["wasm", "http", "http-tls"], optional = true }
web3-wasm = { package = "web3", version = "0.20.0", default-features = false, features = ["wasm", "http", "http-tls"], optional = true }

[dev-dependencies]
mockall = "0.12.0"
Expand Down
1 change: 1 addition & 0 deletions vdr/src/error/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ impl From<Web3Error> for VdrError {
Web3Error::Unreachable => VdrError::ClientNodeUnreachable,
Web3Error::InvalidResponse(err) => VdrError::ClientInvalidResponse(err),
Web3Error::Rpc(err) => VdrError::ClientTransactionReverted(json!(err).to_string()),
Web3Error::Revert(err) => VdrError::ClientTransactionReverted(err),
_ => VdrError::ClientUnexpectedError(value.to_string()),
}
}
Expand Down
Loading