Skip to content

WIP: Update cartesi/compute and machine-manager versions to master #56

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.

Sign up for GitHub

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

Open
nyakiomaina wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: Update cartesi/compute and machine-manager versions to master #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
514d97e
Update cartesi/compute and machine-manager versions to master
Jun 12, 2023
2495baa
Adjusted outputPosition precision
Jun 13, 2023
f772109
removing compute-sdk contract references and updating template hash
Jun 13, 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
6 changes: 3 additions & 3 deletions calculator/contracts/Calculator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ contract Calculator {

CartesiComputeInterface cartesiCompute;

bytes32 templateHash = 0x9e2918f0cf6ef9d8c9281e4d865f56e9a5cc9d3bef4e254c3483edd9cdb25df0;
uint64 outputPosition = 0xa000000000000000;
bytes32 templateHash = 0x21f5756506a2f3cc0f4c4691b560d3821922a00414f8ce99d8f38e9d14ed3e46;
uint64 outputPosition = 0xa0000000000000;
uint8 outputLog2Size = 10;
uint256 finalTime = 1e11;
uint256 roundDuration = 51;
Expand All @@ -51,7 +51,7 @@ contract Calculator {
// specifies an input drive containing the mathematical expression
CartesiComputeInterface.Drive[] memory drives = new CartesiComputeInterface.Drive[](1);
drives[0] = CartesiComputeInterface.Drive(
0x9000000000000000, // 2nd drive position: 1st is the root file-system (0x8000..)
0x90000000000000, // 2nd drive position: 1st is the root file-system (0x8000..)
expressionLog2Size, // driveLog2Size
expression, // directValue
"", // loggerIpfsPath
Expand Down
6 changes: 0 additions & 6 deletions calculator/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ const config: HardhatUserConfig = {
version: "0.7.4",
},
external: {
contracts: [
{
artifacts: "node_modules/@cartesi/compute-sdk/export/artifacts",
deploy: "node_modules/@cartesi/compute-sdk/dist/deploy",
},
],
deployments: {
localhost: ["../compute-env/deployments/localhost"],
},
Expand Down
8 changes: 4 additions & 4 deletions compute-env/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- ethereum

alice_dispatcher:
image: cartesi/compute:1.3.0
image: cartesi/compute:master
restart: always
environment:
MNEMONIC: "test test test test test test test test test test test junk"
Expand Down Expand Up @@ -82,7 +82,7 @@ services:
command: ["-g", "http://alice_kubo:5001"]

alice_machine_manager:
image: cartesi/machine-manager:0.6.0-rc3
image: cartesi/machine-manager:master
volumes:
- ./machines:/opt/cartesi/srv/compute/cartesi-machine
- ./alice_data:/opt/cartesi/srv/compute/flashdrive
Expand Down Expand Up @@ -113,7 +113,7 @@ services:
- alice_kubo

bob_dispatcher:
image: cartesi/compute:1.3.0
image: cartesi/compute:master
restart: always
environment:
MNEMONIC: "test test test test test test test test test test test junk"
Expand Down Expand Up @@ -178,7 +178,7 @@ services:
command: ["-g", "http://bob_kubo:5001"]

bob_machine_manager:
image: cartesi/machine-manager:0.6.0-rc3
image: cartesi/machine-manager:master
volumes:
- ./machines:/opt/cartesi/srv/compute/cartesi-machine
- ./bob_data:/opt/cartesi/srv/compute/flashdrive
Expand Down
6 changes: 3 additions & 3 deletions dogecoin-hash/contracts/DogecoinHash.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ contract DogecoinHash {

CartesiComputeInterface cartesiCompute;

bytes32 templateHash = 0xb48fa074594a537fcc7c1069fc3eeabcbbcabff6f479c08a5c12efdd73b4ca20;
bytes32 templateHash = 0xde193cf5385625629d9085746373ac7cc6f5b6fbe3fa8bcd1ca9b1b09c2ddaa5;

// this DApp has an ext2 file-system (at 0x9000..) and an input drives (at 0xa000), so the output will be at 0xb000..
uint64 outputPosition = 0xb000000000000000;
uint64 outputPosition = 0xb0000000000000;
// output hash has 32 bytes
uint8 outputLog2Size = 5;

Expand Down Expand Up @@ -75,7 +75,7 @@ contract DogecoinHash {
// specifies an input drive with the header data to be hashed using scrypt
CartesiComputeInterface.Drive[] memory drives = new CartesiComputeInterface.Drive[](1);
drives[0] = CartesiComputeInterface.Drive(
0xa000000000000000, // 3rd drive position: 1st is the root file-system (0x8000..), 2nd is the mounted ext2 filesystem (0x9000..)
0xa0000000000000, // 3rd drive position: 1st is the root file-system (0x8000..), 2nd is the mounted ext2 filesystem (0x9000..)
headerDataLog2Size, // driveLog2Size
headerData, // directValue
"", // loggerIpfsPath
Expand Down
6 changes: 0 additions & 6 deletions dogecoin-hash/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ const config: HardhatUserConfig = {
version: "0.7.4",
},
external: {
contracts: [
{
artifacts: "node_modules/@cartesi/compute-sdk/export/artifacts",
deploy: "node_modules/@cartesi/compute-sdk/dist/deploy",
},
],
deployments: {
localhost: ["../compute-env/deployments/localhost"],
},
Expand Down
6 changes: 3 additions & 3 deletions generic-script/contracts/GenericScript.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ contract GenericScript {

CartesiComputeInterface cartesiCompute;

bytes32 templateHash = 0x4caa1154d98668b6114802c6aef70db8f2d32a32b8d79a328737f99c98bdc674;
uint64 outputPosition = 0xa000000000000000;
bytes32 templateHash = 0x385e6518c18d4d40a00b4916d5cd6bc3e7ab5663c9ae13facd646d3a379f39da;
uint64 outputPosition = 0xa0000000000000;
uint8 outputLog2Size = 10;
uint256 finalTime = 1e11;
uint256 roundDuration = 51;
Expand Down Expand Up @@ -62,7 +62,7 @@ contract GenericScript {
// specifies an input drive containing the script
CartesiComputeInterface.Drive[] memory drives = new CartesiComputeInterface.Drive[](1);
drives[0] = CartesiComputeInterface.Drive(
0x9000000000000000, // 2nd drive position: 1st is the root file-system (0x8000..)
0x90000000000000, // 2nd drive position: 1st is the root file-system (0x8000..)
scriptLog2Size, // driveLog2Size
script, // directValue
"", // loggerIpfsPath
Expand Down
6 changes: 0 additions & 6 deletions generic-script/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ const config: HardhatUserConfig = {
version: "0.7.4",
},
external: {
contracts: [
{
artifacts: "node_modules/@cartesi/compute-sdk/export/artifacts",
deploy: "node_modules/@cartesi/compute-sdk/dist/deploy",
},
],
deployments: {
localhost: ["../compute-env/deployments/localhost"],
},
Expand Down
6 changes: 3 additions & 3 deletions gpg-verify/contracts/GpgVerify.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ contract GpgVerify {

CartesiComputeInterface cartesiCompute;

bytes32 templateHash = 0xb5907eafa8a2c0f43249afcef27d207785e427ca4a1d7db8a4a05c7f1b7e1df5;
bytes32 templateHash = 0x15feae8a5eef8c7157b81b1cbf823d5f686cadb76a4dcfb0b38ad9491572706d;

// this DApp has an ext2 file-system (at 0x9000..) and two input drives (at 0xa000.. and 0xb000..), so the output will be at 0xc000..
uint64 outputPosition = 0xc000000000000000;
Expand Down Expand Up @@ -139,7 +139,7 @@ contract GpgVerify {
// specifies two input drives containing the document and the signature
CartesiComputeInterface.Drive[] memory drives = new CartesiComputeInterface.Drive[](2);
drives[0] = CartesiComputeInterface.Drive(
0xa000000000000000, // 3rd drive position: 1st is the root file-system (0x8000..), 2nd is the dapp-data file-system (0x9000..)
0xa0000000000000, // 3rd drive position: 1st is the root file-system (0x8000..), 2nd is the dapp-data file-system (0x9000..)
documentLog2Size, // driveLog2Size
"", // directValue
documentIpfsPath, // loggerIpfsPath
Expand All @@ -150,7 +150,7 @@ contract GpgVerify {
false // downloadAsCor
);
drives[1] = CartesiComputeInterface.Drive(
0xb000000000000000, // 4th drive position
0xb0000000000000, // 4th drive position
signatureLog2Size, // driveLog2Size
"", // directValue
signatureIpfsPath, // loggerIpfsPath
Expand Down
6 changes: 0 additions & 6 deletions gpg-verify/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ const config: HardhatUserConfig = {
version: "0.7.4",
},
external: {
contracts: [
{
artifacts: "node_modules/@cartesi/compute-sdk/export/artifacts",
deploy: "node_modules/@cartesi/compute-sdk/dist/deploy",
},
],
deployments: {
localhost: ["../compute-env/deployments/localhost"],
},
Expand Down
4 changes: 2 additions & 2 deletions helloworld/contracts/HelloWorld.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ contract HelloWorld {

CartesiComputeInterface cartesiCompute;

bytes32 templateHash = 0xe2809d82cbec43a4be2280cadeb89b981d738685a754422e69d318560062a3ad;
uint64 outputPosition = 0x9000000000000000;
bytes32 templateHash = 0x3e4891f40155c257c143ee164aac14f07c30405dc13ab8f253cbaaf348c54ac9;
uint64 outputPosition = 0x90000000000000;
uint8 outputLog2Size = 5;
uint256 finalTime = 1e11;
uint256 roundDuration = 51;
Expand Down
6 changes: 0 additions & 6 deletions helloworld/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ const config: HardhatUserConfig = {
version: "0.7.4",
},
external: {
contracts: [
{
artifacts: "node_modules/@cartesi/compute-sdk/export/artifacts",
deploy: "node_modules/@cartesi/compute-sdk/dist/deploy",
},
],
deployments: {
localhost: ["../compute-env/deployments/localhost"],
},
Expand Down