From d25931c781e34eba7e7d58e0ba5f124e2edcc559 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 26 Jul 2024 11:07:44 +0200 Subject: [PATCH 1/3] upgrade to 0.41.0 --- Cargo.toml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b65e4b52..938520e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,18 +40,18 @@ axum-extra = { version = "0.9.3", features = ["query"] } chrono = { version = "0.4.30", features = ["serde"] } async-trait = "0.1.73" anyhow = "1.0.75" -namada_core = { git = "https://github.com/anoma/namada", tag = "v0.40.0" } -namada_sdk = { git = "https://github.com/anoma/namada", tag = "v0.40.0", default-features = false, features = ["tendermint-rpc", "std", "async-send", "download-params", "rand"] } -namada_tx = { git = "https://github.com/anoma/namada", tag = "v0.40.0" } -namada_governance = { git = "https://github.com/anoma/namada", tag = "v0.40.0" } -namada_ibc = { git = "https://github.com/anoma/namada", tag = "v0.40.0" } -namada_token = { git = "https://github.com/anoma/namada", tag = "v0.40.0" } -namada_parameters = { git = "https://github.com/anoma/namada", tag = "v0.40.0" } -namada_proof_of_stake = { git = "https://github.com/anoma/namada", tag = "v0.40.0" } -tendermint = "0.36.0" -tendermint-config = "0.36.0" -tendermint-rpc = { version = "0.36.0", features = ["http-client"] } -tendermint-proto = "0.36.0" +namada_core = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } +namada_sdk = { git = "https://github.com/anoma/namada", tag = "v0.41.0", default-features = false, features = ["tendermint-rpc", "std", "async-send", "download-params", "rand"] } +namada_tx = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } +namada_governance = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } +namada_ibc = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } +namada_token = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } +namada_parameters = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } +namada_proof_of_stake = { git = "https://github.com/anoma/namada", tag = "v0.41.0" } +tendermint = "0.37.0" +tendermint-config = "0.37.0" +tendermint-rpc = { version = "0.37.0", features = ["http-client"] } +tendermint-proto = "0.37.0" subtle-encoding = "0.5.1" bimap = { version = "0.6.3", features = ["serde"] } async-stream = "0.3.5" From 7aba1b380e4128c4f263397fd045c336a4453b63 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 26 Jul 2024 11:24:25 +0200 Subject: [PATCH 2/3] upgrade to 0.41.0 --- Cargo.toml | 4 ++-- shared/Cargo.toml | 2 +- shared/src/block_result.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 938520e4..2dcd8eeb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ serde = { version = "1.0.138", features = ["derive"] } serde_json = "1.0" clap = { version = "4.4.2", features = ["derive", "env"] } uuid = { version = "1.4.1", features = ["v4", "serde"] } -reqwest = { version = "0.11.20", features = ["json", "cookies"] } +reqwest = { version = "0.12.0", features = ["json", "cookies"] } axum-macros = "0.4.1" axum-extra = { version = "0.9.3", features = ["query"] } chrono = { version = "0.4.30", features = ["serde"] } @@ -84,4 +84,4 @@ fake = { version = "2.9.2", features = ["derive"] } rand = "0.8.5" bigdecimal = "0.4.5" strum = "0.26.3" -strum_macros = "0.26.3" +strum_macros = "0.26.3" \ No newline at end of file diff --git a/shared/Cargo.toml b/shared/Cargo.toml index c630157f..96e45716 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -36,4 +36,4 @@ tokio-retry.workspace = true tokio.workspace = true tracing.workspace = true fake.workspace = true -rand.workspace = true +rand.workspace = true \ No newline at end of file diff --git a/shared/src/block_result.rs b/shared/src/block_result.rs index 4fbf40d4..d0e7f08d 100644 --- a/shared/src/block_result.rs +++ b/shared/src/block_result.rs @@ -60,7 +60,7 @@ pub struct BatchResults { impl From> for BatchResults { fn from(value: TxResult) -> Self { Self { - batch_results: value.batch_results.iter().fold( + batch_results: value.0.iter().fold( BTreeMap::default(), |mut acc, (tx_hash, result)| { let tx_id = Id::from(*tx_hash); @@ -73,7 +73,7 @@ impl From> for BatchResults { acc }, ), - batch_errors: value.batch_results.iter().fold( + batch_errors: value.0.iter().fold( BTreeMap::default(), |mut acc, (tx_hash, result)| { let tx_id = Id::from(*tx_hash); From 6a76ff45b63569bb0be3d9e1f22d7a40e9ceeb4f Mon Sep 17 00:00:00 2001 From: Mateusz Jasiuk Date: Fri, 26 Jul 2024 15:31:56 +0200 Subject: [PATCH 3/3] feat: bump default gas limit --- orm/migrations/2024-06-12-140948_gas/up.sql | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/orm/migrations/2024-06-12-140948_gas/up.sql b/orm/migrations/2024-06-12-140948_gas/up.sql index 543ed052..74b184b6 100644 --- a/orm/migrations/2024-06-12-140948_gas/up.sql +++ b/orm/migrations/2024-06-12-140948_gas/up.sql @@ -8,46 +8,46 @@ CREATE TABLE gas ( ALTER TABLE gas ADD UNIQUE (tx_kind, token); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('transparent_transfer', 'native', 20000); +VALUES ('transparent_transfer', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('shielded_transfer', 'native', 20000); +VALUES ('shielded_transfer', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('shielding_transfer', 'native', 20000); +VALUES ('shielding_transfer', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('unshielding_transfer', 'native', 20000); +VALUES ('unshielding_transfer', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('bond', 'native', 20000); +VALUES ('bond', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('redelegation', 'native', 20000); +VALUES ('redelegation', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('unbond', 'native', 20000); +VALUES ('unbond', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('withdraw', 'native', 20000); +VALUES ('withdraw', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('claim_rewards', 'native', 20000); +VALUES ('claim_rewards', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('vote_proposal', 'native', 20000); +VALUES ('vote_proposal', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('init_proposal', 'native', 20000); +VALUES ('init_proposal', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('change_metadata', 'native', 20000); +VALUES ('change_metadata', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('change_commission', 'native', 20000); +VALUES ('change_commission', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('reveal_pk', 'native', 20000); +VALUES ('reveal_pk', 'native', 1000000); INSERT INTO gas (tx_kind, token, gas_limit) -VALUES ('unknown', 'native', 20000); \ No newline at end of file +VALUES ('unknown', 'native', 1000000);