Add vesting precompile

.github/workflows/build.yml

@@ -69,6 +69,26 @@ jobs:
       - name: Check clippy
         run: |
           SKIP_WASM_BUILD=1 cargo clippy --all-targets --workspace --features runtime-benchmarks --features try-runtime -- -D warnings
+
+  lint-e2e:
+    runs-on:
+      group: laos
+      labels: ubuntu-16-cores
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Install dependencies
+        run: |
+          npm install
+        working-directory: ./e2e-tests
+      - name: Run lint
+        run: |
+          npm run fmt-check
+        working-directory: ./e2e-tests
+
   test:
     runs-on:
       group: laos

Cargo.toml

@@ -252,6 +252,7 @@ substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", defaul
 pallet-laos-evolution = { path = "./pallets/laos-evolution", default-features = false }
 pallet-asset-metadata-extender = { path = "./pallets/asset-metadata-extender", default-features = false }
 pallet-parachain-staking = { path = "./pallets/parachain-staking", default-features = false }
+pallet-benchmark = { path = "./pallets/benchmark", default-features = false}
 
 # Primitives
 laos-primitives = { path = "./primitives", default-features = false }

e2e-tests/compile_contracts.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# we need to move .sol files under /contracts folder so that truffle works properly
+cp -r ../pallets/laos-evolution/src/precompiles/evolution_collection_factory/contracts contracts
+cp -r ../pallets/laos-evolution/src/precompiles/evolution_collection/contracts contracts
+cp -r ../pallets/asset-metadata-extender/src/precompiles/asset_metadata_extender/contracts contracts
+cp -r ../pallets/benchmark/src/precompiles/vesting/contracts contracts
+
+truffle compile
+rm -rf contracts

e2e-tests/package.json

