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 to support movi instruction #234

Merged
merged 1 commit into from
Mar 26, 2022
+39 −38
Merged

update to support movi instruction #234

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
43 changes: 22 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions fuel-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ clap = { version = "3.1", features = ["derive"] }
cynic = { version = "0.14", features = ["surf"] }
derive_more = { version = "0.99" }
fuel-storage = "0.1"
fuel-tx = { version = "0.6", features = ["serde-types"] }
fuel-tx = { version = "0.7", features = ["serde-types"] }
fuel-types = { version = "0.3", features = ["serde-types"] }
fuel-vm = { version = "0.5", features = ["serde-types"] }
fuel-vm = { version = "0.6", features = ["serde-types"] }
futures = "0.3"
hex = "0.4"
itertools = "0.10"
Expand Down
6 changes: 3 additions & 3 deletions fuel-core-interfaces/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ description = "Fuel core interfaces"
[dependencies]
anyhow = "1.0"
async-trait = "0.1"
fuel-asm = "0.2"
fuel-asm = "0.3"
fuel-storage = "0.1"
fuel-tx = { version = "0.6", features = ["serde-types"] }
fuel-tx = { version = "0.7", features = ["serde-types"] }
fuel-types = { version = "0.3", features = ["serde-types"] }
fuel-vm = "0.5"
fuel-vm = "0.6"
futures = "0.3"
lazy_static = "1.4"
parking_lot = "0.11"
Expand Down
10 changes: 5 additions & 5 deletions fuel-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ clap = { version = "3.1", features = ["env", "derive"] }
derive_more = { version = "0.99" }
dirs = "3.0"
env_logger = "0.9"
fuel-asm = { version = "0.2", features = ["serde-types"] }
fuel-asm = { version = "0.3", features = ["serde-types"] }
fuel-core-interfaces = { path = "../fuel-core-interfaces", version = "0.4.2" }
fuel-crypto = { version = "0.3" }
Voxelot marked this conversation as resolved.
Show resolved Hide resolved
fuel-merkle = "0.1"
fuel-storage = { version = "0.1" }
fuel-tx = { version = "0.6", features = ["serde-types"] }
fuel-tx = { version = "0.7", features = ["serde-types"] }
fuel-txpool = { path = "../fuel-txpool", version = "0.4.2" }
fuel-types = { version = "0.3", features = ["serde-types"] }
fuel-vm = { version = "0.5", features = ["serde-types"] }
fuel-vm = { version = "0.6", features = ["serde-types"] }
futures = "0.3"
graphql-parser = "0.3.0"
hex = { version = "0.4", features = ["serde"] }
Expand Down Expand Up @@ -64,8 +64,8 @@ uuid = { version = "0.8", features = ["v4"] }

[dev-dependencies]
assert_matches = "1.5"
fuel-tx = { version = "0.6", features = ["serde-types", "builder", "internals"] }
fuel-vm = { version = "0.5", features = ["serde-types", "random", "test-helpers"] }
fuel-tx = { version = "0.7", features = ["serde-types", "builder", "internals"] }
fuel-vm = { version = "0.6", features = ["serde-types", "random", "test-helpers"] }
insta = "1.8"

[features]
Expand Down
6 changes: 3 additions & 3 deletions fuel-core/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,11 +1369,11 @@ mod tests {
data_offset,
vec![
// set reg 0x10 to call data
Opcode::ADDI(0x10, REG_ZERO, (data_offset + 64) as Immediate12),
Opcode::MOVI(0x10, (data_offset + 64) as Immediate18),
// set reg 0x11 to asset id
Opcode::ADDI(0x11, REG_ZERO, data_offset),
Opcode::MOVI(0x11, data_offset),
// set reg 0x12 to call amount
Opcode::ADDI(0x12, REG_ZERO, variable_transfer_amount),
Opcode::MOVI(0x12, variable_transfer_amount),
// call contract without any tokens to transfer in (3rd arg arbitrary when 2nd is zero)
Opcode::CALL(0x10, 0x12, 0x11, REG_CGAS),
Opcode::RET(REG_ONE),
Expand Down
2 changes: 1 addition & 1 deletion fuel-indexer/schema/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
diesel = { version = "1.4", optional = true, features = ["postgres", "serde_json"] }
fuel-tx = { version = "0.6", default-features = false }
fuel-tx = { version = "0.7", default-features = false }
fuel-types = { version = "0.3", default-features = false }
graphql-parser = "0.3"
itertools = { version = "0.10", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions fuel-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ chrono = { version = "0.4", features = ["serde"] }
fuel-core = { path = "../fuel-core", features = ["test-helpers"], default-features = false }
fuel-gql-client = { path = "../fuel-client", features = ["test-helpers"] }
fuel-storage = "0.1"
fuel-tx = { version = "0.6", features = ["serde-types"] }
fuel-tx = { version = "0.7", features = ["serde-types"] }
fuel-types = { version = "0.3", features = ["serde-types"] }
fuel-vm = { version = "0.5", features = ["serde-types", "random"] }
fuel-vm = { version = "0.6", features = ["serde-types", "random"] }
insta = "1.8"
itertools = "0.10"
rand = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion fuel-txpool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ description = "Transaction pool"
anyhow = "1.0"
async-trait = "0.1"
fuel-core-interfaces = { path = "../fuel-core-interfaces", version = "0.4.2" }
fuel-tx = { version = "0.6", features = ["serde-types"] }
fuel-tx = { version = "0.7", features = ["serde-types"] }
fuel-types = { version = "0.3", features = ["serde-types"] }
futures = "0.3"
parking_lot = "0.11"
Expand Down