Update AssemblyScript to 0.19.2

chain/ethereum/Cargo.toml

@@ -17,6 +17,7 @@ dirs-next = "2.0"
 anyhow = "1.0"
 tiny-keccak = "1.5.0"
 hex = "0.4.3"
+semver = "1.0.3"
 
 # master contains changes such as
 # https://github.com/paritytech/ethabi/pull/140, which upstream does not want

chain/ethereum/src/runtime/abi.rs

@@ -1,10 +1,12 @@
 use graph::prelude::BigInt;
 use graph::runtime::{asc_get, asc_new, AscPtr, DeterministicHostError, FromAscObj, ToAscObj};
-use graph::runtime::{AscHeap, AscType};
+use graph::runtime::{AscHeap, AscIndexId, AscType, IndexForAscTypeId};
 use graph_runtime_derive::AscType;
 use graph_runtime_wasm::asc_abi::class::{
     Array, AscAddress, AscBigInt, AscEnum, AscH160, AscString, EthereumValueKind, Uint8Array,
 };
+use semver::Version;
+use std::mem::size_of;
 
 use crate::trigger::{
     EthereumBlockData, EthereumCallData, EthereumEventData, EthereumTransactionData,
@@ -13,7 +15,35 @@ use crate::trigger::{
 use super::runtime_adapter::UnresolvedContractCall;
 
 type AscH256 = Uint8Array;
-type AscLogParamArray = Array<AscPtr<AscLogParam>>;
+
+pub struct AscLogParamArray(Array<AscPtr<AscLogParam>>);
+
+impl AscType for AscLogParamArray {
+    fn to_asc_bytes(&self) -> Result<Vec<u8>, DeterministicHostError> {
+        self.0.to_asc_bytes()
+    }
+    fn from_asc_bytes(
+        asc_obj: &[u8],
+        api_version: Version,
+    ) -> Result<Self, DeterministicHostError> {
+        Ok(Self(Array::from_asc_bytes(asc_obj, api_version)?))
+    }
+}
+
+impl ToAscObj<AscLogParamArray> for Vec<ethabi::LogParam> {
+    fn to_asc_obj<H: AscHeap + ?Sized>(
+        &self,
+        heap: &mut H,
+    ) -> Result<AscLogParamArray, DeterministicHostError> {
+        let content: Result<Vec<_>, _> = self.iter().map(|x| asc_new(heap, x)).collect();
+        let content = content?;
+        Ok(AscLogParamArray(Array::new(&*content, heap)?))
+    }
+}
+
+impl AscIndexId for AscLogParamArray {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::ArrayEventParam;
+}
 
 #[repr(C)]
 #[derive(AscType)]
@@ -25,6 +55,10 @@ pub struct AscUnresolvedContractCall_0_0_4 {
     pub function_args: AscPtr<Array<AscPtr<AscEnum<EthereumValueKind>>>>,
 }
 
+impl AscIndexId for AscUnresolvedContractCall_0_0_4 {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::SmartContractCall;
+}
+
 impl FromAscObj<AscUnresolvedContractCall_0_0_4> for UnresolvedContractCall {
     fn from_asc_obj<H: AscHeap + ?Sized>(
         asc_call: AscUnresolvedContractCall_0_0_4,
@@ -83,6 +117,10 @@ pub(crate) struct AscEthereumBlock {
     pub size: AscPtr<AscBigInt>,
 }
 
+impl AscIndexId for AscEthereumBlock {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::EthereumBlock;
+}
+
 #[repr(C)]
 #[derive(AscType)]
 pub(crate) struct AscEthereumTransaction_0_0_1 {
@@ -95,6 +133,10 @@ pub(crate) struct AscEthereumTransaction_0_0_1 {
     pub gas_price: AscPtr<AscBigInt>,
 }
 
+impl AscIndexId for AscEthereumTransaction_0_0_1 {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::EthereumTransaction;
+}
+
 #[repr(C)]
 #[derive(AscType)]
 pub(crate) struct AscEthereumTransaction_0_0_2 {
@@ -108,6 +150,10 @@ pub(crate) struct AscEthereumTransaction_0_0_2 {
     pub input: AscPtr<Uint8Array>,
 }
 
+impl AscIndexId for AscEthereumTransaction_0_0_2 {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::EthereumTransaction;
+}
+
 #[repr(C)]
 #[derive(AscType)]
 pub(crate) struct AscEthereumEvent<T>
@@ -123,13 +169,25 @@ where
     pub params: AscPtr<AscLogParamArray>,
 }
 
+impl AscIndexId for AscEthereumEvent<AscEthereumTransaction_0_0_1> {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::EthereumEvent;
+}
+
+impl AscIndexId for AscEthereumEvent<AscEthereumTransaction_0_0_2> {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::EthereumEvent;
+}
+
 #[repr(C)]
 #[derive(AscType)]
 pub(crate) struct AscLogParam {
     pub name: AscPtr<AscString>,
     pub value: AscPtr<AscEnum<EthereumValueKind>>,
 }
 
+impl AscIndexId for AscLogParam {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::EventParam;
+}
+
 #[repr(C)]
 #[derive(AscType)]
 pub(crate) struct AscEthereumCall {
@@ -140,6 +198,10 @@ pub(crate) struct AscEthereumCall {
     pub outputs: AscPtr<AscLogParamArray>,
 }
 
+impl AscIndexId for AscEthereumCall {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::EthereumCall;
+}
+
 #[repr(C)]
 #[derive(AscType)]
 pub(crate) struct AscEthereumCall_0_0_3 {
@@ -151,6 +213,10 @@ pub(crate) struct AscEthereumCall_0_0_3 {
     pub outputs: AscPtr<AscLogParamArray>,
 }
 
+impl AscIndexId for AscEthereumCall_0_0_3 {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::EthereumCall;
+}
+
 impl ToAscObj<AscEthereumBlock> for EthereumBlockData {
     fn to_asc_obj<H: AscHeap + ?Sized>(
         &self,
@@ -219,7 +285,7 @@ impl ToAscObj<AscEthereumTransaction_0_0_2> for EthereumTransactionData {
     }
 }
 
-impl<T: AscType> ToAscObj<AscEthereumEvent<T>> for EthereumEventData
+impl<T: AscType + AscIndexId> ToAscObj<AscEthereumEvent<T>> for EthereumEventData
 where
     EthereumTransactionData: ToAscObj<T>,
 {
@@ -241,7 +307,7 @@ where
                 .unwrap_or(Ok(AscPtr::null()))?,
             block: asc_new(heap, &self.block)?,
             transaction: asc_new::<T, EthereumTransactionData, _>(heap, &self.transaction)?,
-            params: asc_new(heap, self.params.as_slice())?,
+            params: asc_new(heap, &self.params)?,
         })
     }
 }
@@ -255,8 +321,8 @@ impl ToAscObj<AscEthereumCall> for EthereumCallData {
             address: asc_new(heap, &self.to)?,
             block: asc_new(heap, &self.block)?,
             transaction: asc_new(heap, &self.transaction)?,
-            inputs: asc_new(heap, self.inputs.as_slice())?,
-            outputs: asc_new(heap, self.outputs.as_slice())?,
+            inputs: asc_new(heap, &self.inputs)?,
+            outputs: asc_new(heap, &self.outputs)?,
         })
     }
 }
@@ -271,8 +337,8 @@ impl ToAscObj<AscEthereumCall_0_0_3> for EthereumCallData {
             from: asc_new(heap, &self.from)?,
             block: asc_new(heap, &self.block)?,
             transaction: asc_new(heap, &self.transaction)?,
-            inputs: asc_new(heap, self.inputs.as_slice())?,
-            outputs: asc_new(heap, self.outputs.as_slice())?,
+            inputs: asc_new(heap, &self.inputs)?,
+            outputs: asc_new(heap, &self.outputs)?,
         })
     }
 }