@@ -6,7 +6,7 @@
 	"scripts": {
 		"fmt-check": "prettier ./tests --check",
 		"fmt": "prettier ./tests --write",
-		"build": "cp -r ../pallets/laos-evolution/src/precompiles/evolution_collection_factory/contracts contracts && cp -r ../pallets/laos-evolution/src/precompiles/evolution_collection/contracts contracts && cp -r ../pallets/asset-metadata-extender/src/precompiles/asset_metadata_extender/contracts contracts && truffle compile && rm -rf contracts",
+		"build": "./compile_contracts.sh",
 		"test": "mocha -r ts-node/register -t 70000 --grep '@qa' --invert 'tests/**/*.ts'",
 		"qa": "mocha -r ts-node/register -t 200000 --grep '@qa' 'tests/**/*.ts'",
 		"test-sql": "FRONTIER_BACKEND_TYPE='sql' mocha -r ts-node/register 'tests/**/*.ts'"

e2e-tests/tests/config.ts

@@ -3,6 +3,7 @@ import { AbiItem } from "web3-utils";
 import AssetMetadataExtender from "../build/contracts/AssetMetadataExtender.json";
 import EvolutionCollection from "../build/contracts/EvolutionCollection.json";
 import EvolutionCollectionFactory from "../build/contracts/EvolutionCollectionFactory.json";
+import Vesting from "../build/contracts/Vesting.json";
 
 // Node config
 export const RUNTIME_SPEC_NAME = "laos";
@@ -21,18 +22,16 @@ export const ETH_BLOCK_GAS_LIMIT = 15000000; // The same configuration as runtim
 export const GAS_LIMIT = ETH_BLOCK_GAS_LIMIT - 10000000;
 
 // LAOS Evolution Contract
-export const EVOLUTION_COLLETION_FACTORY_ABI = EvolutionCollectionFactory.abi as AbiItem[];
+export const EVOLUTION_COLLECTION_FACTORY_ABI = EvolutionCollectionFactory.abi as AbiItem[];
 export const EVOLUTION_COLLECTION_ABI = EvolutionCollection.abi as AbiItem[];
-export const CONTRACT_ADDRESS = "0x0000000000000000000000000000000000000403";
+export const EVOLUTION_COLLECTION_FACTORY_CONTRACT_ADDRESS = "0x0000000000000000000000000000000000000403";
 export const SELECTOR_LOG_NEW_COLLECTION = "0x5b84d9550adb7000df7bee717735ecd3af48ea3f66c6886d52e8227548fb228c";
 export const SELECTOR_LOG_MINTED_WITH_EXTERNAL_TOKEN_URI =
 	"0xa7135052b348b0b4e9943bae82d8ef1c5ac225e594ef4271d12f0744cfc98348";
 export const SELECTOR_LOG_EVOLVED_WITH_EXTERNAL_TOKEN_URI =
 	"0xdde18ad2fe10c12a694de65b920c02b851c382cf63115967ea6f7098902fa1c8";
-export const SELECTOR_LOG_OWNERSHIP_TRANSFERRED =
-	"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0";
-export const SELECTOR_LOG_PUBLIC_MINTING_ENABLED =
-	"0x8ff3deee4c40ab085dd8d7d0c848cb5295e4ab5faa32e5b60e3936cf1bdc77bf";
+export const SELECTOR_LOG_OWNERSHIP_TRANSFERRED = "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0";
+export const SELECTOR_LOG_PUBLIC_MINTING_ENABLED = "0x8ff3deee4c40ab085dd8d7d0c848cb5295e4ab5faa32e5b60e3936cf1bdc77bf";
 export const SELECTOR_LOG_PUBLIC_MINTING_DISABLED =
 	"0xebe230014056e5cb4ca6d8e534189bf5bfb0759489f16170654dce7c014b6699";
 
@@ -44,6 +43,10 @@ export const SELECTOR_LOG_EXTENDED_UL_WITH_EXTERNAL_URI =
 export const SELECTOR_LOG_UPDATED_EXTENDED_UL_WITH_EXTERNAL_URI =
 	"0xe7ebe38355126fe0c3eab0ec03eb1b94ff501458a80713c9eb8b737334a651ff";
 
+// Vesting contract
+export const VESTING_CONTRACT_ADDRESS = "0x0000000000000000000000000000000000000406";
+export const VESTING_ABI = Vesting.abi as AbiItem[];
+
 // Constants
 export const MAX_U96 = new BN("79228162514264337593543950336"); // 2^96 - 1
 export const REVERT_BYTECODE = "0x60006000fd";

e2e-tests/tests/test-create-collection.ts

@@ -2,8 +2,8 @@ import { expect } from "chai";
 import { step } from "mocha-steps";
 import Contract from "web3-eth-contract";
 import {
-	CONTRACT_ADDRESS,
-	EVOLUTION_COLLETION_FACTORY_ABI,
+	EVOLUTION_COLLECTION_FACTORY_CONTRACT_ADDRESS,
+	EVOLUTION_COLLECTION_FACTORY_ABI,
 	GAS_LIMIT,
 	GAS_PRICE,
 	FAITH,
@@ -21,18 +21,22 @@ describeWithExistingNode("Frontier RPC (Create Collection)", (context) => {
 	let testCollectionAddress: string;
 
 	before(async function () {
-		contract = new context.web3.eth.Contract(EVOLUTION_COLLETION_FACTORY_ABI, CONTRACT_ADDRESS, {
-			from: FAITH,
-			gasPrice: GAS_PRICE,
-			gas: GAS_LIMIT,
-		});
+		contract = new context.web3.eth.Contract(
+			EVOLUTION_COLLECTION_FACTORY_ABI,
+			EVOLUTION_COLLECTION_FACTORY_CONTRACT_ADDRESS,
+			{
+				from: FAITH,
+				gasPrice: GAS_PRICE,
+				gas: GAS_LIMIT,
+			}
+		);
 		context.web3.eth.accounts.wallet.add(FAITH_PRIVATE_KEY);
 	});
 
 	step("when collection is created, it should return owner", async function () {
 		const collectionContract = await createCollection(context);
 		testCollectionContract = collectionContract;
-		
+
 		const owner = await collectionContract.methods.owner().call();
 		expect(owner).to.be.eq(FAITH);
 	});
@@ -55,9 +59,7 @@ describeWithExistingNode("Frontier RPC (Create Collection)", (context) => {
 		// event topics
 		expect(result.events.NewCollection.raw.topics.length).to.be.eq(2);
 		expect(result.events.NewCollection.raw.topics[0]).to.be.eq(SELECTOR_LOG_NEW_COLLECTION);
-		expect(result.events.NewCollection.raw.topics[1]).to.be.eq(
-			context.web3.utils.padLeft(FAITH.toLowerCase(), 64)
-		);
+		expect(result.events.NewCollection.raw.topics[1]).to.be.eq(context.web3.utils.padLeft(FAITH.toLowerCase(), 64));
 
 		// event data
 		expect(result.events.NewCollection.raw.data.toLowerCase()).to.be.eq(
@@ -79,14 +81,18 @@ describeWithExistingNode("Frontier RPC (Create Collection)", (context) => {
 	});
 
 	step("create collection call can estimate gas", async function () {
-		const contract = new context.web3.eth.Contract(EVOLUTION_COLLETION_FACTORY_ABI, CONTRACT_ADDRESS, {
-			from: FAITH,
-			gasPrice: GAS_PRICE,
-		});
-
+		const contract = new context.web3.eth.Contract(
+			EVOLUTION_COLLECTION_FACTORY_ABI,
+			EVOLUTION_COLLECTION_FACTORY_CONTRACT_ADDRESS,
+			{
+				from: FAITH,
+				gasPrice: GAS_PRICE,
+			}
+		);
+
 		let nonce = await context.web3.eth.getTransactionCount(FAITH);
 		context.web3.eth.accounts.wallet.add(FAITH_PRIVATE_KEY);
-		
+
 		const estimatedGas = await contract.methods.createCollection(FAITH).estimateGas({
 			from: FAITH,
 			gas: GAS_LIMIT,