fix: update dependencies

Author: PolyProgrammist

example/Cargo.toml

@@ -11,9 +11,9 @@ serde = "1.0.218"
 serde_json = "1.0.139"
 tokio = { version = "1", features = ["full"] }
 near-sandbox-utils = "0.15"
-near-primitives = { version = "0.30.1", features = ["test_utils"] }
+near-primitives = { version = "0.34.0", features = ["test_utils"] }
 base64 = "0.21"
 borsh = "1.5.7"
-near-crypto = "0.30.1"
+near-crypto = "0.34.0"
 
 [workspace]

example/tests/tests.rs

@@ -912,12 +912,11 @@ async fn prepare_blockchain(
             args: serde_json::to_vec(&serde_json::json!({
                 "greeting": "hola"
             }))?,
-            gas: 300_000_000_000_000,
-            deposit: 0,
+            gas: near_primitives::types::Gas::from_teragas(300),
+            deposit: near_primitives::types::Balance::ZERO,
         },
     ));
 
-    let transfer_amount = 1_000_000_000_000_000_000_000_000; // 1 NEAR in yocto
     let tx = Transaction::V0(TransactionV0 {
         signer_id: sender_account_id.clone(),
         public_key: signer.public_key(),
@@ -926,13 +925,13 @@ async fn prepare_blockchain(
         receiver_id: sender_account_id.clone(),
         actions: vec![
             Action::Transfer(TransferAction {
-                deposit: transfer_amount,
+                deposit: near_primitives::types::Balance::from_near(1),
             }),
             deploy_contract_action,
             function_call_action,
         ],
     });
-    let signed_tx = tx.sign(&signer);
+    let signed_tx = tx.sign(signer);
     let base64_signed_tx = near_primitives::serialize::to_base64(&borsh::to_vec(&signed_tx)?);
 
     let payload_send_tx = client::types::JsonRpcRequestForSendTx {

near-openapi-client/src/lib.rs

@@ -403,7 +403,7 @@ use progenitor_client::{encode_path, ClientHooks, OperationInfo, RequestBuilderE
 #[allow(unused_imports)]
 pub use progenitor_client::{ByteStream, ClientInfo, Error, ResponseValue};
 #[derive(Clone, Debug)]
-#[doc = "Client for NEAR Protocol JSON RPC API\n\nVersion: 1.2.1"]
+#[doc = "Client for NEAR Protocol JSON RPC API\n\nVersion: 1.2.2"]
 pub struct Client {
     pub(crate) baseurl: String,
     pub(crate) client: reqwest::Client,
@@ -441,7 +441,7 @@ impl Client {
 }
 impl ClientInfo<()> for Client {
     fn api_version() -> &'static str {
-        "1.2.1"
+        "1.2.2"
     }
     fn baseurl(&self) -> &str {
         self.baseurl.as_str()

near-openapi-types/Cargo.toml

@@ -8,7 +8,7 @@ description = "Types for progenitor-generated client of NEAR JSON RPC API"
 
 
 [dependencies]
-chrono = { version = "0.4", default-features = false, features = ["serde"] }
+chrono = { version = "0.4", default-features=false, features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 

near-openapi-types/src/lib.rs

@@ -19759,6 +19759,16 @@ impl ::std::convert::From<&RangeOfUint64> for RangeOfUint64 {
 #[doc = "                \"$ref\": \"#/components/schemas/DataReceiverView\""]
 #[doc = "              }"]
 #[doc = "            },"]
+#[doc = "            \"refund_to\": {"]
+#[doc = "              \"anyOf\": ["]
+#[doc = "                {"]
+#[doc = "                  \"$ref\": \"#/components/schemas/AccountId\""]
+#[doc = "                },"]
+#[doc = "                {"]
+#[doc = "                  \"type\": \"null\""]
+#[doc = "                }"]
+#[doc = "              ]"]
+#[doc = "            },"]
 #[doc = "            \"signer_id\": {"]
 #[doc = "              \"$ref\": \"#/components/schemas/AccountId\""]
 #[doc = "            },"]
@@ -19848,6 +19858,8 @@ pub enum ReceiptEnumView {
         #[serde(default)]
         is_promise_yield: bool,
         output_data_receivers: ::std::vec::Vec<DataReceiverView>,
+        #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
+        refund_to: ::std::option::Option<AccountId>,
         signer_id: AccountId,
         signer_public_key: PublicKey,
     },
@@ -20825,6 +20837,12 @@ impl ::std::convert::From<()> for RpcClientConfigRequest {
 #[doc = "      \"maxItems\": 2,"]
 #[doc = "      \"minItems\": 2"]
 #[doc = "    },"]
+#[doc = "    \"chunks_cache_height_horizon\": {"]
+#[doc = "      \"description\": \"Height horizon for the chunk cache. A chunk is removed from the cache\\nif its height + chunks_cache_height_horizon < largest_seen_height.\\nThe default value is DEFAULT_CHUNKS_CACHE_HEIGHT_HORIZON.\","]
+#[doc = "      \"type\": \"integer\","]
+#[doc = "      \"format\": \"uint64\","]
+#[doc = "      \"minimum\": 0.0"]
+#[doc = "    },"]
 #[doc = "    \"client_background_migration_threads\": {"]
 #[doc = "      \"description\": \"Number of threads to execute background migration work in client.\","]
 #[doc = "      \"type\": \"integer\","]
@@ -21288,6 +21306,9 @@ pub struct RpcClientConfigResponse {
     #[doc = "Multiplier for the wait time for all chunks to be received."]
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub chunk_wait_mult: ::std::option::Option<[i32; 2usize]>,
+    #[doc = "Height horizon for the chunk cache. A chunk is removed from the cache\nif its height + chunks_cache_height_horizon < largest_seen_height.\nThe default value is DEFAULT_CHUNKS_CACHE_HEIGHT_HORIZON."]
+    #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
+    pub chunks_cache_height_horizon: ::std::option::Option<u64>,
     #[doc = "Number of threads to execute background migration work in client."]
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub client_background_migration_threads: ::std::option::Option<u32>,
@@ -21480,6 +21501,7 @@ impl ::std::default::Default for RpcClientConfigResponse {
             chunk_request_retry_period: Default::default(),
             chunk_validation_threads: Default::default(),
             chunk_wait_mult: Default::default(),
+            chunks_cache_height_horizon: Default::default(),
             client_background_migration_threads: Default::default(),
             cloud_archival_writer: Default::default(),
             disable_tx_routing: Default::default(),
@@ -28026,7 +28048,7 @@ impl ::std::default::Default for RpcValidatorsOrderedRequest {
 #[doc = "      ]"]
 #[doc = "    },"]
 #[doc = "    \"storage_amount_per_byte\": {"]
-#[doc = "      \"description\": \"Amount of yN per byte required to have on the account.  See\\n<https://nomicon.io/Economics/Economic#state-stake> for details.\","]
+#[doc = "      \"description\": \"Amount of yN per byte required to have on the account.  See\\n<https://nomicon.io/Economics/Economics.html#state-stake> for details.\","]
 #[doc = "      \"allOf\": ["]
 #[doc = "        {"]
 #[doc = "          \"$ref\": \"#/components/schemas/NearToken\""]
@@ -28069,7 +28091,7 @@ pub struct RuntimeConfigView {
     #[doc = "The configuration for congestion control."]
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub congestion_control_config: ::std::option::Option<CongestionControlConfigView>,
-    #[doc = "Amount of yN per byte required to have on the account.  See\n<https://nomicon.io/Economics/Economic#state-stake> for details."]
+    #[doc = "Amount of yN per byte required to have on the account.  See\n<https://nomicon.io/Economics/Economics.html#state-stake> for details."]
     #[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
     pub storage_amount_per_byte: ::std::option::Option<NearToken>,
     #[doc = "Costs of different actions that need to be performed when sending and\nprocessing transaction and receipts."]
@@ -28311,6 +28333,18 @@ impl ::std::fmt::Display for ShardId {
 #[doc = "        }"]
 #[doc = "      },"]
 #[doc = "      \"additionalProperties\": false"]
+#[doc = "    },"]
+#[doc = "    {"]
+#[doc = "      \"type\": \"object\","]
+#[doc = "      \"required\": ["]
+#[doc = "        \"V3\""]
+#[doc = "      ],"]
+#[doc = "      \"properties\": {"]
+#[doc = "        \"V3\": {"]
+#[doc = "          \"$ref\": \"#/components/schemas/ShardLayoutV3\""]
+#[doc = "        }"]
+#[doc = "      },"]
+#[doc = "      \"additionalProperties\": false"]
 #[doc = "    }"]
 #[doc = "  ]"]
 #[doc = "}"]
@@ -28321,6 +28355,7 @@ pub enum ShardLayout {
     V0(ShardLayoutV0),
     V1(ShardLayoutV1),
     V2(ShardLayoutV2),
+    V3(ShardLayoutV3),
 }
 impl ::std::convert::From<&Self> for ShardLayout {
     fn from(value: &ShardLayout) -> Self {
@@ -28342,6 +28377,11 @@ impl ::std::convert::From<ShardLayoutV2> for ShardLayout {
         Self::V2(value)
     }
 }
+impl ::std::convert::From<ShardLayoutV3> for ShardLayout {
+    fn from(value: ShardLayoutV3) -> Self {
+        Self::V3(value)
+    }
+}
 #[doc = "A shard layout that maps accounts evenly across all shards -- by calculate the hash of account\nid and mod number of shards. This is added to capture the old `account_id_to_shard_id` algorithm,\nto keep backward compatibility for some existing tests.\n`parent_shards` for `ShardLayoutV1` is always `None`, meaning it can only be the first shard layout\na chain uses."]
 #[doc = r""]
 #[doc = r" <details><summary>JSON schema</summary>"]
@@ -28545,6 +28585,72 @@ impl ::std::convert::From<&ShardLayoutV2> for ShardLayoutV2 {
         value.clone()
     }
 }
+#[doc = "Counterpart to `ShardLayoutV3` composed of maps with string keys to aid\nserde serialization."]
+#[doc = r""]
+#[doc = r" <details><summary>JSON schema</summary>"]
+#[doc = r""]
+#[doc = r" ```json"]
+#[doc = "{"]
+#[doc = "  \"description\": \"Counterpart to `ShardLayoutV3` composed of maps with string keys to aid\\nserde serialization.\","]
+#[doc = "  \"type\": \"object\","]
+#[doc = "  \"required\": ["]
+#[doc = "    \"boundary_accounts\","]
+#[doc = "    \"id_to_index_map\","]
+#[doc = "    \"last_split\","]
+#[doc = "    \"shard_ids\","]
+#[doc = "    \"shards_split_map\""]
+#[doc = "  ],"]
+#[doc = "  \"properties\": {"]
+#[doc = "    \"boundary_accounts\": {"]
+#[doc = "      \"type\": \"array\","]
+#[doc = "      \"items\": {"]
+#[doc = "        \"$ref\": \"#/components/schemas/AccountId\""]
+#[doc = "      }"]
+#[doc = "    },"]
+#[doc = "    \"id_to_index_map\": {"]
+#[doc = "      \"type\": \"object\","]
+#[doc = "      \"additionalProperties\": {"]
+#[doc = "        \"type\": \"integer\","]
+#[doc = "        \"format\": \"uint\","]
+#[doc = "        \"minimum\": 0.0"]
+#[doc = "      }"]
+#[doc = "    },"]
+#[doc = "    \"last_split\": {"]
+#[doc = "      \"$ref\": \"#/components/schemas/ShardId\""]
+#[doc = "    },"]
+#[doc = "    \"shard_ids\": {"]
+#[doc = "      \"type\": \"array\","]
+#[doc = "      \"items\": {"]
+#[doc = "        \"$ref\": \"#/components/schemas/ShardId\""]
+#[doc = "      }"]
+#[doc = "    },"]
+#[doc = "    \"shards_split_map\": {"]
+#[doc = "      \"type\": \"object\","]
+#[doc = "      \"additionalProperties\": {"]
+#[doc = "        \"type\": \"array\","]
+#[doc = "        \"items\": {"]
+#[doc = "          \"$ref\": \"#/components/schemas/ShardId\""]
+#[doc = "        }"]
+#[doc = "      }"]
+#[doc = "    }"]
+#[doc = "  }"]
+#[doc = "}"]
+#[doc = r" ```"]
+#[doc = r" </details>"]
+#[derive(:: serde :: Deserialize, :: serde :: Serialize, Clone, Debug)]
+pub struct ShardLayoutV3 {
+    pub boundary_accounts: ::std::vec::Vec<AccountId>,
+    pub id_to_index_map: ::std::collections::HashMap<::std::string::String, u32>,
+    pub last_split: ShardId,
+    pub shard_ids: ::std::vec::Vec<ShardId>,
+    pub shards_split_map:
+        ::std::collections::HashMap<::std::string::String, ::std::vec::Vec<ShardId>>,
+}
+impl ::std::convert::From<&ShardLayoutV3> for ShardLayoutV3 {
+    fn from(value: &ShardLayoutV3) -> Self {
+        value.clone()
+    }
+}
 #[doc = "`ShardUId` is a unique representation for shards from different shard layouts.\n\nComparing to `ShardId`, which is just an ordinal number ranging from 0 to NUM_SHARDS-1,\n`ShardUId` provides a way to unique identify shards when shard layouts may change across epochs.\nThis is important because we store states indexed by shards in our database, so we need a\nway to unique identify shard even when shards change across epochs.\nAnother difference between `ShardUId` and `ShardId` is that `ShardUId` should only exist in\na node's internal state while `ShardId` can be exposed to outside APIs and used in protocol\nlevel information (for example, `ShardChunkHeader` contains `ShardId` instead of `ShardUId`)"]
 #[doc = r""]
 #[doc = r" <details><summary>JSON schema</summary>"]

openapi.json

@@ -2,7 +2,7 @@
     "openapi": "3.0.0",
     "info": {
         "title": "NEAR Protocol JSON RPC API",
-        "version": "1.2.1"
+        "version": "1.2.2"
     },
     "paths": {
         "/EXPERIMENTAL_changes": {
@@ -10575,6 +10575,19 @@
                                         },
                                         "type": "array"
                                     },
+                                    "refund_to": {
+                                        "anyOf": [
+                                            {
+                                                "$ref": "#/components/schemas/AccountId"
+                                            },
+                                            {
+                                                "enum": [
+                                                    null
+                                                ],
+                                                "nullable": true
+                                            }
+                                        ]
+                                    },
                                     "signer_id": {
                                         "$ref": "#/components/schemas/AccountId"
                                     },
@@ -11317,6 +11330,12 @@
                         "minItems": 2,
                         "type": "array"
                     },
+                    "chunks_cache_height_horizon": {
+                        "description": "Height horizon for the chunk cache. A chunk is removed from the cache\nif its height + chunks_cache_height_horizon < largest_seen_height.\nThe default value is DEFAULT_CHUNKS_CACHE_HEIGHT_HORIZON.",
+                        "format": "uint64",
+                        "minimum": 0,
+                        "type": "integer"
+                    },
                     "client_background_migration_threads": {
                         "description": "Number of threads to execute background migration work in client.",
                         "format": "uint",
@@ -16170,7 +16189,7 @@
                                 "$ref": "#/components/schemas/NearToken"
                             }
                         ],
-                        "description": "Amount of yN per byte required to have on the account.  See\n<https://nomicon.io/Economics/Economic#state-stake> for details."
+                        "description": "Amount of yN per byte required to have on the account.  See\n<https://nomicon.io/Economics/Economics.html#state-stake> for details."
                     },
                     "transaction_costs": {
                         "allOf": [
@@ -16301,6 +16320,18 @@
                             "V2"
                         ],
                         "type": "object"
+                    },
+                    {
+                        "additionalProperties": false,
+                        "properties": {
+                            "V3": {
+                                "$ref": "#/components/schemas/ShardLayoutV3"
+                            }
+                        },
+                        "required": [
+                            "V3"
+                        ],
+                        "type": "object"
                     }
                 ]
             },
@@ -16428,6 +16459,51 @@
                 ],
                 "type": "object"
             },
+            "ShardLayoutV3": {
+                "description": "Counterpart to `ShardLayoutV3` composed of maps with string keys to aid\nserde serialization.",
+                "properties": {
+                    "boundary_accounts": {
+                        "items": {
+                            "$ref": "#/components/schemas/AccountId"
+                        },
+                        "type": "array"
+                    },
+                    "id_to_index_map": {
+                        "additionalProperties": {
+                            "format": "uint",
+                            "minimum": 0,
+                            "type": "integer"
+                        },
+                        "type": "object"
+                    },
+                    "last_split": {
+                        "$ref": "#/components/schemas/ShardId"
+                    },
+                    "shard_ids": {
+                        "items": {
+                            "$ref": "#/components/schemas/ShardId"
+                        },
+                        "type": "array"
+                    },
+                    "shards_split_map": {
+                        "additionalProperties": {
+                            "items": {
+                                "$ref": "#/components/schemas/ShardId"
+                            },
+                            "type": "array"
+                        },
+                        "type": "object"
+                    }
+                },
+                "required": [
+                    "boundary_accounts",
+                    "shard_ids",
+                    "id_to_index_map",
+                    "shards_split_map",
+                    "last_split"
+                ],
+                "type": "object"
+            },
             "ShardUId": {
                 "description": "`ShardUId` is a unique representation for shards from different shard layouts.\n\nComparing to `ShardId`, which is just an ordinal number ranging from 0 to NUM_SHARDS-1,\n`ShardUId` provides a way to unique identify shards when shard layouts may change across epochs.\nThis is important because we store states indexed by shards in our database, so we need a\nway to unique identify shard even when shards change across epochs.\nAnother difference between `ShardUId` and `ShardId` is that `ShardUId` should only exist in\na node's internal state while `ShardId` can be exposed to outside APIs and used in protocol\nlevel information (for example, `ShardChunkHeader` contains `ShardId` instead of `ShardUId`)",
                 "properties": {

progenitor_fixes.py

@@ -169,7 +169,7 @@ def add_error_derives(m):
     types_cargo_toml = re.sub(r'progenitor-client = "[^"]+"\n', '', types_cargo_toml)
     types_cargo_toml = re.sub(r'reqwest = \{[^}]+\}\n', '', types_cargo_toml)
     types_cargo_toml = re.sub(r'serde_urlencoded = "[^"]+"\n', '', types_cargo_toml)
-    types_cargo_toml += 'near-account-id = { version = "1.1.1", features = ["serde"] }\nnear-gas = { version = "0.3.2", features = ["serde"] }\nnear-token = { version = "0.3.1", features = ["serde"] }\nthiserror = "2.0.17"\nstrum_macros = "0.27.2"\n'
+    types_cargo_toml += 'near-account-id = { version = "2.0", features = ["serde"] }\nnear-gas = { version = "0.3.2", features = ["serde"] }\nnear-token = { version = "0.3.1", features = ["serde"] }\nthiserror = "2.0.17"\nstrum_macros = "0.27.2"\n'
 
     client_cargo_toml_file = open('./near-openapi-client/Cargo.toml', 'w')
     client_cargo_toml_file.write(client_cargo_toml)