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.

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

Use moonbeam's polkadot-v0.9.40 #1167

Merged
merged 4 commits into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
242 changes: 119 additions & 123 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ pallet-evm-precompile-modexp = { git = "https://github.com/darwinia-network/fr
pallet-evm-precompile-simple = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.40", default-features = false }

# moonbeam
pallet-ethereum-xcm = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40", default-features = false }
moonbeam-evm-tracer = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40", default-features = false }
moonbeam-primitives-ext = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40", default-features = false }
moonbeam-rpc-debug = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40" }
moonbeam-rpc-primitives-debug = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40", default-features = false }
moonbeam-rpc-trace = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40" }
precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40", default-features = false }
xcm-primitives = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40", default-features = false }
pallet-ethereum-xcm = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40-1", default-features = false }
moonbeam-evm-tracer = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40-1", default-features = false }
moonbeam-primitives-ext = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40-1", default-features = false }
moonbeam-rpc-debug = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40-1" }
moonbeam-rpc-primitives-debug = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40-1", default-features = false }
moonbeam-rpc-trace = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40-1" }
precompile-utils = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40-1", default-features = false }
xcm-primitives = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.40-1", default-features = false }

# polkadot
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40", default-features = false }
Expand Down
12 changes: 6 additions & 6 deletions precompile/assets/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ where
AccountIdOf<Runtime>: From<H160>,
<<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin: OriginTrait,
<Runtime::RuntimeCall as Dispatchable>::RuntimeOrigin: From<Option<Runtime::AccountId>>,
BalanceOf<Runtime>: TryFrom<U256> + Into<U256> + EvmData,
BalanceOf<Runtime>: TryFrom<U256> + Into<U256> + solidity::Codec,
{
#[precompile::public("totalSupply()")]
#[precompile::view]
Expand Down Expand Up @@ -171,7 +171,7 @@ where
SELECTOR_LOG_APPROVAL,
handle.context().caller,
spender,
EvmDataWriter::new().write(value).build(),
solidity::encode_event_data(value),
)
.record(handle)?;

Expand Down Expand Up @@ -205,7 +205,7 @@ where
SELECTOR_LOG_TRANSFER,
handle.context().caller,
to,
EvmDataWriter::new().write(value).build(),
solidity::encode_event_data(value),
)
.record(handle)?;

Expand Down Expand Up @@ -260,7 +260,7 @@ where
SELECTOR_LOG_TRANSFER,
from,
to,
EvmDataWriter::new().write(value).build(),
solidity::encode_event_data(value),
)
.record(handle)?;

Expand Down Expand Up @@ -321,7 +321,7 @@ where
SELECTOR_LOG_TRANSFER,
H160::default(),
to,
EvmDataWriter::new().write(value).build(),
solidity::encode_event_data(value),
)
.record(handle)?;

Expand Down Expand Up @@ -355,7 +355,7 @@ where
SELECTOR_LOG_TRANSFER,
from,
H160::default(),
EvmDataWriter::new().write(value).build(),
solidity::encode_event_data(value),
)
.record(handle)?;

Expand Down
Loading