chain/ethereum/src/runtime/runtime_adapter.rs

@@ -7,6 +7,7 @@ use crate::{
 use anyhow::{Context, Error};
 use blockchain::HostFn;
 use ethabi::{Address, Token};
+use graph::runtime::{AscIndexId, IndexForAscTypeId};
 use graph::{
     blockchain::{self, BlockPtr, DataSource as _, HostFnCtx},
     cheap_clone::CheapClone,
@@ -204,3 +205,7 @@ pub(crate) struct UnresolvedContractCall {
     pub function_signature: Option<String>,
     pub function_args: Vec<ethabi::Token>,
 }
+
+impl AscIndexId for AscUnresolvedContractCall {
+    const INDEX_ASC_TYPE_ID: IndexForAscTypeId = IndexForAscTypeId::SmartContractCall;
+}

graph/src/data/subgraph/mod.rs

@@ -57,6 +57,11 @@ lazy_static! {
     // doesn't exist. In the future we should not use 0.0.3 as version
     // and skip to 0.0.4 to avoid ambiguity.
     static ref MAX_SPEC_VERSION: Version = Version::new(0, 0, 3);
+
+    static ref MAX_API_VERSION: Version = std::env::var("GRAPH_MAX_API_VERSION")
+        .ok()
+        .and_then(|api_version_str| Version::parse(&api_version_str).ok())
+        .unwrap_or(Version::new(0, 0, 4));
 }
 
 /// Rust representation of the GraphQL schema for a `SubgraphManifest`.
@@ -604,8 +609,12 @@ impl UnresolvedMapping {
 
         let api_version = Version::parse(&api_version)?;
 
-        ensure!(VersionReq::parse("<= 0.0.4").unwrap().matches(&api_version),
-            "The maximum supported mapping API version of this indexer is 0.0.4, but `{}` was found",
+        ensure!(
+            VersionReq::parse(&format!("<= {}", *MAX_API_VERSION))
+                .unwrap()
+                .matches(&api_version),
+            "The maximum supported mapping API version of this indexer is {}, but `{}` was found",
+            *MAX_API_VERSION,
             api_version
         );
 

graph/src/runtime/asc_heap.rs

@@ -1,6 +1,6 @@
 use semver::Version;
 
-use super::{AscPtr, AscType, DeterministicHostError};
+use super::{AscIndexId, AscPtr, AscType, DeterministicHostError, IndexForAscTypeId};
 /// A type that can read and write to the Asc heap. Call `asc_new` and `asc_get`
 /// for reading and writing Rust structs from and to Asc.
 ///
@@ -12,6 +12,11 @@ pub trait AscHeap {
     fn get(&self, offset: u32, size: u32) -> Result<Vec<u8>, DeterministicHostError>;
 
     fn api_version(&self) -> Version;
+
+    fn asc_type_id(
+        &mut self,
+        type_id_index: IndexForAscTypeId,
+    ) -> Result<u32, DeterministicHostError>;
 }
 
 /// Instantiate `rust_obj` as an Asc object of class `C`.
@@ -24,7 +29,7 @@ pub fn asc_new<C, T: ?Sized, H: AscHeap + ?Sized>(
     rust_obj: &T,
 ) -> Result<AscPtr<C>, DeterministicHostError>
 where
-    C: AscType,
+    C: AscType + AscIndexId,
     T: ToAscObj<C>,
 {
     let obj = rust_obj.to_asc_obj(heap)?;
@@ -40,7 +45,7 @@ pub fn asc_get<T, C, H: AscHeap + ?Sized>(
     asc_ptr: AscPtr<C>,
 ) -> Result<T, DeterministicHostError>
 where
-    C: AscType,
+    C: AscType + AscIndexId,
     T: FromAscObj<C>,
 {
     T::from_asc_obj(asc_ptr.read_ptr(heap)?, heap)
@@ -51,7 +56,7 @@ pub fn try_asc_get<T, C, H: AscHeap + ?Sized>(
     asc_ptr: AscPtr<C>,
 ) -> Result<T, DeterministicHostError>
 where
-    C: AscType,
+    C: AscType + AscIndexId,
     T: TryFromAscObj<C>,
 {
     T::try_from_asc_obj(asc_ptr.read_ptr(heap)?, heap)