make evm call and estimateResources public (#1649)

* make evm call and estimateResources public * fix * bump * update bootnode * fix test
AcalaNetwork · Nov 28, 2021 · a2e2e25 · a2e2e25
1 parent 82d54ff
commit a2e2e25
Show file tree

Hide file tree

Showing 59 changed files with 127 additions and 121 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ecosystem-modules/compound-cash/Cargo.toml b/ecosystem-modules/compound-cash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecosystem-compound-cash"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/ecosystem-modules/ren/renvm-bridge/Cargo.toml b/ecosystem-modules/ren/renvm-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecosystem-renvm-bridge"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/ecosystem-modules/starport/Cargo.toml b/ecosystem-modules/starport/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecosystem-starport"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-inspect"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-asset-registry"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-auction-manager"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-cdp-engine"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-cdp-treasury"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'module-collator-selection'
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-currencies"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-dex"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-emergency-shutdown"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-accounts"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-bridge"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/evm-utiltity/Cargo.toml b/modules/evm-utiltity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-utiltity"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/evm-utiltity/macro/Cargo.toml b/modules/evm-utiltity/macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-utiltity-macro"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/evm/rpc/Cargo.toml b/modules/evm/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "evm-rpc"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-rpc-runtime-api"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/evm/rpc/src/lib.rs b/modules/evm/rpc/src/lib.rs
@@ -108,15 +108,15 @@ fn decode_revert_message(data: &[u8]) -> Option<String> {
 
 pub struct EVMApi<B, C, Balance> {
 	client: Arc<C>,
-	deny_unsafe: DenyUnsafe,
+	_deny_unsafe: DenyUnsafe,
 	_marker: PhantomData<(B, Balance)>,
 }
 
 impl<B, C, Balance> EVMApi<B, C, Balance> {
-	pub fn new(client: Arc<C>, deny_unsafe: DenyUnsafe) -> Self {
+	pub fn new(client: Arc<C>, _deny_unsafe: DenyUnsafe) -> Self {
 		Self {
 			client,
-			deny_unsafe,
+			_deny_unsafe,
 			_marker: Default::default(),
 		}
 	}
@@ -126,6 +126,11 @@ fn to_u128(val: NumberOrHex) -> std::result::Result<u128, ()> {
 	val.into_u256().try_into().map_err(|_| ())
 }
 
+// 20M. TODO: use value from runtime
+const MAX_GAS_LIMIT: u64 = 20_000_000;
+// 4M. TODO: use value from runtime
+const MAX_STROAGE_LIMIT: u32 = 4 * 1024 * 1024;
+
 impl<B, C, Balance> EVMApiT<<B as BlockT>::Hash> for EVMApi<B, C, Balance>
 where
 	B: BlockT,
@@ -135,8 +140,6 @@ where
 	Balance: Codec + MaybeDisplay + MaybeFromStr + Default + Send + Sync + 'static + TryFrom<u128> + Into<U256>,
 {
 	fn call(&self, request: CallRequest, at: Option<<B as BlockT>::Hash>) -> Result<Bytes> {
-		self.deny_unsafe.check_if_safe()?;
-
 		let hash = at.unwrap_or_else(|| self.client.info().best_hash);
 
 		let CallRequest {
@@ -148,8 +151,8 @@ where
 			data,
 		} = request;
 
-		let gas_limit = gas_limit.unwrap_or_else(u64::max_value); // TODO: set a limit
-		let storage_limit = storage_limit.unwrap_or_else(u32::max_value); // TODO: set a limit
+		let gas_limit = gas_limit.unwrap_or(MAX_GAS_LIMIT);
+		let storage_limit = storage_limit.unwrap_or(MAX_STROAGE_LIMIT);
 		let data = data.map(|d| d.0).unwrap_or_default();
 
 		let api = self.client.runtime_api();
@@ -205,8 +208,6 @@ where
 		unsigned_extrinsic: Bytes,
 		at: Option<<B as BlockT>::Hash>,
 	) -> Result<EstimateResourcesResponse> {
-		self.deny_unsafe.check_if_safe()?;
-
 		let hash = at.unwrap_or_else(|| self.client.info().best_hash);
 		let request = self
 			.client
@@ -216,7 +217,7 @@ where
 			.map_err(|err| internal_err(format!("execution fatal: {:?}", err)))?;
 
 		// Determine the highest possible gas limits
-		let max_gas_limit = u64::max_value(); // TODO: set a limit
+		let max_gas_limit = MAX_GAS_LIMIT;
 		let mut highest = U256::from(request.gas_limit.unwrap_or(max_gas_limit));
 
 		let request = CallRequest {

diff --git a/modules/example/Cargo.toml b/modules/example/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-example"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/homa-lite/Cargo.toml b/modules/homa-lite/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-homa-lite"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-homa-validator-list"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-homa"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-honzon"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-idle-scheduler"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-incentives"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-loans"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-nft"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-nominees-election"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/polkadot-bridge/Cargo.toml b/modules/polkadot-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-polkadot-bridge"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-prices"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-relaychain"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-session-manager"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/staking-pool/Cargo.toml b/modules/staking-pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-staking-pool"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/staking-pool/rpc/Cargo.toml b/modules/staking-pool/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-staking-pool-rpc"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/staking-pool/rpc/runtime-api/Cargo.toml b/modules/staking-pool/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-staking-pool-rpc-runtime-api"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-support"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-transaction-pause"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-transaction-payment"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"
 default-run = "acala"

diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-cli"
-version = "2.0.2"
+version = "2.0.3"
 authors = ["Acala Developers"]
 edition = "2018"