jeffemmett
/
non-fungible-apps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: lambda layers (#262) 

* feat: add scripts to create lambda layers

* chore: deploy the new version of the contract to mumbai.

* feat: update environment variables used in the serverless config.

* feat: add JSON_RPC env var.

* feat: add deploy:dev command.

* feat: add support for different networks and blockchain explorers.
This commit is contained in:
Shredder 2023-06-09 20:40:31 +03:30 committed by GitHub
parent 869b9f6e78
commit bce1e0a34a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 1264 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

500
contracts/.openzeppelin/polygon-mumbai.json
View File

@ -39,6 +39,11 @@
"address": "0x37150709cFf366DeEaB836d05CAf49F4DA46Bb2E",
"txHash": "0x808546aa8bbc4e36c54d955970d8cfe8c4dc925eb5f65ff7b25203dd312bad4c",
"kind": "transparent"
},
{
"address": "0xdAbc1E0f926545a2898c644870FA4DC39E83EB70",
"txHash": "0xfc68decd1ce3d80c8bb94ef0c715792ef0fc555e9b63b85945841349a5640918",
"kind": "transparent"
}
],
"impls": {
@ -7445,6 +7450,501 @@
}
}
}
},
"3f9c0fe2bffef556e080d82b03898e016c29a3ded5d8dc62eaad7963752823a7": {
"address": "0x5c456c91fe4ADd4440aAfCb856C66F105e8Ade83",
"txHash": "0x6ce06b676b454b622edac784f38d9c1acadd7f0927a51ae3ee765a099c9195cd",
"layout": {
"solcVersion": "0.8.12",
"storage": [
{
"label": "_initialized",
"offset": 0,
"slot": "0",
"type": "t_uint8",
"contract": "Initializable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62",
"retypedFrom": "bool"
},
{
"label": "_initializing",
"offset": 1,
"slot": "0",
"type": "t_bool",
"contract": "Initializable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67"
},
{
"label": "__gap",
"offset": 0,
"slot": "1",
"type": "t_array(t_uint256)50_storage",
"contract": "ContextUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
},
{
"label": "__gap",
"offset": 0,
"slot": "51",
"type": "t_array(t_uint256)50_storage",
"contract": "ERC165Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41"
},
{
"label": "_name",
"offset": 0,
"slot": "101",
"type": "t_string_storage",
"contract": "ERC721Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:25"
},
{
"label": "_symbol",
"offset": 0,
"slot": "102",
"type": "t_string_storage",
"contract": "ERC721Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:28"
},
{
"label": "_owners",
"offset": 0,
"slot": "103",
"type": "t_mapping(t_uint256,t_address)",
"contract": "ERC721Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:31"
},
{
"label": "_balances",
"offset": 0,
"slot": "104",
"type": "t_mapping(t_address,t_uint256)",
"contract": "ERC721Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:34"
},
{
"label": "_tokenApprovals",
"offset": 0,
"slot": "105",
"type": "t_mapping(t_uint256,t_address)",
"contract": "ERC721Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:37"
},
{
"label": "_operatorApprovals",
"offset": 0,
"slot": "106",
"type": "t_mapping(t_address,t_mapping(t_address,t_bool))",
"contract": "ERC721Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:40"
},
{
"label": "__gap",
"offset": 0,
"slot": "107",
"type": "t_array(t_uint256)44_storage",
"contract": "ERC721Upgradeable",
"src": "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol:514"
},
{
"label": "_collectionRolesCounter",
"offset": 0,
"slot": "151",
"type": "t_mapping(t_enum(CollectionRoles)4485,t_uint256)",
"contract": "FleekAccessControl",
"src": "contracts/FleekAccessControl.sol:58"
},
{
"label": "_collectionRoles",
"offset": 0,
"slot": "152",
"type": "t_mapping(t_enum(CollectionRoles)4485,t_mapping(t_address,t_bool))",
"contract": "FleekAccessControl",
"src": "contracts/FleekAccessControl.sol:63"
},
{
"label": "_tokenRolesVersion",
"offset": 0,
"slot": "153",
"type": "t_mapping(t_uint256,t_uint256)",
"contract": "FleekAccessControl",
"src": "contracts/FleekAccessControl.sol:70"
},
{
"label": "_tokenRoles",
"offset": 0,
"slot": "154",
"type": "t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_enum(TokenRoles)4487,t_mapping(t_address,t_bool))))",
"contract": "FleekAccessControl",
"src": "contracts/FleekAccessControl.sol:75"
},
{
"label": "__gap",
"offset": 0,
"slot": "155",
"type": "t_array(t_uint256)49_storage",
"contract": "FleekAccessControl",
"src": "contracts/FleekAccessControl.sol:178"
},
{
"label": "_paused",
"offset": 0,
"slot": "204",
"type": "t_bool",
"contract": "FleekPausable",
"src": "contracts/FleekPausable.sol:23"
},
{
"label": "_canPause",
"offset": 1,
"slot": "204",
"type": "t_bool",
"contract": "FleekPausable",
"src": "contracts/FleekPausable.sol:24"
},
{
"label": "__gap",
"offset": 0,
"slot": "205",
"type": "t_array(t_uint256)49_storage",
"contract": "FleekPausable",
"src": "contracts/FleekPausable.sol:133"
},
{
"label": "_billings",
"offset": 0,
"slot": "254",
"type": "t_mapping(t_enum(Billing)5452,t_uint256)",
"contract": "FleekBilling",
"src": "contracts/FleekBilling.sol:31"
},
{
"label": "__gap",
"offset": 0,
"slot": "255",
"type": "t_array(t_uint256)49_storage",
"contract": "FleekBilling",
"src": "contracts/FleekBilling.sol:81"
},
{
"label": "_accessPoints",
"offset": 0,
"slot": "304",
"type": "t_mapping(t_string_memory_ptr,t_struct(AccessPoint)4984_storage)",
"contract": "FleekAccessPoints",
"src": "contracts/FleekAccessPoints.sol:64"
},
{
"label": "_autoApproval",
"offset": 0,
"slot": "305",
"type": "t_mapping(t_uint256,t_bool)",
"contract": "FleekAccessPoints",
"src": "contracts/FleekAccessPoints.sol:66"
},
{
"label": "__gap",
"offset": 0,
"slot": "306",
"type": "t_array(t_uint256)49_storage",
"contract": "FleekAccessPoints",
"src": "contracts/FleekAccessPoints.sol:211"
},
{
"label": "_appIds",
"offset": 0,
"slot": "355",
"type": "t_uint256",
"contract": "FleekERC721",
"src": "contracts/FleekERC721.sol:53"
},
{
"label": "_apps",
"offset": 0,
"slot": "356",
"type": "t_mapping(t_uint256,t_struct(Token)7203_storage)",
"contract": "FleekERC721",
"src": "contracts/FleekERC721.sol:54"
},
{
"label": "_tokenVerifier",
"offset": 0,
"slot": "357",
"type": "t_mapping(t_uint256,t_address)",
"contract": "FleekERC721",
"src": "contracts/FleekERC721.sol:55"
},
{
"label": "_tokenVerified",
"offset": 0,
"slot": "358",
"type": "t_mapping(t_uint256,t_bool)",
"contract": "FleekERC721",
"src": "contracts/FleekERC721.sol:56"
}
],
"types": {
"t_address": {
"label": "address",
"numberOfBytes": "20"
},
"t_array(t_uint256)44_storage": {
"label": "uint256[44]",
"numberOfBytes": "1408"
},
"t_array(t_uint256)49_storage": {
"label": "uint256[49]",
"numberOfBytes": "1568"
},
"t_array(t_uint256)50_storage": {
"label": "uint256[50]",
"numberOfBytes": "1600"
},
"t_bool": {
"label": "bool",
"numberOfBytes": "1"
},
"t_enum(AccessPointCreationStatus)4970": {
"label": "enum FleekAccessPoints.AccessPointCreationStatus",
"members": [
"DRAFT",
"APPROVED",
"REJECTED",
"REMOVED"
],
"numberOfBytes": "1"
},
"t_enum(Billing)5452": {
"label": "enum FleekBilling.Billing",
"members": [
"Mint",
"AddAccessPoint"
],
"numberOfBytes": "1"
},
"t_enum(CollectionRoles)4485": {
"label": "enum FleekAccessControl.CollectionRoles",
"members": [
"Owner",
"Verifier"
],
"numberOfBytes": "1"
},
"t_enum(TokenRoles)4487": {
"label": "enum FleekAccessControl.TokenRoles",
"members": [
"Controller"
],
"numberOfBytes": "1"
},
"t_mapping(t_address,t_bool)": {
"label": "mapping(address => bool)",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_mapping(t_address,t_bool))": {
"label": "mapping(address => mapping(address => bool))",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_uint256)": {
"label": "mapping(address => uint256)",
"numberOfBytes": "32"
},
"t_mapping(t_enum(Billing)5452,t_uint256)": {
"label": "mapping(enum FleekBilling.Billing => uint256)",
"numberOfBytes": "32"
},
"t_mapping(t_enum(CollectionRoles)4485,t_mapping(t_address,t_bool))": {
"label": "mapping(enum FleekAccessControl.CollectionRoles => mapping(address => bool))",
"numberOfBytes": "32"
},
"t_mapping(t_enum(CollectionRoles)4485,t_uint256)": {
"label": "mapping(enum FleekAccessControl.CollectionRoles => uint256)",
"numberOfBytes": "32"
},
"t_mapping(t_enum(TokenRoles)4487,t_mapping(t_address,t_bool))": {
"label": "mapping(enum FleekAccessControl.TokenRoles => mapping(address => bool))",
"numberOfBytes": "32"
},
"t_mapping(t_string_memory_ptr,t_struct(AccessPoint)4984_storage)": {
"label": "mapping(string => struct FleekAccessPoints.AccessPoint)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_address)": {
"label": "mapping(uint256 => address)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_bool)": {
"label": "mapping(uint256 => bool)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_mapping(t_enum(TokenRoles)4487,t_mapping(t_address,t_bool)))": {
"label": "mapping(uint256 => mapping(enum FleekAccessControl.TokenRoles => mapping(address => bool)))",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_mapping(t_uint256,t_mapping(t_enum(TokenRoles)4487,t_mapping(t_address,t_bool))))": {
"label": "mapping(uint256 => mapping(uint256 => mapping(enum FleekAccessControl.TokenRoles => mapping(address => bool))))",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_struct(Build)7183_storage)": {
"label": "mapping(uint256 => struct IERCX.Build)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_struct(Token)7203_storage)": {
"label": "mapping(uint256 => struct IERCX.Token)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_uint256)": {
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32"
},
"t_string_memory_ptr": {
"label": "string",
"numberOfBytes": "32"
},
"t_string_storage": {
"label": "string",
"numberOfBytes": "32"
},
"t_struct(AccessPoint)4984_storage": {
"label": "struct FleekAccessPoints.AccessPoint",
"members": [
{
"label": "tokenId",
"type": "t_uint256",
"offset": 0,
"slot": "0"
},
{
"label": "score",
"type": "t_uint256",
"offset": 0,
"slot": "1"
},
{
"label": "contentVerified",
"type": "t_bool",
"offset": 0,
"slot": "2"
},
{
"label": "nameVerified",
"type": "t_bool",
"offset": 1,
"slot": "2"
},
{
"label": "owner",
"type": "t_address",
"offset": 2,
"slot": "2"
},
{
"label": "status",
"type": "t_enum(AccessPointCreationStatus)4970",
"offset": 22,
"slot": "2"
}
],
"numberOfBytes": "96"
},
"t_struct(Build)7183_storage": {
"label": "struct IERCX.Build",
"members": [
{
"label": "commitHash",
"type": "t_string_storage",
"offset": 0,
"slot": "0"
},
{
"label": "gitRepository",
"type": "t_string_storage",
"offset": 0,
"slot": "1"
},
{
"label": "ipfsHash",
"type": "t_string_storage",
"offset": 0,
"slot": "2"
},
{
"label": "domain",
"type": "t_string_storage",
"offset": 0,
"slot": "3"
}
],
"numberOfBytes": "128"
},
"t_struct(Token)7203_storage": {
"label": "struct IERCX.Token",
"members": [
{
"label": "name",
"type": "t_string_storage",
"offset": 0,
"slot": "0"
},
{
"label": "description",
"type": "t_string_storage",
"offset": 0,
"slot": "1"
},
{
"label": "externalURL",
"type": "t_string_storage",
"offset": 0,
"slot": "2"
},
{
"label": "ENS",
"type": "t_string_storage",
"offset": 0,
"slot": "3"
},
{
"label": "logo",
"type": "t_string_storage",
"offset": 0,
"slot": "4"
},
{
"label": "color",
"type": "t_uint24",
"offset": 0,
"slot": "5"
},
{
"label": "currentBuild",
"type": "t_uint256",
"offset": 0,
"slot": "6"
},
{
"label": "builds",
"type": "t_mapping(t_uint256,t_struct(Build)7183_storage)",
"offset": 0,
"slot": "7"
}
],
"numberOfBytes": "256"
},
"t_uint24": {
"label": "uint24",
"numberOfBytes": "3"
},
"t_uint256": {
"label": "uint256",
"numberOfBytes": "32"
},
"t_uint8": {
"label": "uint8",
"numberOfBytes": "1"
}
}
}
}
}
}

