Skip to content
This repository has been archived by the owner on Feb 5, 2025. It is now read-only.

Chore/dev into main #1233

Merged
merged 44 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
7b32b0f
Fix/package build (#1124)
bitbeckers Oct 22, 2023
6d75f0a
Feat/deploy to celo (#1135)
bitbeckers Oct 23, 2023
c60e8f7
fix(gha): use pnpm cache in graph gha (#1138)
bitbeckers Oct 23, 2023
a99e85e
Merge branch 'main' into develop
bitbeckers Oct 23, 2023
fe9b359
chore: add wrapper components for split and merge functionality
Jipperism Oct 31, 2023
b033d77
Fix/handle batch transfers graph (#1149)
bitbeckers Nov 3, 2023
859366a
SDK remove default chainID dependency (#1146)
bitbeckers Nov 6, 2023
462abfd
Fix/gha graph (#1165)
bitbeckers Nov 6, 2023
ee250ee
Feat/allowlist proof util (#1168)
bitbeckers Nov 7, 2023
44baf47
Add hypercerts to marketplace functionality (#1170)
bitbeckers Nov 8, 2023
a827b5e
feat(restriction): add transfer restriction to fe (#1173)
bitbeckers Nov 8, 2023
34436b9
feat(metadata): add application name (#1174)
bitbeckers Nov 9, 2023
fc0161d
feat(deployments): typed deployment contracts
bitbeckers Nov 9, 2023
55c1f57
fix(props): props from plas to form (#1176)
bitbeckers Nov 9, 2023
c93f391
format external url in case it is a direct ipfs link (#1182)
Jipperism Nov 13, 2023
dbdb083
fix(fix formatting of ipfs urls on hypercert page) (#1183)
Jipperism Nov 15, 2023
a6c3b8f
Feat/split and merge (#1185)
Jipperism Nov 21, 2023
84a623c
Feat/hardhat deploy script (#1177)
bitbeckers Nov 22, 2023
9657f17
feat(merkle): account allowlist strategy (#1186)
bitbeckers Nov 22, 2023
5623583
Added strategy and tests for hypercert functionality (#1188)
bitbeckers Nov 24, 2023
582af93
Feat/partial fraction sale (#1190)
bitbeckers Nov 24, 2023
3bc340a
Feat/sdk common js (#1191)
bitbeckers Nov 26, 2023
ccdf65b
feat(abis): updated SDK abis and restored tests (#1193)
bitbeckers Nov 29, 2023
1acbaa0
fix(test): add currency admin to test (#1197)
bitbeckers Nov 30, 2023
de5e0d0
fix build error - set output:export in next config (#1199)
Jipperism Dec 1, 2023
31ac54c
add placeholder for transfer fraction button (#1201)
Jipperism Dec 1, 2023
5c94088
change next build back to next export (#1202)
Jipperism Dec 1, 2023
6ef5b40
Feature/transfer fraction button (#1203)
Jipperism Dec 1, 2023
6488e79
add override chain id functionality for plasmic editing (#1204)
Jipperism Dec 1, 2023
a602567
Bugfix/add override chain id for plasmit editing (#1205)
Jipperism Dec 1, 2023
2406b96
remove transfer fraction button from split fraction button (#1206)
Jipperism Dec 1, 2023
6a93ec8
Bugfix/only show transfer button for fraction owned (#1207)
Jipperism Dec 1, 2023
f36b963
Feat/more robust split transfer logic with hc strategy (#1208)
bitbeckers Dec 2, 2023
4b86911
Feat/docs tests cleanup (#1210)
bitbeckers Dec 4, 2023
b253cd6
Feat/docs tests cleanup (#1211)
bitbeckers Dec 4, 2023
2637ed0
Feat/docs tests cleanup (#1212)
bitbeckers Dec 4, 2023
1cc481f
Feat/add batch transfer method to client methods (#1215)
bitbeckers Dec 6, 2023
0c249aa
Chore/lets merge together (#1220)
Jipperism Dec 7, 2023
435db09
feat(urql): refactored to urql and own codegen (#1223)
bitbeckers Dec 8, 2023
73b06f3
Feat/docs updates docusaurs v3 search release (#1226)
bitbeckers Dec 8, 2023
f1de3d6
Feat/sdk npm docs release 1 (#1228)
bitbeckers Dec 8, 2023
210c167
Feat/sdk npm docs release 1 (#1231)
bitbeckers Dec 8, 2023
fbe4d76
Merge branch 'develop' into chore/dev_into_main
bitbeckers Dec 9, 2023
6c166ce
chore(cleanup): merge artifacts
bitbeckers Dec 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix/package build (#1124)
* chore(npm): sdk to workspace to stop link:
* chore(npm): contracts in workspace, no link:
* chore(bump): 0.8.7
* chore(bump): contracts 0.8.7 into sdk 0.8.8
* fix(ci): linting errors from updated ws
* fix(doc): optimism chainId to 10 from 100
* chore(build): remove type module from package.json
* chore(contracts): package sol files
* chore(pack): add sol files to contracts package
* chore(bump): contract 0.8.9
* chore(pack): exports setup
* chore(pack): contracts dir in package
* chore(pack): cleanup build scripts
* chore(bump): contracts 0.8.10
* chore(pack): add all contracts for inheritence
* chore(bump): contracts 0.8.11
* chore(bump): sdk 0.8.10 with updated contracts package
* chore(bump): updated packages in frontend
* chore(gha): run action on pr and push to develop
  • Loading branch information
bitbeckers authored Oct 22, 2023
commit 7b32b0fc0b59e9552d6f55d615f400a26d5f1903
2 changes: 2 additions & 0 deletions .github/workflows/ci-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ on:
push:
branches:
- main
- develop
# Or when a pull request event occurs for a pull request against one of the
# matched branches.
pull_request:
branches:
- main
- develop
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

Expand Down
1 change: 1 addition & 0 deletions contracts/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
**/build
**/cache
**/coverage
**/contracts
**/.coverage_artifacts
**/.coverage_cache
**/.coverage_contracts
Expand Down
24 changes: 17 additions & 7 deletions contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@hypercerts-org/contracts",
"description": "EVM compatible protocol for managing impact claims",
"version": "0.8.7",
"version": "0.8.11",
"author": {
"name": "Hypercerts Foundation",
"url": "https://github.com/hypercerts-org/hypercerts"
Expand All @@ -17,10 +17,18 @@
"module": "./dist/esm/index.js",
"types": "./dist/index.d.ts",
"exports": {
"require": "./dist/cjs/index.js",
"import": "./dist/esm/index.js",
"types": "./dist/index.d.ts"
".": {
"require": "./dist/cjs/index.js",
"import": "./dist/esm/index.js",
"types": "./dist/index.d.ts"
}
},
"files": [
"dist",
"README.md",
"package.json",
"contracts"
],
"devDependencies": {
"@commitlint/cli": "^17.1.2",
"@commitlint/config-conventional": "^17.1.0",
Expand Down Expand Up @@ -49,6 +57,7 @@
"@typescript-eslint/parser": "^5.38.0",
"chai": "^4.3.7",
"commitizen": "^4.2.5",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"cz-conventional-changelog": "^3.3.0",
"dotenv": "^16.0.2",
Expand Down Expand Up @@ -88,14 +97,15 @@
"template"
],
"scripts": {
"build": "pnpm clean && hardhat compile && pnpm tsc -p tsconfig.build.json && rollup -c",
"build": "hardhat compile && pnpm tsc -p tsconfig.build.json && rollup -c && pnpm copy:contracts",
"build:forge": "forge build",
"build:hardhat": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile && pnpm build:declarations",
"build:declarations": "shx cp ./src/types/*.d.ts ./dist/index.d.ts",
"clean": "rimraf cache out dist typechain abi",
"copy:contracts": "copyfiles -u 1 ./src/**/*.sol ./src/*.sol ./contracts",
"docs": "hardhat dodoc",
"lint": "pnpm lint:sol && pnpm prettier:check",
"lint:sol": "solhint -w 5 \"./{src,test}/**/*.sol\"",
"prebuild": "pnpm clean",
"prepublish": "pnpm build",
"prettier": "prettier --config \"./.prettierrc.yml\" --write \"**/*.{json,md,sol,yml}\"",
"prettier:check": "prettier --config \"./.prettierrc.yml\" --check \"**/*.{json,md,sol,yml}\"",
"slither": "slither ./src",
Expand Down
1 change: 0 additions & 1 deletion contracts/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import type { HypercertMinter } from "./types/src/HypercertMinter";
import type { IAllowlist } from "./types/src/interfaces/IAllowlist";
import type { IHypercertToken } from "./types/src/interfaces/IHypercertToken";
import type { Errors } from "./types/src/libs/Errors";

/*
in order to adjust the build folder:
1) import any files here you want in the final build package.
Expand Down
1 change: 0 additions & 1 deletion frontend/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const nextConfig = {
config.resolve.fallback = { fs: false, net: false, tls: false };
return config;
},
transpilePackages: ["@hypercerts-org/sdk"],
};

export default withSentryConfig(
Expand Down
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@graphprotocol/client-cli": "^2.2.16",
"@hypercerts-org/contracts": "0.7.1",
"@hypercerts-org/contracts": "0.8.11",
"@hypercerts-org/observabletreemap": "workspace: *",
"@hypercerts-org/sdk": "0.8.4",
"@hypercerts-org/sdk": "0.8.10",
"@mui/icons-material": "^5.11.9",
"@mui/material": "^5.11.2",
"@mui/x-date-pickers": "^5.0.12",
Expand Down
115 changes: 58 additions & 57 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading