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

Update patches #306

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Update patches #306

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
14 changes: 7 additions & 7 deletions cargo-test-fuzz/patches/cw-plus.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
diff --git a/contracts/cw20-base/Cargo.toml b/contracts/cw20-base/Cargo.toml
index d9b40fd..676ff40 100644
index 2b35f1b..3e333b4 100644
--- a/contracts/cw20-base/Cargo.toml
+++ b/contracts/cw20-base/Cargo.toml
@@ -30,4 +30,6 @@ serde = { version = "1.0.188", default-features = false, features = ["derive"] }
@@ -29,4 +29,6 @@ serde = { version = "1.0.188", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.49" }

+test-fuzz = { path = "../../../../test-fuzz" }
+
[dev-dependencies]
cw-multi-test = "0.16.5"
diff --git a/contracts/cw20-base/src/contract.rs b/contracts/cw20-base/src/contract.rs
index 30335e4..4c854af 100644
index 6f92ac2..2df8ffe 100644
--- a/contracts/cw20-base/src/contract.rs
+++ b/contracts/cw20-base/src/contract.rs
@@ -92,7 +92,33 @@ fn verify_logo(logo: &Logo) -> Result<(), ContractError> {
@@ -91,7 +91,33 @@ fn verify_logo(logo: &Logo) -> Result<(), ContractError> {
}

+#[derive(Clone, serde::Deserialize, serde::Serialize)]
Expand Down Expand Up @@ -49,7 +49,7 @@ index 30335e4..4c854af 100644
+ mut deps: DepsMut<'a>,
_env: Env,
_info: MessageInfo,
@@ -186,6 +212,7 @@ pub fn validate_accounts(accounts: &[Cw20Coin]) -> Result<(), ContractError> {
@@ -185,6 +211,7 @@ pub fn validate_accounts(accounts: &[Cw20Coin]) -> Result<(), ContractError> {

#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn execute(
Expand All @@ -59,7 +59,7 @@ index 30335e4..4c854af 100644
+ deps: DepsMut<'a>,
env: Env,
info: MessageInfo,
@@ -505,6 +532,32 @@ pub fn execute_upload_logo(
@@ -504,6 +531,32 @@ pub fn execute_upload_logo(
}

+#[derive(Clone, serde::Deserialize, serde::Serialize)]
Expand Down Expand Up @@ -93,7 +93,7 @@ index 30335e4..4c854af 100644
+pub fn query<'a>(deps: Deps<'a>, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
match msg {
QueryMsg::Balance { address } => to_binary(&query_balance(deps, address)?),
@@ -588,5 +641,10 @@ pub fn query_download_logo(deps: Deps) -> StdResult<DownloadLogoResponse> {
@@ -587,5 +640,10 @@ pub fn query_download_logo(deps: Deps) -> StdResult<DownloadLogoResponse> {

#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
Expand Down
8 changes: 4 additions & 4 deletions cargo-test-fuzz/patches/solana.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ index a568162..7889a27 100644
pub struct ComputeBudget {
/// Number of compute units that a transaction or individual instruction is
diff --git a/program-runtime/src/invoke_context.rs b/program-runtime/src/invoke_context.rs
index 6ee87fe..6954e02 100644
index db73672..66ae597 100644
--- a/program-runtime/src/invoke_context.rs
+++ b/program-runtime/src/invoke_context.rs
@@ -115,4 +115,5 @@ impl fmt::Display for AllocErr {
Expand Down Expand Up @@ -172,7 +172,7 @@ index 16a52c0..e2683ac 100644
[dev-dependencies]
assert_matches = { workspace = true }
diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index dd944b7..d0099e5 100644
index 2b745d8..0213982 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -389,6 +389,7 @@ declare_builtin_function!(
Expand Down Expand Up @@ -204,10 +204,10 @@ index 061b16c..d994737 100644
[target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys = { workspace = true }
diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
index 376880e..9dbfb9c 100644
index 5357811..f06c15e 100644
--- a/sdk/src/feature_set.rs
+++ b/sdk/src/feature_set.rs
@@ -934,5 +934,5 @@ lazy_static! {
@@ -939,5 +939,5 @@ lazy_static! {

/// `FeatureSet` holds the set of currently active/inactive runtime features
-#[derive(AbiExample, Debug, Clone, Eq, PartialEq)]
Expand Down
4 changes: 2 additions & 2 deletions cargo-test-fuzz/third_party.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"flags": [],
"url": "https://github.com/CosmWasm/cw-plus",
"rev": "49a2ed0a4df46a7100e4f5d65bd8cfd4cd90db5f",
"rev": "12a5f5afab8ece3f7af8374d5c652dd92dae8937",
"patch": "cw-plus.patch",
"subdir": ".",
"package": "cw20-base",
Expand All @@ -29,7 +29,7 @@
{
"flags": ["EXPENSIVE"],
"url": "https://github.com/solana-labs/solana",
"rev": "662ac8bc8678beef560727bc9c6a0911784589ea",
"rev": "ad65c82d6d3928c542b80967101d951c347e8cb7",
"patch": "solana.patch",
"subdir": ".",
"package": "solana-bpf-loader-program",
Expand Down