572
contracts/deployments/mumbai/FleekERC721.json
View File

File diff suppressed because one or more lines are too long

13
contracts/deployments/mumbai/FleekSVG.json
View File

File diff suppressed because one or more lines are too long

4
contracts/deployments/mumbai/proxy.json
View File

@ -1,5 +1,9 @@
{
"FleekERC721": [
{
"address": "0xdAbc1E0f926545a2898c644870FA4DC39E83EB70",
"timestamp": "5/17/2023, 5:27:20 PM"
},
{
"address": "0x37150709cFf366DeEaB836d05CAf49F4DA46Bb2E",
"timestamp": "3/3/2023, 4:43:25 PM"

102
contracts/deployments/mumbai/solcInputs/9953f9ba3b3c3ea88082e5a0f127d034.json Normal file
View File

File diff suppressed because one or more lines are too long

144
contracts/deployments/mumbai/solcInputs/ac10169ad2aa4aa05d336485b75a1a2f.json Normal file
View File

File diff suppressed because one or more lines are too long

11
contracts/hardhat.config.ts
View File

@ -18,6 +18,7 @@ const {
PRIVATE_KEY,
REPORT_GAS,
ETHERSCAN_API_KEY,
POLYGONSCAN_KEY,
POLYGON_API_URL,
ETH_MAIN_API_URL,
ETH_SEPOLIA_API_URL,
@ -91,10 +92,12 @@ const config: HardhatUserConfig = {
timeout: 200000, // 200 seconds max for running tests
},
etherscan: {
// apiKey: {
// polygonMumbai: POLYGONSCAN_KEY,
// },
apiKey: ETHERSCAN_API_KEY ? ETHERSCAN_API_KEY : '',
apiKey: {
polygonMumbai: POLYGONSCAN_KEY ? POLYGONSCAN_KEY : '',
mainnet: ETHERSCAN_API_KEY ? ETHERSCAN_API_KEY : '',
goerli: ETHERSCAN_API_KEY ? ETHERSCAN_API_KEY : '',
sepolia: ETHERSCAN_API_KEY ? ETHERSCAN_API_KEY : '',
},
},
};

3
serverless/.gitignore vendored
View File

@ -12,3 +12,6 @@ yarn-error.log
# output
dist
# Lambda Layers
lambda-layers-*

4
serverless/package.json
View File

@ -8,7 +8,9 @@
"invoke:build": "yarn build && serverless invoke local --function submitBuildInfo",
"prisma:generate": "npx prisma generate",
"prisma:pull": "npx prisma db pull --force",
"start": "serverless offline"
"start": "serverless offline",
"generate:layers": "./scripts/prepare-prisma-client-lambda-layer.sh && ./scripts/prepare-libs-lambda-layer.sh && ./scripts/prepare-node-modules-lambda-layer.sh",
"deploy:dev": "yarn build && yarn generate:layers && yarn sls deploy --stage dev"
},
"author": "fleek",
"license": "MIT",

23
serverless/scripts/prepare-libs-lambda-layer.sh Executable file
View File

@ -0,0 +1,23 @@
#!/bin/bash
function prepare_libs_lambda_layer() {
echo "Cleaning up ..."
rm -rf lambda-layers-libs
echo "Creating layer ..."
mkdir -p lambda-layers-libs/nodejs/node_modules/@libs
echo "Prepare libs lambda layer ..."
cp -r dist/serverless/src/libs/* lambda-layers-libs/nodejs/node_modules/@libs/
echo "Compressing ..."
pushd lambda-layers-libs && tar -zcf /tmp/nodejs.tar.gz . && mv /tmp/nodejs.tar.gz ./nodejs.tar.gz
echo "Remove unzipped files ..."
rm -rf nodejs
echo "Stats:"
ls -lh nodejs.tar.gz
popd
}
prepare_libs_lambda_layer

27
serverless/scripts/prepare-node-modules-lambda-layer.sh Executable file
View File

@ -0,0 +1,27 @@
#!/bin/bash
function prepare_node_modules_lambda_layer() {
echo "Cleaning up workspace ..."
rm -rf lambda-layers-node_modules
echo "Creating layer ..."
mkdir -p lambda-layers-node_modules/nodejs
echo "Prepare server node_modules lambda layer ..."
cp -r node_modules lambda-layers-node_modules/nodejs
echo "Remove Prisma..."
rm -rf lambda-layers-node_modules/nodejs/node_modules/@prisma
rm -rf lambda-layers-node_modules/nodejs/node_modules/.prisma
echo "Compressing ..."
pushd lambda-layers-node_modules && tar -zcf /tmp/nodejs.tar.gz . && mv /tmp/nodejs.tar.gz ./nodejs.tar.gz
echo "Remove unzipped files ..."
rm -rf nodejs
echo "Stats:"
ls -lh nodejs.tar.gz
popd
}
prepare_node_modules_lambda_layer

28
serverless/scripts/prepare-prisma-client-lambda-layer.sh Executable file
View File

@ -0,0 +1,28 @@
#!/bin/bash
function prepare_prisma_client_lambda_layer() {
echo "Cleaning up workspace ..."
rm -rf lambda-layers-prisma-client
echo "Creating layer ..."
mkdir -p lambda-layers-prisma-client/nodejs/node_modules/.prisma
mkdir -p lambda-layers-prisma-client/nodejs/node_modules/@prisma
echo "Prepare Prisma Client lambda layer ..."
cp -r node_modules/.prisma/client lambda-layers-prisma-client/nodejs/node_modules/.prisma
cp -r node_modules/@prisma lambda-layers-prisma-client/nodejs/node_modules
echo "Remove Prisma CLI..."
rm -rf lambda-layers-prisma-client/nodejs/node_modules/@prisma/cli
echo "Compressing ..."
pushd lambda-layers-prisma-client && tar -zcf /tmp/nodejs.tar.gz . && mv /tmp/nodejs.tar.gz ./nodejs.tar.gz
echo "Remove unzipped files ..."
rm -rf nodejs
echo "Stats:"
ls -lh nodejs.tar.gz
popd
}
prepare_prisma_client_lambda_layer

31
serverless/serverless.yaml
View File

@ -18,6 +18,14 @@ provider:
AWS_STAGE: ${self:provider.stage}
AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1
layers:
TopicAwsNodeModules:
path: lambda-layers-node_modules
TopicAwsLibs:
path: lambda-layers-libs
TopicPrismaAwsPrismaClient:
path: lambda-layers-prisma-client
custom:
esbuild:
bundle: true
@ -30,6 +38,7 @@ custom:
concurrency: 10
functions:
submitBuildInfo:
handler: src/functions/builds/handler.submitBuildInfo # Change `src` to `dist` for deployment
events:
@ -47,6 +56,16 @@ functions:
timestamp: true
ipfsHash: true
tokenId: true
environment:
NODE_ENV: production
DATABASE_URL: ${env:DATABASE_URL}
CONTRACT_ADDRESS: ${env:CONTRACT_ADDRESS}
PRIVATE_KEY: ${env:PRIVATE_KEY}
JSON_RPC: ${env:JSON_RPC}
layers:
- { Ref: TopicAwsNodeModulesLambdaLayer }
- { Ref: TopicAwsLibsLambdaLayer }
- { Ref: TopicPrismaAwsPrismaClientLambdaLayer }
submitMintInfo:
handler: src/functions/mints/handler.submitMintInfo
@ -54,4 +73,14 @@ functions:
- http:
path: mint
method: post
cors: true
cors: true
environment:
NODE_ENV: production
DATABASE_URL: ${env:DATABASE_URL}
CONTRACT_ADDRESS: ${env:CONTRACT_ADDRESS}
PRIVATE_KEY: ${env:PRIVATE_KEY}
JSON_RPC: ${env:JSON_RPC}
layers:
- { Ref: TopicAwsNodeModulesLambdaLayer }
- { Ref: TopicAwsLibsLambdaLayer }
- { Ref: TopicPrismaAwsPrismaClientLambdaLayer }

16
serverless/src/libs/log-decoder.ts
View File

@ -1,16 +0,0 @@
var Web3 = require('web3');
var web3 = new Web3(Web3.givenProvider || 'ws://localhost:17895');
export const logDecoder = (
eventFieldsABI: {
indexed: boolean;
internalType: string;
name: string;
type: string;
}[],
data: string,
topics: string[]
) => {
return web3.eth.abi.decodeLog(eventFieldsABI, data, topics);
};

9
serverless/src/libs/nfa-contract.ts
View File

@ -4,14 +4,17 @@ import * as dotenv from 'dotenv';
dotenv.config();
if (process.env.PRIVATE_KEY === undefined) {
throw Error('Private key environment variable not set.');
if (
process.env.PRIVATE_KEY === undefined ||
process.env.JSON_RPC === undefined
) {
throw Error('Private key or the JSON RPC environment variable not set.');
}
const contract_address = abiFile.address;
export const abi = abiFile.abi as any;
export const web3 = new Web3('https://rpc.goerli.mudit.blog');
export const web3 = new Web3(process.env.JSON_RPC);
export const nfaContract = new web3.eth.Contract(abi, contract_address);
export const account = web3.eth.accounts.privateKeyToAccount(
process.env.PRIVATE_KEY