Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add boxes to CI #2456

Merged
merged 65 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
09421ab
readd circleci, add a dockerfile
dan-aztec Sep 21, 2023
04747af
whitespace
dan-aztec Sep 21, 2023
683c54e
try a wildcard in build_manifest
dan-aztec Sep 21, 2023
684289e
just try building blank-react
dan-aztec Sep 21, 2023
04dd89f
update the projectDir
dan-aztec Sep 21, 2023
e3512b7
[debug ci] blank liens
dan-aztec Sep 21, 2023
e13e4cd
fix circleci job name
dan-aztec Sep 21, 2023
da694eb
[debug ci]
dan-aztec Sep 21, 2023
656afe3
re-add yarn build
dan-aztec Sep 21, 2023
452d036
copy for circuits.js, add dep
dan-aztec Sep 21, 2023
788f94d
move from
dan-aztec Sep 21, 2023
c81e1a3
yarn first
dan-aztec Sep 21, 2023
929a541
revert bad
dan-aztec Sep 21, 2023
9b3e1e2
tsc -b first
dan-aztec Sep 21, 2023
2499ff5
formatting
dan-aztec Sep 21, 2023
7920a3a
add aztec/types
dan-aztec Sep 21, 2023
9c88e82
revert wasm direct copy
dan-aztec Sep 21, 2023
9dd1052
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 21, 2023
ffc25bc
add yarn test to the dockerfile
dan-aztec Sep 21, 2023
bc4eda7
just build, no test
dan-aztec Sep 22, 2023
ab3352a
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 22, 2023
a114d09
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 22, 2023
d02457b
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 22, 2023
26cf2be
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 25, 2023
0876733
try to copy e2e to run tests on sandbox
dan-aztec Sep 25, 2023
851cadc
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 25, 2023
998af17
revert bad merge
dan-aztec Sep 25, 2023
14471be
one more revert
dan-aztec Sep 25, 2023
183cfe8
add script
dan-aztec Sep 25, 2023
60e059b
use run_script
dan-aztec Sep 25, 2023
3bc69a0
try -
dan-aztec Sep 25, 2023
b3db1e4
use updated ecr command
dan-aztec Sep 25, 2023
5dc0aee
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 25, 2023
3169d85
somehow file was uncomitted
dan-aztec Sep 25, 2023
38a4cea
fix the envvar
dan-aztec Sep 25, 2023
ae2fe2e
ugh
dan-aztec Sep 25, 2023
01525cf
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 25, 2023
d130c52
adam fixes everything
dan-aztec Sep 25, 2023
edc5479
bad copy
dan-aztec Sep 25, 2023
47aa06e
just use entrypoint
dan-aztec Sep 25, 2023
3854364
dont prune dev deps
dan-aztec Sep 25, 2023
81d9e63
Merge remote-tracking branch 'origin/master' into dan/2455-add-boxes-…
dan-aztec Sep 25, 2023
397f9e7
merge
dan-aztec Sep 25, 2023
11cba28
Revert "merge"
dan-aztec Sep 25, 2023
eed1c75
re-add job
dan-aztec Sep 25, 2023
67b9c1c
bad line
dan-aztec Sep 25, 2023
14be304
depend on yarn megajob
dan-aztec Sep 25, 2023
33775f9
use updated image
dan-aztec Sep 25, 2023
38ee7f5
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 25, 2023
c2f78d8
try to use universal image
dan-aztec Sep 25, 2023
a39b447
depend on aztec-sandbox job so image is ready
dan-aztec Sep 25, 2023
f41746a
fix docker compose
dan-aztec Sep 25, 2023
f92e6a1
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 25, 2023
070ccb9
add docker-pose files and update package.json
dan-aztec Sep 26, 2023
3b62679
also run noirup
dan-aztec Sep 26, 2023
914e94f
update test command
dan-aztec Sep 26, 2023
b3a3910
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 26, 2023
b51b813
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 26, 2023
cdfeb81
add other boxes to jobz
dan-aztec Sep 26, 2023
c478808
conditional usage of dom to allow node test to import
dan-aztec Sep 26, 2023
94cfced
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec Sep 26, 2023
cd3bc40
small readme fix
dan-aztec Sep 26, 2023
74682b9
switch to local link for contractABI
dan-aztec Sep 26, 2023
f54af0c
revert noir-contracts
dan-aztec Sep 26, 2023
bf4e75a
revert more noir-contracts
dan-aztec Sep 26, 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
16 changes: 16 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,17 @@ jobs:
name: "Build and test"
command: build sequencer-client

