Merge branch 'develop' into zhangsoledad/2nd_hardfork_mainnet

nervosnetwork · Feb 19, 2025 · 92af943 · 92af943
2 parents 09ee2e8 + 57defa5
commit 92af943
Show file tree

Hide file tree

Showing 36 changed files with 1,335 additions and 1,282 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/devtools/git/merge-master.sh b/devtools/git/merge-master.sh
@@ -3,4 +3,8 @@
 set -eu
 
 git merge --no-ff --no-commit -s ours master
-git checkout master -- CHANGELOG.md src/main.rs resource/specs/testnet.toml resource/specs/mainnet.toml resource/specs/mainnet.toml.asc .github/workflows/package.yaml util/constant/src/default_assume_valid_target.rs
+git checkout master -- \
+    CHANGELOG.md src/main.rs resource/specs/testnet.toml resource/specs/mainnet.toml \
+    resource/specs/mainnet.toml.asc .github/workflows/package.yaml \
+    util/constant/src/default_assume_valid_target.rs \
+    util/constant/src/latest_assume_valid_target.rs
diff --git a/script/src/lib.rs b/script/src/lib.rs
@@ -10,9 +10,10 @@ mod verify_env;
 
 pub use crate::error::{ScriptError, TransactionScriptError};
 pub use crate::scheduler::{Scheduler, ROOT_VM_ID};
+pub use crate::syscalls::generator::generate_ckb_syscalls;
 pub use crate::types::{
     ChunkCommand, CoreMachine, DataPieceId, RunMode, ScriptGroup, ScriptGroupType, ScriptVersion,
     TransactionState, TxData, VerifyResult, VmIsa, VmState, VmVersion,
 };
-pub use crate::verify::{TransactionScriptsSyscallsGenerator, TransactionScriptsVerifier};
+pub use crate::verify::TransactionScriptsVerifier;
 pub use crate::verify_env::TxVerifyEnv;