From 514d97e3692a9724a90b3f3a5a4ddbfe082d349a Mon Sep 17 00:00:00 2001 From: nyakiomaina Date: Mon, 12 Jun 2023 12:25:53 +0300 Subject: [PATCH 1/3] Update cartesi/compute and machine-manager versions to master --- compute-env/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compute-env/docker-compose.yml b/compute-env/docker-compose.yml index b00835b..6d0051e 100644 --- a/compute-env/docker-compose.yml +++ b/compute-env/docker-compose.yml @@ -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" @@ -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 @@ -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" @@ -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 From 2495baafe1f68cec776f159b9d6e18442a076c11 Mon Sep 17 00:00:00 2001 From: nyakiomaina Date: Tue, 13 Jun 2023 09:00:12 +0300 Subject: [PATCH 2/3] Adjusted outputPosition precision --- calculator/contracts/Calculator.sol | 4 ++-- dogecoin-hash/contracts/DogecoinHash.sol | 4 ++-- generic-script/contracts/GenericScript.sol | 4 ++-- gpg-verify/contracts/GpgVerify.sol | 4 ++-- helloworld/contracts/HelloWorld.sol | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/calculator/contracts/Calculator.sol b/calculator/contracts/Calculator.sol index 465bd98..7ca4857 100644 --- a/calculator/contracts/Calculator.sol +++ b/calculator/contracts/Calculator.sol @@ -33,7 +33,7 @@ contract Calculator { CartesiComputeInterface cartesiCompute; bytes32 templateHash = 0x9e2918f0cf6ef9d8c9281e4d865f56e9a5cc9d3bef4e254c3483edd9cdb25df0; - uint64 outputPosition = 0xa000000000000000; + uint64 outputPosition = 0xa0000000000000; uint8 outputLog2Size = 10; uint256 finalTime = 1e11; uint256 roundDuration = 51; @@ -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 diff --git a/dogecoin-hash/contracts/DogecoinHash.sol b/dogecoin-hash/contracts/DogecoinHash.sol index 81b5cfe..8953a6b 100644 --- a/dogecoin-hash/contracts/DogecoinHash.sol +++ b/dogecoin-hash/contracts/DogecoinHash.sol @@ -35,7 +35,7 @@ contract DogecoinHash { bytes32 templateHash = 0xb48fa074594a537fcc7c1069fc3eeabcbbcabff6f479c08a5c12efdd73b4ca20; // 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; @@ -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 diff --git a/generic-script/contracts/GenericScript.sol b/generic-script/contracts/GenericScript.sol index 9a93b78..ab14d23 100644 --- a/generic-script/contracts/GenericScript.sol +++ b/generic-script/contracts/GenericScript.sol @@ -33,7 +33,7 @@ contract GenericScript { CartesiComputeInterface cartesiCompute; bytes32 templateHash = 0x4caa1154d98668b6114802c6aef70db8f2d32a32b8d79a328737f99c98bdc674; - uint64 outputPosition = 0xa000000000000000; + uint64 outputPosition = 0xa0000000000000; uint8 outputLog2Size = 10; uint256 finalTime = 1e11; uint256 roundDuration = 51; @@ -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 diff --git a/gpg-verify/contracts/GpgVerify.sol b/gpg-verify/contracts/GpgVerify.sol index 5dde386..3caedc1 100644 --- a/gpg-verify/contracts/GpgVerify.sol +++ b/gpg-verify/contracts/GpgVerify.sol @@ -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 @@ -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 diff --git a/helloworld/contracts/HelloWorld.sol b/helloworld/contracts/HelloWorld.sol index d4a7cba..215499d 100644 --- a/helloworld/contracts/HelloWorld.sol +++ b/helloworld/contracts/HelloWorld.sol @@ -32,7 +32,7 @@ contract HelloWorld { CartesiComputeInterface cartesiCompute; bytes32 templateHash = 0xe2809d82cbec43a4be2280cadeb89b981d738685a754422e69d318560062a3ad; - uint64 outputPosition = 0x9000000000000000; + uint64 outputPosition = 0x90000000000000; uint8 outputLog2Size = 5; uint256 finalTime = 1e11; uint256 roundDuration = 51; From f7721095d1c07bc8ba628c20435561c0cae70289 Mon Sep 17 00:00:00 2001 From: nyakiomaina Date: Tue, 13 Jun 2023 10:29:14 +0300 Subject: [PATCH 3/3] removing compute-sdk contract references and updating template hash --- calculator/contracts/Calculator.sol | 2 +- calculator/hardhat.config.ts | 6 ------ dogecoin-hash/contracts/DogecoinHash.sol | 2 +- dogecoin-hash/hardhat.config.ts | 6 ------ generic-script/contracts/GenericScript.sol | 2 +- generic-script/hardhat.config.ts | 6 ------ gpg-verify/contracts/GpgVerify.sol | 2 +- gpg-verify/hardhat.config.ts | 6 ------ helloworld/contracts/HelloWorld.sol | 2 +- helloworld/hardhat.config.ts | 6 ------ 10 files changed, 5 insertions(+), 35 deletions(-) diff --git a/calculator/contracts/Calculator.sol b/calculator/contracts/Calculator.sol index 7ca4857..e832b02 100644 --- a/calculator/contracts/Calculator.sol +++ b/calculator/contracts/Calculator.sol @@ -32,7 +32,7 @@ contract Calculator { CartesiComputeInterface cartesiCompute; - bytes32 templateHash = 0x9e2918f0cf6ef9d8c9281e4d865f56e9a5cc9d3bef4e254c3483edd9cdb25df0; + bytes32 templateHash = 0x21f5756506a2f3cc0f4c4691b560d3821922a00414f8ce99d8f38e9d14ed3e46; uint64 outputPosition = 0xa0000000000000; uint8 outputLog2Size = 10; uint256 finalTime = 1e11; diff --git a/calculator/hardhat.config.ts b/calculator/hardhat.config.ts index 63de1b3..8601af4 100644 --- a/calculator/hardhat.config.ts +++ b/calculator/hardhat.config.ts @@ -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"], }, diff --git a/dogecoin-hash/contracts/DogecoinHash.sol b/dogecoin-hash/contracts/DogecoinHash.sol index 8953a6b..1e5f4bd 100644 --- a/dogecoin-hash/contracts/DogecoinHash.sol +++ b/dogecoin-hash/contracts/DogecoinHash.sol @@ -32,7 +32,7 @@ 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 = 0xb0000000000000; diff --git a/dogecoin-hash/hardhat.config.ts b/dogecoin-hash/hardhat.config.ts index 7e7a973..f60c3f0 100644 --- a/dogecoin-hash/hardhat.config.ts +++ b/dogecoin-hash/hardhat.config.ts @@ -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"], }, diff --git a/generic-script/contracts/GenericScript.sol b/generic-script/contracts/GenericScript.sol index ab14d23..7582165 100644 --- a/generic-script/contracts/GenericScript.sol +++ b/generic-script/contracts/GenericScript.sol @@ -32,7 +32,7 @@ contract GenericScript { CartesiComputeInterface cartesiCompute; - bytes32 templateHash = 0x4caa1154d98668b6114802c6aef70db8f2d32a32b8d79a328737f99c98bdc674; + bytes32 templateHash = 0x385e6518c18d4d40a00b4916d5cd6bc3e7ab5663c9ae13facd646d3a379f39da; uint64 outputPosition = 0xa0000000000000; uint8 outputLog2Size = 10; uint256 finalTime = 1e11; diff --git a/generic-script/hardhat.config.ts b/generic-script/hardhat.config.ts index 85753f1..4deb1f2 100644 --- a/generic-script/hardhat.config.ts +++ b/generic-script/hardhat.config.ts @@ -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"], }, diff --git a/gpg-verify/contracts/GpgVerify.sol b/gpg-verify/contracts/GpgVerify.sol index 3caedc1..300a3b7 100644 --- a/gpg-verify/contracts/GpgVerify.sol +++ b/gpg-verify/contracts/GpgVerify.sol @@ -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; diff --git a/gpg-verify/hardhat.config.ts b/gpg-verify/hardhat.config.ts index 36eb1bb..d736cbd 100644 --- a/gpg-verify/hardhat.config.ts +++ b/gpg-verify/hardhat.config.ts @@ -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"], }, diff --git a/helloworld/contracts/HelloWorld.sol b/helloworld/contracts/HelloWorld.sol index 215499d..df25c85 100644 --- a/helloworld/contracts/HelloWorld.sol +++ b/helloworld/contracts/HelloWorld.sol @@ -31,7 +31,7 @@ contract HelloWorld { CartesiComputeInterface cartesiCompute; - bytes32 templateHash = 0xe2809d82cbec43a4be2280cadeb89b981d738685a754422e69d318560062a3ad; + bytes32 templateHash = 0x3e4891f40155c257c143ee164aac14f07c30405dc13ab8f253cbaaf348c54ac9; uint64 outputPosition = 0x90000000000000; uint8 outputLog2Size = 5; uint256 finalTime = 1e11; diff --git a/helloworld/hardhat.config.ts b/helloworld/hardhat.config.ts index 4c61cd0..5fdb1a4 100644 --- a/helloworld/hardhat.config.ts +++ b/helloworld/hardhat.config.ts @@ -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"], },