boxes-blank-react:
machine:
image: ubuntu-2004:202010-01
resource_class: large
steps:
- *checkout
- *setup_env
- run:
name: "Build"
command: build boxes-blank-react

canary:
machine:
image: ubuntu-2004:202010-01
Expand Down Expand Up @@ -1420,6 +1431,11 @@ workflows:
- aztec-rpc: *yarn_project
- aztec-node: *yarn_project
- cli: *yarn_project
- boxes-blank-react:
requires:
- yarn-project-base
- circuits-js
<<: *defaults
- key-store: *yarn_project
- merkle-tree: *yarn_project
- p2p: *yarn_project
Expand Down
4 changes: 4 additions & 0 deletions build_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@
"buildDir": "yarn-project",
"projectDir": "yarn-project/aztec.js"
},
"boxes-blank-react": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/boxes/blank-react"
},
"canary-build": {
"buildDir": "yarn-project",
"projectDir": "yarn-project/canary",
Expand Down
18 changes: 18 additions & 0 deletions yarn-project/boxes/blank-react/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/circuits.js AS circuits
FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder

COPY . .

COPY --from=circuits /usr/src/yarn-project/circuits.js/dest /usr/src/yarn-project/circuits.js/dest
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note there's two FROM, normally it would just be builder, but this one requires the circuits.js subpackage for a wasm file for the webpack build


WORKDIR /usr/src/yarn-project/boxes/blank-react
RUN yarn
RUN yarn build && yarn formatting

RUN yarn cache clean
RUN yarn workspaces focus --production > /dev/null

FROM node:18-alpine
COPY --from=builder /usr/src/yarn-project/boxes/blank-react /usr/src/yarn-project/boxes/blank-react
WORKDIR /usr/src/yarn-project/boxes/blank-react
ENTRYPOINT ["yarn"]
2 changes: 1 addition & 1 deletion yarn-project/boxes/blank-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"main": "./dest/index.js",
"scripts": {
"build": "yarn clean && webpack",
"build": "yarn clean && tsc -b && webpack",
"install:noir": "curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash noirup -v aztec",
"install:sandbox": "docker pull aztecprotocol/aztec-sandbox:latest",
"clean": "rm -rf ./dest .tsbuildinfo",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,67 +1,66 @@
.input {
border: none;
outline-width: 0;
outline-color: rgba(0, 0, 0, 0);
padding: 2px 20px 0 20px;
width: 100%;
height: 45px;
color: #000;
border: 1px solid rgba(0, 0, 0, 0);
font-size: 16px;
text-align: left;
font-weight: 400;
border-radius: 10px;
text-align: left;
text-overflow: ellipsis;
transition: box-shadow .2s;
box-shadow: 0px 4px 10px rgba(0, 0, 0, .1);
background-color: white;
-webkit-appearance: none;
border: none;
outline-width: 0;
outline-color: rgba(0, 0, 0, 0);
padding: 2px 20px 0 20px;
width: 100%;
height: 45px;
color: #000;
border: 1px solid rgba(0, 0, 0, 0);
font-size: 16px;
text-align: left;
font-weight: 400;
border-radius: 10px;
text-align: left;
text-overflow: ellipsis;
transition: box-shadow 0.2s;
box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
background-color: white;
-webkit-appearance: none;


&:disabled {
color: #4a4a4a;
background-color: rgba(239, 239, 239, 0.3);
background: radial-gradient(rgba(239, 239, 239, 0.3), rgba(239, 239, 239, 0.3));
-webkit-text-fill-color: #4a4a4a;
cursor: not-allowed;
}
&:disabled {
color: #4a4a4a;
background-color: rgba(239, 239, 239, 0.3);
background: radial-gradient(rgba(239, 239, 239, 0.3), rgba(239, 239, 239, 0.3));
-webkit-text-fill-color: #4a4a4a;
cursor: not-allowed;
}
}

.label {
font-weight: 450;
font-size: 18px;
display: flex;
width: 100%;
flex-direction: column;
text-align: left;
margin-bottom: 15px;
justify-content: space-between;
font-weight: 450;
font-size: 18px;
display: flex;
width: 100%;
flex-direction: column;
text-align: left;
margin-bottom: 15px;
justify-content: space-between;
}

.inputWrapper {
width: 100%;
display: flex;
gap: 15px;
width: 100%;
display: flex;
gap: 15px;
}

.field {
display: flex;
justify-content: start;
flex-direction: column;
align-items: flex-start;
display: flex;
justify-content: start;
flex-direction: column;
align-items: flex-start;
}

.content {
display: flex;
justify-content: space-between;
flex-direction: column;
margin: 30px;
width: 450px;
gap: 30px;
display: flex;
justify-content: space-between;
flex-direction: column;
margin: 30px;
width: 450px;
gap: 30px;
}

.actionButton {
width: 100%;
align-self: center;
}
width: 100%;
align-self: center;
}
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,14 @@ async function handleFunctionCall(
if (functionAbi.functionType === 'unconstrained') {
return await viewContractFunction(contractAddress!, contractAbi, functionName, typedArgs, rpcClient, wallet);
} else {
const txnReceipt = await callContractFunction(contractAddress!, contractAbi, functionName, typedArgs, rpcClient, wallet);
const txnReceipt = await callContractFunction(
contractAddress!,
contractAbi,
functionName,
typedArgs,
rpcClient,
wallet,
);
return `Transaction ${txnReceipt.status} on block number ${txnReceipt.blockNumber}`;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.copy {
cursor: pointer;
width: 35px;
height: 25px;
padding: 2px 8px;
}
cursor: pointer;
width: 35px;
height: 25px;
padding: 2px 8px;
}
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
.dropdownWrapper {
position: absolute;
top: 60px;
right: 0px;
border-radius: 10px;
display: flex;
overflow: hidden;
flex-direction: column;
gap: 1px;
border: 1px solid #ebeaea;
background-color: #ebeaea;
z-index: 1;
position: absolute;
top: 60px;
right: 0px;
border-radius: 10px;
display: flex;
overflow: hidden;
flex-direction: column;
gap: 1px;
border: 1px solid #ebeaea;
background-color: #ebeaea;
z-index: 1;
}

.dropdownOptionBackground {
background-color: white;
background-color: white;
}

.dropdownOption {
font-size: 14px;
padding: 10px 25px;
white-space: nowrap;
cursor: pointer;
font-weight: 600;
justify-content: space-between;
letter-spacing: 0.5px;
display: flex;
font-size: 14px;
padding: 10px 25px;
white-space: nowrap;
cursor: pointer;
font-weight: 600;
justify-content: space-between;
letter-spacing: 0.5px;
display: flex;
}

.singleOption {
text-align: center;
align-items: center;
justify-content: center;
text-align: center;
align-items: center;
justify-content: center;
}

.dropdownOption.disabled {
background-image: initial;
cursor: default;
background-color: #c4c4c4;
background-image: initial;
cursor: default;
background-color: #c4c4c4;
}

.dropdownOptionBackground:hover {
background-color: #ebeaea;
background-color: #ebeaea;
}

.dropdownOptionBackground.disabled:hover {
background-color: white;
background-color: white;
}

.sublabel {
text-align: right;
text-align: right;
}

.sublabels {
display: flex;
flex-direction: row;
font-weight: 450;
display: flex;
flex-direction: row;
font-weight: 450;
}

.feeOption {
gap: 5px;
display: flex;
flex-direction: column;
gap: 5px;
display: flex;
flex-direction: column;
}

.label {
color: #2f1f49;
}
color: #2f1f49;
}
40 changes: 20 additions & 20 deletions yarn-project/boxes/blank-react/src/app/components/popup.module.scss
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
.popup {
width: 66vw;
position: absolute;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
background-color: white;
border-radius: 20px;
justify-content: space-around;
box-shadow: 0px 4px 10px rgba(0, 0, 0, .1);
border: 3px solid rgb(47, 31, 73);
align-items: center;
gap: 30px;
padding: 30px;
overflow: scroll;
min-width: 600px;
z-index: 100;
width: 66vw;
position: absolute;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
background-color: white;
border-radius: 20px;
justify-content: space-around;
box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
border: 3px solid rgb(47, 31, 73);
align-items: center;
gap: 30px;
padding: 30px;
overflow: scroll;
min-width: 600px;
z-index: 100;
}

.alert {
width: 20px;
width: 20px;
}

.content {
width: 100%;
}
width: 100%;
}
Loading
Loading