Skip to content

Commit fd128b6

Browse files
Merge pull request #70 from BitGo/WP-5257/create-durable-nonce-solana-recovery
Wp 5257/create durable nonce solana recovery
2 parents 0e5ab4f + 50a2edb commit fd128b6

File tree

8 files changed

+862
-218
lines changed

8 files changed

+862
-218
lines changed

masterBitgoExpress.json

Lines changed: 99 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@
174174
}
175175
},
176176
"required": [
177-
"pubkey",
178177
"source"
179178
]
180179
}
@@ -808,23 +807,107 @@
808807
"coinSpecificParams": {
809808
"type": "object",
810809
"properties": {
811-
"addressScan": {
812-
"type": "number"
810+
"evmRecoveryOptions": {
811+
"type": "object",
812+
"properties": {
813+
"eip1559": {
814+
"type": "object",
815+
"properties": {
816+
"maxFeePerGas": {
817+
"type": "number"
818+
},
819+
"maxPriorityFeePerGas": {
820+
"type": "number"
821+
}
822+
},
823+
"required": [
824+
"maxFeePerGas",
825+
"maxPriorityFeePerGas"
826+
]
827+
},
828+
"gasLimit": {
829+
"type": "number"
830+
},
831+
"gasPrice": {
832+
"type": "number"
833+
},
834+
"replayProtectionOptions": {
835+
"type": "object",
836+
"properties": {
837+
"chain": {
838+
"oneOf": [
839+
{
840+
"type": "string"
841+
},
842+
{
843+
"type": "number"
844+
}
845+
]
846+
},
847+
"hardfork": {
848+
"type": "string"
849+
}
850+
},
851+
"required": [
852+
"chain",
853+
"hardfork"
854+
]
855+
},
856+
"scan": {
857+
"type": "number"
858+
}
859+
}
813860
},
814-
"feeRate": {
815-
"type": "number"
861+
"solanaRecoveryOptions": {
862+
"type": "object",
863+
"properties": {
864+
"closeAtaAddress": {
865+
"type": "string"
866+
},
867+
"durableNonce": {
868+
"type": "object",
869+
"properties": {
870+
"publicKey": {
871+
"type": "string"
872+
},
873+
"secretKey": {
874+
"type": "string"
875+
}
876+
},
877+
"required": [
878+
"publicKey",
879+
"secretKey"
880+
]
881+
},
882+
"programId": {
883+
"type": "string"
884+
},
885+
"recoveryDestinationAtaAddress": {
886+
"type": "string"
887+
},
888+
"tokenContractAddress": {
889+
"type": "string"
890+
}
891+
}
816892
},
817-
"ignoreAddressTypes": {
818-
"type": "array",
819-
"items": {
820-
"type": "string",
821-
"enum": [
822-
"p2sh",
823-
"p2shP2wsh",
824-
"p2wsh",
825-
"p2tr",
826-
"p2trMusig2"
827-
]
893+
"utxoRecoveryOptions": {
894+
"type": "object",
895+
"properties": {
896+
"feeRate": {
897+
"type": "number"
898+
},
899+
"ignoreAddressTypes": {
900+
"type": "array",
901+
"items": {
902+
"type": "string"
903+
}
904+
},
905+
"scan": {
906+
"type": "number"
907+
},
908+
"userKeyPath": {
909+
"type": "string"
910+
}
828911
}
829912
}
830913
}

0 commit comments

Comments
 (0)