From d5ff6d6a5bc3421e8a118855abb08e50c3bc5870 Mon Sep 17 00:00:00 2001 From: Kaze Date: Fri, 13 Mar 2026 17:40:23 +0900 Subject: [PATCH] update deployment 1.1.0 * use updated wrapper implementations post-audit * add CowWrapperHelpers --- cannonfile.toml | 13 +++++++++++-- package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/cannonfile.toml b/cannonfile.toml index 742b1a2..e3f01f0 100644 --- a/cannonfile.toml +++ b/cannonfile.toml @@ -4,7 +4,7 @@ # https://usecannon.com/learn/cannonfile name = "cow-euler-integration" -version = "1.0.0" +version = "1.1.0" # Set the package reference for the settlement contract. [var.pkg] [var.pkg] @@ -23,7 +23,8 @@ source = "<%= settings.evcPkg %>" chainId = 13370 [var.main] -salt = "0x0000000000000000000000000000000000000000000000000000000000000000" +salt = "<%= HashZero %>" +wrapperHelpersSalt = "<%= HashZero %>" cowSettlementAddress = "<%= cow.Settlement.address %>" # When deploying, override this setting with the correct EVC address from https://evc.wtf/docs/contracts/deployment-addresses @@ -50,6 +51,14 @@ ifExists = "continue" salt = "<%= settings.salt %>" args = ["<%= settings.evcAddress %>", "<%= settings.cowSettlementAddress %>"] +# We also include the CowWrapperHelper as we don't have a better other place to deploy it right now. +[deploy.WrapperHelpers] +artifact = "CowWrapperHelpers" +create2 = true +ifExists = "continue" +salt = "<%= settings.wrapperHelpersSalt %>" +args = ["<%= settings.cowSettlementAddress %>"] + # Authorise these wrappers as a solvers [invoke.authorizeOpenWrapper] target = ["cow.Authenticator"] diff --git a/package.json b/package.json index cead8d1..8cef10b 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,6 @@ "license": "ISC", "packageManager": "pnpm@10.28.0", "devDependencies": { - "@usecannon/cli": "^2.26.0-alpha.0" + "@usecannon/cli": "^2.26.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 87a4f0c..e82b65e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@usecannon/cli': - specifier: ^2.26.0-alpha.0 - version: 2.26.0-alpha.0 + specifier: ^2.26.0 + version: 2.26.0 packages: @@ -164,12 +164,12 @@ packages: '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} - '@usecannon/builder@2.26.0-alpha.0': - resolution: {integrity: sha512-o1YUNWb6WxcKU/byMbzHfGvzYn795YQEp2aJ+dgcqidNd3p5T3cX0Q86QeDEPGoCaJgqPmACN21/iE3NvyTWhA==} + '@usecannon/builder@2.26.0': + resolution: {integrity: sha512-rzgp+CInwn9TQNaQPYUVJWly0WTeFmkxu+/nC3DoQIY+lW4bL2bDENMNwfN+aIHIUf59Yb7KGXsXoVxFiEJpfQ==} engines: {node: '>=16.0.0'} - '@usecannon/cli@2.26.0-alpha.0': - resolution: {integrity: sha512-0+OBLmW0Mc6L4VtzEm39uTNOAueIr0ntOGurx/o9zkPm/3JEaomNcLcpgO5kpdccwUaAly+sl2eoV+PejvZeig==} + '@usecannon/cli@2.26.0': + resolution: {integrity: sha512-eGgfTcAqRZua3+vDEtatpzp71UzdIMpMJxniua0WL6tm7GllAl+XiZ21/9OI1EhuOS3TPcwAUUMqOIx4Yl+r8w==} hasBin: true '@usecannon/router@4.1.3': @@ -1211,7 +1211,7 @@ snapshots: '@types/normalize-package-data@2.4.4': {} - '@usecannon/builder@2.26.0-alpha.0': + '@usecannon/builder@2.26.0': dependencies: '@usecannon/router': 4.1.3 '@usecannon/web-solc': 0.5.1 @@ -1240,10 +1240,10 @@ snapshots: - typescript - utf-8-validate - '@usecannon/cli@2.26.0-alpha.0': + '@usecannon/cli@2.26.0': dependencies: '@iarna/toml': 3.0.0 - '@usecannon/builder': 2.26.0-alpha.0 + '@usecannon/builder': 2.26.0 abitype: 1.2.3(zod@3.25.76) chalk: 4.1.2 commander: 12.1.0