From e34c3c6136d0450f23f94256c889219f7bf12eec Mon Sep 17 00:00:00 2001 From: jhernandezb Date: Mon, 25 Mar 2024 22:45:21 -0600 Subject: [PATCH 1/3] eth-verify recovery param --- packages/ethereum-verify/src/decode.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ethereum-verify/src/decode.rs b/packages/ethereum-verify/src/decode.rs index 0628aac82..8b823da72 100644 --- a/packages/ethereum-verify/src/decode.rs +++ b/packages/ethereum-verify/src/decode.rs @@ -10,6 +10,7 @@ use sha3::{Digest, Keccak256}; /// [EIP-155]: https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md pub fn get_recovery_param(v: u8) -> StdResult { match v { + 0 | 1 => Ok(v), 27 => Ok(0), 28 => Ok(1), _ => Err(StdError::generic_err("Values of v other than 27 and 28 not supported. Replay protection (EIP-155) cannot be used here.")) From 6b41a706a595b73576a471f46c8dfdafb20292b4 Mon Sep 17 00:00:00 2001 From: jhernadnezb Date: Mon, 25 Mar 2024 22:55:24 -0600 Subject: [PATCH 2/3] add backport --- .mergify.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 28110cd80..114fdf065 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -24,3 +24,11 @@ pull_request_rules: backport: branches: - release/v2.x + - name: backport to v3 + conditions: + - base=main + - label=backport/3.x + actions: + backport: + branches: + - release/v3.x From cb1b777eab3076d1ab2cb03abdbe55ee086f3075 Mon Sep 17 00:00:00 2001 From: jhernadnezb Date: Mon, 25 Mar 2024 23:27:25 -0600 Subject: [PATCH 3/3] bump rust version --- .circleci/config.yml | 86 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fbca6eea8..53e2ad628 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ workflows: jobs: contract_sg721_base: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/collections/sg721-base steps: - checkout: @@ -41,7 +41,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-sg721-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-sg721-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -63,11 +63,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-sg721-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-sg721-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} contract_sg721_nt: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/collections/sg721-nt steps: - checkout: @@ -77,7 +77,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-sg721-nt-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-sg721-nt-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -99,11 +99,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-sg721-nt-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-sg721-nt-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} contract_base_factory: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/factories/base-factory steps: - checkout: @@ -113,7 +113,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-base-factory-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-base-factory-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -135,11 +135,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-base-factory-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-base-factory-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} contract_base_minter: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/minters/base-minter steps: - checkout: @@ -149,7 +149,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-base-minter-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-base-minter-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -171,11 +171,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-base-minter-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-base-minter-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} contract_vending_factory: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/factories/vending-factory steps: - checkout: @@ -185,7 +185,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-vending-factory-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-vending-factory-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -207,11 +207,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-vending-factory-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-vending-factory-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} contract_vending_minter: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/minters/vending-minter steps: - checkout: @@ -221,7 +221,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-vending-minter-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-vending-minter-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -243,11 +243,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-vending-minter-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-vending-minter-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} contract_open_edition_factory: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/factories/open-edition-factory steps: - checkout: @@ -257,7 +257,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-open-edition-factory-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-open-edition-factory-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -279,11 +279,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-open-edition-factory-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-open-edition-factory-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} contract_open_edition_minter: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/minters/open-edition-minter steps: - checkout: @@ -293,7 +293,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-open-edition-minter-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-open-edition-minter-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -315,11 +315,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-open-edition-minter-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-open-edition-minter-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} contract_whitelist: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/whitelists/whitelist steps: - checkout: @@ -329,7 +329,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-whitelist-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-whitelist-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -351,10 +351,10 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-whitelist-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-whitelist-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} test-suite: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/test-suite steps: - checkout: @@ -364,7 +364,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-test-suite-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-test-suite-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -374,11 +374,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-test-suite-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-test-suite-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} package_sg_std: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/package/sg-std steps: - checkout: @@ -388,7 +388,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-sg-std-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-sg-std-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -398,11 +398,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-sg-std-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-sg-std-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} package_sg_utils: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/package/sg-utils steps: - checkout: @@ -412,7 +412,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-sg-utils-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-sg-utils-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -422,11 +422,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-sg-utils-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-sg-utils-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} sg-eth-airdrop: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 working_directory: ~/project/contracts/sg-eth-airdrop steps: - checkout: @@ -436,7 +436,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-sg-eth-airdrop-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-sg-eth-airdrop-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -458,11 +458,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-sg-eth-airdrop-rust:1.73.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-sg-eth-airdrop-rust:1.74.1-{{ checksum "~/project/Cargo.lock" }} lint: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 steps: - checkout - run: @@ -470,7 +470,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-lint-rust:1.73.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-lint-rust:1.74.1-{{ checksum "Cargo.lock" }} - run: name: Add rustfmt component command: rustup component add rustfmt @@ -489,7 +489,7 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-lint-rust:1.73.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-lint-rust:1.74.1-{{ checksum "Cargo.lock" }} # This runs one time on the top level to ensure all contracts compile properly into wasm. # We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time @@ -497,7 +497,7 @@ jobs: # We also sanity-check the resultant wasm files. wasm-build: docker: - - image: rust:1.73.0 + - image: rust:1.74.1 steps: - checkout: path: ~/project