Skip to content

Commit

Permalink
Merge pull request #310 from TxnLab/dev
Browse files Browse the repository at this point in the history
0.11.2
  • Loading branch information
pbennett authored Oct 16, 2024
2 parents 7e10b7d + bb258af commit b18ff1d
Show file tree
Hide file tree
Showing 21 changed files with 1,347 additions and 1,311 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Github Releases To Discord
uses: SethCohen/[email protected].0
uses: SethCohen/[email protected].1
with:
webhook_url: ${{ secrets.WEBHOOK_URL }}
username: "Reti Releases"
10 changes: 5 additions & 5 deletions contracts/bootstrap/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap",
"version": "0.11.1",
"version": "0.11.2",
"description": "",
"main": "index.ts",
"scripts": {
Expand All @@ -11,16 +11,16 @@
},
"license": "MIT",
"dependencies": {
"@algorandfoundation/algokit-utils": "7.0.0-beta.11",
"algosdk": "^2.9.0",
"@algorandfoundation/algokit-utils": "7.0.0-beta.14",
"algosdk": "2.9.0",
"prompts": "^2.4.2",
"yargs": "^17.7.2"
},
"devDependencies": {
"@tsconfig/node18": "^18.2.4",
"@types/node": "^20.12.2",
"@types/node": "20.16.11",
"@types/prompts": "^2.4.9",
"@types/yargs": "^17.0.32",
"typescript": "^5.4.3"
"typescript": "5.6.3"
}
}
28 changes: 14 additions & 14 deletions contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reti-contracts",
"version": "0.11.1",
"version": "0.11.2",
"license": "MIT",
"scripts": {
"generate-client": "pnpx @algorandfoundation/[email protected] generate -a contracts/artifacts/StakingPool.arc56_draft.json -o contracts/clients/StakingPoolClient.ts && pnpx @algorandfoundation/[email protected] generate -a contracts/artifacts/ValidatorRegistry.arc56_draft.json -o contracts/clients/ValidatorRegistryClient.ts && ./update_contract_artifacts.sh",
Expand All @@ -17,23 +17,23 @@
"prettier:fix": "npx prettier --write ."
},
"dependencies": {
"@algorandfoundation/algokit-utils": "7.0.0-beta.11",
"algosdk": "^2.9.0"
"@algorandfoundation/algokit-utils": "7.0.0-beta.14",
"algosdk": "2.9.0"
},
"devDependencies": {
"@algorandfoundation/algokit-client-generator": "^3.0.6",
"@algorandfoundation/tealscript": "^0.103.0",
"@joe-p/algokit-generate-component": "^0.2.1",
"@typescript-eslint/eslint-plugin": "8.7.0",
"@typescript-eslint/parser": "8.7.0",
"@algorandfoundation/algokit-client-generator": "4.0.0-beta.5",
"@algorandfoundation/tealscript": "0.103.0",
"@joe-p/algokit-generate-component": "0.2.1",
"@typescript-eslint/eslint-plugin": "8.8.1",
"@typescript-eslint/parser": "8.8.1",
"eslint": "8.57.1",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-airbnb-typescript": "18.0.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-prettier": "5.2.1",
"prettier": "3.3.3",
"typescript": "5.5.4",
"vitest": "2.1.1"
"typescript": "5.6.3",
"vitest": "2.1.2"
}
}
8 changes: 4 additions & 4 deletions nodemgr/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ require (
github.com/manifoldco/promptui v0.9.0
github.com/prometheus/client_golang v1.20.4
github.com/ssgreg/repeat v1.5.1
github.com/urfave/cli/v3 v3.0.0-alpha9
golang.org/x/crypto v0.27.0
github.com/urfave/cli/v3 v3.0.0-alpha9.1
golang.org/x/crypto v0.28.0
golang.org/x/oauth2 v0.23.0
golang.org/x/term v0.24.0
golang.org/x/term v0.25.0
)

require (
Expand All @@ -29,6 +29,6 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/sys v0.26.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
)
8 changes: 8 additions & 0 deletions nodemgr/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,17 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/urfave/cli/v3 v3.0.0-alpha9 h1:P0RMy5fQm1AslQS+XCmy9UknDXctOmG/q/FZkUFnJSo=
github.com/urfave/cli/v3 v3.0.0-alpha9/go.mod h1:0kK/RUFHyh+yIKSfWxwheGndfnrvYSmYFVeKCh03ZUc=
github.com/urfave/cli/v3 v3.0.0-alpha9.1 h1:1fJU+bltkwN8lF4Sni/X0i1d8XwPIrS82ivZ8qsp/q4=
github.com/urfave/cli/v3 v3.0.0-alpha9.1/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y=
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
Expand All @@ -93,9 +97,13 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
Expand Down
8 changes: 6 additions & 2 deletions nodemgr/poolcmds.go
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,14 @@ func PayoutPool(ctx context.Context, command *cli.Command) error {
func OfflinePool(ctx context.Context, command *cli.Command) error {
var info = App.retiClient.Info()
poolID := command.Uint("pool")
if int(poolID) >= len(info.Pools) {
if int(poolID) > len(info.Pools) {
return fmt.Errorf("pool num:%d not valid for pool id", poolID)
}
signerAddr, _ := types.DecodeAddress(info.Config.Manager)

return App.retiClient.GoOffline(info.Pools[poolID-1].PoolAppId, signerAddr)
err := App.retiClient.GoOffline(info.Pools[poolID-1].PoolAppId, signerAddr)
if err == nil {
misc.Infof(App.logger, "Pool %d, app id:%d is now offline", poolID, info.Pools[poolID-1].PoolAppId)
}
return err
}
Loading

0 comments on commit b18ff1d

Please sign in to comment.