Attempt at installing accountid20

crates/cargo-contract/Cargo.toml

@@ -44,6 +44,10 @@ scale-info = "2.8.0"
 subxt = "0.29.0"
 hex = "0.4.3"
 jsonrpsee = { version = "0.18.2", features = ["ws-client"] }
+libsecp256k1 = { version = "0.7", default-features = false , features = [ "hmac" ] }
+sha3 = "0.10.8"
+sp-io = "23.0.0"
+impl-serde = "0.4.0"
 
 [build-dependencies]
 anyhow = "1.0.71"

crates/cargo-contract/src/cmd/extrinsics/instantiate.rs

@@ -41,7 +41,7 @@ use crate::{
         Balance,
         CodeHash,
     },
-    DEFAULT_KEY_COL_WIDTH,
+    DEFAULT_KEY_COL_WIDTH, account::AccountId20,
 };
 use anyhow::{
     anyhow,
@@ -329,7 +329,7 @@ impl Exec {
         &self,
         result: &ExtrinsicEvents<DefaultConfig>,
         code_hash: Option<CodeHash>,
-        contract_address: subxt::utils::AccountId32,
+        contract_address: AccountId20,
         token_metadata: &TokenMetadata,
     ) -> Result<(), ErrorVariant> {
         let events = DisplayEvents::from_events(

crates/cargo-contract/src/cmd/extrinsics/mod.rs

@@ -94,7 +94,8 @@ pub use contract_transcode::ContractMessageTranscoder;
 pub use error::ErrorVariant;
 pub use instantiate::InstantiateCommand;
 pub use remove::RemoveCommand;
-pub use subxt::PolkadotConfig as DefaultConfig;
+// pub use subxt::PolkadotConfig as DefaultConfig;
+pub use super::DefaultConfig;
 pub use upload::UploadCommand;
 
 type PairSigner = tx::PairSigner<DefaultConfig, sr25519::Pair>;

crates/cargo-contract/src/cmd/mod.rs

@@ -20,6 +20,8 @@ pub mod encode;
 pub mod info;
 pub mod runtime_api;
 
+use crate::account;
+
 pub(crate) use self::{
     build::{
         BuildCommand,
@@ -40,10 +42,25 @@ pub(crate) use self::extrinsics::{
 
 use subxt::{
     Config,
-    OnlineClient,
+    OnlineClient, SubstrateConfig,
 };
+use subxt::config::substrate::SubstrateExtrinsicParams;
+
+// pub use subxt::PolkadotConfig as DefaultConfig;
+pub use AcademyPowConfig as DefaultConfig;
+
+pub enum AcademyPowConfig{}
+impl subxt::Config for DefaultConfig {
+    type Index = <SubstrateConfig as Config>::Index;
+    type Hash = <SubstrateConfig as Config>::Hash;
+    type AccountId = account::AccountId20;
+    type Address = account::AccountId20;
+    type Signature = account::EthereumSignature;
+    type Hasher = <SubstrateConfig as Config>::Hasher;
+    type Header = <SubstrateConfig as Config>::Header;
+    type ExtrinsicParams = SubstrateExtrinsicParams<Self>;
+}
 
-pub use subxt::PolkadotConfig as DefaultConfig;
 type Client = OnlineClient<DefaultConfig>;
 type Balance = u128;
 type CodeHash = <DefaultConfig as Config>::Hash;

crates/cargo-contract/src/main.rs

@@ -17,6 +17,7 @@
 #![deny(unused_crate_dependencies)]
 
 mod cmd;
+mod account;
 
 use self::cmd::{
     BuildCommand,

crates/transcode/Cargo.toml

@@ -38,6 +38,12 @@ serde_json = "1.0.99"
 thiserror = "1.0.40"
 strsim = "0.10.0"
 
+libsecp256k1 = { version = "0.7", default-features = false , features = [ "hmac" ] }
+sha3 = "0.10.8"
+sp-io = "23.0.0"
+impl-serde = "0.4.0"
+sp-runtime = "24.0.0"
+
 [dev-dependencies]
 assert_matches = "1.5.0"
 ink = "4.2.0"