Skip to content

pink: Use customized ink address as contract id #610

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

Merged
kvinwang merged 7 commits into from
Dec 30, 2021
Merged

pink: Use customized ink address as contract id #610

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6db27a
Update substrate to 0444ab7b4af
kvinwang Dec 27, 2021
7d14f65
Update substrate to f57c6447af
kvinwang Dec 28, 2021
1eb4adc
Use customized ink address as contract id
kvinwang Dec 21, 2021
2e3f0ef
Update Cargo.lock
kvinwang Dec 28, 2021
6e35fe7
contract: Rename Group to Cluster
kvinwang Dec 29, 2021
9b6de19
Merge branch 'master' into custom-ink-address
kvinwang Dec 30, 2021
7dd789d
Fix unittest
kvinwang Dec 30, 2021
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
Prev Previous commit
Next Next commit
Update substrate to f57c6447af
  • Loading branch information
@kvinwang
kvinwang committed Dec 29, 2021
commit 7d14f65931dbf53fd47709052c3b820f7e4d1d98
3 changes: 2 additions & 1 deletion crates/phala-trie-storage/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use serde::{Serialize, Serializer, Deserializer, Deserialize};
use sp_core::storage::ChildInfo;
use sp_core::Hasher;
use sp_state_machine::{Backend, TrieBackend};
use sp_trie::{trie_types::TrieDBMut, MemoryDB, TrieMut, HashDBT};
use sp_trie::{trie_types::TrieDBMutV0 as TrieDBMut, MemoryDB, TrieMut, HashDBT};

/// Storage key.
pub type StorageKey = Vec<u8>;
Expand Down Expand Up @@ -130,6 +130,7 @@ where
.map(|(k, v)| (k.as_ref(), v.as_ref().map(|v| v.as_ref()))),
)
}),
sp_core::storage::StateVersion::V0,
)
}

Expand Down
2 changes: 1 addition & 1 deletion crates/pink/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ where
});

self.backend
.full_storage_root(delta, child_delta)
.full_storage_root(delta, child_delta, sp_core::storage::StateVersion::V0)
}

pub fn commit_transaction(&mut self, root: Hash, transaction: Backend::Transaction) {
Expand Down
1 change: 1 addition & 0 deletions standalone/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
state_version: 0,
};

/// The BABE epoch configuration at genesis.
Expand Down
2 changes: 1 addition & 1 deletion substrate
Open in desktop
Submodule substrate updated 89 files
+1 −1 .gitlab-ci.yml
+25 −11 Cargo.lock
+1 −0 bin/node-template/runtime/src/lib.rs
+2 −3 bin/node/bench/src/generator.rs
+3 −3 bin/node/bench/src/trie.rs
+2 −2 bin/node/executor/benches/bench.rs
+1 −1 bin/node/executor/tests/common.rs
+1 −0 bin/node/runtime/src/lib.rs
+7 −2 client/api/src/backend.rs
+2 −2 client/api/src/call_executor.rs
+11 −4 client/api/src/in_mem.rs
+8 −0 client/beefy/rpc/Cargo.toml
+132 −0 client/beefy/rpc/src/lib.rs
+1 −0 client/block-builder/src/lib.rs
+55 −8 client/chain-spec/src/chain_spec.rs
+1 −1 client/chain-spec/src/lib.rs
+9 −4 client/db/src/bench.rs
+70 −38 client/db/src/lib.rs
+16 −6 client/db/src/storage_cache.rs
+1 −0 client/executor/runtime-test/src/lib.rs
+6 −5 client/executor/src/integration_tests/mod.rs
+57 −31 client/executor/src/wasm_runtime.rs
+4 −2 client/network/src/protocol/sync.rs
+2 −2 client/rpc/src/state/tests.rs
+15 −1 client/service/src/client/call_executor.rs
+51 −13 client/service/src/client/client.rs
+4 −2 client/service/src/client/genesis.rs
+8 −8 client/service/test/src/client/mod.rs
+3 −2 frame/benchmarking/src/lib.rs
+22 −7 frame/executive/src/lib.rs
+7 −8 frame/nicks/src/lib.rs
+2 −2 frame/session/src/historical/mod.rs
+5 −5 frame/support/src/lib.rs
+4 −3 frame/support/src/storage/child.rs
+1 −0 frame/support/test/compile_pass/src/lib.rs
+19 −6 frame/system/src/lib.rs
+1 −0 frame/system/src/mock.rs
+23 −0 frame/system/src/tests.rs
+69 −47 frame/transaction-storage/src/benchmarking.rs
+2 −1 frame/transaction-storage/src/lib.rs
+7 −0 primitives/api/proc-macro/src/impl_runtime_apis.rs
+4 −41 primitives/api/src/lib.rs
+42 −16 primitives/core/src/crypto.rs
+6 −59 primitives/core/src/ecdsa.rs
+2 −34 primitives/core/src/ed25519.rs
+2 −16 primitives/core/src/sr25519.rs
+7 −3 primitives/externalities/src/lib.rs
+134 −10 primitives/io/src/lib.rs
+4 −0 primitives/runtime-interface/src/impls.rs
+1 −0 primitives/runtime/src/lib.rs
+11 −11 primitives/runtime/src/traits.rs
+2 −2 primitives/state-machine/Cargo.toml
+13 −5 primitives/state-machine/src/backend.rs
+20 −10 primitives/state-machine/src/basic.rs
+103 −66 primitives/state-machine/src/ext.rs
+44 −21 primitives/state-machine/src/in_memory_backend.rs
+128 −31 primitives/state-machine/src/lib.rs
+10 −6 primitives/state-machine/src/overlayed_changes/mod.rs
+69 −30 primitives/state-machine/src/proving_backend.rs
+7 −3 primitives/state-machine/src/read_only.rs
+44 −14 primitives/state-machine/src/testing.rs
+114 −43 primitives/state-machine/src/trie_backend.rs
+90 −67 primitives/state-machine/src/trie_backend_essence.rs
+51 −0 primitives/storage/src/lib.rs
+7 −3 primitives/tasks/src/async_externalities.rs
+1 −1 primitives/transaction-storage-proof/src/lib.rs
+4 −4 primitives/trie/Cargo.toml
+2 −2 primitives/trie/benches/bench.rs
+166 −76 primitives/trie/src/lib.rs
+87 −27 primitives/trie/src/node_codec.rs
+74 −19 primitives/trie/src/node_header.rs
+7 −4 primitives/trie/src/storage_proof.rs
+2 −4 primitives/trie/src/trie_codec.rs
+44 −37 primitives/trie/src/trie_stream.rs
+1 −0 primitives/version/Cargo.toml
+22 −2 primitives/version/proc-macro/src/decl_runtime_version.rs
+74 −4 primitives/version/src/lib.rs
+1 −1 test-utils/client/src/client_ext.rs
+2 −2 test-utils/client/src/lib.rs
+1 −1 test-utils/runtime/Cargo.toml
+2 −0 test-utils/runtime/client/src/lib.rs
+2 −0 test-utils/runtime/src/genesismap.rs
+7 −7 test-utils/runtime/src/lib.rs
+6 −4 test-utils/runtime/src/system.rs
+1 −1 utils/frame/try-runtime/cli/src/commands/execute_block.rs
+13 −4 utils/frame/try-runtime/cli/src/commands/follow_chain.rs
+1 −1 utils/frame/try-runtime/cli/src/commands/offchain_worker.rs
+1 −1 utils/frame/try-runtime/cli/src/commands/on_runtime_upgrade.rs
+5 −2 utils/frame/try-runtime/cli/src/lib.rs