Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
nhenin committed Mar 15, 2024
1 parent a404592 commit ab8f22e
Show file tree
Hide file tree
Showing 72 changed files with 28,772 additions and 25,723 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
push:
branches:
- main
- nhenin/sanchonet
tags:
- runtime@v*
- marlowe-runtime-web@v*
Expand Down Expand Up @@ -82,7 +83,7 @@ jobs:
echo TAG=$TAG
tagAndPush "marlowe-web-server"
else
export "TAG=${GITHUB_SHA::8}"
export "TAG=latest"
echo TAG=$TAG
tagAndPush "marlowe-chain-indexer"
tagAndPush "marlowe-chain-sync"
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ maps to the volume (one-liner: `docker volume inspect marlowe-cardano_shared | j
To use this with `cardano-cli`:

----
export CARDANO_NODE_SOCKET_PATH=$(docker volume inspect marlowe-cardano_shared | jq -r '.[].Mountpoint')
export CARDANO_NODE_SOCKET_PATH=$(docker volume inspect sanchonet-integration_shared | jq -r '.[].Mountpoint')
# -E passes the current environment to sudo
sudo -E cardano-cli ...
----
Expand Down
8 changes: 8 additions & 0 deletions activate-cardano-nodesocket-path
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export CARDANO_NODE_SOCKET_PATH=$(docker volume inspect sanchonet-integration_shared | jq -r '.[].Mountpoint')/node.socket
sudo chmod o+xrw $CARDANO_NODE_SOCKET_PATH
sudo chmod o+rx $(dirname $CARDANO_NODE_SOCKET_PATH)
sudo chmod o+rx $(dirname $(dirname $CARDANO_NODE_SOCKET_PATH))
sudo chmod o+rx $(dirname $(dirname $(dirname $CARDANO_NODE_SOCKET_PATH)))
sudo chmod o+rx $(dirname $(dirname $(dirname $(dirname $CARDANO_NODE_SOCKET_PATH))))
sudo chmod o+rx $(dirname $(dirname $(dirname $(dirname $(dirname $CARDANO_NODE_SOCKET_PATH)))))
export CARDANO_NODE_CONFIG=$(ps aux | grep 'cardano-node run' | grep -v grep | sed 's/.* --config \([^ ]*\).*/\1/')
22 changes: 6 additions & 16 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repository cardano-haskell-packages
url: https://input-output-hk.github.io/cardano-haskell-packages
url: https://chap.intersectmbo.org/
secure: True
root-keys:
3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
Expand All @@ -14,10 +14,10 @@ repository cardano-haskell-packages
-- We duplicate the hackage index-state first for haskell.nix, even though cabal ignores it.
-- This must always match the hackage index-state on the next line.
-- See https://github.com/input-output-hk/haskell.nix/issues/1869#issuecomment-1449272480
index-state: 2024-02-01T00:00:00Z
index-state: 2024-02-15T11:36:53Z
index-state:
, hackage.haskell.org 2024-02-01T00:00:00Z
, cardano-haskell-packages 2024-02-01T00:00:00Z
hackage.haskell.org 2024-02-15T11:36:53Z
, cardano-haskell-packages 2024-02-14T10:17:08Z

packages:
async-components
Expand Down Expand Up @@ -194,13 +194,9 @@ source-repository-package
--sha256: sha256-69iE7LrigHTSKJrgq6uGU+U4j+NtBwR4ae18vsLyVvI=
subdir: core

-- These constraints needed for plutus-apps
constraints:
-- 0.3.6.2 switched from cryptonite to crypton, and this causes linker
-- failures when other packages depend on cryptonite.
-- Can be removed when this is resolved: https://github.com/snoyberg/http-client/issues/508
http-client-tls < 0.3.6.2,
ouroboros-network-framework ==0.10.1.0
cardano-ledger-core ==1.10.0.0,
ouroboros-consensus-cardano ^>= 0.13

allow-newer:
primitive,
Expand All @@ -223,9 +219,3 @@ source-repository-package
--sha256: 1yfbv9bwr71jd2sqfsb5jjq6j5bjfbjpp946fbkhxwwc2npwj0pd


source-repository-package
type: git
location: https://github.com/nhenin/cardano-api
tag: 8a539a8e63d8c410a329e3bc028d8339f32e4c8f
subdir: cardano-api
--sha256: 0r2zi4is8ayjryq80b144zcfl95ylx60gjp9n1qdcr1hcyrm76aj
42 changes: 22 additions & 20 deletions configuration/conway-babbage-test-genesis.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
{
"poolVotingThresholds": {
"pvtCommitteeNormal": 0.51,
"pvtCommitteeNoConfidence": 0.51,
"pvtHardForkInitiation": 0.51,
"pvtMotionNoConfidence": 0.51
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"hardForkInitiation": 0.51,
"motionNoConfidence": 0.51,
"ppSecurityGroup": 0.51
},
"dRepVotingThresholds": {
"dvtMotionNoConfidence": 0.51,
"dvtCommitteeNormal": 0.51,
"dvtCommitteeNoConfidence": 0.51,
"dvtUpdateToConstitution": 0.51,
"dvtHardForkInitiation": 0.51,
"dvtPPNetworkGroup": 0.51,
"dvtPPEconomicGroup": 0.51,
"dvtPPTechnicalGroup": 0.51,
"dvtPPGovGroup": 0.51,
"dvtTreasuryWithdrawal": 0.51
"motionNoConfidence": 0.51,
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"updateToConstitution": 0.51,
"hardForkInitiation": 0.51,
"ppNetworkGroup": 0.51,
"ppEconomicGroup": 0.51,
"ppTechnicalGroup": 0.51,
"ppGovGroup": 0.51,
"treasuryWithdrawal": 0.51
},
"committeeMinSize": 0,
"committeeMaxTermLength": 60,
"govActionLifetime": 14,
"govActionDeposit": 0,
"dRepDeposit": 0,
"dRepActivity": 0,
"committeeMaxTermLength": 200,
"govActionLifetime": 10,
"govActionDeposit": 1000000000,
"dRepDeposit": 2000000,
"dRepActivity": 20,
"constitution": {
"anchor": {
"url": "",
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
}
},
"committee": {
"members": {},
"members": {
},
"quorum": 0
}
}
Loading

0 comments on commit ab8f22e

Please sign in to comment.